车间报工

src/view/performance/chejianbaogong.vue

@@ -29,71 +29,75 @@
         <el-main>
 
 <div class="gva-search-box" style=" overflow: hidden; padding: 0; margin-top:20px;display: flex;">
-			<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px; color: red;">
-              <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-form-item label="机台号" prop="id" label-width="60" class="zy-label">
-                    <el-input v-model="formData.机台号"  placeholder=""/>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="工单编号" prop="id">
-                    <el-input v-model="formData.工单编号"  placeholder=""  />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="10">
-                  <el-form-item label=" "prop="name">
-                    <el-input v-model="formData.产品名称"  placeholder="" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-						  <el-row :gutter="20">
-							<el-col :span="7">
-							 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id">
-							   <el-input v-model="formData.印件号"  placeholder="" />
-							 </el-form-item>
-							</el-col>
-						  <el-col :span="15">
-							 <el-form-item label="工序名称" prop="name">
-							   <el-input v-model="formData.工序名称"  placeholder="" />
-							 </el-form-item>
-							</el-col>
-						  </el-row>
-
-						  <el-row :gutter="20">
-							<el-col :span="4">
-							 <el-form-item label="班组成员" prop="id">
-							 </el-form-item>
-							</el-col>
-						  </el-row>
-
-							<el-row :gutter="1">
-							  <!-- 循环生成 el-input 组件 -->
-							  <el-col v-for="i in 6" :span="4" :key="i">
-								<el-input v-model="formData[`sczl_bh${i}`]"  placeholder="" />
-							  </el-col>
-							</el-row>
-
-							<el-row :gutter="1">
-							  <!-- 循环生成 el-input 组件 -->
-							  <el-col v-for="i in 6" :span="4" :key="i">
-								<el-input v-model="formData[`sczl_name${i}`]"  placeholder="" class="red-input"/>
-							  </el-col>
-							</el-row>
-			</div>
-
-	<div style="flex: 1; border: 0px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
+	<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px; color: red;">
+	  <el-row :gutter="20">
+		<el-col :span="5">
+		  <el-form-item label="机台号" prop="id" label-width="60" class="zy-label">
+			<el-input v-model="formData.机台号"  placeholder=""/>
+		  </el-form-item>
+		</el-col>
+		<el-col :span="6">
+		  <el-form-item label="工单编号" prop="id">
+			<el-input v-model="formData.工单编号"  placeholder=""  />
+		  </el-form-item>
+		</el-col>
+		<el-col :span="12">
+		  <el-form-item label=" "prop="name">
+			<el-input v-model="formData.产品名称"  placeholder="" />
+		  </el-form-item>
+		</el-col>
+	  </el-row>
+	  <el-row :gutter="20">
+		<el-col :span="7">
+		 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id">
+		   <el-input v-model="formData.印件号"  placeholder="" />
+		 </el-form-item>
+		</el-col>
+	  <el-col :span="15">
+		 <el-form-item label="工序名称" prop="name">
+		   <el-input v-model="formData.工序名称"  placeholder="" />
+		 </el-form-item>
+		</el-col>
+	  </el-row>
+
+	  <el-row :gutter="20">
+		<el-col :span="4">
+		 <el-form-item label="班组成员" prop="id">
+		 </el-form-item>
+		</el-col>
+	  </el-row>
+
+		<el-row :gutter="1">
+		  <!-- 循环生成 el-input 组件 -->
+		  <el-col v-for="i in 6" :span="4" :key="i">
+			<el-input v-model="formData[`sczl_bh${i}`]"  placeholder="" />
+		  </el-col>
+		</el-row>
 
+		<el-row :gutter="1">
+		  <!-- 循环生成 el-input 组件 -->
+		  <el-col v-for="i in 6" :span="4" :key="i">
+			<el-input v-model="formData[`sczl_name${i}`]"  placeholder="" class="red-input"/>
+		  </el-col>
+		</el-row>
+	</div>
+<!-- overflow: hidden;flex: 1;  -->
+	<div style="border: 0px lawngreen solid; margin: 0; padding: 0;width:34%;">
 	 <el-table tooltip-effect="dark" :data="selectData" row-key="ID"
 	   highlight-current-row="true" border
       :row-style="{ height: '20px'}" :cell-style="{ padding: '0px'}"
 	  :header-row-style="{ height: '20px'}" style="width:100%;height: 30vh;"  @row-dblclick="handleSelectClick" >
-	   <el-table-column prop="process" label="印件及工序"width="480" />
-	   <el-table-column prop="completed" label="已完成板数" width="470" />
+	   <el-table-column prop="process" label="印件及工序"width="280" />
+	   <el-table-column prop="completed" label="已完成板数" width="160" />
 	 </el-table>
 	</div>
 
 </div>
