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

src/view/performance/06-packingDocuments/index.vue

@@ -50,9 +50,9 @@
 						<el-dialog v-model="BzVisible2" title="冲月定额" destroy-on-close width="200px"
 							@keydown="selectCY($event)">
 							<el-table tooltip-effect="dark" :data="selectDataCY" row-key="ID"
-								highlight-current-row="true" border style="width:100%"
-								ref="table">
-								<el-table-column prop="sczl_冲定额" label="冲月定额" width="150" />
+								highlight-current-row="true" border style="width:100%"  @row-dblclick="SelectClickCY"
+								ref="table" :row-style="{ height: '30px' }"	>
+								<el-table-column prop="sczl_冲定额" label="冲月定额" width="150"  />
 							</el-table>
 						</el-dialog>
 					<!-- 弹出框 -->
@@ -68,7 +68,7 @@
 								<el-form-item label="员工编号">
 									<el-input v-model="detailData.sczl_bh" style="width: 100px;"
 										placeholder="Enter回车" 
-										@blur="getBzsubmit()" />
+										 />
 									<el-input v-model="detailData.name" style="width: 100px; padding-left: 5px;"
 										@click="selectvalue($event)" readonly />
 								</el-form-item>
@@ -78,13 +78,13 @@
 									  <el-option  label="A班" value="A班" />
 									  <el-option label="B班" value="B班" />
 									</el-select> -->
-									<el-input v-model="detailData.sczl_bzdh" style="width: 80px;" />
+									<el-input v-model="detailData.sczl_bzdh" style="width: 80px;" @keydown="getBzsubmit($event)" />
 								</el-form-item>
 								<br>
 
 								<el-form-item label="计时时数" style="padding-left: 195px;">
 									<el-input v-model="detailData.sczl_jsss" style="width: 100px;"
-										@click="selectvalue($event)" @blur="getBzsubmit2"/>
+										@click="selectvalue($event)" />
 								</el-form-item>
 
 								<el-form-item label="冲月定额">
@@ -92,7 +92,7 @@
 										<el-option label="" value="" />
 										<el-option label="是" value="是" />
 									</el-select> -->
-									<el-input v-model="detailData.sczl_冲定额" style="width: 80px;" />
+									<el-input v-model="detailData.sczl_冲定额" style="width: 80px;" @keydown="getBzsubmit2($event)" />
 								</el-form-item>
 
 								<el-table :data="detailData.table" border tooltip-effect="dark"
@@ -237,27 +237,6 @@
 </template>
 
 <script>
-
-
-// export default {
-//   data() {
-//   },
-//   methods: {
-//     focusFirstNode() {
-//       // 在对话框打开时聚焦在第一个节点上
-// 	  const tree = this.$refs.dedhTree;
-// 	  if (this.dedhtreeData && this.dedhtreeData.length > 0) {
-//             // 设置第一个节点为默认选中节点
-//             this.$refs.dedhTree.setCurrentKey(this.dedhtreeData[0].id);
-//         }
-//     },
-//   },
-//   mounted() {
-//     if (this.dedhsearchModel) {
-//       this.focusFirstNode();
-//     }
-//   },
-// };
 </script>
 
 
@@ -308,7 +287,7 @@
 	const selectDataBz = reactive([])
 	const selectDataCY = reactive([])
 const SelectClickBz = (row, column, event) => {
-
+	detailData.sczl_bzdh = row.sczl_bzdh
 		BzVisible.value = false
 	}
 	const selectBZ = (event) => {
@@ -335,6 +314,10 @@ const SelectClickBz = (row, column, event) => {
 		}
 
 	}
