Browse Source

车间报工

liuhairui 1 year ago
parent
commit
1c4f4a2498
1 changed files with 86 additions and 81 deletions
  1. 86 81
      src/view/performance/chejianbaogong.vue

+ 86 - 81
src/view/performance/chejianbaogong.vue

@@ -419,15 +419,6 @@
 								</el-col>
 				</el-row>
 				<el-row :gutter="10" style="margin-top: 0px;">
-				 <!-- <el-col :span="1">
-				   <span></span>
-				 </el-col> -->
-
-
-
-
-
-
 
 				<el-col :span="3">
 				  <el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')" placeholder=""/>
@@ -453,33 +444,6 @@
 				<el-col :span="3">
 				  <el-input v-model="formDatas.code8" @keyup.enter.native="getbzyg($event, '8')" placeholder="" />
 				</el-col>
-				<!-- <el-col :span="2">
-				  <el-input v-model="formData.name"  placeholder="瞿春生" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="percentage"  placeholder="11.0" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="打包废纸" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="ZI00401" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="瞿春生" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-				</el-col> -->
 			  </el-row>
 			 <el-row :gutter="10" style="margin-top: 1px;font-weight: bold;color:purple">
 			  				 <!-- <el-col :span="2">
@@ -509,29 +473,8 @@
 							<el-col :span="3">
 							  <el-input v-model="formDatas.name8"  placeholder="" />
 							</el-col>
-			  	<!-- 			<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="ZI00401" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="瞿春生" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-			  				</el-col> -->
 			  </el-row>
 			  <el-row :gutter="10" style="margin-top: 1px;font-weight: bold;color:purple">
-			  				 <!-- <el-col :span="2">
-			  				   <span></span>
-			  				 </el-col> -->
 			  				<el-col :span="3">
 			  				  <el-input v-model="formDatas.percentage1"  placeholder="" />
 			  				</el-col>
@@ -556,24 +499,6 @@
 							<el-col :span="3">
 							  <el-input v-model="formDatas.percentage8"  placeholder="" />
 							</el-col>
-			  			<!-- 	<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="是" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="ZI00401" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="瞿春生" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc"  placeholder="11.0" />
-			  				</el-col> -->
 			  </el-row>
 			</div>
 			<div style="height: 50vh; width: 15vh;margin-top: 3vh;">
@@ -4262,6 +4187,7 @@ const getSpotCheckItem = async (machineName) => {
 
 // 班组人员及分配比例
 const FacilityTeam = async (value) => {
+  console.log('机台班组维护机台获取:'+value)
   const response = await facilityTeam({ machine: value });
   if (response.code === 0) {
     // 清空 bzData 数组
@@ -4587,6 +4513,11 @@ const addBz = async() => {
   console.log(selectedOption.value)
   console.log(BZMC.value)
   console.log(selectedOption.value.split('|')[0])
+  // console.log(2222)
+  // console.log(2222)
+  // console.log(2222)
+  // console.log(2222)
+  // return false;
   const response = await MachineTeamAdd({
     sczl_jtbh:  selectedOption.value.split('|')[0],
     sczl_bzdh:  BZMC.value,
@@ -4619,6 +4550,80 @@ const addBz = async() => {
       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() => {
@@ -4973,12 +4978,12 @@ const FacilityInspect = async () => {
 // 关闭弹窗
 const closeDialog = () => {
 	chanliangVisible.value=false
-    dialogFormVisible.value = false
-    formData.value = {
-        address: '',
-        image: '',
-        name: '',
-        }
+  // dialogFormVisible.value = false
+  //   formData.value = {
+  //       address: '',
+  //       image: '',
+  //       name: '',
+  //       }
 }
 const equipmentCode=ref('JY01')
 const equipmentName=ref('海德堡对开')