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

src/api/jixiaoguanli/jitairibaobiao.js

@@ -1144,4 +1144,12 @@ export const JPmachineDetail = (params) => {
     method: 'get',
     params
   })
+}
+
+export const JpChanliangEdit = (data) => {
+  return service({
+    url: '/mes_server/facility/JpChanliangEdit',
+    method: 'post',
+    data
+  })
 }

src/view/performance/06-packingDocuments/index.vue

@@ -970,32 +970,63 @@
 		dedhsearchModel.value = true;
 		const getPieceWorks = await getDedh();
 		console.log(getPieceWorks);
-		if (getPieceWorks.code === 0) {
-			const transformedData2 = getPieceWorks.data.bh_mc.map(item => ({
-				label: `${item.sys_mc}【${item.sys_bh}】`,
-				params: {
-					code: item.sys_bh
-				},
-				children: item.bh_mc?.map(sysItem => ({
-					label: `${sysItem.sys_mc}【${sysItem.sys_bh}】`,
-					params: {
-						code: sysItem.sys_bh
-					},
-					children: sysItem.bh_mc?.map(syssItem => ({
-						label: `${syssItem.sys_mc}【${syssItem.sys_bh}】`,
-						params: {
-							code: syssItem.sys_bh
-						}
-					})) || []
-				})) || []
-			}));
-			dedhtreeData.value = transformedData2;
-		}
+			console.log(22222)
+	if (getPieceWorks.code === 0) {
+	    const transformItems = (items) => {
+	        return items.map(item => ({
+	            label: `${item.sys_mc}【${item.sys_bh}】`,
+	            params: {
+	                code: item.sys_bh
+	            },
+	            children: item.bh_mc ? transformItems(item.bh_mc) : []
+	        }));
+	    };
+	
+	    const transformedData2 = getPieceWorks.data.map(topItem => ({
+	        label: `${topItem.sys_mc}【${topItem.sys_bh}】`,
+	        params: {
+	            code: topItem.sys_bh
+	        },
+	        children: topItem.bh_mc ? transformItems(topItem.bh_mc) : []
+	    }));
+	
+	    dedhtreeData.value = transformedData2;
+	}
+			
+		
+		// if (getPieceWorks.code === 0) {
+		// 	const transformedData2 = getPieceWorks.data.bh_mc.map(item => ({
+		// 		label: `${item.sys_mc}【${item.sys_bh}】`,
+		// 		params: {
+		// 			code: item.sys_bh
+		// 		},
+		// 		children: item.bh_mc?.map(sysItem => ({
+		// 			label: `${sysItem.sys_mc}【${sysItem.sys_bh}】`,
+		// 			params: {
+		// 				code: sysItem.sys_bh
+		// 			},
+		// 			children: sysItem.bh_mc?.map(syssItem => ({
+		// 				label: `${syssItem.sys_mc}【${syssItem.sys_bh}】`,
+		// 				params: {
+		// 					code: syssItem.sys_bh
+		// 				}
+		// 			})) || []
+		// 		})) || []
+		// 	}));
+		// 	dedhtreeData.value = transformedData2;
+		// }
 	};
 	// 点击定额代号
 	const dedhhandleNodeClick = (node, check) => {
+		console.log(node);
 		console.log(node.params.code);
-		detailData.table[_index.value].sczl_dedh = node.params.code
+		if (node.children && node.children.length > 0) {
+			console.log(11);
+		} else {
+			detailData.table[_index.value].sczl_dedh = node.params.code
+			dedhsearchModel.value = false;
+		}
+		// dedhsearchModel.value = false;
 	}
 
 

src/view/performance/chejianbaogong.vue