+	const SelectClickCY = (row, column, event) => {
+		detailData.sczl_冲定额 = row.sczl_冲定额
+		BzVisible2.value = false
+	}
 	// 侧边栏功能
 	const treeData = reactive([])
 	const getSideData = async () => {
@@ -924,7 +907,8 @@ const SelectClickBz = (row, column, event) => {
 	}
 
 	//班组回车事件
-	const getBzsubmit = () => {
+	const getBzsubmit = (event) => {
+		if (event.keyCode !== 37){
 		//弹出选择
 		const data = [{
 			'sczl_bzdh': 'A班'
@@ -937,18 +921,21 @@ const SelectClickBz = (row, column, event) => {
 		}
 
 		setCurrent(data[0])
+		}
+
 	}
 	//冲月定额
-	const getBzsubmit2 = () => {
-		//弹出选择
-		const data = [{
-			'sczl_冲定额': '是'
+	const getBzsubmit2 = (event) => {
+		if (event.keyCode !== 37) {
+			const data = [{
+			'sczl_冲定额': ' '
 		}, {
 			'sczl_冲定额': '否'
 		}]
 		selectDataCY.splice(0, selectDataCY.length, ...data)
 		BzVisible2.value = true
 		setCurrent2(data[0])
+		}
 	}
 	const dialogSelectVisible_Bz = ref(false)
 	const selectData_Bz = reactive([])
@@ -1266,6 +1253,7 @@ const SelectClickBz = (row, column, event) => {
 		margin-left: 2px !important;
 		padding: 3px !important;
 		font-size: 12px;
+
 	}
 
 	.el-tabs__header {

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1837,6 +1837,20 @@
               </div>
             </el-form>
           </el-dialog>
+		  
+		  <!--当日上报产量 组员及分配比例-->
+		  <el-dialog v-model="JPblModellist" :before-close="() => JPblModellist = false" style="width: 20%">
+		    <el-form>
+		      <div>
+		        <el-table :data="JPemployeeDatalist" border :show-overflow-tooltip="true" :cell-class-name="JPblplanUsageCellClass"  @row-click="JPtablebllickHandlerlist($event)">
+		          <el-table-column prop="员工编号" label="员工编号"></el-table-column>
+		          <el-table-column prop="ygxm" label="员工姓名"></el-table-column>
+		        </el-table>
+		      </div>
+		    </el-form>
+		  </el-dialog>
+		  
+	
 	
 		  
 		  
@@ -3341,9 +3355,9 @@ const JPentedit = async (event,key,val) => {
 					JPformdataedit[bzyg]['姓名'] = getYg_response.data[0].ygxm
 					JPformdataedit[bzyg]['编号'] = getYg_response.data[0].员工编号
 				  }else{
-					JPblModellist.value = true;
+					JPblModellistedit.value = true;
 					// console.log(getYg_response.data)
-					JPemployeeDatalist.value = getYg_response.data // 假设响应数据是数组
+					JPemployeeDatalistedit.value = getYg_response.data // 假设响应数据是数组
 				  }
 				}
 			}
@@ -3676,12 +3690,13 @@ const JPent = async (event,key,val) => {
 			bzxm=`组员${key}`
 			if(JPformdata[bzyg]['编号']){
 				const getYg_response = await getYg({sczl_bh:JPformdata[bzyg]['编号']});
-				// console.log(getYg_response)
+				console.log(getYg_response)
 				if (getYg_response.code === 0) {
 				  if(getYg_response.data.length === 1){
 					JPformdata[bzyg]['姓名'] = getYg_response.data[0].ygxm
 					JPformdata[bzyg]['编号'] = getYg_response.data[0].员工编号
 				  }else{
+					  console.log(456)
 					JPblModellist.value = true;
 					// console.log(getYg_response.data)
 					JPemployeeDatalist.value = getYg_response.data // 假设响应数据是数组
@@ -3839,6 +3854,30 @@ const JPent = async (event,key,val) => {
        JPclickedlist.value = false;
      }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
    };
+   
+   const JPclickedlistedit = ref(false);
+ const JPtablebllickHandlerlistedit = async (row, column, event) => {
+     if (JPclickedlistedit.value) {
+       // 如果已经点击过一次，则不再执行操作
+       return;
+     }
+     let nextIndex = 1;
+     while (JPformdataedit[`组员${nextIndex}`]['编号'] !== '') {
+       nextIndex++;
+       if (nextIndex > 10) {
+         // 如果所有字段都已经填满，则不做任何事情并退出函数
+         return;
+       }
+     }
+     // 将选定的值分配给下一个空的代码和名称字段
+     JPformdataedit[`组员${nextIndex-1}`]['编号'] = row.员工编号;
+     JPformdataedit[`组员${nextIndex-1}`]['姓名'] = row.ygxm;
+     JPblModellistedit.value = false;
+     JPclickedlistedit.value = true;
+     setTimeout(() => {
+       JPclickedlistedit.value = false;
+     }, 300); // 300毫秒内再次点击将不会触发事件，你可以根据需要调整这个延迟时间
+   };
 
 
 const Selection_ids = ref('')
@@ -4576,7 +4615,8 @@ const selectBz_rcl = () => {
 
 const blModel = ref(false)
 const employeeData = ref('')
-const getbzyg = async (value,key) => {
+const getbzyg = async (value,key) => {
+	console.log(12)
   let bzyg=''
   bzyg=`code${key}`
   let bzxm=''
@@ -4629,6 +4669,11 @@ const JPblplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
     return 'plan-usage-low';
   }
 }
+const JPblplanUsageCellClassedit = ({row, column, rowIndex, columnIndex}) =>{
+  if (column.property === '员工编号' || column.property === 'ygxm') {
+    return 'plan-usage-low';
+  }
+}
 
 
 const addBz = async() => {