liuhairui 1 year ago
parent
commit
f1f72ce862

+ 8 - 0
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
+  })
 }

+ 24 - 8
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}`];
 	}

File diff suppressed because it is too large
+ 844 - 64
src/view/yunyin/shengchanguanli/shebeiyunxing.vue


Some files were not shown because too many files changed in this diff