印版优化

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -703,16 +703,18 @@
                         @row-click="clickybupdate">
                 <el-table-column type="selection" width="30" />
                 <el-table-column align="left" sortable   label="方案" prop="方案"  width="110"/>
-                <el-table-column align="left" sortable   label="印件" prop="Gy0_yjno" width="110" />
-                <el-table-column align="left" sortable   label="工序" prop="Gy0_gxh" width="110" />
-                <el-table-column align="left" sortable   label="工序名称" prop="gy0_gxmc" width="120" />
-                <el-table-column align="left" sortable   label="工序名称" prop="add_gxmc" width="340" />
-                <el-table-column align="left" sortable   label="开数" prop="Gy0_Ks" width="110" />
-                <el-table-column align="left" sortable   label="联数" prop="Gy0_ls" width="110" />
+                <el-table-column align="left" sortable   label="印件-工序" prop="combinedProp" width="110" />
+                <!-- <el-table-column align="left" sortable   label="工序" prop="Gy0_gxh" width="110" /> -->
+                <el-table-column align="left" sortable   label="工序名称" prop="combinedProp2" width="120" />
+                <!-- <el-table-column align="left" sortable   label="工序名称" prop="add_gxmc" width="340" /> -->
+                <el-table-column align="left" sortable   label="开数*联数" prop="combinedProp3" width="130" />
+                <!-- <el-table-column align="left" sortable   label="联数" prop="Gy0_ls" width="110" /> -->
                 <el-table-column align="left" sortable   label="备注" prop="备注" width="150" />
-                <el-table-column align="left" sortable   label="工价系数" prop="工价系数" width="110" />
+                <el-table-column align="left" sortable   label="难度系数" prop="工价系数" width="110" />
                 <el-table-column align="left" sortable   label="损耗系数" prop="损耗系数" width="110" />
-                <el-table-column align="left" sortable   label="计损色数" prop="Gy0_Ms" width="110" />
+				<el-table-column align="left" sortable   label="基础损耗" prop="基础损耗" width="110" />
+				<el-table-column align="left" sortable   label="损耗率" prop="损耗率" width="110" />
+                <el-table-column align="left" sortable   label="计损色数" prop="计损色数" width="110" />
                 <el-table-column align="left" sortable   label="人工检_正品板" prop="人工检_正品板" width="150" />
                 <el-table-column align="left" sortable   label="人工检_次品板" prop="人工检_次品板" width="150" />
                 <el-table-column align="left" sortable   label="人工检_废检" prop="人工检_废检" width="140"/>
@@ -734,6 +736,7 @@
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }"
                         @row-dblclick="ybupdateCompanyFunc"
+						@row-click="ybClick"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange"
               >
                 <el-table-column type="selection" width="30" />
@@ -1445,7 +1448,7 @@
                   <input type="hidden" v-model="add_ybformDataTest.gxmc1">
                   <el-form-item label="" prop="gongxu" class="mab" label-width="50">
                     <el-select v-model="add_ybformDataTest.gongxu" placeholder="请选择"  id="chbm" style="width: 400px;">
-                      <el-option v-for="option in addybdisplaydata.gongxuNameOptions" @click="ongongxufanclick" :key="option" :label="option"  :value="option" />
+                      <el-option v-for="option in add_ybformDataTest.gongxuNameOptions" @click="ongongxufanclick" :key="option" :label="option"  :value="option" />
                     </el-select>
                   </el-form-item>
 
