liuhairui 1 year ago
parent
commit
0531b78085
1 changed files with 11 additions and 121 deletions
  1. 11 121
      src/view/performance/chejianbaogong.vue

+ 11 - 121
src/view/performance/chejianbaogong.vue

@@ -5014,43 +5014,31 @@ const BZhandle = (val) => {
       }
     }
   }
-  // console.log(formDatas)
-  // for (const key in val) {
-  //   if (val[key] === 0) {
-  //     break;
-  //   }
-  //   const parts = val[key].split(/[\s()]+/);
-  //   const code = parts[0];
-  //   const name = parts[1];
-  //   const percentage = parts[2];
-  //
-  //   // 根据索引填充不同的字段
-  //   const index = parseInt(key) + 1; // 索引从1开始
-  //   formDatas.value['code' + index] = code;
-  //   formDatas.value['name' + index] = name;
-  //   formDatas.value['percentage' + index] = percentage;
 	  BZMC.value=val.班组号
-  // }
 };
 
+
+
+
+
 const fpsum = ref();
 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); 
   fpsum.value = values.reduce((sum, value) => sum + value, 0); 
-//   const relevantKeys2 = ['组员1', '组员2','组员3','组员4','组员5','组员6','组员7','组员8','组员9','组员10',];  
-//   const valuess = relevantKeys2.map(key => parseFloat(formdata3.value[key]['比例'], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-//   fpsum2.value = valuess.reduce((sum, value) => sum + value, 0);  
 }
 
