功能优化

src/api/jixiaoguanli/jitairibaobiao.js

@@ -766,11 +766,11 @@ export const ChromaDataEdit = (data) => {
   })
 }
 //每日上报产量凹印版距修改
-export const PrintingModeDataEdit = (params) => {
+export const PrintingModeDataEdit = (data) => {
   return service({
     url:'/mes_server/Facility/PrintingModeDataEdit',
-    method: 'get',
-    params
+    method: 'post',
+    data
   })
 }
 //关联工资核算

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -2913,8 +2913,7 @@ if(type2.value==='add'){
 const openSearchZhiModal = (code, idx) => {
   if (code.key==='Tab') {
     setTimeout(() => document.querySelector('.zhi').focus(), 50)
-    _getProductZzList()
-    searchZhiModel.value = true
+    _getProductZzList() 
     zzdhIndex.value = idx
   }
 }
@@ -2929,6 +2928,9 @@ const _getProductZzList = async ()=>{
   try {
     const response = await getProductZzList({search:''});
     getProductZhiListdata.value = handleTreeDatas(response.data)
+	nextTick(() => {
+	 searchZhiModel.value = true
+	});
   } catch (error) {
     console.error(error);
   }
@@ -2977,38 +2979,42 @@ const handleTreeData = (treeData) => {
 }
 //纸张tab 点击事件
 const selectZhiNode = (v) => {
-  if(type2.value==='add'){
-	  if(v.物料名称){
-	    if (zzdhIndex.value == 0) {
-	          add_yjzlformdata['zzdh'] = v.物料代码
-	          add_yjzlformdata['zzmc'] = v.物料名称
-			  console.log(v.规格)
-	          add_yjzlformdata['tl'] = v.规格
-			  
-	        } else {
-	          add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
-	          add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
-	        }
-			zhi_keyword.value=''
-	  }
-  }else if(type2.value==='update'){
-	  console.log(zzdhIndex.value)
-	  if(v.物料名称){
-	    if (zzdhIndex.value == 0) {
-	          yjformDataTest['yj_zzdh'] = v.物料代码
-	          yjformDataTest['yj_zzmc'] = v.物料名称
-	          yjformDataTest['yj_tlgg'] = v.规格
-	        } else {
-	          yjformDataTest['yj_zzdh' + zzdhIndex.value] = v.物料代码
-	          yjformDataTest['yj_zzmc' + zzdhIndex.value] = v.物料名称
-	        }
-			zhi_keyword.value=''
-	  }
+  if (v.children && v.children.length > 0) {
+    // Node has child nodes, expand the structure
+    // Perform any necessary actions for expanding the structure
+  } else {
+    // Node does not have child nodes, assign values
+    if (type2.value === 'add') {
+      if (v.物料名称) {
+        if (zzdhIndex.value == 0) {
+          add_yjzlformdata['zzdh'] = v.物料代码;
+          add_yjzlformdata['zzmc'] = v.物料名称;
+          add_yjzlformdata['tl'] = v.规格;
+        } else {
+          add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码;
+          add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称;
+        }
+        zhi_keyword.value = '';
+      }
+    } else if (type2.value === 'update') {
+      if (v.物料名称) {
+        if (zzdhIndex.value == 0) {
+          yjformDataTest['yj_zzdh'] = v.物料代码;
+          yjformDataTest['yj_zzmc'] = v.物料名称;
+          yjformDataTest['yj_tlgg'] = v.规格;
+        } else {
+          yjformDataTest['yj_zzdh' + zzdhIndex.value] = v.物料代码;
+          yjformDataTest['yj_zzmc' + zzdhIndex.value] = v.物料名称;
+        }
+        zhi_keyword.value = '';
+      }
+    }
+    searchZhiModel.value = false;
   }
-   searchZhiModel.value = false
 }
 
 
+
 //清空对象的属性值
 const gdyj_clearFormData = () => {
   Object.keys(add_yjzlformdata).forEach(key => {
@@ -3394,20 +3400,20 @@ const add_ybformDataTest = reactive({
 //点击新增印版资料
 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
-    });
+  // 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;
-  }
+  // }
 
 };
 //点击下拉框获取数据方案、印件、编号、工艺名称、工序名称

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1857,7 +1857,11 @@
 		        <el-input v-model="hesuanValue.产品板距" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="CPType === true"/>		  				  
 		      </el-form-item>
 		      <el-form-item label="印刷方式:" prop="flatFeed" class="mab" v-if="CPType === true">
-		        <el-input v-model="hesuanValue.印刷方式" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="CPType === true"/>		  				  
+				  <el-select v-model="hesuanValue.印刷方式" placeholder="" style="width: 190px;" :clearable="true" v-if="CPType === true"	>
+				    <el-option label="卷对卷" value="卷对卷"></el-option>
+				    <el-option label="卷对张" value="卷对张"></el-option>
+				  </el-select>
+		        <!-- <el-input v-model="hesuanValue.印刷方式" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="CPType === true"/> -->		  				  
 		      </el-form-item>
 		      <el-form-item label="色度数 :" prop="flatFeed" class="mab" v-if="SDType === true">
 		        <el-input v-model="hesuanValue.色度数" id="辅电表" @keydown="ent1($event)" :clearable="true" style="width: 200px;" v-if="SDType === true" />		  				  
@@ -1884,8 +1888,18 @@
 		                @keyup.enter="xzhscsgetProductValue"  style="width: 200px;"/>
 		      <el-input v-model="xzhscsformData['cpdh']"   disabled   style="width: 120px;margin-left: 10px;"/>
 		      <el-input v-model="xzhscsformData['gdmc']"   disabled   style="width: 500px;"/>
-			  <el-input v-model="xzhscsformData['yjdh']"   disabled   style="width: 120px;margin-left: 10px;"/>
-			  <el-input v-model="xzhscsformData['yjmc']"   disabled   style="width: 500px;"/>
+<!-- 			  <el-input v-model="xzhscsformData['yjdh']"   disabled   style="width: 120px;margin-left: 10px;"/>
+			  <el-input v-model="xzhscsformData['yjmc']"   disabled   style="width: 500px;"/> -->
+		    </el-form-item>
+		  </div>
+		  <div style="width: 100%; height: 60px; padding: 0px; margin: 5px 0px 0px 260px; display: flex; align-items: center;">
+		    <el-form-item label=" :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+		      <!-- <el-input v-model="xzhscsformData['gdbh']"
+		                @keyup.enter="xzhscsgetProductValue"  style="width: 200px;"/>
+		      <el-input v-model="xzhscsformData['cpdh']"   disabled   style="width: 120px;margin-left: 10px;"/>
+		      <el-input v-model="xzhscsformData['gdmc']"   disabled   style="width: 500px;"/> -->
+		  			  <el-input v-model="xzhscsformData['yjdh']"   disabled   style="width: 120px;margin-left: 10px;"/>
+		  			  <el-input v-model="xzhscsformData['yjmc']"   disabled   style="width: 500px;"/>
 		    </el-form-item>
 		  </div>
 		  <el-table ref="paichengRef"
@@ -3822,39 +3836,43 @@ if(selected.value==='难度调整系数'){
  //核算调整弹窗确定
  const hesuanenterDialog = async () => {
  if(selected.value==='难度调整系数'){
-	try{
-		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()
+	    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: '失败'
+			  message: '11111'
 			})
-		}	
-	}catch(e){
-		ElMessage({
-		  type: 'error',
-		  message: '请确认是否已选择要修改的内容'
-		})
-	}
-	
+		}
+		
+
+	 
  }else if(selected.value=== '凹印版距'){
+	 // console.log(hesuanValue.印刷方式)
 	 const id=ref('')
 	 	  // console.log(multipleSelection.value.length)
 	 	  // console.log(multipleSelection.value[0])
@@ -4123,6 +4141,8 @@ const xzhscsConfirm = async () => {
     if (AccountingParameterEditdata.code === 0) {
       xzhscslist.value = false;
       ElMessage({ type: 'success', message: '更新成功' });
+	  sxzhscstableData.value =''
+	  xzhscsformData=''
     } else {
       ElMessage({ type: 'error', message: '更新失败' });
     }
@@ -4133,6 +4153,8 @@ const xzhscsConfirm = async () => {
 //修正核算参数退出
 const sxzhscsCancel = () => {
   xzhscslist.value = false;
+  sxzhscstableData.value =''
+  xzhscsformData=''
 };
 //修正核算参数颜色
 const sxzhscsCellClass = ({row, column, rowIndex, columnIndex}) =>{