+
+
+
+
+
           <div class="gva-table-box" style="margin-top: 20px;">
             <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
 			<el-tab-pane label="设备作业清单" @click="showTable('设备作业清单')" name="first"  :class="{ 'active-tab': activeTab === 'first' }" style="font-size: 16px;">
@@ -3122,35 +3126,57 @@ const complaintsData = ref([])
 function oncomplaints() {
 	Complaints()
 }
-
+const multipleTable = ref(null);
 const dbclSelection = ref('')
 //当班产量明细复选框
 const dbclmxSelectionChange = (selection, type) => {
-  console.log(selection)
-  const ids = selection.map(item => {
-    return item.UniqId
-  })
-  console.log(ids.join(','))
-  dbclSelection.value = ids.join(',')
+  console.log(selection);
+  // 如果选择项多于一个，弹出提示并撤销选择
+  if (selection.length > 1) {
+	ElMessage({type: 'warning',message: '您只能选择一条进行删除！'})
+    // 重置选择项
+	dbclSelection.value = '';  // 清空之前的选择
+	selection.splice(0, selection.length);  // 清空当前选择数组
+	return false;
+  }else{
+	  const ids = selection.map(item => item.UniqId);
+	  dbclSelection.value = ids.join(',');
+	  console.log(dbclSelection.value)
+  }
 }
 
-//当班产量明细
+//当班产量明细删除按钮
 const deldbcl_onclick = async () => {
-  console.log(dbclSelection.value)
+  // console.log(dbclSelection.value)
+  // return false;
   if (dbclSelection.value !== '') {
     try {
       //产量上报数据删除
       const res1 = await ChanliangDel({UniqId: dbclSelection.value})
       if(res1.code === 0){
-        ElMessage.success('当班产量明细删除成功')
-        //当班产量明细
-        const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: BZMC.value });
-        console.log(response);
-        if (response.code === 0) {
-          CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
-          formData.value.production_now=response.data[0].产量
-          formData.value.production_all=response.data.total.产量
-        }
+        ElMessage.success(dbclSelection.value+'当班产量明细删除成功')
+		dbclSelection.value = ''; // 清空当前选择记录
+		CLMXData.value = []; // 清空表格数据
+		 // 清除表格选择
+		if (multipleTable.value) {
+		  multipleTable.value.clearSelection();
+		}
+		//当班产量明细 显示最新数据
+		const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: BZMC.value });
+		console.log(response);
+		// if (response.code === 0) {
+		 
+		// }
+		
+		if (response.data === null) {
+				CLMXData.splice(0, CLMXData.length, ...Object.values([]));
+			return false;
+		}else{
+			CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
+			formData.value.production_now=response.data[0].产量
+			formData.value.production_all=response.data.total.产量
+			return false;
+		}
       }
     } catch(err) {
       ElMessage.error(err)
@@ -3599,16 +3625,14 @@ const SubmitPatrolRecord = async () => {
 	  xunchaVisible.value=false
   }
 }
+//日产量上报提交按钮默认开启
 const isSubmitting = ref(false)
 
-
-//日产量上报
+//日产量上报按钮
 function onchanliang() {
   ReportInfo();
+  //日产量上报提交按钮默认开启
   isSubmitting.value = false
-  //获取机台号
-  console.log(JTMC.split("#")[0]);
-  //日产量上报 4.1获取报工单其他信息
 }
 
 // 获取当前日期
@@ -3624,6 +3648,7 @@ const currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
 const currenttime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 //日产量详情获取
 const ReportInfo = async () => {
+  //4.1获取报工单其他信息接口
   const response = await reportInfo({ machine: JTMC.split("#")[0] });
   if (response.code === 0) {
     const { order_info, class: classInfo } = response.data;
@@ -4298,7 +4323,7 @@ const addBz = async() => {
   // console.log(selectedOption.value)
   console.log("机台编号"+selectedOption.value.split('|')[0])
   console.log("班组编号"+BZMC.value)
-  return false;
+  // return false;
   //班组维护->班组添加【接口】
   const response = await MachineTeamAdd({
     sczl_jtbh:  selectedOption.value.split('|')[0],
@@ -4326,79 +4351,11 @@ const addBz = async() => {
     sys_id: '【'+MAC.value+'/'+JTMC+'】'
   })
   if (response.code === 0) {
+    FacilityProduction()
     ElMessage({ type: 'success',message: '成功' });
 
-    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)
-    }
+
+
   }
 
   // console.log("新增班组刷新")