liuhairui před 5 měsíci
rodič
revize
17d3ba8c4d
1 změnil soubory, kde provedl 281 přidání a 79 odebrání
  1. 281 79
      src/view/DecisionSupport/Modelchange.vue

+ 281 - 79
src/view/DecisionSupport/Modelchange.vue

@@ -93,37 +93,138 @@
     </div>
 	
 	
-	<!-- 班组长审核对话框 -->
+	<!-- 班组长审核 -->
 	<el-dialog
 	  v-model="leaderAuditDialog"
 	  title="班组长审核"
-	  width="400px"
+	  width="700px"
 	  @close="closeLeaderAudit"
 	>
-	  <el-form :model="leaderForm" label-width="100px">
-	    <el-form-item label="换版联拼数">
-	      <el-input v-model="leaderForm.换版联拼数" placeholder="请输入换版联拼数" />
-	    </el-form-item>
-	    <el-form-item label="换版总工时">
-	      <el-input v-model="leaderForm.换版总工时" placeholder="请输入换版总工时" />
-	    </el-form-item>
-	    <el-form-item label="换版类型">
-	      <el-select v-model="leaderForm.换版类型" placeholder="请选择换版类型">
-	        <el-option label="装新版" value="装新版" />
-	        <el-option label="装旧版" value="装旧版" />
-	        <el-option label="换版" value="换版" />
-	      </el-select>
-	    </el-form-item>
-	    <el-form-item label="系数">
-	      <el-input v-model="leaderForm.coefficient" placeholder="请输入系数" />
-	    </el-form-item>
-	   <!-- <el-form-item label="班组长">
-	      <el-input v-model="leaderForm.leader" disabled />
-	    </el-form-item>
-	    <el-form-item label="Uniqid">
-	      <el-input v-model="leaderForm.Uniqid" disabled />
-	    </el-form-item> -->
-	  </el-form>
+	  <div class="detail-form">
+	    <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="工单编号">
+            <el-input v-model="detailData.工单编号" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="印件号">
+            <el-input v-model="detailData.印件号" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="工序号" label-width="70px">
+            <el-input v-model="detailData.工序号" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="工序名称">
+            <el-input v-model="detailData.工序名称" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="机台编号">
+            <el-input v-model="detailData.机台编号" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="系数">
+            <el-input v-model="detailData.系数" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="班组长" style="width: 33.33%; float: left; margin-right: 0;" label-width="70px">
+            <el-input v-model="detailData.班组长" placeholder="-" disabled/>
+          </el-form-item>
+          <el-form-item label="班组长确认状态" style="width: 33.33%; float: left; margin-right: 0;">
+            <el-input v-model="detailData.班组长确认状态" placeholder="-" disabled />
+          </el-form-item>
+          <el-form-item label="班组长确认时间" style="width: 33.33%; float: left; margin-right: 0;">
+            <el-input v-model="detailData.班组长确认时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" style="clear: both;">
+          <el-form-item label="统计人员" style="width: 33.33%; float: left; margin-right: 0;">
+            <el-input v-model="detailData.统计人员" placeholder="-" disabled/>
+          </el-form-item>
+          <el-form-item label="统计确认状态" style="width: 33.33%; float: left; margin-right: 0;">
+            <el-input v-model="detailData.统计确认状态" placeholder="-" disabled />
+          </el-form-item>
+          <el-form-item label="统计确认时间" style="width: 33.33%; float: left; margin-right: 0;">
+            <el-input v-model="detailData.统计确认时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="装版总工时">
+            <el-input v-model="detailData.装版总工时" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="装版类型">
+            <el-input v-model="detailData.装版类型" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="装版联拼数">
+            <el-input v-model="detailData.装版联拼数" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开始时间">
+            <el-input v-model="detailData.开始时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="装版联拼数">
+            <el-input v-model="detailData.装版联拼数" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="装版补产工时">
+            <el-input v-model="detailData.装版补产工时" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开始时间">
+            <el-input v-model="detailData.开始时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间">
+            <el-input v-model="detailData.结束时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="换版联拼数">
+            <el-input v-model="leaderForm.换版联拼数" placeholder="请输入换版联拼数" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="换版总工时">
+            <el-input v-model="leaderForm.换版总工时" placeholder="请输入换版总工时" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="换版类型">
+            <el-select v-model="leaderForm.换版类型" placeholder="请选择换版类型">
+              <el-option label="装新版" value="装新版" />
+              <el-option label="装旧版" value="装旧版" />
+              <el-option label="换版" value="换版" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="系数">
+            <el-input v-model="leaderForm.coefficient" placeholder="请输入系数" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上报机台">
+            <el-input v-model="detailData.上报机台" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+	  </div>
 	  <template #footer>
 	    <span class="dialog-footer">
 	      <el-button @click="closeLeaderAudit">取消</el-button>
@@ -132,27 +233,104 @@
 	  </template>
 	</el-dialog>
 	
-	<!-- 统计员审核对话框 -->
+	<!-- 统计员审核 -->
 	<el-dialog
 	  v-model="statAuditDialog"
 	  title="统计员审核"
