车间报工

src/view/performance/chejianbaogong.vue

@@ -30,7 +30,7 @@
 <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="5">
+                <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>
@@ -2589,8 +2589,11 @@ const chanliangEdits = async() => {
     })
   }
 }
+const roww = ref(null)
 //班组人员及分配比例单机
 const clickybupdate = async (row) => {
+  console.log(row)
+  roww.value = row
   console.log('班组人员及分配比例单机')
   // ElMessageBox.confirm('确定切换当前班组人员为工作班组人员吗?', '提示', {
   //     confirmButtonText: '确定',
@@ -2623,12 +2626,13 @@ const gyupdateCompanyFunc = async (row) => {
 }
 //班组人员及分配比例右键
 const bzonRightClick = async (row) => {
+  console.log(roww.value)
   ElMessageBox.confirm('确定切换班组吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    SetMachineTeams(row)
+    SetMachineTeams(roww.value)
   })
 }
 //数据接口调用
@@ -2644,6 +2648,7 @@ const SetMachineTeams = async(row) => {
     production_all:0,
     team_id:row.ID
   })
+  console.log(res)
   if (res.code === 0) {
     FacilityProduction()
     ElMessage({
@@ -3419,7 +3424,6 @@ const gz_ontable =  (ygbh) => {
   	  	   gz_tableData2.splice(0, gz_tableData2.length, ...response.data);
   	  }
   })
-
 }
 
 const generateSummaryData = (data) => {
@@ -3447,7 +3451,6 @@ const generateSummaryData = (data) => {
       };
       currentName = name;
     }
-
     // 更新合计数据
 	currentSummary['日期']++;
     currentSummary['计件工资'] += parseFloat(item['计件工资']);
@@ -3480,57 +3483,13 @@ const RemodelGetTab = async() => {
   const response = await remodelGetTab()
   let arr=[]
   if (response.code === 0) {
-	  // for(let key in response.data){
-		//   if(response.data[key][0]){
-		// 	  let children =[]
-		// 	  for (let i = 0; i < response.data[key].length; i++) {
-		// 		  children.push({label:response.data[key][i],machine:key})
-		// 	  }
-		// 	  arr.push({
-		// 		  label:key,
-		// 		  children:children
-		// 	  })
-		// 	  console.log(response.data[key].length)
-		//   }else{
-		// 	 arr.push({label:key})
-		//   }
-	  // }
-	  // huanxingtreeData.value=arr
     huanxingtreeData.value=[{label:JTMC,children:response.data[JTMC].map(item=>({
         label:item,
         machine:JTMC
       }))}]
   }
 }
-//设置机台状态
-const SetMachineStatus = async (row) => {
-	let classString = '';
-	const sczl_bh_values = [formData.value.sczl_bh1, formData.value.sczl_bh2, formData.value.sczl_bh3, formData.value.sczl_bh4, formData.value.sczl_bh5, formData.value.sczl_bh6];
-
-	for (let i = 0; i < sczl_bh_values.length; i++) {
-	  if (sczl_bh_values[i]) {
-	    classString += sczl_bh_values[i] + ',';
-	  }
-	}
-
-	// 去除最后一个逗号
-	classString = classString.slice(0, -1);
-
 
-   const response = await setMachineStatus({
-	 machine: JTMC.split("#")[0],
-	 order:row['工单编号|质量信息'].split('|')[0],
-	 yjno:'1',
-	 gy_name:row['工序名称'],
-	 status:'生产',
-	 production_now:0,
-	 production_all:0,
-	 class:classString
-  });
-  if (response.code === 0) {
-	 FacilityProduction(JTMC)
-  }
-}
 //提交巡查记录
 function onxuncha() {
 	xunchaData.value=[]
@@ -4791,29 +4750,32 @@ const updateCompanyFunc = async(row) => {
         dialogFormVisible.value = true
     }
 }
-
+const rowws = ref(null)
 //设备作业清单单机
 const yjupdateCompanyFunc = async(row) => {
   console.log(row)
-  console.log("通过 "+row['工单编号|质量信息'].replace(/\|$/, '')+" 获取右上角数据")
+  rowws.value = row
+  console.log("通过 "+row['工单编号|质量信息'].replace(/\|$/, '')+" 获取右上角数据↓↓↓↓↓")
   const res = await Procedure({ Gd_gdbh: row['工单编号|质量信息'].replace(/\|$/, '') })
   console.log(res)
   selectData.value = res.data;
 }
 //设备作业清单右键
 const yjonRightClick = async(row) => {
-  console.log(row)
+  console.log(rowws.value)
   ElMessageBox.confirm('确定切换当前工单为工作工单吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    setMachineTeams(row)
+    setMachineTeams(rowws.value)
   })
 }
 
 const setMachineTeams = async(row) => {
-	console.log(row.UniqId)
+	console.log(row)
+	// console.log(row['印件资料'].split('-')[0].split('0')[1])
+	// console.log(row.UniqId)
     const res = await setMachineTeam({
 			machine: JTMC.split("#")[0],
 			order:row['工单编号|质量信息'].split('|')[0],
@@ -4837,13 +4799,42 @@ const setMachineTeams = async(row) => {
 const MachineWorkOrderEdits = async(row) => {
     const res = await MachineWorkOrderEdit({
 		    UniqId:row.UniqId,
-			machine: JTMC,
+			  machine: JTMC,
 			})
+  console.log(res)
     if (res.code === 0) {
     SetMachineStatus(row)
     }
 }
+//设置机台状态
+const SetMachineStatus = async (row) => {
+  let classString = '';
+  const sczl_bh_values = [formData.value.sczl_bh1, formData.value.sczl_bh2, formData.value.sczl_bh3, formData.value.sczl_bh4, formData.value.sczl_bh5, formData.value.sczl_bh6];
+  for (let i = 0; i < sczl_bh_values.length; i++) {
+    if (sczl_bh_values[i]) {
+      classString += sczl_bh_values[i] + ',';
+    }
+  }
+  // 去除最后一个逗号
+  classString = classString.slice(0, -1);
+  
+  console.log("获取"+row['印件号'])
+  return false;
 
+  const response = await setMachineStatus({
+    machine: JTMC.split("#")[0],
+    order:row['工单编号|质量信息'].split('|')[0],
+    yjno:row['印件号'],
+    gy_name:row['工序名称'],
+    status:'生产',
+    production_now:0,
+    production_all:0,
+    class:classString
+  });
+  if (response.code === 0) {
+    FacilityProduction(JTMC)
+  }
+}
 const EquipmentSchedulingEdits = async(row) => {
   console.log(row)
   const res = await EquipmentSchedulingEdit([{