Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/job/related/related.vue

@@ -51,7 +51,7 @@
               <el-table-column align="left" sortable label="关联人数" prop="关联人数" width="105"/>
               <el-table-column align="left" sortable label="关联计件工资" prop="关联计件工资" width="135"/>
               <el-table-column align="left" sortable label="关联加班工资" prop="关联加班工资" width="135"/>
-			  <el-table-column align="left" sortable label="关联额定补差" prop="关联额定补差" width="135"/>
+			  <el-table-column align="left" sortable label="关联定额补差" prop="关联定额补差" width="135"/>
               <el-table-column align="left" sortable label="关联计时工资" prop="关联计时工资" width="135"/>
               <el-table-column align="left" sortable label="关联工资合计" prop="关联工资合计" width="135"/>
             </el-table>

src/view/performance/yuangongrigongzi.vue

@@ -459,7 +459,7 @@ const getTableData = async () => {
 	
   const response = await dailygetList({
 	  date: params.date, department: params.sys_id,});
-  console.log(response)
+  // console.log(response)
   if (response.code === 0) {
 	   const originalData = response.data;
 	      const summaryData = generateSummaryData(originalData);
@@ -476,7 +476,7 @@ const getTableData = async () => {
 			 
 	        }
 	      });
-		  console.log(combinedData)
+		  // console.log(combinedData)
 	      // 更新表格数据
 	      tableData.splice(0, tableData.length, ...combinedData);
   }
@@ -497,20 +497,23 @@ const generateSummaryData = (data) => {
       }
       // 创建新的合计数据
       currentSummary = {
-        '员工姓名': name,
-        '日期': 0,
+        '员工姓名': name,
+		'日期': 0,
         '计件工资': 0,
         '加班工资': 0,
+        '计时时数': 0,
+        '计时工资': 0,
         '日工资合计': 0
       };
       currentName = name;
     }
 
-    // 更新合计数据
-	
-    currentSummary['日期']++;
+    // 更新合计数据
+	currentSummary['日期']++;
     currentSummary['计件工资'] += parseFloat(item['计件工资']);
     currentSummary['加班工资'] += parseFloat(item['加班工资']);
+    currentSummary['计时时数'] += parseFloat(item['计时时数']);
+    currentSummary['计时工资'] += parseFloat(item['计时工资']);
     currentSummary['日工资合计'] += parseFloat(item['日工资合计']);
 	currentSummary['员工姓名']='合计（'+currentSummary['日期']+'天）';
   });
@@ -524,6 +527,8 @@ const generateSummaryData = (data) => {
   summaryData.forEach((summary) => {
     summary['计件工资'] = summary['计件工资'].toFixed(2); // 保留两位小数
 	summary['加班工资'] = summary['加班工资'].toFixed(2);
+	summary['计时时数'] = summary['计时时数'].toFixed(2);
+	summary['计时工资'] = summary['计时工资'].toFixed(2);
 	summary['日工资合计'] = summary['日工资合计'].toFixed(2);
   });
 

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -778,6 +778,7 @@
                         <el-option label="新华订单" value="新华订单"></el-option>
                         <el-option label="研发打样" value="研发打样"></el-option>
                         <el-option label="废码利用" value="废码利用"></el-option>
+                        <el-option label="翌星订单" value="翌星订单"></el-option>
                       </el-select>
                       <!--                      <el-input v-model="add_gdscgdformData['重点工单']"  style="width: 110px;"  id="重点工单"  @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')" />-->
                     </el-form-item>
@@ -1081,7 +1082,7 @@
                     <el-input disabled v-model="add_yjzlformdata.万小张" style="width: 80px;"/>
                   </el-form-item>
                   <el-form-item label="纸张规格:" class="mab" prop="keyOrder">
-                    <el-input disabled v-model="add_yjzlformdata.tlgg" style="width: 240px;"/>
+                    <el-input  v-model="add_yjzlformdata.tlgg" style="width: 240px;"/>
                   </el-form-item>
                 </div>
                 <div style="display: flex; gap: 0px;">
@@ -1210,7 +1211,7 @@
                       <el-input v-model="gdgyformData['难度系数']"  style="flex: 1;" id="难度系数"  @keydown="gyzlent($event, '设备编号', '难度系数', '小时产能')"/>
                     </el-form-item>
                     <el-form-item label="装版工时:"  class="mab" prop="keyOrder">
-                      <el-input disabled v-model="gdgyformData['装版工时']"  style="flex: 1;"/>
+                      <el-input disabled v-model="gdgyformData['辅助工时']"  style="flex: 1;"/>
                     </el-form-item>
                     <el-form-item label="排产小时产能:"  class="mab" prop="keyOrder" label-width=" 120px">
                       <el-input  v-model="gdgyformData['小时产能']"  style="flex: 1;" id="小时产能"  @keydown="gyzlent($event, '难度系数', '小时产能', '')"/>
@@ -2163,14 +2164,14 @@ const add_gdyjenterDialog =  async  () => {
     ElMessage({type: 'warning',message: '印件号不能为空'})
     return false;
   }
-  if(add_yjzlformdata['yjdh'] === ''){
-    ElMessage({type: 'warning',message: '印件代号不能为空'})
-    return false;
-  }
-  if(add_yjzlformdata['zzdh'] === ''){
-    ElMessage({type: 'warning',message: '纸张编号不能为空'})
-    return false;
-  }
+  // if(add_yjzlformdata['yjdh'] === ''){
+  //   ElMessage({type: 'warning',message: '印件代号不能为空'})
+  //   return false;
+  // }
+  // if(add_yjzlformdata['zzdh'] === ''){
+  //   ElMessage({type: 'warning',message: '纸张编号不能为空'})
+  //   return false;
+  // }
   const formattedData = {
     Yj_Gdbh: _Gd_gdbh.value,
     yj_cpdh: _Gd_cpdh.value,
@@ -3371,6 +3372,7 @@ const gdgyupdateCompanyFunc = async(row) => {
   gdgyformData['设备编号'] = []
   //通过车间名称查询机台
   const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
+  console.log(MachineList_jitai)
   if(MachineList_jitai.data === null || MachineList_jitai.data === ''){
     ElMessage({type: 'warning', message: '未找到该车间机台'})
     return false;
@@ -3430,10 +3432,10 @@ const gdgyupdateCompanyFunc = async(row) => {
 const gdgyenterDialog = async () => {
   if(_Gd_gdbh.value){
     const selectedValuesAsString = gdgyformData['设备编号'].join(' ');
-    if(gdgyformData['shdh'] === ''){
-      ElMessage({type: 'warning', message: '工序损耗不能为空'})
-      return false;
-    }
+    // if(gdgyformData['shdh'] === ''){
+    //   ElMessage({type: 'warning', message: '工序损耗不能为空'})
+    //   return false;
+    // }
     if(gdgyformData['小时产能'] === '' || gdgyformData['小时产能'] === "0"){
       ElMessage({type: 'warning', message: '排产小时产能 不能为空或0'})
       return false;