-	  width="400px"
+	  width="700px"
 	  @close="closeStatAudit"
 	>
-	  <el-form :model="statForm" label-width="100px">
-	    <el-form-item label="装版补产工时">
-	      <el-input v-model="statForm.装版补产工时" placeholder="请输入装版补产工时" />
-	    </el-form-item>
-	   <!-- <el-form-item label="统计人员">
-	      <el-input v-model="statForm.statistics" disabled />
-	    </el-form-item>
-	    <el-form-item label="Uniqid">
-	      <el-input v-model="statForm.Uniqid" disabled />
-	    </el-form-item>
-	    <el-form-item label="关联ID">
-      <el-input v-model="statForm.yieldUid" disabled/>
-    </el-form-item> -->
-	  </el-form>
+	  <div class="detail-form">
+	    <el-row :gutter="20">
+	        <el-col :span="12">
+	          <el-form-item label="工单编号">
+	            <el-input v-model="detailData.工单编号" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="印件号">
+	            <el-input v-model="detailData.印件号" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="工序号" label-width="70px">
+	            <el-input v-model="detailData.工序号" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="工序名称">
+	            <el-input v-model="detailData.工序名称" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="机台编号">
+	            <el-input v-model="detailData.机台编号" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="系数">
+	            <el-input v-model="detailData.系数" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="24">
+	          <el-form-item label="班组长" style="width: 33.33%; float: left; margin-right: 0;" label-width="70px">
+	            <el-input v-model="detailData.班组长" placeholder="-" disabled/>
+	          </el-form-item>
+	          <el-form-item label="班组长确认状态" style="width: 33.33%; float: left; margin-right: 0;">
+	            <el-input v-model="detailData.班组长确认状态" placeholder="-" disabled />
+	          </el-form-item>
+	          <el-form-item label="班组长确认时间" style="width: 33.33%; float: left; margin-right: 0;">
+	            <el-input v-model="detailData.班组长确认时间" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="24" style="clear: both;">
+	          <el-form-item label="统计人员" style="width: 33.33%; float: left; margin-right: 0;">
+	            <el-input v-model="detailData.统计人员" placeholder="-" disabled/>
+	          </el-form-item>
+	          <el-form-item label="统计确认状态" style="width: 33.33%; float: left; margin-right: 0;">
+	            <el-input v-model="detailData.统计确认状态" placeholder="-" disabled />
+	          </el-form-item>
+	          <el-form-item label="统计确认时间" style="width: 33.33%; float: left; margin-right: 0;">
+	            <el-input v-model="detailData.统计确认时间" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="装版总工时">
+	            <el-input v-model="detailData.装版总工时" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+	          <el-form-item label="装版类型">
+	            <el-input v-model="detailData.装版类型" placeholder="-" disabled/>
+	          </el-form-item>
+	        </el-col>
+	        <el-col :span="12">
+          <el-form-item label="装版联拼数">
+            <el-input v-model="detailData.装版联拼数" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="装版补产工时">
+            <el-input v-model="statForm.装版补产工时" placeholder="请输入装版补产工时" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开始时间">
+            <el-input v-model="detailData.开始时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间">
+            <el-input v-model="detailData.结束时间" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上报机台">
+            <el-input v-model="detailData.上报机台" placeholder="-" disabled/>
+          </el-form-item>
+        </el-col>
+	      </el-row>
+	  </div>
 	  <template #footer>
 	    <span class="dialog-footer">
 	      <el-button @click="closeStatAudit">取消</el-button>
@@ -165,28 +343,24 @@
 	<el-dialog
 	  v-model="detailDialogVisible"
 	  title="明细详情数据"
-	  width="600px"
+	  width="700px"
 	  @close="closeDetailDialog"
 	>
 	  <div class="detail-form">
 	    <el-row :gutter="20">
+	     
 	      <el-col :span="12">
 	        <el-form-item label="工单编号">
 	          <el-input v-model="detailData.工单编号" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="印件号">
+		      <el-input v-model="detailData.印件号" placeholder="-" disabled/>
+		    </el-form-item>
+		  </el-col>
 	      <el-col :span="12">
-	        <el-form-item label="机台编号">
-	          <el-input v-model="detailData.机台编号" placeholder="-" disabled/>
-	        </el-form-item>
-	      </el-col>
-	      <el-col :span="12">
-	        <el-form-item label="印件号">
-	          <el-input v-model="detailData.印件号" placeholder="-" disabled/>
-	        </el-form-item>
-	      </el-col>
-	      <el-col :span="12">
-	        <el-form-item label="工序号">
+	        <el-form-item label="工序号" label-width="70px">
 	          <el-input v-model="detailData.工序号" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
@@ -195,56 +369,75 @@
 	          <el-input v-model="detailData.工序名称" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
+	     
 	      <el-col :span="12">
