Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts

@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
-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 '../../supplierManage/supplieritem/supplieritem.data'
 
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
@@ -47,10 +47,15 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物品代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物品基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '供应商物品信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          isMainValue: true
+        }] 
       }
     }
   },
@@ -71,7 +76,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     }

src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
-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 '../supplieritem/supplieritem.data'
 
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
@@ -47,10 +47,15 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物品代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物品基础信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '供应商物品信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          isMainValue: true
+        }] 
       }
     }
   },