优化

src/view/performance/Dayreports.vue

@@ -1363,36 +1363,36 @@ const initFormData = () => {
     sczl_dedh: "",
     sczl_工价系数: "",
     sczl_计产系数: "",
-    sczl_bh1: "",
-    sczl_bh2: "",
-    sczl_bh3: "",
-    sczl_bh4: "",
-    sczl_bh5: "",
-    sczl_bh6: "",
-    sczl_bh7: "",
-    sczl_bh8: "",
-    sczl_bh9: "",
-    sczl_bh10: "",
-    sczl_rate1: "",
-    sczl_rate2: "",
-    sczl_rate3: "",
-    sczl_rate4: "",
-    sczl_rate5: "",
-    sczl_rate6: "",
-    sczl_rate7: "",
-    sczl_rate8: "",
-    sczl_rate9: "",
-    sczl_rate10: "",
-    sczl_bh1_name: "",
-    sczl_bh2_name: "",
-    sczl_bh3_name: "",
-    sczl_bh4_name: "",
-    sczl_bh5_name: "",
-    sczl_bh6_name: "",
-    sczl_bh7_name: "",
-    sczl_bh8_name: "",
-    sczl_bh9_name: "",
-    sczl_bh10_name: "",
+    // sczl_bh1: "",
+    // sczl_bh2: "",
+    // sczl_bh3: "",
+    // sczl_bh4: "",
+    // sczl_bh5: "",
+    // sczl_bh6: "",
+    // sczl_bh7: "",
+    // sczl_bh8: "",
+    // sczl_bh9: "",
+    // sczl_bh10: "",
+    // sczl_rate1: "",
+    // sczl_rate2: "",
+    // sczl_rate3: "",
+    // sczl_rate4: "",
+    // sczl_rate5: "",
+    // sczl_rate6: "",
+    // sczl_rate7: "",
+    // sczl_rate8: "",
+    // sczl_rate9: "",
+    // sczl_rate10: "",
+    // sczl_bh1_name: "",
+    // sczl_bh2_name: "",
+    // sczl_bh3_name: "",
+    // sczl_bh4_name: "",
+    // sczl_bh5_name: "",
+    // sczl_bh6_name: "",
+    // sczl_bh7_name: "",
+    // sczl_bh8_name: "",
+    // sczl_bh9_name: "",
+    // sczl_bh10_name: "",
   };
 };
 // 验证规则

src/view/performance/chejianbaogong.vue

@@ -15,6 +15,7 @@
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px"  @click="gzSel" >员工工资查询</el-button>
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="oncomplaints" >客诉记录</el-button>
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 120px" @click="deldbcl_onclick" :disabled="dbclSelection === ''"   title="当班产量明细" >当班产量明细删除</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px"  @click="pd_lcdlistonClick" >流程单查询</el-button>
 		</div>
 	</header>
 	
@@ -146,7 +147,7 @@
 		<el-tab-pane label="当班产量明细" @click="showsTable('当班产量明细')" name="third">
             <el-table ref="multipleTable" highlight-current-row="true" :show-overflow-tooltip="true" :row-style="{ height: '40px' }"
                       :cell-style="{ padding: '0px'}" :header-row-style="{ height: '40px' }" :header-cell-style="{ padding: '0px' }"
-                      @row-dblclick="ybupdateCompanyFunc" style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark"
+                      @row-dblclick="ybupdateCompanyFunc" @row-click="dbclmxclick" style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark"
                       :data="CLMXData" row-key="ID" @selection-change="dbclmxSelectionChange">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
@@ -159,14 +160,14 @@
               <el-table-column align="left" label="制程次品" prop="制程次品" width="100" />
               <el-table-column align="left" label="前工序废" prop="前工序废" width="100" />
               <el-table-column align="left" label="来料异常" prop="来料异常"  width="100"/>
+			  <el-table-column align="left" label="码开始行" prop="码开始行" width="100" />
+              <el-table-column align="left" label="码结束行" prop="码结束行" width="100" />
+              <el-table-column align="left" label="码包" prop="码包" width="100" />
               <el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
               <el-table-column align="left" label="保养工时" prop="保养工时" width="100" />
               <el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
               <el-table-column align="left" label="异常停机工时" prop="异常停机工时"  width="120"/>
               <el-table-column align="left" label="通电工时" prop="通电工时" width="100"/>
