From 908c33e2d38ed88ebd5f0212434a7736534cf835 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:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain.data.ts             | 55 ++++++++++++++-----
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index c7b63d571..4be7b1106 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.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() // 国际化
 
 /**
@@ -19,7 +19,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     form: {
-      // labelMessage: '信息提示说明！！！',
+      labelMessage: '影响明细中物品代码，需在供应商物品中维护',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
@@ -124,7 +124,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isForm: false,
     form: {
       value: 'PurchasePrediction',
       componentProps:{
@@ -270,6 +270,11 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
+    },
+    tableForm: {
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
     }
   },
   {
@@ -295,21 +300,43 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
+      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: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
+        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：指查询具体值
       }
     }
   },