印件修改弹窗

src/view/performance/Dayreports.vue

@@ -1590,7 +1590,7 @@ const Synchronous = async () => {
 	  message: '同步成功',
 	})
   }
-  getTableData()
+  // getTableData()
 }
 const displayMod = ref('')
 // 按工单显示

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -785,14 +785,14 @@
 		    v-model="huanxingVisible"
 		    title="选择客户代号"
 		    destroy-on-close
-		    width="145vh"
-		    style="height: 78vh;"
+		    width="80vh"
+		    style="height: 50vh;"
 		    :before-close="closehuanxingVisible"
 		  >
 		    <div style="display: flex;">
 		      <div style="flex: 0.1;">
-		        <el-aside width="50vh" style="margin: 0;">
-		          <div class="JKWTree-tree" style="height: 50vh; border-right: 1px solid #ebeef5;">
+		        <el-aside width="70vh" style="margin: 0;">
+		          <div class="JKWTree-tree" style="width:70vh;height: 35vh; border-right: 1px solid #ebeef5;">
 		            <el-tree :data="treeData" node-key="label" @node-click="treeDataClick" @node-expand="handleNodeExpand">
 		              <template #default="{ node, data }">
 		                {{ node.label }}
@@ -888,7 +888,7 @@
                   </el-row>
                   <el-row>
                     <el-form-item label="印件代号:" prop="address" class="mab" label-width="105px">
-                      <el-input v-model="yjformDataTest['yj_yjdh']"  placeholder="" style="width: 140px;"  id="印件代号"  @keydown="yj_ent($event, '印件号', '印件代号', 'yj_zzdh')" />
+                      <el-input v-model="yjformDataTest['yj_yjdh']"  placeholder="" style="width: 140px;"  id="印件代号"   @keydown="add_yinjian_ent($event, 'yj_desc', '印件号', '印件代号')" />
                     </el-form-item>
                   </el-row>
                   <el-row>
@@ -902,40 +902,40 @@
                     <el-col :span="24">
                       <el-form-item label="纸张:" prop="address" class="mab"  label-width="105px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh']"  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="yj_ent($event, '印件代号', 'yj_zzdh', 'yj_zzmc')" />
-                          <el-input v-model="yjformDataTest['yj_zzmc']"  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="yj_ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
+                          <el-input v-model="yjformDataTest['yj_zzdh']"  placeholder="" style="width: 140px;"  id="zzdh"  @keydown="add_gdzlyjent($event, '印件名称', 'zzdh', 'zzmc',0)" />
+                          <el-input v-model="yjformDataTest['yj_zzmc']"  placeholder=""  style="width: 460px;" id="zzmc"  @keydown="add_gdzlyjent($event, 'zzdh', 'zzmc', 'zzdh1')"  />
                         </el-row>
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
                       <el-form-item label="备用纸张1:" prop="address" class="mab"  label-width="105px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh1']"  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="yj_ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />
-                          <el-input v-model="yjformDataTest['yj_zzmc1']"  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="yj_ent($event, 'yj_zzdh1', 'yj_zzmc1', 'yj_zzdh2')"  />
+                          <el-input v-model="yjformDataTest['yj_zzdh1']"  placeholder="" style="width: 140px;"  id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)" />
+                          <el-input v-model="yjformDataTest['yj_zzmc1']"  placeholder=""  style="width: 460px;"  id="zzmc1"  @keydown="add_gdzlyjent($event, 'zzdh1', 'zzmc1', 'zzdh2')"   />
                         </el-row>
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
                       <el-form-item label="备用纸张2:" prop="address" class="mab"  label-width="105px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh2']"  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="yj_ent($event, 'yj_zzdh2', 'yj_zzdh2', 'yj_zzmc2')" />
-                          <el-input v-model="yjformDataTest['yj_zzmc2']"  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="yj_ent($event, 'yj_zzdh2', 'yj_zzmc2', 'yj_zzdh3')"  />
+                          <el-input v-model="yjformDataTest['yj_zzdh2']"  placeholder="" style="width: 140px;"  id="zzdh2"  @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" />
+                          <el-input v-model="yjformDataTest['yj_zzmc2']"  placeholder=""  style="width: 460px;" id="zzmc2"  @keydown="add_gdzlyjent($event, 'zzdh2', 'zzmc2', 'zzdh3')"  />
                         </el-row>
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
                       <el-form-item label="备用纸张3:" prop="address" class="mab"  label-width="105px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh3']"  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="yj_ent($event, 'yj_zzmc2', 'yj_zzdh3', 'yj_zzmc3')" />