-              <el-table-column align="left" label="码开始行" prop="码开始行" width="100" />
-              <el-table-column align="left" label="码结束行" prop="码结束行" width="100" />
-              <el-table-column align="left" label="码包" prop="码包" width="100" />
               <el-table-column align="left" label="主电表" prop="主电表"  width="100"/>
               <el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
               <el-table-column align="left" label="色度数" prop="色度" width="100" />
@@ -1304,18 +1305,18 @@
 				  </el-col>
       </el-row>
 			  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
-				  <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
-				  </el-col>
-            <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
-              <el-form-item label="日期" prop="id" style="margin-top:0px; margin-bottom: 1px;">
-                <el-input v-model="formData3.日期" id="日期" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')"  placeholder="" />
-              </el-form-item>
-            </el-col>
-			  	  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
-              <el-form-item label="流程标牌" prop="id" style="margin-top:0px; margin-bottom: 1px;">
-              <el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')"  placeholder="" />
-              </el-form-item>
-			  	  </el-col>
+				  <!-- <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
+				  </el-col> -->
+				<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+					<el-form-item label="日期" prop="" style="margin-top:0px; margin-bottom: 1px;margin-left:24px">
+					<el-input v-model="formData3.日期" id="日期" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')"   placeholder="" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+					<el-form-item label="流程标牌" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')"  placeholder="" />
+					</el-form-item>
+				</el-col>
 			  	  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
               <el-form-item label="上机时间" prop="id" style="margin-top:0px; margin-bottom: 1px;">
               <el-input v-model="formData3.上机时间" id="上机时间" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')"  placeholder="" />
@@ -1333,85 +1334,102 @@
 <!--               <div style="margin-top: 20px;">-->
                <div style="margin-top: 5px;">
                	<el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
-                  <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col>
-                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-                    <el-form-item label="产量" prop="id" style="margin-top:0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.产量" id="产量" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')"  placeholder="" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+                  <!-- <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col> -->
+				  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+					<el-form-item label="产量" prop="" style="margin-top:0px; margin-bottom: 1px;margin-left:24px">
+					<el-input v-model="formData3.产量" id="产量" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')"   placeholder="" />
+					</el-form-item>
+				  </el-col>
+			
+                  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
                     <el-form-item label="制程废品" prop="id" style="margin-top:0px; margin-bottom: 1px;">
                       <el-input v-model="formData3.制程废品" id="制程废品" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')"  placeholder="" />
                     </el-form-item>
                   </el-col>
+
                   <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
-                    <el-form-item label="制程次品" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+                    <el-form-item label="制程次品" prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:0px">
                       <el-input v-model="formData3.制程次品" id="制程次品" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')"  placeholder="" />
                     </el-form-item>
                   </el-col>
+
                   <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
                     <el-form-item label="前工序废" prop="" style="margin-top:0px; margin-bottom: 1px;">
                       <el-input v-model="formData3.前工序废" id="前工序废" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')"  placeholder="" />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+
+                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
                     <el-form-item label="来料异常" prop="" style="margin-top:0px; margin-bottom: 1px;">
                       <el-input v-model="formData3.来料异常" id="来料异常" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')"  placeholder="" />
                     </el-form-item>
                   </el-col>
                 </el-row>
 
-
                 <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