-	        <el-form-item label="装版类型">
-	          <el-input v-model="detailData.装版类型" placeholder="-" disabled/>
+	        <el-form-item label="机台编号">
+	          <el-input v-model="detailData.机台编号" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
-	      <el-col :span="12">
-	        <el-form-item label="装版总工时">
-	          <el-input v-model="detailData.装版总工时" placeholder="-" disabled/>
+		  <el-col :span="12">
+		    <el-form-item label="系数">
+		      <el-input v-model="detailData.系数" placeholder="-" disabled/>
+		    </el-form-item>
+		  </el-col>
+	      <el-col :span="24">
+	        <el-form-item label="班组长" style="width: 33.33%; float: left; margin-right: 0;" label-width="70px">
+	          <el-input v-model="detailData.班组长" placeholder="-" disabled/>
 	        </el-form-item>
-	      </el-col>
-	      <el-col :span="12">
-	        <el-form-item label="装版联拼数">
-	          <el-input v-model="detailData.装版联拼数" placeholder="-" disabled/>
+	        <el-form-item label="班组长确认状态" style="width: 33.33%; float: left; margin-right: 0;">
+	          <el-input v-model="detailData.班组长确认状态" placeholder="-" disabled /> 
 	        </el-form-item>
-	      </el-col>
-	      <el-col :span="12">
-	        <el-form-item label="班组长确认状态">
-	          <el-input v-model="detailData.班组长确认状态" placeholder="-" disabled />
+	        <el-form-item label="班组长确认时间" style="width: 33.33%; float: left; margin-right: 0;">
+	          <el-input v-model="detailData.班组长确认时间" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
-	      <el-col :span="12">
-	        <el-form-item label="统计确认状态">
-	          <el-input v-model="detailData.统计确认状态" placeholder="-" disabled />
+	      <el-col :span="24" style="clear: both;">
+	        <el-form-item label="统计人员" style="width: 33.33%; float: left; margin-right: 0;">
+	          <el-input v-model="detailData.统计人员" placeholder="-" disabled/>
+	        </el-form-item>
+	        <el-form-item label="统计确认状态" style="width: 33.33%; float: left; margin-right: 0;">
+	          <el-input v-model="detailData.统计确认状态" placeholder="-" disabled /> 
+	        </el-form-item>
+	        <el-form-item label="统计确认时间" style="width: 33.33%; float: left; margin-right: 0;">
+	          <el-input v-model="detailData.统计确认时间" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
 	      <el-col :span="12">
-	        <el-form-item label="系数">
-	          <el-input v-model="detailData.系数" placeholder="-" disabled/>
+	        <el-form-item label="装版总工时">
+	          <el-input v-model="detailData.装版总工时" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
 	      <el-col :span="12">
-	        <el-form-item label="装版补产工时">
-	          <el-input v-model="detailData.装版补产工时" placeholder="-" disabled/>
+	        <el-form-item label="装版类型">
+	          <el-input v-model="detailData.装版类型" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
 	      <el-col :span="12">
-	        <el-form-item label="开始时间">
-	          <el-input v-model="detailData.开始时间" placeholder="-" disabled/>
+	        <el-form-item label="装版联拼数">
+	          <el-input v-model="detailData.装版联拼数" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
 	      <el-col :span="12">
-	        <el-form-item label="结束时间">
-	          <el-input v-model="detailData.结束时间" placeholder="-" disabled/>
+	        <el-form-item label="装版补产工时">
+	          <el-input v-model="detailData.装版补产工时" placeholder="-" disabled/>
 	        </el-form-item>
 	      </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="开始时间">
+		      <el-input v-model="detailData.开始时间" placeholder="-" disabled/>
+		    </el-form-item>
+		  </el-col>
+		  <el-col :span="12">
+		    <el-form-item label="结束时间">
+		      <el-input v-model="detailData.结束时间" placeholder="-" disabled/>
+		    </el-form-item>
+		  </el-col>
 	    </el-row>
 	  </div>
 	  <template #footer>
 	    <span class="dialog-footer">
-	      <el-button @click="closeDetailDialog">关闭</el-button>
+	      <el-button @click="closeDetailDialog">取消</el-button>
+	      <el-button type="primary" @click="closeDetailDialog">确认</el-button>
 	    </span>
 	  </template>
 	</el-dialog>
@@ -454,12 +647,17 @@
   const handleLeaderAudit = (row) => {
     currentRow.value = row
  
+    // 设置审核表单数据
     leaderForm.换版联拼数 = row['装版联拼数']
     leaderForm.换版总工时 = row['装版总工时']
     leaderForm.换版类型 = row['装版类型']
     leaderForm.coefficient = row['系数']
     leaderForm.leader = sys_id
     leaderForm.Uniqid = row['Uniqid']
+    
+    // 设置明细数据
+    detailData.value = { ...row }
+    
     // 打开对话框
     leaderAuditDialog.value = true
   }
@@ -472,6 +670,10 @@
     statForm.statistics = sys_id
     statForm.Uniqid = row['Uniqid']
     statForm.yieldUid = row['关联ID']
+    
+    // 设置明细数据
+    detailData.value = { ...row }
+    
     // 打开对话框
     statAuditDialog.value = true
   }