-                          <el-input v-model="yjformDataTest['yj_zzmc3']"  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="yj_ent($event, 'yj_zzdh3', 'yj_zzmc3', 'yj_zzdh4')"  />
+                          <el-input v-model="yjformDataTest['yj_zzdh3']"  placeholder="" style="width: 140px;"  id="zzdh3"  @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)"  />
+                          <el-input v-model="yjformDataTest['yj_zzmc3']"  placeholder=""  style="width: 460px;" id="zzmc3"  @keydown="add_gdzlyjent($event, 'zzdh3', 'zzmc3', 'zzdh4')"  />
                         </el-row>
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
                       <el-form-item label="备用纸张4:" prop="address" class="mab"  label-width="105px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh4']"  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="yj_ent($event, 'yj_zzmc3', 'yj_zzdh4', 'yj_zzmc4')" />
-                          <el-input v-model="yjformDataTest['yj_zzmc4']"  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="yj_ent($event, 'yj_zzdh', 'yj_zzmc4', 'yj_tlgg')"  />
+                          <el-input v-model="yjformDataTest['yj_zzdh4']"  placeholder="" style="width: 140px;"  id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" />
+                          <el-input v-model="yjformDataTest['yj_zzmc4']"  placeholder=""  style="width: 460px;" id="zzmc4"  @keydown="add_gdzlyjent($event, 'zzdh4', 'zzmc4', 'yj_tlgg')"  />
                         </el-row>
                       </el-form-item>
                     </el-col>