-								  <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col>
-								  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-                    <el-form-item label="联数" prop="" style="margin-top:0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.Gy0_ls" id="联数" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
-                    </el-form-item>
-								  </el-col>
-								  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-                    <el-form-item label="墨色" prop="" label-width="60" style="margin-top:0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.Gy0_ms" id="墨色" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
-                    </el-form-item>
-								  </el-col>
-                  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-                    <el-form-item label="装版总时长"  prop="id" style="margin-top:0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.装版总时长" disabled id="装版总时长" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
-                    </el-form-item>
-                  </el-col>
-                    <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-                      <el-form-item label="打样总工时" label-width="100" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+					<!-- <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col> -->
+
+					<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
+						<el-form-item label="联数" prop="" style="margin-top:0px; margin-bottom: 1px;margin-left:24px">
+						<el-input v-model="formData3.Gy0_ls" id="联数" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"   placeholder="" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+						<el-form-item label="墨色" prop="" label-width="60" style="margin-top:0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.Gy0_ms" id="墨色" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"   placeholder="" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+						<el-form-item label="装版总时长"  prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:-12px">
+						<el-input v-model="formData3.装版总时长" disabled id="装版总时长" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
+						</el-form-item>
+					</el-col>
+
+                    <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+                      <el-form-item label="打样总工时"  prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:-12px">
                         <el-input v-model="formData3.打样总工时" disabled style="margin-top:0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
                       </el-form-item>
                     </el-col>
+
                     <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
                       <el-form-item label="通电工时"  prop="id" style="margin-top:0px; margin-bottom: 1px;">
                         <el-input v-model="formData3.通电工时" style="margin-top:0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')"  placeholder="" />
                       </el-form-item>
                     </el-col>
                   </el-row>
+
 					<el-row :gutter="20" style="margin-top:0px; margin-bottom: 1vh;">
-					<el-col :span="1" style="margin-top:0px; margin-bottom: 1px;">
+					<!-- <el-col :span="1" style="margin-top:0px; margin-bottom: 1px;"></el-col> -->
+					<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;margin-left:0">
+						<el-form-item label="定额代号" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.定额代号" id="定额代号" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
+						</el-form-item>
 					</el-col>
-					<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-					<el-form-item label="定额代号" prop="id" style="margin-top:0px; margin-bottom: 1px;">
-					  <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
-					</el-form-item>
-					</el-col>
-					<el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-					</el-col>
-					  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-					  <el-form-item label="码包" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+
+					<el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="码开始行" prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:0">
+						<el-input v-model="formData3.码开始行" style="margin-top:0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
+					  </el-form-item>
+					  </el-col>
+					  <el-col :span="3" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="码结束行" prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:0">
+						<el-input v-model="formData3.码结束行" style="margin-top:0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
+					  </el-form-item>
+					  </el-col>
+					  <el-col :span="6" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="码包" prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:105px">
 						<el-input v-model="formData3.码包" style="margin-top:0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
 					  </el-form-item>
 					  </el-col>
-					  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-					  <el-form-item label="主电表" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-col :span="5" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="主电表" prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:14px">
 						<el-input v-model="formData3.主电表" style="margin-top:0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
 					  </el-form-item>
 					  </el-col>
 					  <el-col :span="4" style="margin-top:0px; margin-bottom: 1px;">
-					  <el-form-item label="辅电表" prop="id" style="margin-top:0px; margin-bottom: 1px;">
+					  <el-form-item label="辅电表" prop="id" style="margin-top:0px; margin-bottom: 1px;margin-left:16px">
 						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top:0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
 					  </el-form-item>
 					  </el-col>
@@ -1419,7 +1437,7 @@
                	<div style="display: flex;">
 					  <div style="width: 248vh;">组员及分配比例</div>
 					  <div style="width: 22vh;">特殊组员</div>
-					  <div style="">拉料人员</div>
+					  <div style="width: 22vh;">拉料人员</div>
                	</div>
                	<el-row :gutter="10" style="margin-top: 1vh;">
                		 <el-col :span="2">
@@ -1749,7 +1767,45 @@
 			    </div>
 			  </el-form>
 			</el-dialog>