@@ -2555,8 +2558,17 @@ const tableRowClick = async (row) => {
   const res = await getProductData({product_code:_product_code.value});
   console.log(row.产品编号 + "--->下方表格获取数据")
   console.log(res)
+  console.log(res.data.gyData)
+  const processedData = res.data.gyData.map(item => {
+    return {
+      ...item,
+      combinedProp: item.Gy0_yjno + '--'+item.Gy0_gxh,
+      combinedProp2: item.gy0_gxmc + '-'+item.add_gxmc,
+	  combinedProp3: item.Gy0_Ks + '*'+item.Gy0_ls
+    };
+  });
   yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
-  gytableData.splice(0, gytableData.length, ...res.data.gyData);
+  gytableData.splice(0, gytableData.length, ...processedData);
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
   jstableData.splice(0, jstableData.length, ...res.data.jsData);
   if(yjtableData.length==0){
@@ -3396,37 +3408,50 @@ const addgycloseDialog = () => {
   addgydialogFormVisible.value = false
 }
 //=========新增印版资料========
-const addybdialogFormVisible = ref(false)
-const addybdisplay = ref(false)
-const addyb_keyword = ref('')
-const getYBListdata = ref([])
+const addybdialogFormVisible = ref(false);
+const addybdisplay = ref(false);
+const addyb_keyword = ref('');
+const getYBListdata = ref([]);
 const addybdisplaydata = reactive({
-  chbm:'',
-  chbmNameOptions:[],
-})
+  chbm: '',
+  chbmNameOptions: [],
+});
 const add_ybformDataTest = reactive({
-  gongxu:'',
-  gongxuNameOptions:[],
-})
-//点击新增印版资料
+  gongxu: '',
+  gongxuNameOptions: [],
+  YB_方案: '',
+  YB_Yjno: '',
+  YB_gxh: '',
+  YB_gymc: '',
+  YB_gxmc: '',
+  物料代码: '',
+  物料名称: '',
+  ybbz: '',
+  gxmc1: '',
+});
+
 const addyb_onclick = async () => {
-  console.log(_UniqID)
-  // if(_UniqID.value === '' || _UniqID.value === undefined || _UniqID.value === null){
-  //   ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
-  //   return false;
-  // }else{
-  //   const getProductYbInfo_list = await getProductYbInfo({UniqID:_UniqID.value});
-  //   console.log(getProductYbInfo_list.data.gy_data)
-  //   //默认取第一个数据
-  //   // add_ybformDataTest.gongxu = getProductYbInfo_list.data.gy_data[0]['gy'];
-  //   add_ybformDataTest.gxmc1 = getProductYbInfo_list.data['印版名称'];
-  //   addybdisplaydata.gongxuNameOptions = getProductYbInfo_list.data.gy_data.map(item=>{
-  //     return item.gy
-  //   });
-    addybdialogFormVisible.value = true;
-  // }
+  if (ybID.value === '' || ybID.value === undefined || ybID.value === null) {
+    ElMessage({ type: 'warning', message: '请选择具体的工单后，再操作此功能' });
+    return false;
+  } else {
+    const getProductYbInfo_list = await getProductYbInfo({ UniqID: ybID.value });
+
+    add_ybformDataTest.gxmc1 = getProductYbInfo_list.data['印版名称'];
+    add_ybformDataTest.YB_方案 = getProductYbInfo_list.data['YB_方案'];
+    add_ybformDataTest.YB_Yjno = getProductYbInfo_list.data['YB_Yjno'];
+    add_ybformDataTest.YB_gxh = getProductYbInfo_list.data['YB_gxh'];
+    add_ybformDataTest.YB_gymc = getProductYbInfo_list.data['印版名称'];
+    add_ybformDataTest.YB_gxmc = getProductYbInfo_list.data['YB_gxmc'];
+    add_ybformDataTest.物料代码 = getProductYbInfo_list.data['存货编码'];
+    add_ybformDataTest.物料名称 = getProductYbInfo_list.data['物料名称'];
+    add_ybformDataTest.ybbz = getProductYbInfo_list.data['印版备注'];
+    add_ybformDataTest.gongxuNameOptions = getProductYbInfo_list.data.gy_data.map(item => item.gy);
 
+    addybdialogFormVisible.value = true;
+  }
 };