@@ -2180,6 +2180,9 @@ import {
   dailysearch,
   dailygetGzByYgbh,
   MachineChanliangDetail,
+  ChanliangPrintDetail,
+  ChanliangProcessDetail,
+  JpUploade,
   getTimelist
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
@@ -3259,13 +3262,13 @@ const JPformdata = reactive({
 })
 //班组产量提报 JP检品机 班组产量提报确定
 const JPchanliangenterDialog = async() => {
-	// console.log(JPformdata)
+	console.log(JPformdata)
 	const JPformattedData = {
 	  sczl_jtbh:JTMC+'#',
-	  sczl_gdbh: JPformdata['工单编号'],
-	  sczl_yjno: JPformdata['印件号'],
-	  sczl_gxh: JPformdata['工序号'],
-	  sczl_gxmc: JPformdata['工序名称'],
+	  sczl_gdbh:JPformdata['工单编号'],
+	  sczl_yjno:JPformdata['印件号'],
+	  sczl_gxh:JPformdata['工序号'],
+	  sczl_gxmc:JPformdata['工序名称'],
 	  sczl_rq: JPformdata['日期'],
 	  sczl_num: JPformdata['流程标牌'],
 	  sczl_type: JPformdata['检验类别'],
@@ -3298,14 +3301,15 @@ const JPchanliangenterDialog = async() => {
 	  sczl_rate9: JPformdata.组员9['比例'],
 	  sczl_rate10: JPformdata.组员10['比例'],
 	  
-	};
+	}
 	console.log(JPformattedData)
-	
+	// return false
 	const JpUploade_edit = await JpUploade(JPformattedData);
 	console.log(JpUploade_edit)
 	if (JpUploade_edit.code === 0) {
 		JPchanliangVisible.value = false
 	  ElMessage({type: 'success',message: '添加成功'})
+	  FacilityDetail()
 	} else {
 	  ElMessage({type: 'error',message: '添加失败'})
 	}
@@ -3407,8 +3411,8 @@ const JPent = async (event,key,val) => {
 		if(event.target.id === '印件号'){
 			if(JPformdata['工单编号']!=''){
 				//获取印件名称
+				console.log(JPformdata['工单编号'])
 			 	ChanliangPrintDetail({gdbh:JPformdata['工单编号']}).then(response=>{
-					// console.log(response)
 				  if (response.code === 0) {
 			 		  if(response.data){
 			 			  if(response.data.length==1){
@@ -3595,6 +3599,18 @@ const getMachineReportInfos = async () => {
 	JPformdata['工单编号'] = getMachineReportInfos.data.order_info.order
 	JPformdata['产品名称'] = getMachineReportInfos.data.order_info.product_name
 	JPformdata['定额代号'] = getMachineReportInfos.data.order_info.dedh
+	
+	
+	JPformdata['印件号'] = getMachineReportInfos.data.order_info.yjno
+	JPformdata['印件名称'] = getMachineReportInfos.data.order_info.yj_name
+	JPformdata['工序号'] = getMachineReportInfos.data.order_info.gxh
+	JPformdata['工序名称'] = getMachineReportInfos.data.order_info.gy_name
+	for (let i = 1; i <= 10; i++) {
+	  JPformdata[`组员${i}`]['编号'] = getMachineReportInfos.data.class[`sczl_bh${i}`];
+	}
+	for (let i = 1; i <= 10; i++) {
+	  JPformdata[`组员${i}`]['姓名'] = getMachineReportInfos.data.class[`sczl_name${i}`];
+	}
 	for (let i = 1; i <= 10; i++) {
 	  JPformdata[`组员${i}`]['比例'] = getMachineReportInfos.data.class[`sczl_rate${i}`];
 	}

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -1202,7 +1202,7 @@
 
                   <el-row>
                       <el-form-item label="标准损耗:" prop="address" class="mab">
-                        <el-input v-model="add_gyformData.Gy0_shdh" placeholder="Enter回车"  @keyup.enter="getSH()"   style="width: 150px;" id="Gy0_shdh" />
+                        <el-input v-model="add_gyformData.Gy0_shdh" readonly placeholder="Enter回车"  @keyup.enter="getSH()"   style="width: 150px;" id="Gy0_shdh" />
                         <el-input v-model="add_gyformData.sys_mc"   style="width: 160px;" id="sys_mc"  @keydown="ent($event, 'Gy0_shdh', 'sys_mc', '基础损耗')"/>
                       </el-form-item>
                       <el-form-item label="基础损耗:" prop="address" class="mab">

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -57,7 +57,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
-            <el-input v-model="form['shdh']"  placeholder="Enter回车"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
+            <el-input v-model="form['shdh']"  placeholder="Enter回车" readonly style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
             <el-input disabled v-model="form['工序损耗名称']"  style="width: 88.7%;margin-left: 10px"/>
           </el-form-item>
           <div style="display: flex; gap: 0px;">

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -1227,7 +1227,7 @@
                     </el-select>
                   </el-form-item>
                   <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
-                    <el-input v-model="gdgyformData['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
+                    <el-input v-model="gdgyformData['shdh']" readonly style="width: 10%;" id="工序损耗"  @keydown="gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
                     <el-input  v-model="gdgyformData['工序损耗名称']"  style="width: 88.7%;margin-left: 10px"/>
                   </el-form-item>
                   <div style="display: flex; gap: 0px;">
@@ -3808,18 +3808,18 @@ const gyzlent = (event,id1,id2,id3) => {
 	    document.getElementById(id3).focus()
 	  }
 	}
-	if (id2 === '车间名称' && event.key==='Tab') {
+	if (id2 === '车间名称' && event.key==='Tab'  || id2 === '车间名称' &&  event.key==='Enter') {
 	  document.getElementById(id3).focus()
 	  cjdisplay.value = true
 	}
-	if (id2 === '工序损耗' &&  event.key==='Tab') {
+	if (id2 === '工序损耗' &&  event.key==='Tab' || id2 === '工序损耗' &&  event.key==='Enter') {
 	  if(gdgyformData['车间名称']){
 	     getGxshList();
 	    _getSH()
 	    shxsdisplay.value = true
 	  }
 	}
-	if (id2 === '工序名称' &&  event.key==='Tab' || event.key==='Enter') {
+	if (id2 === '工序名称' &&  event.key==='Tab' || id2 === '工序名称' &&  event.key==='Enter') {
 	  if(gdgyformData['工艺名称'] === undefined){
 	    gdgyformData['工艺名称'] = '';
 	  }