-			
+
+			<!--流程单查询【弹窗】-->
+			<el-dialog v-model="pd_lcdlist" title="工单工序生产进程" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
+            <div style="width: 100%;height: 100%;">
+              <el-button type="" @click="pd_lcdCancel">退出</el-button>
+            </div>
+            <div style="width: 100%; height: 100%; display: flex; align-items: center;">
+              <el-form-item label="工单编号" style="margin-right: 20px; padding: 0;">
+                <el-input v-model="pd_lcdformData['gdbh']" @keyup.enter="pd_lcdProductValue"/>
+              </el-form-item>
+              <el-form-item label="印件号" style="margin-right: 5px; padding: 0;">
+                <el-input v-model="pd_lcdformData['yjno']" @keyup.enter="pd_lcdProductValue"/>
+              </el-form-item>
+              <el-form-item label="" style="margin-right: 5px; padding: 0;">
+                <el-input v-model="pd_lcdformData['code']" disabled/>
+              </el-form-item>
+              <el-form-item label="" style="margin-right: 5px; padding: 0;">
+                <el-input v-model="pd_lcdformData['name']" disabled style="width: 500px"/>
+              </el-form-item>
+            </div>
+            <div style="width: 100%; height: 70vh; display: flex;">
+              <layout>
+                <layout-sider :resize-directions="['right']" :width="240" style="margin-right: 10px;height: 70vh;">
+                  <div class="JKWTree-tree">
+                    <el-tree :data="pd_lcd_treeData" @node-click="pd_lcd_handleNodeClick" default-expand-all></el-tree>
+                  </div>
+                </layout-sider>
+                <layout-main>
+                  <!-- 这里放右侧的内容 -->
+                  <el-space wrap>
+                    <!-- 右侧内容 -->
+                    <template v-for="item in processList.total_process">
+                      <el-button disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button>
+                    </template>
+                  </el-space>
+                </layout-main>
+              </layout>
+            </div>
+          </el-dialog>
 
 
 
@@ -2129,7 +2185,10 @@ import {
 import {
   EquipmentSchedulingEdit,
   Procedure,
-  teamDel, workOrderListDetail
+  teamDel, 
+  workOrderListDetail,
+  getOrderProcessLeft,
+  getOrderProcessRight
 } from "@/api/yunyin/yunying";
 
 import {
@@ -2446,6 +2505,10 @@ const bzcloseDialog = async () => {
 const dbclmxhandleSelectionChange = async (row) => {
   console.log(row)
 }
+
+const dbclmxclick = async (row) => {
+	console.log(row)
+}
 const ybupdateCompanyFunc = async (row) => {
   console.log(currentBz.value)
   dbformData.value = {};
@@ -3717,7 +3780,7 @@ const ReportInfo = async () => {
 	console.log(getTimelistss)
 	console.log("获取下机时间")
 	console.log(formData)
-	
+	chanliangVisible.value = true
 	//4.1获取报工单其他信息接口
 	const response = await reportInfo({ machine: JTMC.split("#")[0] });
 	// console.log(response)
@@ -3889,7 +3952,10 @@ const SubmitDailyProduction = async () => {
     code: formData3.value.码包,
     main_meter: formData3.value.主电表,
     auxiliary_meter: formData3.value.辅电表,
-    bom: formData3.value.formattedArray
+    bom: formData3.value.formattedArray,
+	ma_start: formData3.value.码开始行,
+	ma_end: formData3.value.码结束行,
+	
   }
   console.log(restoredData)
   //4.2日产量上报 添加
@@ -5314,9 +5380,13 @@ const updateCompanyFunc = async(row) => {
 }
 const rowws = ref(null)
 const wangongbh = ref(null)
+const _Gd_gdbh = ref(null)
+const _Gd_yjno = ref(null)
 //设备作业清单单机
 const yjupdateCompanyFunc = async(row) => {
   console.log(row)
+  _Gd_gdbh.value = row['工单编号|质量信息'].replace(/\|$/, '')
+  _Gd_yjno.value = row['印件号']
   rowws.value = row
   wangongbh.value = row['工单编号|质量信息'].replace(/\|$/, '')
   console.log("通过 "+row['工单编号|质量信息'].replace(/\|$/, '')+" 获取右上角数据↓↓↓↓↓")
@@ -5552,6 +5622,79 @@ const enterDialog = async () => {
   })
 }
 
+// =========== 流程单查询 ===========
+
+const pd_lcdlist = ref(false);
+const pd_lcdformData = reactive({
+  gdbh: '',
+  code: '',
+  name: '',
+  yjno: '',
+});
+// 流程单查询按钮
+const processList = ref([]);
+const pd_lcdlistonClick = async () => {
+  if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
+    ElMessage({type: 'warning',message: '请选择具体的工单，在进行操作'})
+    return false;
+  }else{
+    pd_lcdformData['gdbh'] = _Gd_gdbh.value;
+    pd_lcdformData['yjno'] = _Gd_yjno.value;
+    pd_lcdlist.value = true;
+    processList.value = []
+    _getOrderProcessLeft_list();
+  }
+}
+const pd_lcdProductValue = async () => {
+  _getOrderProcessLeft_list();
+}
+const pd_lcd_treeData = ref([]);
+const _getOrderProcessLeft_list = async () => {
+  const order = pd_lcdformData['gdbh'];
+  const yjno = pd_lcdformData['yjno']
+  // console.log(order)
+  try {
+    //5.1流程单查询-工单工序生产进程菜单栏
+    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order,yjno:yjno});
+    console.log(getOrderProcessLeft_list)
+    pd_lcdformData['code'] = getOrderProcessLeft_list.data.Gd_info['code'];
+    pd_lcdformData['name'] = getOrderProcessLeft_list.data.Gd_info['name'];
+    pd_lcd_treeData.value = [{
+      label: order + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
+      // label: order + '-' + getOrderProcessLeft_list.data.Gd_info['code'] + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
+      value: undefined,
+      children: []
+    }]
+    const newData = [];
+    for (let key in getOrderProcessLeft_list.data.Gy_info) {
+      let temp = getOrderProcessLeft_list.data.Gy_info[key];
+      let concatenatedValue = `${temp.Gy0_yjno}-${temp.Gy0_gxh} ---> ${temp.Gy0_gxmc}`;
+      newData.push({ label: concatenatedValue,value: temp.Gy0_gxh });
+    }
+    pd_lcd_treeData.value[0].children = newData;
+    //5.2流程单查询-获取工单工序生产进程右侧【进入页面默认显示第一个】
+    const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:newData[0].value,yjno:yjno});
+    processList.value = getOrderProcessRight_list.data
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const pd_lcd_handleNodeClick = async (node) => {
+  if (node.value === undefined) return
+  const order = pd_lcdformData['gdbh'];
+  const yjno = pd_lcdformData['yjno'];
+  ////5.2流程单查询-获取工单工序生产进程右侧
+  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value,yjno:yjno});
+  console.log(getOrderProcessRight_list)
+  processList.value = getOrderProcessRight_list.data
+};
+
+// 流程单查询退出
+const pd_lcdCancel = async () => {
+  pd_lcdlist.value = false;
+}
+
 // const sbzyqdplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
 //   if(formData.value['工单编号'] === row['工单编号|质量信息'].split('|')[0]){
 //     return 'back-color-row';

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -651,6 +651,11 @@ const chejianRowClick = async (row) => {
   _Gd_gdbh.value = row.工单编号;
   _Gd_yjno.value = row.yjno;
 }
