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/job/rewards/rewards.vue

@@ -59,6 +59,11 @@
                   icon="search"
                   @click="onSubmit"
                 >查询</el-button>
+				<el-button
+				 icon="refresh"
+				 type="primary"
+				 @click="onReset"
+				>切换显示方式</el-button>
 				<el-button
 				  type="primary"
 				  icon="search"
@@ -69,10 +74,7 @@
 				  icon="search"
 				  @click="onDel"
 				>删除</el-button>
-                <el-button
-                  icon="refresh"
-                  @click="onReset"
-                >切换显示方式</el-button>
+                
               </el-form-item>
             </el-form>
           </div>
@@ -1378,8 +1380,10 @@ const closeDialog = () => {
 const enterDialog = async() => {
 	if (type.value === 'update') {
 		  SubmitDailyProduction()
+		  
 	} else if (type.value === 'create') {
 		  add()   
+		  
 	}
 	// SubmitDailyProduction()
   // elFormRef.value?.validate(async(valid) => {
@@ -1483,8 +1487,8 @@ const enterDialog = async() => {
  	    type: 'success',
  	    message: '成功'
  	  })
-   }
-   detailShow.value = false
+	  dialogFormVisible.value = false
+   } 
    getTableData()
  }
  const add = async () => {
@@ -1560,8 +1564,9 @@ const enterDialog = async() => {
  	 	    type: 'success',
  	 	    message: '成功'
  	 	  })
+		  dialogFormVisible.value = false
  	}
- 	detailShow.value = false
+ 	
  	getTableData()
  }
 //键盘 input框跳转

src/view/performance/09-workOrderVerification/index.vue

@@ -73,12 +73,12 @@
               >新增
               </el-button>
               <div style="margin-left: auto;">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   :icon="Download"
 				  class="bt"
                   @click="exportExcel"
-                >导出到Excel</el-button>
+                >导出到Excel</el-button> -->
               </div>
             </div>
             <!-- 数据展示 -->

src/view/performance/14-overTimePayVerification/index.vue

@@ -53,18 +53,18 @@
                 @click="onSearch"
               >搜索
               </el-button>
-              <el-button
+              <!-- <el-button
                 type="primary"
                 :icon="Refresh"
               >重置
-              </el-button>
+              </el-button> -->
               <div style="margin-left: auto;">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   :icon="Download"
                   @click="exportExcel"
                 >导出到Excel
-                </el-button>
+                </el-button> -->
               </div>
             </div>
             <!-- 上半数据展示 -->

src/view/performance/Manualdocuments.vue

@@ -38,7 +38,7 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
 			  <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-			  <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button>
+			  <!-- <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button> -->
               <el-button type="primary" class="bt" icon="refresh"  @click="onRefresh">刷新质检系数</el-button>
               <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
@@ -1722,7 +1722,13 @@ function doubleClick(row, column, event) {
 }
 // 单击表格操作
 function Click(row, column, event) {
-    lastCellValue= row['UniqId'];
+    lastCellValue= row['UniqId'];
+	console.log(row)
+	const parts = row['sczl_yjgx'].split('-')
+	ScrapFactor.yjno=parts[0]
+	ScrapFactor.gdbh=row['sczl_gdbh']
+	ScrapFactor.type=row['sczl_检验类别']
+	ScrapFactor.gxh=parts[1]
    console.log(lastCellValue)
 
 }

src/view/performance/Packagingoutput.vue

@@ -36,8 +36,7 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
               <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-              <el-button type="primary" class="bt" icon="search" @click="positioningVisible">定位</el-button>
-              <el-button type="primary" class="bt" icon="refresh">重置</el-button>
+              <!-- <el-button type="primary" class="bt" icon="search" @click="positioningVisible">定位</el-button> -->
 			  <el-button type="primary" class="bt" icon="delete" @click="Del">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -46,9 +46,9 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="80" />
-              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="80"/>
-              <el-table-column  sortable  align="center" label="性别" prop="性别" width="45"/>
+              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="120" />
+              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="120"/>
+              <el-table-column  sortable  align="center" label="性别" prop="性别" width="120"/>
               <el-table-column  sortable  align="left" label="聘用日期" prop="聘用日期" width="110" />
               <el-table-column  sortable  align="left" label="转正日期" prop="转正日期" width="110" />
               <el-table-column  sortable  align="left" label="所在部门" prop="所在部门" width="110"  />
@@ -56,13 +56,13 @@
               <el-table-column  sortable  align="left" label="身份证号" prop="身份证号" width="160" />
               <el-table-column  sortable  align="left" label="出生日期" prop="出生日期" width="110" />
               <el-table-column  sortable  align="left" label="人员性质" prop="人员性质" width="110" />
-              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="90" />
+              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="120" />
               <el-table-column  sortable  align="left" label="班次类型" prop="班次类型" width="120" />
-              <el-table-column  sortable  align="left" label="工资表类别" prop="工资表类别" width="160" />
-              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
-              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="80" />
-              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="80" />
-              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
+              <el-table-column  sortable  align="left" label="工资表类别" prop="工资表类别" width="140" />
+              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="140" />
+              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="120" />
+              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="120" />
+              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="120" />
               <el-table-column  sortable  align="left" label="创建用户" prop="sys_id" width="110" />
               <el-table-column  sortable  align="left" label="创建时间" prop="sys_rq" width="110" />
               <el-table-column  sortable  align="left" label="修改时间" prop="mod_rq" width="110" />