+/*
+	新增说明
+	判断SY、PM:不能大于1、其他必须等于1(除特殊组员),每个都必须在0-1之间
+*/
 //机台班组维护新增按钮
 const addBz = async() => {
   updateTotal()
   const jt = selectedOption.value.split('|')[0]//获取车间数据
-	//判断车间分配比例【SY、PM、WY
+	//判断车间分配比例【SY、PM】	
 	const shouldCheckLessThanOne = !jt.includes('SY') && !jt.includes('PM');
 	const relevantKeys = ['percentage1', 'percentage2', 'percentage3', 'percentage4', 'percentage5', 'percentage6', 'percentage7', 'percentage8'];
   	const values = relevantKeys.reduce((acc, key) => {
@@ -5130,81 +5118,6 @@ const addBz = async() => {
 	    ElMessage({ type: 'success',message: '成功' });
 	  }
   }
-
-
-  // console.log("新增班组刷新")
-  // console.log(BZMC.value)
-  // const facilityTeamlist = await facilityTeam({ machine:BZMC.value});
-  // if (facilityTeamlist.code === 0) {
-  //   // 清空 bzData 数组
-  //   bzData.splice(0, bzData.length);
-  //   facilityTeamlist.data.map(item=>{
-  //     if(formData.value['班组Id']==item.ID){
-  //       currentBz.value=item
-  //       formDatas.value = {};
-  //       let sczl_bhkey = ''
-  //       let sczl_namekey = ''
-  //       let percentagekey = ''
-  //       if (currentBz.value[9]) {
-  //         for (let i = 1; i <= 10; i++) {
-  //           sczl_bhkey = `code${i}`
-  //           sczl_namekey = `name${i}`
-  //           percentagekey = `percentage${i}`
-  //           formDatas.value[sczl_bhkey] = '';
-  //           formDatas.value[sczl_namekey] = '';
-  //           formDatas.value[percentagekey] = '';
-  //         }
-  //         formDatas.value.code8 = currentBz.value[9].split(' ')[0];
-  //         formDatas.value.name8 = currentBz.value[9].split(' ')[1]
-  //         formDatas.value.percentage8 = parseFloat(currentBz.value[9].split(' ')[2].split('(')[1].split(')')[0])/100
-  //         for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 4, 6); i++) {
-  //           sczl_bhkey = `code${i}`
-  //           sczl_namekey = `name${i}`
-  //           percentagekey = `percentage${i}`
-  //           formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
-  //           formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
-  //           if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
-  //             formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
-  //           }else{
-  //             formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
-  //           }
-  //         }
-  //       } else {
-  //         for (let i = 1; i <= 10; i++) {
-  //           sczl_bhkey = `code${i}`
-  //           sczl_namekey = `name${i}`
-  //           percentagekey = `percentage${i}`
-  //           formDatas.value[sczl_bhkey] = '';
-  //           formDatas.value[sczl_namekey] = '';
-  //           formDatas.value[percentagekey] = '';
-  //         }
-  //         for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length - 3, 6); i++) {
-  //           sczl_bhkey = `code${i}`
-  //           sczl_namekey = `name${i}`
-  //           percentagekey = `percentage${i}`
-  //           formDatas.value[sczl_bhkey] = currentBz.value[i - 1].split(' ')[0];
-  //           formDatas.value[sczl_namekey] = currentBz.value[i - 1].split(' ')[1];
-  //           if(isNaN(parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0]))){
-  //             formDatas.value[percentagekey] = currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0];
-  //           }else{
-  //             formDatas.value[percentagekey] = parseFloat(currentBz.value[i - 1].split(' ')[2].split('(')[1].split(')')[0])/100;
-  //           }
-  //         }
-  //       }
-  //       console.log(formDatas)
-  //     }
-  //   })
-  //   // 遍历接口返回的数据,并给每个对象添加 JTMC 属性
-  //   const updatedData = response.data.map(item => {
-  //     return { ...item, JTMC: value }; // 添加 JTMC 属性
-  //   });
-  //   FPData.splice(0, FPData.length, ...updatedData)
-  //   // 将更新后的数据添加到 bzData 数组
-  //   bzData.push(...updatedData);
-  //   // FPData.push(...updatedData)
-  //   console.log(FPData)
-  // }
-
 }
 //机台班组维护更新当前班组
 const selectBz = async() => {
@@ -5255,23 +5168,6 @@ const selectBz = async() => {
 		BZMC.value = currentBz.value.班组号
 		let sczl_bhkey=''
 		let sczl_namekey=''
-		// if (currentBz.value) {
-		//   for (let i = 1; i <= 6; i++) {
-		//   	sczl_bhkey=`sczl_bh${i}`
-		//     sczl_namekey=`sczl_name${i}`
-		//     formData.value[sczl_bhkey] = '';
-		//     formData.value[sczl_namekey] = '';
-		//   }
-		//   for (let i = 1; i <= Math.min(Object.keys(currentBz.value).length-4, 6); i++) {
-		// 	sczl_bhkey=`sczl_bh${i}`
-		// 	sczl_namekey=`sczl_name${i}`
-		// 	console.log(currentBz.value[i-1].split(' '))
-		//     formData.value[sczl_bhkey] = currentBz.value[i-1].split(' ')[0];
-		//     formData.value[sczl_namekey] = currentBz.value[i-1].split(' ')[1];
-		//     classbz.value[i-1]=currentBz.value[i-1].split(' ')[0]
-		//   }
-		//   formData.value.class=classbz.value.join(',')
-		// }
     if (currentBz.value[9]) {
       for (let i = 1; i <= 9; i++) {
         sczl_bhkey=`sczl_bh${i}`
@@ -5310,11 +5206,6 @@ const selectBz = async() => {
       formData.value.class=classbz.value.join(',')
     }
 	
-// 		console.log(formData)
-// console.log(formData)
-// console.log(formData)
-	
-	
 		const response = await setMachineTeam({
 			machine: JTMC.split("#")[0],
 			order:formData.value.工单编号,
@@ -5331,7 +5222,6 @@ const selectBz = async() => {
 			ElMessage({type: 'success',message: '成功'})
       FacilityProduction()
     }
-		// currentBz.value={}
 	}
 }
 const delBz = async() => {