+
 //点击下拉框获取数据方案、印件、编号、工艺名称、工序名称
 const ongongxufanclick = async (v) => {
   add_ybformDataTest.YB_方案 = add_ybformDataTest.gongxu.split('-->')[0];
@@ -3641,6 +3666,12 @@ const ybupdateCompanyFunc = async (row) => {
   // ybformDataTest = row;
   ybdialogFormVisible.value = true;
 };
+const ybID=ref()
+//双击修改
+const ybClick = async (row) => {
+  console.log(row.UniqID)
+  ybID.value=row.UniqID
+};
 // 弹窗
 const ybdialogFormVisible = ref(false)
 // 打开修改弹窗

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -967,7 +967,7 @@
 					                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 					                :header-cell-style="{ padding: '0px' }" @row-click="getUid"
 					                highlight-current-row="true" @row-dblclick="gytableDatadoubleClick"
-					                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+					                style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
 					        <el-table-column type="selection" width="55" />
 					        <!-- <el-table-column align="left" label="选择" prop="工单编号"  width="100"/> -->
 					        <el-table-column align="left" label="产品名称" prop="产品名称"  width="200"/>
@@ -1018,7 +1018,7 @@
 					                :header-cell-style="{ padding: '0px' }"
 					                :show-overflow-tooltip="true"
 					                highlight-current-row="true"
-					                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
+					                style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
 					        <el-table-column type="selection" width="55" />
 					        <el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
 					        <el-table-column align="left" label="印件号" prop="印件号" width="70" />
@@ -3120,10 +3120,12 @@ const getbzyg = async (value,key) => {
   bzyg=`code${key}`
   let bzxm=''
   bzxm=`name${key}`
+  console.log(formDatas.value[bzxm])
+  console.log(formDatas.value[bzyg])
   const response = await getYg({sczl_bh:formDatas.value[bzyg]});
   if (response.code === 0) {
-    formDatas.value[bzxm]=response.data.ygxm
-	formDatas.value[bzyg]=response.data.员工编号
+    formDatas.value[bzxm]=response.data[0].ygxm
+	formDatas.value[bzyg]=response.data[0].员工编号
   }
 }
 const addBz = async() => {
@@ -3566,7 +3568,7 @@ const MachineChanliang = async(value) => {
  	
  //获取员工信息
  const GetYg = (event,inputName) => {
-	 // console.log(eval(`formdata3.value.组员${inputName}['编号']`))
+	 console.log(eval(`formdata3.value.组员${inputName}['编号']`))
 	 if(eval(`formdata3.value.组员${inputName}['编号']`)===""){
 		 console.log("123")
 	 }else{
@@ -3580,7 +3582,7 @@ const MachineChanliang = async(value) => {
 		 	EmployeeData({code:value.value}).then(response=>{
 		 		if (response.code === 0) {
 		 			if(inputName==='1'){
-		 			  formdata3.value.组员1['姓名']=response.data[0].员工姓名;
+		 			  formdata3.value.组员1['姓名']='123';
 		 			}else if(inputName==='2'){
 		 			  formdata3.value.组员2['姓名']=response.data[0].员工姓名;
 		 			}else if(inputName==='3'){
@@ -3836,41 +3838,31 @@ if(selected.value==='难度调整系数'){
  //核算调整弹窗确定
  const hesuanenterDialog = async () => {
  if(selected.value==='难度调整系数'){
-	    console.log(multipleSelection.value.length)
-		if(multipleSelection.value.length>1){
-			const id=ref('')
-			// console.log(multipleSelection.value[0])
-			for(let i=0;i<multipleSelection.value.length;i++){
-				id.value+=multipleSelection.value[i].UniqId+','
-				console.log(multipleSelection.value[i].UniqId)
-			}
-			const res = await CoefficientEdit({id:id.value,工价系数:hesuanValue.缩放系数 })
-			console.log(res)
-			if(res.code===0){
-				ElMessage({
-				  type: 'success',
-				  message: '成功'
-				})
-				// multipleSelection.value='' 
-				// multipleTable.clearSelection();
-				// console.log(multipleSelection.value)
-			    hesuanVisible.value=false
-			    FacilitychanLiang()
-			}else{
-				ElMessage({
-				  type: 'error',
-				  message: '失败'
-				})
-			}	
-		}else{
-			ElMessage({
-			  type: 'error',
-			  message: '11111'
-			})
-		}
-		
-
-	 
+console.log(multipleSelection.value.length)
+	const id=ref('')
+	// console.log(multipleSelection.value[0])
+	for(let i=0;i<multipleSelection.value.length;i++){
+		id.value+=multipleSelection.value[i].UniqId+','
+		console.log(multipleSelection.value[i].UniqId)
+	}
+	const res = await CoefficientEdit({id:id.value,工价系数:hesuanValue.缩放系数 })
+	console.log(res)
+	if(res.code===0){
+		ElMessage({
+		  type: 'success',
+		  message: '成功'
+		})
+		// multipleSelection.value='' 
+		// multipleTable.clearSelection();
+		// console.log(multipleSelection.value)
+		hesuanVisible.value=false
+		FacilitychanLiang()
+	}else{
+		ElMessage({
+		  type: 'error',
+		  message: '失败'
+		})
+	}	
  }else if(selected.value=== '凹印版距'){
 	 // console.log(hesuanValue.印刷方式)
 	 const id=ref('')