From 0b14078e61ea3d18e4cf77667606d30410e5ff3b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 29 Mar 2024 11:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierinvoiceRequestDetail/index.ts |  6 ++
 .../supplierinvoiceRequestMain/index.vue      | 25 ++++++-
 .../supplierinvoiceRequestMain.data.ts        | 66 +++++++++++--------
 3 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts
index d256011f2..7cbc9a250 100644
--- a/src/api/wms/supplierinvoiceRequestDetail/index.ts
+++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts
@@ -39,6 +39,12 @@ export const getPoNumber = async (params) => {
   return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumber`, params})
 }
 
+// 查询供应商发票明细数据
+export const getPoNumberPoLineInfo = async (params) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumberPoLineInfo`, params})
+}
+
+
 // 查询供应商发票申请子详情
 export const getSupplierinvoiceRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/supplierinvoice-request-detail/get?id=` + id })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 0a0dabae0..55d5560b2 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -122,7 +122,6 @@
         }
       } else {
         console.log(searchFormRef.formModel);
-        
         const setV = {}
         if(formField == 'recordNumber'){
           setV['recordNumber'] = val[0]['number']
@@ -131,12 +130,32 @@
             'billType':searchFormRef.formModel.billType,
             'recordNumber':val[0]['number']
           }
+          let orderNoFlag = false;
           SupplierinvoiceRequestDetailApi.getPoNumber(params).then(res =>{
             console.log("返回结果:",res)
+            if(res.length == 0){
+              orderNoFlag = true
+              return
+            }
+            let options = [];
+            for(let i=0;i<res.length;i++){
+              let option = {
+                label:res[i],
+                value:res[i]
+              }
+              options.push(option)
+            }
+            SupplierinvoiceRequestMain.allSchemas.formSchema.forEach(item => {
+              if (item.field == 'poNumber') {
+                item.componentProps.options = options
+              }
+            })
           })
-
+          if(orderNoFlag){
+            message.error("选择的记录单号没有订单")
+              return;
+          }
         }
-        
         setV[formField] = val[0][searchField]
         searchFormRef.setValues(setV)
       }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 9ddad94ca..615879886 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -235,12 +235,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'Select',
       componentProps:{
-        options:[{lablel:'',value:''}]
+        options:[{label:'',value:''}]
       }
     },
     tableForm: {
       type: 'Select',
-      options:[{lablel:'',value:''}]
+      options:[{label:'',value:''}]
     }
   },
   {
@@ -561,12 +561,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    label: '订单行',
+    field: 'poLine',
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -575,7 +571,27 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'number',
         searchTitle: '订单号信息',
         searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
-        searchPage: supplierinvoiceRequestDetailApi.getPoNumber
+        searchPage: supplierinvoiceRequestDetailApi.getPoNumberPoLineInfo,
+        searchCondition: [
+          {
+            key: 'recordNumber',
+            value: 'recordNumber',
+            message: '请填写单号！',
+            isMainValue: true
+          },
+          {
+            key: 'billType',
+            value: 'billType',
+            message: '请填写单号类型！',
+            isMainValue: true
+          },
+          {
+            key: 'poNumber',
+            value: 'poNumber',
+            message: '请选择订单号',
+            isMainValue: true
+          }
+        ]
       }
     },
     tableForm: {
@@ -584,33 +600,27 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'number',
       searchTitle: '订单号信息',
       searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
-      searchPage: supplierinvoiceRequestDetailApi.getPoNumber,
+      searchPage: supplierinvoiceRequestDetailApi.getPoNumberPoLineInfo,
       searchCondition: [
         {
-          key: 'number',
+          key: 'recordNumber',
           value: 'recordNumber',
           message: '请填写单号！',
           isMainValue: true
-        }
-        ,
+        },
         {
-          key: 'recordType',
-          value: 'recordType',
+          key: 'billType',
+          value: 'billType',
           message: '请填写单号类型！',
           isMainValue: true
-        }]
-    }
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
+        },
+        {
+          key: 'poNumber',
+          value: 'poNumber',
+          message: '请选择订单号',
+          isMainValue: true
+        }
+      ]
     }
   },
   {