@@ -2711,7 +2711,8 @@ const enterDialog = async () => {
   const formattedData = {
     '客户编号': formDataTest['客户编号'],
     '客户名称': formDataTest['客户名称'],
-    '印品代号': formDataTest['产品编号'],
+    // '印品代号': formDataTest['产品编号'],
+	'产品编号': formDataTest['产品编号'],
     '版本号': formDataTest['版本号'],
     '客户料号': formDataTest['客户料号'],
     '产品名称': formDataTest['产品名称'],
@@ -2722,16 +2723,42 @@ const enterDialog = async () => {
   };
   console.log(type.value)
   if(type.value =='create'){
-  const addProduct = await addProduct(formattedData);
-  if (addProduct.code === 0) {
-    ElMessage({type: 'success',message: '更新成功'})
+  const formattedData = {
+    '客户编号': formDataTest['客户编号'],
+    '客户名称': formDataTest['客户名称'],
+    // '印品代号': formDataTest['产品编号'],
+  	'产品编号': formDataTest['产品编号'],
+    '版本号': formDataTest['版本号'],
+    '客户料号': formDataTest['客户料号'],
+    '产品名称': formDataTest['产品名称'],
+    '产品类别': formDataTest['产品类别'],
+    '计量单位': formDataTest['计量单位'],
+    '成品规格': formDataTest['成品规格'],
+    '产品备注': formDataTest['产品备注'],
+  };
+  const res = await addProduct(formattedData);
+  if (res.code === 0) {
+    ElMessage({type: 'success',message: '新增成功'})
   } else {
-    ElMessage({ type: 'error',message: '更新失败'})
+    ElMessage({ type: 'error',message: '新增失败'})
   }
   formDataTest=[]
   dialogFormVisible.value = false;
   _getProduct();
   }else{
+  const formattedData = {
+    '客户编号': formDataTest['客户编号'],
+    '客户名称': formDataTest['客户名称'],
+    // '印品代号': formDataTest['产品编号'],
+  	'产品编号': formDataTest['产品编号'],
+    '版本号': formDataTest['版本号'],
+    '客户料号': formDataTest['客户料号'],
+    '产品名称': formDataTest['产品名称'],
+    '产品类别': formDataTest['产品类别'],
+    '计量单位': formDataTest['计量单位'],
+    '成品规格': formDataTest['成品规格'],
+    '产品备注': formDataTest['产品备注'],
+  };
   const editProductedit = await editProduct(formattedData);
   if (editProductedit.code === 0) {
     const row = tableData.find(item => item.UniqID === dbclickId.value)
@@ -2751,8 +2778,10 @@ const enterDialog = async () => {
 
 //=========修改印件资料========
 let yjformDataTest = reactive({})
+const type2=ref()
 //双击修改
 const yjupdateCompanyFunc = async (row) => {
+	type2.value='update'
   //3.1获取产品印件资料
   const getProductYjInfo_edit = await getProductYjInfo({UniqId:row.UniqId})
   Object.assign(yjformDataTest,getProductYjInfo_edit.data[0]);
@@ -2840,6 +2869,7 @@ const getProductYjListdata = ref()
 
 //点击新增印件资料按钮
 const addcpyj_onclick = () => {
+	type2.value='add'
 	if(_Gd_gdbh.value == null){
 	  cgugdlist.value = false;
 	  ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
@@ -2864,11 +2894,20 @@ const cpsearchHandle = async (v) => {
 }
 //印件代号 点击树状图获取点击的数据
 const selectNode = (v) => {
-  if(v.物料名称){
-    add_yjzlformdata['yjdh'] = v.物料代码
-    add_yjzlformdata['yjmc'] = v.物料名称
-    searchModel.value= false
-  }
+	console.log(type2.value)
+if(type2.value==='add'){
+	if(v.物料名称){
+	  add_yjzlformdata['yjdh'] = v.物料代码
+	  add_yjzlformdata['yjmc'] = v.物料名称
+	  searchModel.value= false
+	}
+}else if(type2.value==='update'){
+	if(v.物料名称){
+	  yjformDataTest['yj_yjdh'] = v.物料代码
+	  yjformDataTest['yj_yjmc'] = v.物料名称
+	  searchModel.value= false
+	}
+}
 }
 
 const openSearchZhiModal = (code, idx) => {
@@ -2937,17 +2976,32 @@ const handleTreeData = (treeData) => {
 }
 //纸张tab 点击事件
 const selectZhiNode = (v) => {
-  if(v.物料名称){
-    if (zzdhIndex.value == 0) {
-          add_yjzlformdata['zzdh'] = v.物料代码
-          add_yjzlformdata['zzmc'] = v.物料名称
-          add_yjzlformdata['tlgg'] = v.规格
-        } else {
-          add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
-          add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
-        }
-    searchZhiModel.value = false
+  if(type2.value==='add'){
+	  if(v.物料名称){
+	    if (zzdhIndex.value == 0) {
+	          add_yjzlformdata['zzdh'] = v.物料代码
+	          add_yjzlformdata['zzmc'] = v.物料名称
+	          add_yjzlformdata['tlgg'] = v.规格
+	        } else {
+	          add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
+	          add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
+	        }
+	  }
+  }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.物料名称
+	        }
+	  }
   }
+  
+   searchZhiModel.value = false
 }
 
 
@@ -3265,7 +3319,7 @@ const selectSHNode = (node,check) => {
 //   return tree;
 // };
 //工艺新增确定
-const addgyenterDialog = () => {
+const addgyenterDialog = async () =>{
   console.log(add_yjzlformdata)
   const formattedData = {
     Gy0_cpdh: _Gd_gdbh.value,
@@ -3296,10 +3350,12 @@ const addgyenterDialog = () => {
   		  type: 'success',
   		  message: '成功'
   		})
-		addgydialogFormVisible.value = false
+     GetInfo()
+	 addgydialogFormVisible.value = false
 	 Object.keys(add_gyformData).forEach(key => {
 			add_gyformData[key] = '';
 		  });
+    
   	}else{
   		ElMessage({
   		  type: 'error',
@@ -3307,7 +3363,12 @@ const addgyenterDialog = () => {
   		})
   	}
   });
-
+}
+//新增后刷新
+const GetInfo = async () => {
+  const getProductData_data = await getProductData({product_code:_Gd_gdbh.value});
+  yjtableData.splice(0, yjtableData.length, ...getProductData_data.data.yjData);
+  gytableData.splice(0, gytableData.length, ...getProductData_data.data.gyData);	
 }
 //工艺新增取消
 const addgycloseDialog = () => {