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

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -1435,8 +1435,10 @@ const xzhscsgetProductValue = () => {
 // 修正工单核算参数表格数据
 const _AccountingParameterdata = async ()=>{
   let workOrder = xzhscsformData['gdbh'];
+  console.log(workOrder)
   try {
     const AccountingParameterdata = await AccountingParameter({workOrder:workOrder});
+    console.log(AccountingParameterdata);
     sxzhscstableData.value = AccountingParameterdata.data;
     const formattedData = AccountingParameterdata.data.map(item=>{
       item.sxzhscsold_难度系数 = item.难度系数;
@@ -2258,9 +2260,10 @@ const _getProductYjList = async ()=>{
   }
 }
 //3.5获取纸张代号及名称
-const _getProductZzList = async ()=>{
+const _getProductZzList = async (v)=>{
+  console.log(v)
   try {
-    const response = await getProductZzList({search:''});
+    const response = await getProductZzList({search:v});
     getProductZhiListdata.value = handleTreeDatas(response.data)
   } catch (error) {
     console.error(error);
@@ -2305,27 +2308,27 @@ const add_gdzlyjent = async (event,id1,id2,id3,idx) => {
     searchModel.value = true
   }
   if (id2 === 'zzdh' && event.key==='Tab' || id2 === 'zzdh' && event.key=== 'Enter') {
-    _getProductZzList()
+    _getProductZzList(add_yjzlformdata['zzdh'])
     searchZhiModel.value = true
     zzdhIndex.value = idx
   }
   if (id2 === 'zzdh1' && event.key==='Tab' || id2 === 'zzdh1' && event.key=== 'Enter') {
-    _getProductZzList()
+    _getProductZzList(add_yjzlformdata['zzdh1'])
     searchZhiModel.value = true
     zzdhIndex.value = idx
   }
   if (id2 === 'zzdh2' && event.key==='Tab' || id2 === 'zzdh2' && event.key=== 'Enter') {
-    _getProductZzList()
+    _getProductZzList(add_yjzlformdata['zzdh2'])
     searchZhiModel.value = true
     zzdhIndex.value = idx
   }
   if (id2 === 'zzdh3' && event.key==='Tab' || id2 === 'zzdh3' && event.key=== 'Enter') {
-    _getProductZzList()
+    _getProductZzList(add_yjzlformdata['zzdh3'])
     searchZhiModel.value = true
     zzdhIndex.value = idx
   }
   if (id2 === 'zzdh4' && event.key==='Tab' || id2 === 'zzdh4' && event.key=== 'Enter') {
-    _getProductZzList()
+    _getProductZzList(add_yjzlformdata['zzdh4'])
     searchZhiModel.value = true
     zzdhIndex.value = idx
   }
@@ -2770,6 +2773,7 @@ const onyycpzlclick = () => {
     ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
   }else{
     yycpzlformData['gdbh'] = _Gd_gdbh.value;
+    // yycpzlformData['cpdh'] = _Gd_cpdh.value;
     yyzltableData.value = [];
     _WorkOrderDetailCopedata();
     onyycpzllist.value = true;
@@ -3311,9 +3315,10 @@ const edit_getProductYjList = async ()=>{
 }
 
 //3.5获取纸张代号及名称
-const edit_getProductZzList = async ()=>{
+const edit_getProductZzList = async (v)=>{
+  console.log(v)
   try {
-    const response = await getProductZzList({search:''});
+    const response = await getProductZzList({search:v});
     edit_getProductZhiListdata.value = edit_handleTreeDatas(response.data)
   } catch (error) {
     console.error(error);
@@ -3362,27 +3367,27 @@ const edit_gdyjent = (event,id1,id2,id3,idx) => {
     edit_searchModel.value = true
   }
   if (id2 === '纸张代号' && event.key==='Tab' || id2 === '纸张代号' && event.key=== 'Enter') {
-    edit_getProductZzList()
+    edit_getProductZzList(gdyjformData['纸张代号'])
     edit_searchZhiModel.value = true
     edit_zzdhIndex.value = idx
   }
   if (id2 === '备用纸张1' && event.key==='Tab' || id2 === '备用纸张1' && event.key=== 'Enter') {
-    edit_getProductZzList()
+    edit_getProductZzList(gdyjformData['备用纸张1'])
     edit_searchZhiModel.value = true
     edit_zzdhIndex.value = idx
   }
   if (id2 === '备用纸张2' && event.key==='Tab' || id2 === '备用纸张2' && event.key=== 'Enter') {
-    edit_getProductZzList()
+    edit_getProductZzList(gdyjformData['备用纸张2'])
     edit_searchZhiModel.value = true
     edit_zzdhIndex.value = idx
   }
   if (id2 === '备用纸张3' && event.key==='Tab' || id2 === '备用纸张3' && event.key=== 'Enter') {
-    edit_getProductZzList()
+    edit_getProductZzList(gdyjformData['备用纸张3'])
     edit_searchZhiModel.value = true
     edit_zzdhIndex.value = idx
   }
   if (id2 === '备用纸张4' && event.key==='Tab' || id2 === '备用纸张4' && event.key=== 'Enter') {
-    edit_getProductZzList()
+    edit_getProductZzList(gdyjformData['备用纸张4'])
     edit_searchZhiModel.value = true
     edit_zzdhIndex.value = idx
   }