From 756a1261fbadf74b4b0d58ecf03ba0f9010da029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 13 Nov 2023 16:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchaseMain/index.vue    |  4 +-
 .../purchaseMain/purchaseMain.data.ts         | 80 ++++++++++++-------
 2 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 4d686d6c5..08a1669d8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -72,7 +72,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData" @success="importSuccess" :isShowOut="true" />
 </template>
 
 <script setup lang="ts">
@@ -182,7 +182,7 @@ const butttondata = (row) => {
     defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['3'])}), // 打开
     defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['2'])}), // 下架
     defaultButtons.mainListEditBtn({hasPermi:'wms:purchase-main:update',hide:isShowMainButton(row,['1'])}), // 编辑
-    defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchase-main:delete',hide:isShowMainButton(row,['1'])}), // 删除
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchase-main:delete',hide:isShowMainButton(row,['1'])}), // 删除
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index d7344ebe2..c037aa07d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -30,7 +30,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      labelMessage: '影响明细中物品代码，需在供应商物品中维护',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
@@ -564,6 +564,54 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商物品',
+      searchField: 'itemCode',
+      searchTitle: '供应商物品信息',
+      searchAllSchemas: Supplieritem.allSchemas,
+      searchPage: SupplieritemApi.getSupplieritemPage,
+      searchCondition: [{
+        key:'supplierCode',
+        value:'supplierCode',
+        isMainValue: true
+      }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 
+      // {
+      //   key:'available',
+      //   value:'TRUE',
+      //   isMainValue: false
+      // }
+      ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择供应商物品',
+        searchField: 'itemCode',
+        searchTitle: '供应商物品信息',
+        searchAllSchemas: Supplieritem.allSchemas,
+        searchPage: SupplieritemApi.getSupplieritemPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          isMainValue: true
+        }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 
+        // {
+        //   key:'available',
+        //   value:'TRUE',
+        //   isMainValue: false
+        // }
+        ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值
+      }
+    }
+  },
   {
     label: '订单数量',
     field: 'orderQty',
@@ -609,32 +657,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
-      }
-    }
-  },
   {
     label: '明细状态',
     field: 'status',