From a103489f416ad9c7f065bcc67537aae6682e962e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 22:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7(=E6=96=B0)=20=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMainNew/index.vue    | 58 +++++++++++++++++--
 .../purchasereturnRequestMain.data.ts         |  8 +--
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 087a3d5be..353664dfa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -73,7 +73,7 @@
     @onChange="onChangeForm"
   >
   <template #hahaha>
-      <el-button style="margin-left:90px;width:100%" type="primary">选择收货单明细</el-button>
+      <el-button style="margin-left:90px;width:100%" type="primary" @click="chooseReceiptList">选择收货单明细</el-button>
    
   </template>
   <template #hehehe>
@@ -81,8 +81,18 @@
   </template>
   </BasicForm>
   <!-- 添加明细：采购收货记录单号 -->
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
-
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+    <template #searchQueryhahaha>
+      <el-form :inline="true">
+        <el-form-item label="供应商">
+          <el-input v-model="formRef.formRef.formModel.supplierName" placeholder="请输入供应商" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="物料号">
+          <el-input v-model="formRef.formRef.formModel.itemCode" placeholder="请输入物料号" disabled></el-input>
+        </el-form-item>
+      </el-form>
+    </template>
+  </SearchTable>
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -114,7 +124,7 @@
     @searchTableSuccess="searchTableSuccessLabel"
   />
   <!-- 标签打印 -->
-  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
+  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess"/>
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -149,6 +159,8 @@ import * as BalanceApi from '@/api/wms/balance'
 import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMainNew' })
 
@@ -243,6 +255,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
       row[formField] = val[0][searchField]
     } else {
       const setV = {}
+      setV[formField] = val[0][searchField]
       if(formField=='itemCode'){
         // 更换查询 供应商下拉框数据
         PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
@@ -659,6 +672,43 @@ const handleAddTable = () => {
   //   }
   // })
 }
+// 选择收货单明细
+const chooseReceiptList = ()=>{
+    // searchTableRef.value.open(
+  //   ('供应商信息',
+  //   // _searchTableAllSchemas,
+  //   // _searchTablePage, // 接口
+  //   // formField,
+  //   // searchField,
+  //   true,//是否多选
+  //   // type,
+  //   // row,
+  //   _searchCondition
+  //   )
+  // )
+  
+  searchTableRef.value.open(
+    "收货单明细",
+    Itembasic.allSchemas,
+    ItembasicApi.getItembasicPage,
+    "hahaha",
+    "hahaha",
+    false,
+    'tableForm',
+    null,
+    [{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }],
+    undefined,
+    false,
+    null
+  )
+
+}
 const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) => {
   console.log(val)
   tableData.value = [...tableData.value, ...val]
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
index 26d19b63d..6f80ef1ce 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
@@ -209,7 +209,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(
     },
     {
       label: '供应商1',
-      field: 'supplierCode1',
+      field: 'supplierCode',
       sort: 'custom',
       table: {
         width: 150
@@ -448,9 +448,9 @@ export const PurchasereturnRequestMainRules = reactive({
   dueTime: [
     { required: true, message: '请选择截止时间', trigger: 'blur' }
   ],
-  purchaseReceiptRecordNumber: [
-    { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
-  ],
+  // purchaseReceiptRecordNumber: [
+  //   { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
+  // ],
   carrierCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
   ],