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

src/api/jixiaoguanli/baogong.js

@@ -65,3 +65,38 @@ export const MachineTeamAdd = (data) => {
     data
   })
 }
+export const remodelDataAdd = (data) => {
+  return service({
+    url:'/mes_server/facility/remodelDataAdd',
+    method: 'post',
+    data
+  })
+}
+export const remodelDataEdit = (data) => {
+  return service({
+    url:'/mes_server/facility/remodelDataEdit',
+    method: 'post',
+    data
+  })
+}
+export const PrintDetailAdd = (data) => {
+  return service({
+    url:'/mes_server/facility/PrintDetailAdd',
+    method: 'post',
+    data
+  })
+}
+export const remodelDataDel = (params) => {
+  return service({
+    url:'/mes_server/facility/remodelDataDel',
+    method: 'get',
+    params
+  })
+}
+export const PrintDetailEdit = (params) => {
+  return service({
+    url:'/mes_server/facility/PrintDetailEdit',
+    method: 'get',
+    params
+  })
+}

src/view/job/processSheet/processSheet.vue

@@ -130,6 +130,7 @@
 	import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 	import { ElMessage, ElMessageBox } from 'element-plus'
 	import { ref, reactive } from 'vue'
+  import {hiprint} from "vue-plugin-hiprint";
 	const workData = ref({
 		Gd_gdbh:'',
 		maobao:'',

src/view/performance/Dayreports.vue

@@ -893,31 +893,31 @@ const unsetColorReadonly = (id) => {
 
 
 //工单编号回车事件
-// const getCPMCsubmit = () => {
-// 	if(formData.value.sczl_gdbh!=''){
-// 		productionGdmc({gdbh:formData.value.sczl_gdbh}).then(response=>{
-// 		  if (response.code === 0) {
-// 			  formData.value.Gd_cpmc = response.data.Gd_cpmc
-// 			  yjnoArr.value = response.data.yjno;
+const getCPMCsubmit = () => {
+	if(formData.value.sczl_gdbh!=''){
+		productionGdmc({gdbh:formData.value.sczl_gdbh}).then(response=>{
+		  if (response.code === 0) {
+			  formData.value.Gd_cpmc = response.data.Gd_cpmc
+			  yjnoArr.value = response.data.yjno;
 			  
-// 			  document.getElementById('产品名称').style.color = 'red';
-// 			}else{
-// 				formData.value.sczl_gdbh = '';
-// 				formData.value.Gd_cpmc = '';
-// 				gxmc.value = '';
-// 				document.getElementById('产品名称').style.color = 'black';
-// 			}
-// 		});
-// 	}else{
-// 		ElMessage({
-// 		  type: 'error',
-// 		  message: '请注意, 工单编号输入空置, 除非有特殊需要！'
-// 		})
+			  document.getElementById('产品名称').style.color = 'red';
+			}else{
+				formData.value.sczl_gdbh = '';
+				formData.value.Gd_cpmc = '';
+				gxmc.value = '';
+				document.getElementById('产品名称').style.color = 'black';
+			}
+		});
+	}else{
+		ElMessage({
+		  type: 'error',
+		  message: '请注意, 工单编号输入空置, 除非有特殊需要！'
+		})
 		
-// 		gxmc.value = '';
-// 		document.getElementById('产品名称').style.color = 'black';
-// 	}
-// }
+		gxmc.value = '';
+		document.getElementById('产品名称').style.color = 'black';
+	}
+}
 
 //印件号数组
 const yjnoArr = ref([0])

src/view/performance/chejianbaogong.vue

@@ -921,6 +921,14 @@
 		  width="145vh"
 		  style="height: 78vh;"
 		>
+      <header>
+        <div style="height: 50px;margin-left: 1vh;">
+          <el-button type="primary" @click="onHxadd" >新增</el-button>
+          <el-button type="primary" @click="onHxedit" >修改</el-button>
+          <el-button type="primary" @click="onHxdel" >删除</el-button>
+          <el-button type="primary" @click="onHxsave"  v-if="huanxingType" >提交</el-button>
+        </div>
+      </header>
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
 		      <el-aside width="26vh" style="margin: 0;">
@@ -1209,9 +1217,15 @@
 		  v-model="yinbanVisible"
 		  title="印版领退"
 		  destroy-on-close
-		  width="180vh"
+		  width="130vh"
 		  style="height: 78vh;"
 		>
+      <header>
+        <div style="height: 50px;margin-left: 1vh;">
+          <el-button type="primary" @click="onYbout" >领出</el-button>
+          <el-button type="primary" @click="onYbback" >收回</el-button>
+        </div>
+      </header>
 		  <el-row :gutter="24">
 		    <el-col :span="4">
 		      <el-form-item label="工单编号" prop="id">
@@ -1232,7 +1246,7 @@
 
 		  <div style="display: flex;">
 		    <div style="flex: 1;">
-		      <el-aside width="34vh" style="margin: 0;">
+		      <el-aside width="28vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">
 		          <el-tree :data="yinbantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="yinbanNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1245,13 +1259,15 @@
 		        :data="yinbanselectData"
 		        row-key="ID"
 		        highlight-current-row="true"
-				:show-overflow-tooltip="true"
+				    :show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:140vh; height:50vh;"
+		        style="width:100vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
-		      >
-		        <el-table-column
+            @selection-change="handleybSelectionChange"
+          >
+            <el-table-column type="selection" width="55" align="center" label=""></el-table-column>
+            <el-table-column
 		          prop="存货编码"
 		          label="存货编码"
 		          width="100"
@@ -1311,16 +1327,10 @@
 				/>
 
 				<el-table-column
-				  prop="点检方法"
-				  label="备注说明"
-				  width="90"
+				  prop="UniqId"
+				  label="UNIQID"
+				  width="80"
 				/>
-				<!-- <el-table-column
-				  prop="点检方法"
-				  label="备注说明"
-				  width="180"
-				/> -->
-
 		      </el-table>
 		    </div>
 		  </div>
@@ -1410,7 +1420,7 @@
 		        style="width:138vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
-				:show-overflow-tooltip="true"
+			    	:show-overflow-tooltip="true"
 		      >
 		        <el-table-column
 		          prop="工单编号"
@@ -1872,7 +1882,12 @@ import {
   ModelChangeRecord,
   ComplaintRecord,
   RemodelDetail,
-  MachineTeamAdd
+  MachineTeamAdd,
+  remodelDataAdd,
+  remodelDataEdit,
+  remodelDataDel,
+  PrintDetailAdd,
+  PrintDetailEdit
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -1994,6 +2009,7 @@ const huanxingNodeClick = (node) => {
   if(node.machine){
 	  // console.log(node.label.split('/')[1])
 	  huanxingstatus.value=true
+    formData.value.huanxingId=node.label.split('/')[1]
 	  remodelDetail(node.label.split('/')[1])
 	  modelChangeRecord(node.machine)
   }else{
@@ -2074,48 +2090,54 @@ const classbz=ref([])
 const FacilityProduction = async (addr) => {
   const response = await facilityProduction({machine:JTMC});
   if (response.code === 0) {
-	    formData.value.工单编号 = response.data.工单编号;
-	    formData.value.印件号 = response.data.印件号;
-		formData.value.工序号 = response.data.工序名称.substring(0,2);
-	    formData.value.工序名称 = response.data.工序名称;
-	    formData.value.产品名称 = response.data.产品名称;
-		formData.value.班组Id=response.data.班组Id
-		formData.value.machine=JTMC
-		formData.value.状态=response.data.状态
-    formData.value.定额代号=response.data.定额代号
-    formData.value.addr=addr
-    BZMC.value=response.data.班组编号
-	       // 填充sczl_bh和sczl_name字段
-		   let sczl_bhkey=''
-		   let sczl_namekey=''
-		   if (response.data.班组成员) {
-		     for (let i = 0; i < Math.min(Object.keys(response.data.班组成员).length, 9); i++) {
-				 sczl_bhkey=`sczl_bh${i+1}`
-				 sczl_namekey=`sczl_name${i+1}`
-		       formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
-		       formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
-			   classbz.value[i]=response.data.班组成员[i]['编号']
-		     }
-		   }
-		   formData.value.class=classbz.value.join(',')
-	   //      for (let i = 1; i <= 10; i++) {
-	   //        if (response.data.班组成员) {
-				// // formData.value.['sczl_bh12'] = response.data.班组成员[i]['编号'];
-				// // formData.value['sczl_name12'] = response.data.班组成员[i]['名字'];
-				// //  console.log(formData)
-				// // console.log(response.data[sczl_bh]['员工姓名'])
-				// // console.log(formData.value.sczl_bh)
-				// // console.log(sczl_name)
-	   //        } else {
-				// console.log(555555555555555)
-	   //          // 如果字段不存在，可以在这里进行处理
-	   //          // console.log('2');
-				// // formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
-				// // formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
-				// // console.log(formData.value.sczl_bh)
-				// // console.log(sczl_name)
-	   //        }
-	   //      }
+    if(response.data){
+      formData.value.工单编号 = response.data.工单编号;
+      formData.value.印件号 = response.data.印件号;
+      formData.value.工序号 = response.data.工序名称.substring(0,2);
+      formData.value.工序名称 = response.data.工序名称;
+      formData.value.产品名称 = response.data.产品名称;
+      formData.value.班组Id=response.data.班组Id
+      formData.value.machine=JTMC
+      formData.value.状态='生产'
+      formData.value.定额代号=response.data.定额代号
+      formData.value.addr=addr
+      BZMC.value=response.data.班组编号
+      // 填充sczl_bh和sczl_name字段
+      let sczl_bhkey=''
+      let sczl_namekey=''
+      if (response.data.班组成员) {
+        for (let i = 0; i < Math.min(Object.keys(response.data.班组成员).length, 9); i++) {
+          sczl_bhkey=`sczl_bh${i+1}`
+          sczl_namekey=`sczl_name${i+1}`
+          formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
+          formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
+          classbz.value[i]=response.data.班组成员[i]['编号']
+        }
+        formData.value.class=classbz.value.join(',')
+      }
+      //      for (let i = 1; i <= 10; i++) {
+      //        if (response.data.班组成员) {
+      // // formData.value.['sczl_bh12'] = response.data.班组成员[i]['编号'];
+      // // formData.value['sczl_name12'] = response.data.班组成员[i]['名字'];
+      // //  console.log(formData)
+      // // console.log(response.data[sczl_bh]['员工姓名'])
+      // // console.log(formData.value.sczl_bh)
+      // // console.log(sczl_name)
+      //        } else {
+      // console.log(555555555555555)
+      //          // 如果字段不存在，可以在这里进行处理
+      //          // console.log('2');
+      // // formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
+      // // formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
+      // // console.log(formData.value.sczl_bh)
+      // // console.log(sczl_name)
+      //        }
+      //      }
+      if(response.data.工单编号){
+        InspectionRecord()
+        FacilityDetail()
+      }
+    }
 	   const responses = await MachineDetailList({workshop:CJMC});
 	   if(responses.code===0){
 		   responses.data.map(item=>{
@@ -2123,10 +2145,6 @@ const FacilityProduction = async (addr) => {
 				   formData.value.status=item.状态
 			   }
 		   })
-	   }
-	   if(response.data.工单编号){
-		   InspectionRecord()
-		   FacilityDetail()
 	   }
 		FacilityWorklist()
 		FacilityTeam(JTMC)
@@ -2153,6 +2171,47 @@ const FacilityWorklist = async () => {
 	}
   }
 }
+
+const clickybupdate = async (row) => {
+  formData.value.班组Id=row.ID
+  BZMC.value=row.班组号
+  console.log(row)
+  let sczl_bhkey=''
+  let sczl_namekey=''
+  for (let i = 1; i <= 10; i++) {
+    sczl_bhkey = `sczl_bh${i}`
+    sczl_namekey = `sczl_name${i}`
+    formData.value[sczl_bhkey] = '';
+    formData.value[sczl_namekey] = '';
+  }
+  for (let i = 0; i < Object.keys(row).length-4; i++) {
+    sczl_bhkey=`sczl_bh${i+1}`
+    sczl_namekey=`sczl_name${i+1}`
+    formData.value[sczl_bhkey] =row[i].split(' ')[0];
+    formData.value[sczl_namekey] = row[i].split(' ')[1];
+    console.log(formData)
+
+  }
+  console.log(formData)
+
+  // const response = await facilityWorklist({machine:JTMC});
+  // if (response.code === 0) {
+  //   sbzyData.splice(0, sbzyData.length, ...response.data);
+  //   // formData.value.productCode= response.data[0]['产品代号']
+  //   response.data.map(item=>{
+  //     if(item['工单编号|质量信息'].substring(0, 7)==formData.value.工单编号){
+  //       formData.value.productCode=item.产品代号
+  //     }
+  //   })
+  //   selectData.value=[]
+  //   const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
+  //   // formData.value.productCode= response.data[0]['产品代号']
+  //   // console.log(res)
+  //   if (res.code === 0) {
+  //     selectData.value = res.data
+  //   }
+  // }
+}
 //检验记录
 const InspectionRecord = async () => {
   JYData=[]
@@ -2279,10 +2338,162 @@ const pageSize = ref(10)
 const tableData = ref([])
 const zhibiaoselectData=ref([])
 const yinbanVisible = ref(false)
+const huanxingType=ref(false)
+const huanxingStatus=ref(0)
 const yinbantreeData=ref([])
 const fujiaselectData=ref([])
 const searchInfo = ref({})
 
+const onHxadd = () => {
+  huanxingType.value=true
+  huanxingStatus.value=1
+  huanxingData.value.班组=''
+  huanxingData.value.码包B=''
+  huanxingData.value.工单编号A=''
+  huanxingData.value.印件工序A=''
+  huanxingData.value.码包号A=''
+  huanxingData.value.工单编号B=''
+  huanxingData.value.印件工序B=''
+  huanxingData.value.机长=''
+  huanxingData.value.班长=''
+  huanxingData.value.质量巡查员=''
+  huanxingData.value.印件名称A=''
+  huanxingData.value.印件名称B=''
+  huanxingData.value.项目1=false
+  huanxingData.value.项目2=false
+  huanxingData.value.项目3=false
+  huanxingData.value.项目4=false
+  huanxingData.value.项目5=false
+}
+const onHxedit = () => {
+  huanxingType.value=true
+  huanxingStatus.value=2
+}
+const onHxdel = () => {
+  ElMessageBox.confirm('确定要删除吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    remodelDataDels()
+  })
+}
+
+const remodelDataDels = async() => {
+  const response = await remodelDataDel({
+    UniqId:formData.value.huanxingId
+  })
+  if (response.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '删除成功！'
+    })
+    huanxingtreeData.value=[]
+    huanxingselectData.value=[]
+    huanxingData.value={}
+    formData.value.huanxingId=''
+    huanxingstatus.value=false
+    RemodelGetTab()
+  }
+}
+
+const onHxsave = () => {
+  if(huanxingData.value.项目1==true){
+    huanxingData.value.项目1=1
+  }else{
+    huanxingData.value.项目1=0
+  }
+  if(huanxingData.value.项目2==true){
+    huanxingData.value.项目2=1
+  }else{
+    huanxingData.value.项目2=0
+  }
+  if(huanxingData.value.项目3==true){
+    huanxingData.value.项目3=1
+  }else{
+    huanxingData.value.项目3=0
+  }
+  if(huanxingData.value.项目4==true){
+    huanxingData.value.项目4=1
+  }else{
+    huanxingData.value.项目4=0
+  }
+  if(huanxingData.value.项目5==true){
+    huanxingData.value.项目5=1
+  }else{
+    huanxingData.value.项目5=0
+  }
+
+  if(huanxingStatus.value==1){
+    remodelDataAdds()
+  }
+  if(huanxingStatus.value==2){
+    remodelDataEdits()
+    console.log(huanxingData)
+  }
+  huanxingType.value=false
+  huanxingStatus.value=0
+}
+
+const remodelDataAdds = async() => {
+  const response = await remodelDataAdd({
+    日期:huanxingData.value.日期,
+    班组:huanxingData.value.班组,
+    机台编号:huanxingData.value.机台编号,
+    工单编号A:huanxingData.value.工单编号A,
+    印件工序A:huanxingData.value.印件工序A,
+    码包号A:huanxingData.value.码包号A,
+    工单编号B:huanxingData.value.工单编号B,
+    印件工序B:huanxingData.value.印件工序B,
+    码包号B:huanxingData.value.码包B,
+    清场项目A:huanxingData.value.项目1,
+    清场项目B:huanxingData.value.项目2,
+    清场项目C:huanxingData.value.项目3,
+    清场项目D:huanxingData.value.项目4,
+    清场项目E:huanxingData.value.项目5,
+    机长:huanxingData.value.机长,
+    班长:huanxingData.value.班长,
+    质量巡查员:huanxingData.value.质量巡查员
+  })
+  if (response.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '新增成功！'
+    })
+    // remodelDetail(formData.value.huanxingId)
+    RemodelGetTab()
+    modelChangeRecord(JTMC)
+  }
+}
+
+const remodelDataEdits = async() => {
+  const response = await remodelDataEdit({
+    日期:huanxingData.value.日期,
+    班组:huanxingData.value.班组,
+    机台编号:huanxingData.value.机台编号,
+    工单编号A:huanxingData.value.工单编号A,
+    印件工序A:huanxingData.value.印件工序A,
+    码包号A:huanxingData.value.码包号A,
+    工单编号B:huanxingData.value.工单编号B,
+    印件工序B:huanxingData.value.印件工序B,
+    码包号B:huanxingData.value.码包B,
+    清场项目A:huanxingData.value.项目1,
+    清场项目B:huanxingData.value.项目2,
+    清场项目C:huanxingData.value.项目3,
+    清场项目D:huanxingData.value.项目4,
+    清场项目E:huanxingData.value.项目5,
+    机长:huanxingData.value.机长,
+    班长:huanxingData.value.班长,
+    质量巡查员:huanxingData.value.质量巡查员,
+    UniqId:formData.value.huanxingId
+  })
+  if (response.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '修改成功！'
+    })
+  }
+}
 // 重置
 const onReset = () => {
   searchInfo.value = {}
@@ -2418,13 +2629,14 @@ function ondianjian() {
 //机台印版领用->右侧详情
 const facilityPrintDetailItem = async (value) => {
   try {
+    formData.value.code=value
     // 调用接口获取巡检项目数据
     const response = await facilityPrintDetail({ workOrder: formData.value.工单编号,code:value,productCode:formData.value.productCode });
 	// const response = await facilityPrintDetail({ workOrder: '2312165',code:'0521',productCode:'104601001' });
     // 检查接口返回的状态码
     if (response.code === 0) {
      console.log(response)
-	 yinbanselectData.value=response.data
+	   yinbanselectData.value=response.data
     }
   } catch (error) {
     // 捕获并打印异常
@@ -2440,8 +2652,8 @@ const yinbanNodeClick = (node, check, nodeData) => {
   } else {
     // 点击的是子节点，或者没有子节点
     // 执行相应的子节点单击事件处理逻辑
-	yinbanselectData.value=[]
-     facilityPrintDetailItem(node.code)
+	  yinbanselectData.value=[]
+    facilityPrintDetailItem(node.code)
   }
 };
 const onyinban = async() => {
@@ -2461,6 +2673,54 @@ const onyinban = async() => {
 		yinbanVisible.value = true;
 	}
 }
+const onYbout = async() => {
+  yinbanSelection.value.map((item)=>{
+    item.Yb_工单编号=formData.value.工单编号
+    item.Yb_存货编码=item.存货编码
+    item.Yb_供方批号=item.供方批号
+    item.Yb_领用机台=JTMC
+    item.Yb_印数=item.印数
+    item.Sys_id=`[${formData.value.addr}/${JTMC}]`
+    delete item.UniqId
+    delete item.产品名称
+    delete item.产品编号
+    delete item.供方批号
+    delete item.制造日期
+    delete item.印数
+    delete item.印版名称
+    delete item.印版类别
+    delete item.存货名称
+    delete item.存货编码
+    delete item.客户名称
+    delete item.客户编号
+    return item
+  })
+  const response = await PrintDetailAdd(yinbanSelection.value)
+  if(response.code===0){
+    facilityPrintDetailItem(formData.value.code)
+    ElMessage({
+      type: 'success',
+      message: '成功！'
+    })
+  }
+}
+const onYbback = async() => {
+  const arr=[]
+  yinbanSelection.value.map((item)=>{
+    if(item.UniqId===null){
+    }else{
+      arr.push(item.UniqId)
+    }
+  })
+  const response = await PrintDetailEdit({id:arr.join(',')})
+  if(response.code===0){
+    facilityPrintDetailItem(formData.value.code)
+    ElMessage({
+      type: 'success',
+      message: '成功！'
+    })
+  }
+}
 const onzhicheng = async () => {
 	zhichengstatus.value=false
 	xunchaData.value=[]
@@ -2519,6 +2779,10 @@ function onstatus() {
 	 // ReportProduceInfo()
 }
 function onClear() {
+  huanxingtreeData.value=[]
+  huanxingselectData.value=[]
+  huanxingData.value={}
+  huanxingstatus.value=false
 	huanxingVisible.value=true
 	RemodelGetTab()
 }
@@ -2744,6 +3008,7 @@ const GetMachineMac = async (addr) => {
   if (response.code === 0) {
     if(response.data===null){
       JTMC = 'MQ07#';
+      CJMC='模切车间';
       FacilityProduction(addr);
     }else{
       // 将接口返回的数据添加到树型结构中
@@ -2982,6 +3247,12 @@ const chanliangSelectionChange = (val) => {
 	console.log(formData3.value.formattedArray);
 	// console.log(selectedItems)
 }
+const handleybSelectionChange = (val) => {
+  yinbanSelection.value = []
+  if(val.length>0){
+  	yinbanSelection.value = val
+  }
+}
 //获取设备点检->检验项目
 const FacilityInspectionItem = async (value) => {
   try {
@@ -3597,7 +3868,7 @@ const selectBz = async() => {
 			yjno:formData.value.印件号,
 			gy_name:formData.value.工序名称,
 			sczl_bzdh:BZMC.value,
-			status:formData.value.状态,
+			status:'生产',
 			production_now:0,
 			production_all:0,
 			team_id:currentBz.value.ID
@@ -3607,7 +3878,8 @@ const selectBz = async() => {
 			  type: 'success',
 			  message: '成功'
 			})
-		}
+      FacilityProduction()
+    }
 		// currentBz.value={}
 	}
 }
@@ -3644,6 +3916,7 @@ setOptions()
 
 // 多选数据
 const multipleSelection = ref([])
+const yinbanSelection = ref([])
 // 多选
 const handleSelectionChange = (val) => {
     multipleSelection.value = val
@@ -3728,7 +4001,7 @@ const setMachineTeams = async(row) => {
 			yjno:row['印件资料'].split('-')[0],
 			gy_name:row['工序名称'],
 			sczl_bzdh:BZMC.value,
-			status:formData.value.状态,
+			status:'生产',
 			production_now:0,
 			production_all:0,
 			team_id:formData.value.班组Id

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -3515,4 +3515,4 @@ const createROLuckyExcel = (files) => {
 .mab{
   margin-bottom: 5px;
 }
-</style>
+</style>

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -150,11 +150,11 @@
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
                         :header-cell-style="{ padding: '0px' }"
                         style="width: 100%;height: 74vh" border tooltip-effect="dark"
-                        highlight-current-row="true"
                         @row-click="cjpc_tableRowClick"
                         :data="paichengData" row-key="ID"
                         :cell-class-name="cjzcCellClass"
               >
+<!--                highlight-current-row="true"-->
                 <template v-for="(item, idx) in paichengColumns">
                   <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
                     <div v-if="['优先次序', '生产工时', '辅助工时', '班次安排', '排单备注','最早开工时间', '计划开工时间'].includes(item.prop)">
@@ -1224,7 +1224,8 @@ const paichengColumns = ref(
     [
       { label: '优先次序', prop: '优先次序', width: '105' },
       { label: '工单编号', prop: '工单编号', width: '100' },
-      { label: '印件名称', prop: '印件名称', width: '220' },
+      // { label: '印件名称', prop: '印件名称', width: '220' },
+      { label: '印件名称', prop: '印件名称', width: '100' },
       { label: '接货数', prop: '接货数', width: '105' },
       { label: '小时产能', prop: '小时产能', width: '100' },
       { label: '生产工时', prop: '生产工时', width: '100' },
@@ -1239,6 +1240,7 @@ const paichengColumns = ref(
     ]
 )
 const handleKeyDown = (event, x, y, prop) => {
+  console.log(event)
   const currentElement = document.getElementById(`input${x}${y}`);
   if (currentElement === null && currentElement === undefined) return
   let move = 0
@@ -1247,6 +1249,7 @@ const handleKeyDown = (event, x, y, prop) => {
       if (x === 0 && y === +y) {
         console.log("排序前的值");
         console.log(paichengData.value);
+
         paichengData.value.sort((a, b) => {
           const priorityA = parseFloat(a['优先次序']);
           const priorityB = parseFloat(b['优先次序']);
@@ -1268,12 +1271,12 @@ const handleKeyDown = (event, x, y, prop) => {
           const hours = date.getHours().toString().padStart(2, '0');
           const minutes = date.getMinutes().toString().padStart(2, '0');
           const seconds = date.getSeconds().toString().padStart(2, '0');
-
           const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
           return formattedDate;
         }
         // 获取第一行数据
         const firstRow = paichengData.value[+y];
+        console.log(firstRow)
         // 初始化上一行的计划完工时间为第一行的计划开工时间
         let prevCompletionTime = new Date(firstRow['计划开工时间']).getTime() / 1000;
         // 遍历每一行数据
@@ -1285,6 +1288,7 @@ const handleKeyDown = (event, x, y, prop) => {
           const finalTimestamp = prevCompletionTime + resultTimestamp;
           // 将计划完工时间赋值到当前行
           row['计划完工时间'] = formatTimestamp(finalTimestamp);
+          // row['计划开工时间'] =formatTimestamp(finalTimestamp);
           // 更新上一行的计划完工时间为当前行的计划完工时间
           prevCompletionTime = finalTimestamp;
 
@@ -1397,6 +1401,7 @@ const _EquipmentSchedulingdata = async ()=>{
   let machine = _machine.value;
   try {
     const EquipmentSchedulingdata = await EquipmentScheduling({machine:machine});
+    console.log(EquipmentSchedulingdata)
     if (EquipmentSchedulingdata.code === 0) {
       paichengData.value = EquipmentSchedulingdata.data
     }
@@ -1571,9 +1576,9 @@ const rowContextMenu = (row) => {
   color: blue !important;
 }
 /*车间设备制程背景粉色*/
-/*:deep(.el-table__body .background-color-column-fen div div div) {*/
-/*  background: #ff80ff !important;*/
-/*}*/
+:deep(.el-table__body .background-color-column-fen div div div) {
+  background: #ff80ff !important;
+}
 /*文字蓝色*/
 :deep(.color-column-lan div) {
   color: red !important;