+//点击下方表格 获取工单编号和印件号
+const chejianfuRowClick = async (row) => {
+  _Gd_gdbh.value = row.工单编号;
+  _Gd_yjno.value = row.yjno;
+}
 const gdtableRowClick = async (row) => {
   _Gd_gdbh.value = row.工单编号;
   if (currentNode.value == "计划中") {

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -207,7 +207,7 @@
 						style="width: 100%;height: 250px;margin-top: 0px;" border tooltip-effect="dark"
 						:data="bzData" row-key="ID" @selection-change="BZSelectionChange">
           			  <!-- <el-table-column type="selection" width="55" /> -->
-          			  <el-table-column align="left" label="机台" prop="JTMC" width="70"/>
+          			  <el-table-column align="left" label="机台" prop="JTMC" width="100"/>
           			  <el-table-column align="left" label="班组" prop="班组号" width="60"/>
           			  <el-table-column align="left" label="组员1" prop="0" width="195"/>
           			  <el-table-column align="left" label="组员2" prop="1" width="195"/>
@@ -884,7 +884,7 @@
 						style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" >
 				<el-table-column type="selection" width="55" />
 				<!-- <el-table-column align="left" label="选择" prop="工单编号"  width="100"/> -->
-				<el-table-column fixed align="left" label="产品名称" prop="产品名称"  width="200"/>
+				<el-table-column fixed align="left" sortable label="产品名称" prop="产品名称"  width="200"/>
 				<el-table-column fixed align="left" label="工序" prop="工序"  width="100"/>
 				<el-table-column fixed align="left" label="产量" prop="产量"  width="70"/>
 				<el-table-column align="left" label="千件工价" prop="千件工价"  width="85"/>
@@ -4744,10 +4744,10 @@ const fpsum2 = ref();
 function updateTotal() {
   // 直接指定要累加的属性名  
   const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7',];  
-  const values = relevantKeys.map(key => parseFloat(formDatas.value[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
+  const values = relevantKeys.map(key => parseFloat(formDatas.value[key], 10) || ""); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
   fpsum.value = values.reduce((sum, value) => sum + value, 0);
   const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组员6','组员7','组员8','组员9',];  
-  const valuess = relevantKeys2.map(key => parseFloat(formdata3.value[key]['比例'], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
+  const valuess = relevantKeys2.map(key => parseFloat(formdata3.value[key]['比例'], 10) || ""); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
   fpsum2.value = valuess.reduce((sum, value) => sum + value, 0);  
 }
 
@@ -4760,8 +4760,30 @@ const addBz = async() => {
 	updateTotal()
 	const jt = selectedOption.value.split('|')[0]//获取车间数据
 	//判断车间分配比例【SY、PM、WY】	
-	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM') && !jt.includes('WY');
+	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
 	console.log(fpsum.value)
+	const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];
+  const values = relevantKeys.reduce((acc, key) => {
+    const value = parseFloat(formDatas.value[key], 10);
+    if (!isNaN(value)) {
+      acc.push(value); // 只有当 value 不是 NaN 时才添加到数组中
+    }
+    return acc;
+  }, []); // 初始化为空数组
+ 
+  console.log("数值", values);
+ 
+  const hasInvalidValue = values.some(value => value <= 0 || value > 1);
+  console.log(hasInvalidValue);
+ 
+  if (hasInvalidValue) {
+    ElMessage({
+      type: "error",
+      message: "某人分配系数有误",
+    });
+    return;
+  }
+	
 	if (fpsum.value > 1) {
 		ElMessage({
 		type: "error",
@@ -4913,10 +4935,16 @@ const delBz = async() => {
 		}).then(() => {
       const response = teamDel({UniqId:UniqId})
 	  response.then(result => {
+		console.log(result)
 	    if(result.code===0){
+		let messageType = 'success';
+		// 检查 result.msg 是否包含特定的错误提示
+		if (result.msg.includes('无法删除正在生产的班组资料，请先切换班组')) {
+			messageType = 'error';
+		}
 	      ElMessage({
-	        type: 'success',
-	        message: '成功'
+	        type: messageType,
+	        message: result.msg
 	      })
 	    		console.log(response)
 	    		FacilityTeam(JTMC)
@@ -6555,54 +6583,79 @@ const FacilitychanLiang = async () => {
   if(response.code==0){
 		let totalA = response.data['totalA']
 	  	let totalB = response.data['totalB']
+		let 保养工时A = response.data['保养工时A']
+		let 保养工时B = response.data['保养工时B']
 		let 制程废品A = response.data['制程废品A']
 		let 制程废品B = response.data['制程废品B']
 		let 制程次品A = response.data['制程次品A']
 		let 制程次品B = response.data['制程次品B']
+		let 前工序废A = response.data['前工序废A']
+		let 前工序废B = response.data['前工序废B']
+		let 异常工时A = response.data['异常工时A']
+		let 异常工时B = response.data['异常工时B']
+		let 异常补时工时A = response.data['异常补时工时A']
+		let 异常补时工时B = response.data['异常补时工时B']
+		let 打样工时A = response.data['打样工时A']
+		let 打样工时B = response.data['打样工时B']
 		let 来料异常A = response.data['来料异常A']
 		let 来料异常B = response.data['来料异常B']
 		let 装版工时A = response.data['装版工时A']
 		let 装版工时B = response.data['装版工时B']
+		let 通电工时A = response.data['通电工时A']
+		let 通电工时B = response.data['通电工时B']
 		
 	  	 delete response.data['totalA']
 	  	 delete response.data['totalB']
 		 
+		 delete response.data['保养工时A']
+		 delete response.data['保养工时B']
 		 delete response.data['制程废品A']
 		 delete response.data['制程废品B']
 		 delete response.data['制程次品A']
 		 delete response.data['制程次品B']
+		 delete response.data['前工序废A']
+		 delete response.data['前工序废B']
+		 delete response.data['异常工时A']
+		 delete response.data['异常工时B']
+		 delete response.data['异常补时工时A']
+		 delete response.data['异常补时工时B']
+		 delete response.data['打样工时A']
+		 delete response.data['打样工时B']
 		 delete response.data['来料异常A']
 		 delete response.data['来料异常B']
 		 delete response.data['装版工时A']
 		 delete response.data['装版工时B']
+		 delete response.data['通电工时A']
+		 delete response.data['通电工时B']
 		 
 	  	gytableData.value=Object.values(response.data)
 		
-		console.log(response.data)
+		console.log(111,gytableData.value)
 		
 		
 		
 	  	if(totalA){
 	  		let rowA = {
-	  			产品名称: 'A班产量：'+totalA,
+	  			产品名称: 'A班产量：',
 	  			UniqId: "",bzdh: "",cpmc: "",dedh: "",gxh: "",gxmc: "",num: "",sczl_bh98: "",sj1: "",sj2: "",yjno: "",
-	  			主电表: "",产量: "",保养工时: "",制程废品: 制程废品A,制程次品:制程次品A,前工序废: "",千件工价: "",印刷方式: "",备注: "",
-	  			工单编号: "",工序: "",异常总工时: "",异常类型: "",异常补时: "",打样工时: "",日定额: "",更新时间: "",来料异常: 来料异常A,用户: "",码包: "",
-	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时: 装版工时A,辅电表: "",通电工时: "",难度系数: "",
+	  			主电表: "",产量:totalA,保养工时: 保养工时A,制程废品: 制程废品A,制程次品:制程次品A,前工序废: 前工序废A,千件工价: "",印刷方式: "",备注: "",
+	  			工单编号: "",工序: "",异常总工时: 异常工时A,异常类型: "",异常补时: 异常补时工时A,打样工时: 打样工时A,日定额: "",更新时间: "",来料异常: 来料异常A,用户: "",码包: "",
+	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时: 装版工时A,辅电表: "",通电工时: 通电工时A,难度系数: "",
 	  		}
 	  		gytableData.value.push(rowA)
 	  	}
 	  	if(totalB){
-	  		let rowB = {
-	  			产品名称: 'B班产量：'+totalB,
+			let rowB = {
+	  			产品名称: 'B班产量：',
 	  			UniqId: "",bzdh: "",cpmc: "",dedh: "",gxh: "",gxmc: "",num: "",sczl_bh98: "",sj1: "",sj2: "",yjno: "",
-	  			主电表: "",产量: "",保养工时: "",制程废品: 制程废品B,制程次品: 制程次品B,前工序废: "",千件工价: "",印刷方式: "",备注: "",
-	  			工单编号: "",工序: "",异常总工时: "",异常类型: "",异常补时: "",打样工时: "",日定额: "",更新时间: "",来料异常: 来料异常B,用户: "",码包: "",
-	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时:装版工时B,辅电表: "",通电工时: "",难度系数: "",
+	  			主电表: "",产量:totalB,保养工时: 保养工时B,制程废品: 制程废品B,制程次品:制程次品B,前工序废: 前工序废B,千件工价: "",印刷方式: "",备注: "",
+	  			工单编号: "",工序: "",异常总工时: 异常工时B,异常类型: "",异常补时: 异常补时工时B,打样工时: 打样工时B,日定额: "",更新时间: "",来料异常: 来料异常B,用户: "",码包: "",
+	  			码开始行: "",码结束行: "",组员1: "",组员2: "",组员3: "",色度数: "",装版工时: 装版工时B,辅电表: "",通电工时: 通电工时B,难度系数: "",
 	  		}
 	  		gytableData.value.push(rowB)
 	  	}
   }
+  console.log(222,gytableData.value)
 }
 
 // 关闭弹窗