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

src/api/wms/accountcalendar/index.ts

@@ -15,7 +15,13 @@ export interface AccountcalendarVO {
 
 // 查询账期日历列表
 export const getAccountcalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/accountcalendar/senior', data })
+  } else {
     return await request.get({ url: `/wms/accountcalendar/page`, params })
+  }
 }
 
 // 查询账期日历详情

src/api/wms/areabasic/index.ts

@@ -15,7 +15,13 @@ export interface AreaVO {
 
 // 查询库区列表
 export const getAreaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/areabasic/senior', data })
+  } else {
     return await request.get({ url: `/wms/areabasic/page`, params })
+  }
 }
 // 查询库区列表
 export const getAreaList = async (params) => {

src/api/wms/businesstype/index.ts

@@ -25,7 +25,13 @@ export interface BusinesstypeVO {
 
 // 查询业务类型列表
 export const getBusinesstypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/businesstype/senior', data })
+  } else {
     return await request.get({ url: `/wms/businesstype/page`, params })
+  }
 }
 
 // 查询业务类型详情

src/api/wms/carrier/index.ts

@@ -23,7 +23,13 @@ export interface CarrierVO {
 
 // 查询承运商列表
 export const getCarrierPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/carrier/senior', data })
+  } else {
     return await request.get({ url: `/wms/carrier/page`, params })
+  }
 }
 
 // 查询承运商详情

src/api/wms/condition/index.ts

@@ -11,7 +11,13 @@ export interface ConditionVO {
 
 // 查询条件列表
 export const getConditionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/condition/senior', data })
+  } else {
     return await request.get({ url: `/wms/condition/page`, params })
+  }
 }
 
 // 查询条件详情

src/api/wms/configuration/index.ts

@@ -11,7 +11,13 @@ export interface ConfigurationVO {
 
 // 查询配置列表
 export const getConfigurationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/configuration/senior', data })
+  } else {
     return await request.get({ url: `/wms/configuration/page`, params })
+  }
 }
 
 // 查询配置详情

src/api/wms/configurationsetting/index.ts

@@ -13,7 +13,13 @@ export interface ConfigurationsettingVO {
 
 // 查询配置设置列表
 export const getConfigurationsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/configurationsetting/senior', data })
+  } else {
     return await request.get({ url: `/wms/configurationsetting/page`, params })
+  }
 }
 
 // 查询配置设置详情

src/api/wms/currencyexchange/index.ts

@@ -12,7 +12,13 @@ export interface CurrencyexchangeVO {
 
 // 查询货币转换列表
 export const getCurrencyexchangePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/currencyexchange/senior', data })
+  } else {
     return await request.get({ url: `/wms/currencyexchange/page`, params })
+  }
 }
 
 // 查询货币转换详情

src/api/wms/customer/index.ts

@@ -23,7 +23,13 @@ export interface CustomerVO {
 
 // 查询客户列表
 export const getCustomerPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customer/senior', data })
+  } else {
     return await request.get({ url: `/wms/customer/page`, params })
+  }
 }
 // 查询客户列表
 export const getCustomerList = async (params) => {

src/api/wms/customerdock/index.ts

@@ -19,7 +19,13 @@ export interface CustomerdockVO {
 
 // 查询客户月台列表
 export const getCustomerdockPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customerdock/senior', data })
+  } else {
     return await request.get({ url: `/wms/customerdock/page`, params })
+  }
 }
 
 // 查询客户月台详情

src/api/wms/customeritem/index.ts

@@ -19,7 +19,13 @@ export interface CustomeritemVO {
 
 // 查询客户物品列表
 export const getCustomeritemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customeritem/senior', data })
+  } else {
     return await request.get({ url: `/wms/customeritem/page`, params })
+  }
 }
 
 // 查询客户物品详情

src/api/wms/dock/index.ts

@@ -19,7 +19,13 @@ export interface DockVO {
 
 // 查询月台列表
 export const getDockPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/dock/senior', data })
+  } else {
     return await request.get({ url: `/wms/dock/page`, params })
+  }
 }
 // 查询月台列表
 export const getDockList = async (params) => {

src/api/wms/documentsetting/index.ts

@@ -20,7 +20,13 @@ export interface DocumentsettingVO {
 
 // 查询单据设置列表
 export const getDocumentsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/documentsetting/senior', data })
+  } else {
     return await request.get({ url: `/wms/documentsetting/page`, params })
+  }
 }
 
 // 查询单据设置详情

src/api/wms/jobsetting/index.ts

@@ -22,7 +22,13 @@ export interface JobsettingVO {
 
 // 查询任务设置列表
 export const getJobsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/jobsetting/senior', data })
+  } else {
     return await request.get({ url: `/wms/jobsetting/page`, params })
+  }
 }
 
 // 查询任务设置详情

src/api/wms/location/index.ts

@@ -26,7 +26,13 @@ export interface LocationVO {
 
 // 查询库位列表
 export const getLocationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/location/senior', data })
+  } else {
     return await request.get({ url: `/wms/location/page`, params })
+  }
 }
 // 查询库位所有列表
 export const getLocationList = async (params) => {

src/api/wms/locationgroup/index.ts

@@ -14,7 +14,13 @@ export interface LocationgroupVO {
 
 // 查询库位组列表
 export const getLocationgroupPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/locationgroup/senior', data })
+  } else {
     return await request.get({ url: `/wms/locationgroup/page`, params })
+  }
 }
 // 查询库位组列表
 export const getLocationgroupList = async (params) => {

src/api/wms/owner/index.ts

@@ -23,7 +23,13 @@ export interface OwnerVO {
 
 // 查询货主列表
 export const getOwnerPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/owner/senior', data })
+  } else {
     return await request.get({ url: `/wms/owner/page`, params })
+  }
 }
 
 // 查询货主详情

src/api/wms/paramsetting/index.ts

@@ -14,7 +14,13 @@ export interface ParamsettingVO {
 
 // 查询参数设置列表
 export const getParamsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/paramsetting/senior', data })
+  } else {
     return await request.get({ url: `/wms/paramsetting/page`, params })
+  }
 }
 
 // 查询参数设置详情

src/api/wms/process/index.ts

@@ -15,7 +15,13 @@ export interface ProcessVO {
 
 // 查询工序列表
 export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/process/senior', data })
+  } else {
     return await request.get({ url: `/wms/process/page`, params })
+  }
 }
 
 // 查询工序详情

src/api/wms/productionline/index.ts

@@ -16,7 +16,13 @@ export interface ProductionlineVO {
 
 // 查询生产线列表
 export const getProductionlinePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/productionline/senior', data })
+  } else {
     return await request.get({ url: `/wms/productionline/page`, params })
+  }
 }
 
 // 查询生产线详情

src/api/wms/project/index.ts

@@ -13,7 +13,13 @@ export interface ProjectVO {
 
 // 查询项目列表
 export const getProjectPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/project/senior', data })
+  } else {
     return await request.get({ url: `/wms/project/page`, params })
+  }
 }
 
 // 查询项目详情

src/api/wms/purchaseprice/index.ts

@@ -13,7 +13,13 @@ export interface PurchasepriceVO {
 
 // 查询采购价格单列表
 export const getPurchasepricePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/purchaseprice/senior', data })
+  } else {
     return await request.get({ url: `/wms/purchaseprice/page`, params })
+  }
 }
 
 // 查询采购价格单详情

src/api/wms/recordsetting/index.ts

@@ -12,7 +12,13 @@ export interface RecordsettingVO {
 
 // 查询记录设置列表
 export const getRecordsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/recordsetting/senior', data })
+  } else {
     return await request.get({ url: `/wms/recordsetting/page`, params })
+  }
 }
 
 // 查询记录设置详情

src/api/wms/requestsetting/index.ts

@@ -16,7 +16,13 @@ export interface RequestsettingVO {
 
 // 查询申请设置列表
 export const getRequestsettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/requestsetting/senior', data })
+  } else {
     return await request.get({ url: `/wms/requestsetting/page`, params })
+  }
 }
 
 // 查询申请设置详情

src/api/wms/rule/index.ts

@@ -13,7 +13,13 @@ export interface RuleVO {
 
 // 查询规则列表
 export const getRulePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/rule/senior', data })
+  } else {
     return await request.get({ url: `/wms/rule/page`, params })
+  }
 }
 
 // 查询规则详情

src/api/wms/saleprice/index.ts

@@ -13,7 +13,13 @@ export interface SalepriceVO {
 
 // 查询销售价格单列表
 export const getSalepricePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/saleprice/senior', data })
+  } else {
     return await request.get({ url: `/wms/saleprice/page`, params })
+  }
 }
 
 // 查询销售价格单详情

src/api/wms/shift/index.ts

@@ -15,7 +15,13 @@ export interface ShiftVO {
 
 // 查询班次列表
 export const getShiftPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/shift/senior', data })
+  } else {
     return await request.get({ url: `/wms/shift/page`, params })
+  }
 }
 
 // 查询班次详情

src/api/wms/supplier/index.ts

@@ -23,7 +23,13 @@ export interface SupplierVO {
 
 // 查询供应商列表分页
 export const getSupplierPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/supplier/senior', data })
+  } else {
     return await request.get({ url: `/wms/supplier/page`, params })
+  }
 }
 // 查询供应商列表
 export const getSupplierList = async (params) => {

src/api/wms/supplieritem/index.ts

@@ -22,7 +22,13 @@ export interface SupplieritemVO {
 
 // 查询供应商物品列表
 export const getSupplieritemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/supplieritem/senior', data })
+  } else {
     return await request.get({ url: `/wms/supplieritem/page`, params })
+  }
 }
 
 // 查询供应商物品详情

src/api/wms/systemcalendar/index.ts

@@ -12,7 +12,13 @@ export interface SystemcalendarVO {
 
 // 查询系统日历列表
 export const getSystemcalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/systemcalendar/senior', data })
+  } else {
     return await request.get({ url: `/wms/systemcalendar/page`, params })
+  }
 }
 
 // 查询系统日历详情

src/api/wms/team/index.ts

@@ -13,7 +13,13 @@ export interface TeamVO {
 
 // 查询班组列表
 export const getTeamPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/team/senior', data })
+  } else {
     return await request.get({ url: `/wms/team/page`, params })
+  }
 }
 
 // 查询班组详情

src/api/wms/transactiontype/index.ts

@@ -15,7 +15,13 @@ export interface TransactiontypeVO {
 
 // 查询事务类型列表
 export const getTransactiontypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/transactiontype/senior', data })
+  } else {
     return await request.get({ url: `/wms/transactiontype/page`, params })
+  }
 }
 
 // 查询事务类型详情

src/api/wms/warehouse/index.ts

@@ -13,7 +13,13 @@ export interface WarehouseVO {
 
 // 查询仓库列表
 export const getWarehousePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/warehouse/senior', data })
+  } else {
     return await request.get({ url: `/wms/warehouse/page`, params })
+  }
 }
 // 查询仓库所有列表
 export const getWarehouseList = async (params) => {

src/api/wms/workshop/index.ts

@@ -13,7 +13,13 @@ export interface WorkshopVO {
 
 // 查询车间列表
 export const getWorkshopPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workshop/senior', data })
+  } else {
     return await request.get({ url: `/wms/workshop/page`, params })
+  }
 }
 
 // 查询车间详情

src/api/wms/workstation/index.ts

@@ -17,7 +17,13 @@ export interface WorkstationVO {
 
 // 查询工位列表
 export const getWorkstationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workstation/senior', data })
+  } else {
     return await request.get({ url: `/wms/workstation/page`, params })
+  }
 }
 
 // 查询工位详情

src/components/Annex/src/Annex.vue

@@ -64,7 +64,7 @@ const deleteAnnex = async (id) => {
   emit('deleteAnnexSuccess')
 }
 const downFile = (item)=>{
-   window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path,'222')
+   window.open(import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/0/get/' + item.path)
 }
 </script>
 

src/components/SearchHigh/src/SearchHigh.vue

@@ -62,7 +62,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 const message = useMessage() // 消息弹窗
 const route = useRoute() // 路由信息
 const popoverVisible = ref(false)
-const searchOption_high = ref(tableColumnsFun[route.name].allSchemas.tableColumns.filter(item => (item.field != "action")))
+const searchOption_high = ref(tableColumnsFun[route.name]?.allSchemas.tableColumns.filter(item => (item.field != "action")))
 const moreListData = ref({
   filters:[]
 })

src/views/wms/accountcalendar/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:accountcalendar:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:accountcalendar:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/areabasic/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -103,6 +104,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:areabasic:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:areabasic:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -211,6 +213,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/businesstype/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -108,6 +109,7 @@ const HeadButttondata = [
   // defaultButtons.defaultImportBtn({hasPermi:'wms:businesstype:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:businesstype:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -216,6 +218,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/carrier/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:carrier:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:carrier:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/condition/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:condition:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:condition:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/configuration/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:configuration:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:configuration:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/configurationsetting/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:configurationsetting:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:configurationsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/currencyexchange/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:currencyexchange:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:currencyexchange:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/customer/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customer:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customer:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/customerdock/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -115,6 +116,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customerdock:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customerdock:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -223,6 +225,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/customeritem/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -109,6 +110,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customeritem:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customeritem:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -217,6 +219,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/dock/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -109,6 +110,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:dock:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:dock:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -217,6 +219,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/documentsetting/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   // defaultButtons.defaultImportBtn({hasPermi:'wms:documentsetting:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:documentsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/jobsetting/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -92,6 +93,7 @@ const HeadButttondata = [
   // defaultButtons.defaultImportBtn({hasPermi:'wms:jobsetting:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:jobsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -191,6 +193,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/location/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -115,6 +116,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:location:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:location:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -223,6 +225,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/locationgroup/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -109,6 +110,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:locationgroup:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:locationgroup:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -217,6 +219,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/owner/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:owner:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:owner:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/paramsetting/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:paramsetting:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:paramsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/process/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -109,6 +110,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:process:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:process:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -217,6 +219,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/productionline/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -114,6 +115,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:productionline:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionline:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -222,6 +224,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/project/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -103,6 +104,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:project:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:project:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -211,6 +213,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/purchaseprice/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -109,6 +110,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:purchaseprice:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchaseprice:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -217,6 +219,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/recordsetting/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   // defaultButtons.defaultImportBtn({hasPermi:'wms:recordsetting:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:recordsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/requestsetting/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   // defaultButtons.defaultImportBtn({hasPermi:'wms:requestsetting:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:requestsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/rule/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:rule:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:rule:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/saleprice/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -109,6 +110,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:saleprice:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:saleprice:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -217,6 +219,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/shift/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:shift:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:shift:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/strategy/arrivalInspectionStrategy/AddForm.vue

@@ -1,16 +1,15 @@
-
+<!-- 到货验货任务拆分策略弹出层 -->
-<!-- 供应商送货策略弹出层 -->
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
       <!-- 规则 -->
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="140px" label-position="left">
         <div class="item">
           <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
           <el-row>
             <el-col :span="24">
-              <el-form-item label="代码" prop="code">
+              <el-form-item label="代码" prop="strategyCode">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable disabled />
+                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -34,12 +33,10 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
         <!-- 规则条件 -->
         <div class="item mt-20px">
           <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
           <el-row>
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 供应商类型 -->
@@ -53,7 +50,6 @@
                   <el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value"
                     :label="dict.label" :value="dict.value" />
                 </el-select>
-                <!-- </div> -->
               </el-form-item>
               <!-- 供应商 -->
               <el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" class="err-120">
@@ -65,86 +61,26 @@
                   <el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
                 </el-select>
               </el-form-item>
-              <!-- 星期几 -->
-              <el-form-item v-else-if="item.ParamCode == 'Weekday'" label="星期几" class="flex-top err-120">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.weekRangeOptions"
-                    :key="cur.value" />
-                </el-select>
-                <div class="checkbox">
-                  <el-checkbox-group v-model="item.Value" @change="change">
-                    <el-checkbox :label="cur.label" v-for="cur in options.weekOptions" :key="cur.value" />
-                  </el-checkbox-group>
-                </div>
-              </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
         <!-- 规则配置 -->
         <div class="item mt-20px">
           <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" label-width="120px" label-position="left">
           <el-row>
-            <!-- 开始时间 -->
             <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
-              <!-- 开始时间 -->
+              <!-- 按零件拆分 -->
-              <el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间" :prop="'configuration.' + index + '.Value'"
+              <el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分">
-                :rules="{
+                <el-switch v-model="item.Value" />
-                  required: true,
-                  message: '请选择开始时间',
-                  trigger: 'change',
-                }">
-                <el-time-select v-model="item.Value" start="00:00" end="23:59" step="00:15" placeholder="请选择开始时间"
-                  style="width: 100%;" />
-              </el-form-item>
-              <!-- 结束时间 -->
-              <el-form-item v-else-if="item.ParamCode == 'EndTime'" label="结束时间"
-                :prop="'configuration.' + index + '.Value'" :rules="{
-                  required: true,
-                  message: '请选择结束时间',
-                  trigger: 'change',
-                }">
-                <el-time-select v-model="item.Value" start="00:00" end="23:59" step="00:15" placeholder="请选择结束时间"
-                  style="width: 100%;" />
-              </el-form-item>
-              <!-- 仓库 -->
-              <el-form-item v-else-if="item.ParamCode == 'WarehouseCode'" label="仓库"
-                :prop="'configuration.' + index + '.Value'" :rules="{
-                  required: true,
-                  message: '请选择仓库',
-                  trigger: 'change',
-                }">
-                <el-select v-model="item.Value" placeholder="请选择仓库" clearable>
-                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
-                </el-select>
               </el-form-item>
-              <!-- 月台 -->
+              <!-- 按批次拆分 -->
-              <el-form-item v-else-if="item.ParamCode == 'DockCode'" label="月台"
+              <el-form-item v-else-if="item.ParamCode == 'ByBatch'" label="按批次拆分">
-                :prop="'configuration.' + index + '.Value'" :rules="{
+                <el-switch v-model="item.Value" />
-                  required: true,
-                  message: '请选择月台',
-                  trigger: 'change',
-                }">
-                <el-select v-model="item.Value" placeholder="请选择月台" clearable>
-                  <el-option v-for="cur in options.dockList" :key="cur.id" :label="cur.name" :value="cur.id" />
-                </el-select>
-              </el-form-item>
-              <!-- 在途库位 -->
-              <el-form-item v-else-if="item.ParamCode == 'OnTheWayLocationCode'" label="在途库位"
-                :prop="'configuration.' + index + '.Value'" :rules="{
-                  required: true,
-                  message: '请选择在途库位',
-                  trigger: 'change',
-                }">
-                <el-select v-model="item.Value" placeholder="请选择在途库位" clearable>
-                  <el-option v-for="cur in options.locationList" :key="cur.id" :label="cur.name" :value="cur.id" />
-                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+      </el-form>
     </div>
     <template #footer>
       <!-- 按钮-->
@@ -157,9 +93,6 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 defineOptions({ name: 'SupplieDeliveryStrategyAddForm' })
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { getSupplierList } from '@/api/wms/supplier'
-import { getWarehouseList } from '@/api/wms/warehouse'
-import { getDockList } from '@/api/wms/dock'
-import { getLocationList } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
 
 
@@ -171,9 +104,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
+const formRef = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
-const formRef3 = ref() // 表单 Ref
 const change = (e) => {
   console.log(e);
 
@@ -181,8 +112,8 @@ const change = (e) => {
 const formStrategyCode = ref('')
 // form表单数据
 const formData = ref({
-  strategyCode: formStrategyCode.value,//策略代码
+  id: '',
-  code: formStrategyCode.value,//规则代码
+  strategyCode: formStrategyCode.value,//策略代码id
   name: '',//名称
   description: '',//描述
   priority: '',//优先级
@@ -192,35 +123,22 @@ const formData = ref({
     // 供应商类型
     { ParamCode: 'SupplierType', Operator: "==", Value: "" },
     // 供应商
-    { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+    { ParamCode: 'SupplierCode', Operator: "IN", Value: "" }
-    // 星期几
-    { ParamCode: 'Weekday', Operator: "IN", Value: [] }
   ],
   configuration: [
-    // 开始时间
+    // 按零件拆分
-    { ParamCode: 'BeginTime', Value: "" },
+    { ParamCode: 'ByItem', Value: false },
-    // 结束时间
+    // 按批次拆分
-    { ParamCode: 'EndTime', Value: "" },
+    { ParamCode: 'ByBatch', Value: false },
-    // 仓库代码
-    { ParamCode: 'WarehouseCode', Value: '' },
-    // 月台代码
-    { ParamCode: 'DockCode', Value: '' },
-    // 在途库位代码
-    { ParamCode: 'OnTheWayLocationCode', Value: '' },
   ]
 })
 
 // 验证规则
 const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
   description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
-  BeginTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
-  EndTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
-  WarehouseCode: [{ required: true, message: '请选择仓库', trigger: 'change' }],
-  DockCode: [{ required: true, message: '请选择月台', trigger: 'change' }],
-  OnTheWayLocationCode: [{ required: true, message: '请选择在途库位', trigger: 'change' }],
 })
 
 // 所有的范围类型
@@ -252,16 +170,7 @@ const options = reactive({
   supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'),
   //供应商列表
   supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
-  // 星期几范围下拉框列表
+
-  weekRangeOptions: formatRangeOptions('IN', 'NOT IN'),
-  //星期几列表
-  weekOptions: [{ value: 1, label: '星期一' }, { value: 2, label: '星期二' }, { value: 3, label: '星期三' }, { value: 4, label: '星期四' }, { value: 5, label: '星期五' }, { value: 6, label: '星期六' }, { value: 7, label: '星期日' }],
-  //仓库列表
-  warehouseList: [],
-  //月台列表
-  dockList: [],
-  //在途库位列表
-  locationList: [],
 })
 // 获取供应商列表的参数
 const querySupplierParams = ref({
@@ -275,27 +184,12 @@ const getFormSupplierList = async () => {
 // 选择供应商类型
 const changeSupplierType = (e) => {
   querySupplierParams.value.type = e
+  formData.value.condition[1].Value = []
   getFormSupplierList()
 }
 
-// 获取仓库列表
-const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList();
-}
-// 获取月台列表
-const getFormDockList = async () => {
-  options.dockList = await getDockList();
-
-}
-// 获取库位列表
-const getFormLocationList = async () => {
-  options.locationList = await getLocationList({ type: 'TRANSPORT' });
-}
 
 getFormSupplierList()
-getFormWarehouseList()
-getFormDockList()
-getFormLocationList()
 
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
@@ -309,19 +203,22 @@ const open = async (type: string, strategyCode: string, id?: number) => {
     formLoading.value = true
     try {
       let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
       formData.value.strategyCode = data.strategyCode
-      formData.value.code = data.code
       formData.value.name = data.name
       formData.value.description = data.description
       formData.value.priority = data.priority
-      formData.value.status = data.status==1?true:false
+      formData.value.status = data.status == 0 ? true : false
-      if(data.condition){
+      if (data.condition) {
         formData.value.condition = JSON.parse(data.condition)
       }
-      if(data.configuration){
+      if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
       }
 
+      querySupplierParams.value.type = formData.value?.condition[0]?.Value || ''
+      getFormSupplierList()
+
     } finally {
       formLoading.value = false
     }
@@ -333,21 +230,19 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
+  if (!formRef) return
-  const valid2 = formRef2.value.validate()
+  const valid = await formRef.value.validate()
-  const valid1 = formRef1.value.validate()
+  if (!valid) return;
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
   // 提交请求
   formLoading.value = true
   try {
     let data = {
+      id: formData.value.id,
       strategyCode: formData.value.strategyCode,//策略代码
-      code: formData.value.code,//规则代码
       name: formData.value.name,//名称
       description: formData.value.description,//描述
       priority: formData.value.priority,//优先级
-      status: formData.value.status?1:0,//状态
+      status: formData.value.status ? 0 : 1,//状态
       //规则条件集合
       condition: JSON.stringify(formData.value.condition),
       configuration: JSON.stringify(formData.value.configuration)
@@ -370,8 +265,8 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
+    id: '',
     strategyCode: formStrategyCode.value,//策略代码
-    code: formStrategyCode.value,//规则代码
     name: '',//名称
     description: '',//描述
     priority: '',//优先级
@@ -382,20 +277,12 @@ const resetForm = () => {
       { ParamCode: 'SupplierType', Operator: "==", Value: "" },
       // 供应商
       { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
-      // 星期几
-      { ParamCode: 'Weekday', Operator: "IN", Value: [] }
     ],
     configuration: [
-      // 开始时间
+       // 按零件拆分
-      { ParamCode: 'BeginTime', Value: "" },
+      { ParamCode: 'ByItem', Value: false },
-      // 结束时间
+      // 按批次拆分
-      { ParamCode: 'EndTime', Value: "" },
+      { ParamCode: 'ByBatch', Value: false },
-      // 仓库代码
-      { ParamCode: 'WarehouseCode', Value: '' },
-      // 月台代码
-      { ParamCode: 'DockCode', Value: '' },
-      // 在途库位代码
-      { ParamCode: 'OnTheWayLocationCode', Value: '' },
     ]
   }
 }

src/views/wms/strategy/arrivalInspectionStrategy/index.vue

@@ -15,7 +15,6 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" /> -->
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
           <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
@@ -37,7 +36,7 @@ import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
 // import { dateFormatter } from '@/utils/formatTime'
 
-defineOptions({ name: 'ArrivalInspectionStrategy' })
+defineOptions({ name: 'PurchaseReceiptStrategy' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -48,7 +47,7 @@ const list = ref([]) // 字典表格数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  strategyCode: 'S001',
+  strategyCode: 'S004',
 })
 
 /** 查询字典类型列表 */

src/views/wms/strategy/inspectStrategy/AddForm copy.vue

@@ -1,381 +0,0 @@
-<!-- 检验策略弹窗 -->
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
-      <!-- 规则 -->
-      <div class="item">
-        <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="代码" prop="code">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="描述" prop="describe">
-                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="1" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- 规则条件 -->
-      <div class="item mt-20px">
-        <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row>
-            <!-- 供应商类型 -->
-            <el-col :span="24">
-              <el-form-item label="供应商类型" class="flex-top err-120" prop="supplierType">
-                <el-select v-model="formData.supplierTypeRange" placeholder="请选择范围"
-                  style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.supplierType" placeholder="请选择供应商类型" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.supplierTypeOptions" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 供应商 -->
-            <el-col :span="24">
-              <el-form-item label="供应商" prop="supplier" class="err-120">
-                <el-select v-model="formData.supplierRange" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.supplier" placeholder="请选择供应商" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.supplierList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 物品 -->
-            <el-col :span="24">
-              <el-form-item label="物品" prop="items" class="err-120">
-                <el-select v-model="formData.itemsRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.items" placeholder="请选择物品" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.itemsList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- 规则配置 -->
-      <div class="item mt-20px">
-        <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row>
-            <!-- 检验方式 -->
-            <el-col :span="24">
-              <el-form-item label="检验方式" class="flex-top" prop="inspectWay">
-                <div class="checkbox">
-                  <el-checkbox-group v-model="formData.inspectWay">
-                    <el-checkbox :label="item.label" v-for="item in options.inspectWayOptions" :key="item.value" />
-                  </el-checkbox-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 抽检方式 -->
-            <el-col :span="24">
-              <el-form-item label="抽检方式" class="flex-top" prop="spotceckWay">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.spotceckWay">
-                    <el-radio :label="item.value" v-for="item in options.spotceckWayOptions" :key="item.value">{{
-                      item.label }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 抽检规则 -->
-            <el-col :span="24">
-              <el-form-item label="抽检规则" class="flex-top" prop="spotceckRules1">
-                <div style="flex:1;display:flex;align-items:center;margin-bottom:10px"
-                  v-for="(item, index) in formData.spotceckRules" :key="index">
-                  <div style="width: 26px;display: flex;">
-                    <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
-                      @click="handleDeleteTable(item, index)" v-if="formData.spotceckRules?.length>1" />
-                  </div>
-
-                  <el-input-number v-model="item.minNum" :min="0" :max="item.maxNum - 1" class='ml-20px mr-20px'
-                    style="width:100px" controls-position="right" @blur="inputNumberBlur" />
-                  <div>至</div>
-                  <el-input-number v-model="item.maxNum" :min="item.minNum + 1" class='ml-20px mr-20px'
-                    style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
-                  <div>抽样数</div>
-                  <el-input-number v-model="item.num"  :min="0" class='ml-20px mr-20px'
-                      style="width:100px" controls-position="right"  @blur="inputNumberBlur"/>
-                  <div>EA</div>
-                </div>
-                <div class="button flex">
-                  <div @click="handleAddTable">
-                    <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
-                    <div>添加条件</div>
-                  </div>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <template #footer>
-      <!-- 按钮-->
-      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import {
-  validateInteger,
-} from "@/utils/validator";
-defineOptions({ name: 'InspectStrategyAddForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
-const formRef3 = ref() // 表单 Ref
-// form表单数据
-const formData = ref({
-  code: '',//代码
-  name: '',//名称
-  describe: '',//描述
-  priority: '',//优先级
-  status: false,//状态
-
-  supplierTypeRange: 1,//供应商类型范围
-  supplierType: '',//选择的供应商类型
-
-  supplierRange: 1,//供应商范围
-  supplier: '',//选择的供应商
-
-  itemsRange: 1,//物品范围
-  items: '',//选择的物品
-
-  inspectWay: [],//选择的检验方式
-  spotceckWay: 1,//选择的抽检方式
-
-  spotceckRules: [{
-    minNum: 0,
-    maxNum: 1,
-    num: 0,
-  }],//抽检规则
-  spotceckRules1: ''
-})
-// 验证规则
-const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
-  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
-  supplier: [{ required: true, message: '请选择供应商', trigger: 'change' }],
-  items: [{ required: true, message: '请选择物品', trigger: 'change' }],
-  inspectWay: [{ required: true, message: '请选择检验方式', trigger: 'change' }],
-  spotceckWay: [{ required: true, message: '请选择抽检方式', trigger: 'change' }],
-  spotceckRules1: [{ required: true, message: '抽检规则请填写完全', trigger: 'blur' },
-  { validator: validateInteger, message: '请输入整数', trigger: 'blur' }],
-})
-// 下拉框列表集合
-const options = reactive({
-  // 范围下拉框列表
-  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
-  // 供应商类型列表
-  supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }],
-  //供应商列表
-  supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }],
-  //物品列表
-  itemsList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }],
-  //检验方式列表
-  inspectWayOptions: [{ value: 1, label: '免检' }, { value: 2, label: '全检' }, { value: 3, label: '抽检' }],
-  //抽检方式列表
-  spotceckWayOptions: [{ value: 1, label: '数量' }, { value: 2, label: '半分比' }],
-})
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-//失去焦点的时候验证
-const inputNumberBlur = ()=>{
-  const isEmpty = formData.value.spotceckRules.some((item, index) => {
-    return item.minNum < 0 || item.minNum == null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
-  })
-  console.log(isEmpty);
-  
-  if (isEmpty) {
-    formData.value.spotceckRules1 = ''
-  } else {
-    formData.value.spotceckRules1 = '1'
-  }
-} 
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-
-  // 校验抽检规则是否全部填写
-  const isEmpty = formData.value.spotceckRules.some((item, index) => {
-    return item.minNum<0|| item.minNum==null || item.maxNum < 0 || item.maxNum == null || item.num < 0 || item.num == null
-  })
-  if (isEmpty) {
-    formData.value.spotceckRules1 = ''
-  } else {
-    formData.value.spotceckRules1 = '1'
-  }
-  // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
-  const valid2 = formRef2.value.validate()
-  const valid1 = formRef1.value.validate()
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
-  // 提交请求
-  formLoading.value = true
-
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    code: '',
-    name: '',
-    describe: '',
-    priority: '',
-    status: false,
-
-    supplierTypeRange: 1,//供应商类型范围
-    supplierType: '',//选择的供应商类型
-
-    supplierRange: 1,//供应商范围
-    supplier: '',//选择的供应商
-
-    itemsRange: 1,//物品范围
-    items: '',//选择的物品
-
-    inspectWay: [],//选择的检验方式
-    spotceckWay: 1,//选择的抽检方式
-
-    spotceckRules: [{
-      minNum: 0,
-      maxNum: 1,
-      num: 0,
-    }],//抽检规则
-  }
-}
-
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
-// 添加抽查规则
-const handleAddTable = () => {
-  console.log(formData.value.spotceckRules);
-  formData.value.spotceckRules.push({
-    minNum: 0,
-    maxNum: 1,
-    num: 0,
-  })
-}
-// 删除抽查规则
-const handleDeleteTable = (item, index) => {
-  formData.value.spotceckRules.splice(index, 1)
-}
-
-</script>
-<style scoped lang="scss">
-.item {
-  border: 1px solid #dedede;
-  border-radius: 4px;
-  padding: 30px 30px 5px;
-  position: relative;
-
-  .title {
-    position: absolute;
-    background: white;
-    padding: 0px 10px;
-    position: absolute;
-    top: 0px;
-    height: 30px;
-    line-height: 30px;
-    margin-top: -15px;
-  }
-}
-
-.checkbox {
-  background: #f5f5f5;
-  flex: 1;
-  padding: 0px 15px;
-  border-radius: 2px;
-}
-
-::v-deep .flex-top .el-form-item__content {
-  align-items: flex-start !important;
-}
-
-::v-deep .err-120 .el-form-item__error {
-  padding-left: 120px !important;
-}
-
-.button {
-  >div {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-
-    >div {
-      margin-left: 6px;
-      text-decoration: underline;
-      color: #409eff;
-    }
-  }
-}
-</style>

src/views/wms/strategy/inspectStrategy/AddForm.vue

@@ -110,13 +110,13 @@
                     <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;"
                       @click="handleDeleteTable(item.Value,cur, key)" v-if="item.Value?.length > 1" />
                   </div>
-                  <el-input-number v-model="cur.minNum" :min="0" :max="cur.maxNum - 1" class='ml-20px mr-20px'
+                  <el-input-number v-model="cur.FloorQty" :min="1" :max="cur.CeilingQty - 1" class='ml-20px mr-20px'
                     style="width:100px" controls-position="right" @blur="inputNumberBlur" />
                   <div>至</div>
-                  <el-input-number v-model="cur.maxNum" :min="cur.minNum + 1" class='ml-20px mr-20px' style="width:100px"
+                  <el-input-number v-model="cur.CeilingQty" :min="cur.FloorQty + 1" class='ml-20px mr-20px' style="width:100px"
                     controls-position="right" @blur="inputNumberBlur" />
                   <div>抽样数</div>
-                  <el-input-number v-model="cur.num" :min="0" class='ml-20px mr-20px' style="width:100px"
+                  <el-input-number v-model="cur.SampleValue" :min="1" class='ml-20px mr-20px' style="width:100px"
                     controls-position="right" @blur="inputNumberBlur" />
                   <div>EA</div>
                 </div>
@@ -188,9 +188,9 @@ const formData = ref({
     // 抽检规则列表
     {
       ParamCode: 'AqlList', Value: [{
-        minNum: 0,
+        FloorQty: 1,
-        maxNum: 1,
+        CeilingQty:2,
-        num: 0,
+        SampleValue: 1,
       }]
     },
   ]
@@ -294,6 +294,7 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
+  console.log(formData.value);
   // 提交请求
   formLoading.value = true
   try {
@@ -349,9 +350,9 @@ const resetForm = () => {
       // 抽检规则列表
       {
         ParamCode: 'AqlList', Value: [{
-          minNum: 0,
+           FloorQty: 1,
-          maxNum: 1,
+          CeilingQty: 2,
-          num: 0,
+          SampleValue: 1,
         }]
       },
     ]
@@ -378,9 +379,9 @@ const buttonBaseClick = (val, item) => {
 // 添加抽查规则
 const handleAddTable = (item) => {
   item.push({
-    minNum: 0,
+    FloorQty: 1,
-    maxNum: 1,
+    CeilingQty: 2,
-    num: 0,
+    SampleValue: 1,
   })
 }
 // 删除抽查规则

src/views/wms/strategy/inspectStrategy/index.vue

@@ -1,4 +1,4 @@
-<!-- 策略 -->
+<!-- 检验策略策略 -->
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />

src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue

@@ -51,7 +51,6 @@
                   <el-option v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" :key="dict.value"
                     :label="dict.label" :value="dict.value" />
                 </el-select>
-                <!-- </div> -->
               </el-form-item>
               <!-- 供应商 -->
               <el-form-item v-else-if="item.ParamCode == 'SupplierCode'" label="供应商" class="err-120">
@@ -72,39 +71,19 @@
           <el-row>
             <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
               <!-- 按零件拆分 -->
-              <el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分" :prop="'configuration.' + index + '.Value'"
+              <el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分">
-                :rules="{
-                  required: true,
-                  message: '请选择开始时间',
-                  trigger: 'change',
-                }">
                 <el-switch v-model="item.Value" />
               </el-form-item>
               <!-- 按库位拆分 -->
-              <el-form-item v-else-if="item.ParamCode == 'ByLocation'" label="按库位拆分"
+              <el-form-item v-else-if="item.ParamCode == 'ByLocation'" label="按库位拆分">
-                :prop="'configuration.' + index + '.Value'" :rules="{
-                  required: true,
-                  message: '请选择按库位拆分',
-                  trigger: 'change',
-                }">
                 <el-switch v-model="item.Value" />
               </el-form-item>
               <!--按器具拆分-->
-              <el-form-item v-else-if="item.ParamCode == 'ByContainer'" label="按器具拆分"
+              <el-form-item v-else-if="item.ParamCode == 'ByContainer'" label="按器具拆分">
-                :prop="'configuration.' + index + '.Value'" :rules="{
-                  required: true,
-                  message: '请选择按器具拆分',
-                  trigger: 'change',
-                }">
                 <el-switch v-model="item.Value" />
               </el-form-item>
               <!-- 每个任务明细数量 -->
-              <el-form-item v-else-if="item.ParamCode == 'JobDetailCount'" label="每个任务明细数量"
+              <el-form-item v-else-if="item.ParamCode == 'JobDetailCount'" label="每个任务明细数量">
-                :prop="'configuration.' + index + '.Value'" :rules="{
-                  required: true,
-                  message: '请选择每个任务明细数量',
-                  trigger: 'change',
-                }">
                 <!-- <el-input v-model="item.Value" placeholder="请输入每个任务明细数量" clearable /> -->
                 <el-input-number v-model="item.Value" :min="0" />
               </el-form-item>

src/views/wms/strategy/storageCapacityStrategy/AddForm.vue

@@ -2,14 +2,14 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">
           <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
+          <el-row gutter="10">
-          <el-row>
             <el-col :span="24">
-              <el-form-item label="代码" prop="code">
+              <el-form-item label="代码" prop="strategyCode">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
+                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -18,8 +18,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="描述" prop="describe">
+              <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -33,109 +33,107 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+
         <!-- 规则条件 -->
         <div class="item mt-20px">
           <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
+          <el-row gutter="10">
-          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择物品类型 -->
-            <el-col :span="24">
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
-              <el-form-item label="" label-width="0" prop="item" class="err-240">
+                <el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
-                <el-select v-model="formData.itemType" placeholder="" style="width: 110px;margin-right: 10px;">
+                  style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.itemTypeOptions"
-                    :key="item.value" />
+                    :key="cur.value" />
                 </el-select>
-                <el-select v-model="formData.itemTypeRange" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
+                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="item.value" />
+                    :key="cur.value" />
                 </el-select>
-                <el-select v-model="formData.item" placeholder="请选择物品" style="flex: 1;" clearable>
+                <el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
-                  <el-option v-for="item in options.itemList" :key="item.value" :label="item.label" :value="item.value" />
+                  v-if="item.ParamCode == 'ItemType'">
+                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
+                    :value="cur.value" />
                 </el-select>
+                <el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
+                  v-else-if="item.ParamCode == 'AbcClass'">
+                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
+                    :value="cur.value" />
+                </el-select>
+                <el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
+                  v-else-if="item.ParamCode == 'ItemGroup'" />
+                <el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
+                  v-else-if="item.ParamCode == 'Project'" />
+                <el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
+                  v-else-if="item.ParamCode == 'ItemCode'" />
               </el-form-item>
-            </el-col>
               <!-- 仓库 库区  库位组 库位 -->
-            <el-col :span="24">
+              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
-              <el-form-item label="" label-width="0" prop="warehouse" class="err-240">
+                <el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
-                <el-select v-model="formData.warehouseType" style="width: 110px;;margin-right: 10px;">
+                  @change="changeWarehouse">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.warehouseTypeOptions"
+                  <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
-                    :key="item.value" />
+                    :key="index" />
                 </el-select>
-
+                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                <el-select v-model="formData.warehouseTypeRange" placeholder="请选择范围"
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                  style="width: 110px;;margin-right: 10px;">
+                    :key="cur.value" />
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
                 </el-select>
-                <el-select v-model="formData.warehouse" placeholder="请选择库位" style="flex: 1;" clearable>
+                <el-select v-model="item.Value"
-                  <el-option v-for="item in options.warehouseTypeList" :key="item.value" :label="item.label"
+                  :placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
-                    :value="item.value" />
+                  clearable style="flex: 1;">
+                  <el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+
         <!-- 规则配置 -->
         <div class="item mt-20px">
           <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
+          <el-row gutter="10">
-          <el-row>
+            <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
               <!-- 存储类型 -->
-            <el-col :span="24">
+              <el-form-item label="存储类型" v-if="index == 0">
-              <el-form-item label="存储类型" class="flex-top" prop="storageType">
+                <div class="checkbox">
-                <div class="checkbox flex">
+                  <el-radio-group v-model="item.Value">
-                  <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate"
+                    <el-radio label="NOTLIMIT">不限制</el-radio>
-                    @change="handleCheckAllChange">全部</el-checkbox>
+                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                  <el-checkbox-group v-model="formData.storageType" @change="handleCheckedCitiesChange"
+                      :key="cur.value">{{ cur.label }}</el-radio>
-                    style="margin-left: 30px;flex:1">
+                  </el-radio-group>
-                    <el-checkbox :label="item" v-for="(item, index) in options.storageTypeOptions" :key="index" />
-                  </el-checkbox-group>
                 </div>
               </el-form-item>
-            </el-col>
               <!-- 存储容量 -->
-            <el-col :span="24">
+              <el-form-item label="存储容量" v-else-if="index == 1">
-              <el-form-item label="存储容量" prop="storageCapacity">
+                <el-input v-model="item.Value" placeholder="请输入存储容量" clearable />
-                <el-input v-model="formData.storageCapacity" placeholder="请输入存储容量" clearable />
               </el-form-item>
-            </el-col>
               <!-- 替代存储类型 -->
-            <el-col :span="24">
+              <el-form-item label="替代存储类型" v-if="index == 2">
-              <el-form-item label="替代存储类型" class="flex-top" prop="replaceStorageType">
+                <div class="checkbox">
-                <div class="checkbox flex">
+                  <el-radio-group v-model="item.Value">
-                  <el-checkbox v-model="replaceCheckAll" :indeterminate="replaceIsIndeterminate"
+                    <el-radio label="NOTLIMIT">不限制</el-radio>
-                    @change="replaceHandleCheckAllChange">全部</el-checkbox>
+                    <el-radio :label="cur.value" v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                  <el-checkbox-group v-model="formData.replaceStorageType" @change="replaceHandleCheckedCitiesChange"
+                      :key="cur.value">{{ cur.label }}</el-radio>
-                    style="margin-left: 30px;flex:1">
+                  </el-radio-group>
-                    <el-checkbox :label="item" v-for="(item, index) in options.storageTypeOptions" :key="index" />
-                  </el-checkbox-group>
                 </div>
               </el-form-item>
-            </el-col>
+              <!-- 替代容量 -->
-            <!-- 替代存储容量 -->
+              <el-form-item label="替代容量" v-else-if="index == 3">
-            <el-col :span="24">
+                <el-input v-model="item.Value" placeholder="请输入替代容量" clearable />
-              <el-form-item label="替代存储容量" prop="replaceStorageCapacity">
-                <el-input v-model="formData.replaceStorageCapacity" placeholder="请输入存储容量" clearable />
               </el-form-item>
-            </el-col>
               <!-- 固定位置 -->
-            <el-col :span="24">
+              <el-form-item label="固定位置" v-else-if="index == 4">
-              <el-form-item label="固定位置" prop="fixedPosition">
+                <el-switch v-model="item.Value" />
-                <el-switch v-model="formData.fixedPosition" />
               </el-form-item>
-            </el-col>
               <!-- 占用相邻库位 -->
-            <el-col :span="24">
+              <el-form-item label="占用相邻库位" v-else-if="index == 5">
-              <el-form-item label="占用相邻库位" prop="occupyWarehouse">
+                <el-switch v-model="item.Value" />
-                <el-switch v-model="formData.occupyWarehouse" />
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+      </el-form>
     </div>
     <template #footer>
       <!-- 按钮-->
@@ -145,7 +143,15 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-defineOptions({ name: 'StorageCapacityStrategyAddForm' })
+defineOptions({ name: 'UpShelfStrategyAddForm' })
+import { getWarehouseList } from '@/api/wms/warehouse'
+import { getAreaList } from '@/api/wms/areabasic'
+import { getLocationgroupList } from '@/api/wms/locationgroup'
+import { getLocationList } from '@/api/wms/location'
+import * as RuleApi from '@/api/wms/rule'
+
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -154,74 +160,166 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
+const formRef = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
+
-const formRef3 = ref() // 表单 Ref
+
+const formStrategyCode = ref('')
 // form表单数据
 const formData = ref({
-  code: '',//代码
+  id: '',
+  strategyCode: formStrategyCode.value,//策略代码id
   name: '',//名称
-  describe: '',//描述
+  description: '',//描述
   priority: '',//优先级
-  status: false,//状态
+  status: true,//状态
+  //规则条件集合
+  condition: [
+    // 物品类型/物品分组/物品/abc类/项目/
+    { ParamCode: 'ItemGroup', Operator: "IN", Value: "" },
+    // 仓库
+    { ParamCode: 'LocationCode', Operator: "IN", Value: "" },
+  ],
+  configuration: [
+    // 存储类型
+    { ParamCode: 'StorageType', Value: 'NOTLIMIT' },
+    // 存储容量
+    { ParamCode: 'StorageQty', Value: '' },
+    // 替代存储类型
+    { ParamCode: 'AltStorageType', Value: 'NOTLIMIT' },
+    // 替代容量
+    { ParamCode: 'AltStorageQty', Value: '' },
+    // 是否定制位置
+    { ParamCode: 'IsFixed', Value: false },
+    // 是否占用相邻库位
+    { ParamCode: 'IsOccupyAdjacent', Value: false },
+  ]
 
-  // 物品类型
-  itemType: 1,//选择的物品类型
-  itemTypeRange: 1, //物品类型范围
-  item: '',//选择的物品
-
-  // 仓库 库位
-  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-  warehouseTypeRange: 1, //物品类型范围
-  warehouse: '',//选择的仓库/库区/库位组/库位
-
-  storageType: [],//存储类型
-  storageCapacity:'',//存储容量
-  replaceStorageType:[],//替代存储类型
-  replaceStorageCapacity: '',//替代存储容量
-  fixedPosition:false,//固定位置
-  occupyWarehouse: false,//占用相邻库位
 })
 // 验证规则
 const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
-  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  item: [{ required: true, message: '请选择物品', trigger: 'change' }],
-  warehouse: [{ required: true, message: '请选择仓库', trigger: 'change' }],
-  storageType: [{ required: true, message: '请选择存储类型', trigger: 'change' }],
-  storageCapacity: [{ required: true, message: '请输入存储容量', trigger: 'blur' }],
-  replaceStorageType: [{ required: true, message: '请选择替代存储类型', trigger: 'change' }],
-  replaceStorageCapacity: [{ required: true, message: '请输入替代存储容量', trigger: 'blur' }],
-  fixedPosition: [{ required: true, message: '请选择固定位置', trigger: 'change' }],
-  occupyWarehouse: [{ required: true, message: '请选择占用相邻库位', trigger: 'change' }],
 })
+
+// 所有的范围类型
+const rangeOptions = [
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+  { value: '>', label: '大于' },
+  { value: '<', label: '小于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<=', label: '小于等于' },
+  { value: 'IN', label: '包含' },
+  { value: 'NOT IN', label: '不包含' },
+  { value: 'NULL', label: '为空' },
+  { value: 'NOT NULL', label: '不为空' },
+]
+const formatRangeOptions = (...rest) => {
+  // 交集
+  let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
+  return result
+}
+
 // 下拉框列表集合
 const options = reactive({
-  // 范围下拉框列表
+  //范围下拉框列表
-  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
+  rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
 
   // 物品类型列表
-  itemTypeOptions: [{ value: 1, label: '物品分类' }, { value: 2, label: '物品分组' }, { value: 3, label: '物品' }, { value: 4, label: '项目' }, { value: 5, label: 'ABC类' }],
+  itemTypeOptions: [{ value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }],
-  // 物品列表
+
-  itemList: [{ value: 1, label: '物品1' }, { value: 2, label: '物品2' }, { value: 3, label: '物品3' }],
+  //仓库列表
-  // 仓库类型
+  warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
-  warehouseTypeOptions: [{ value: 1, label: '仓库' }, { value: 2, label: '库区' }, { value: 3, label: '库位组' }, { value: 4, label: '库位' }],
+  warehouseList: [],
-  // 仓库列表
+  // 溢流库位列表
-  warehouseTypeList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
+  overflowWarehouseList: []
-  // 存储类型列表
-  storageTypeOptions: ['包装', '容器', '单件'],
 })
 
+// 选择物品类型/物品分组/abc类/物品/项目
+const changeItemsType = () => {
+  formData.value.condition[1].Value = ''
+}
+
+// 获取仓库列表
+const getFormWarehouseList = async () => {
+  options.warehouseList = await getWarehouseList();
+}
+// 获取库区列表
+const getFormAreaList = async () => {
+  options.warehouseList = await getAreaList();
+}
+// 获取库位组列表
+const getFormLocationgrouList = async () => {
+  options.warehouseList = await getLocationgroupList();
+}
+// 获取库位列表
+const getFormLocationList = async (queryParms) => {
+  if (queryParms) {
+    options.overflowWarehouseList = await getLocationList(queryParms);
+  } else {
+    options.warehouseList = await getLocationList();
+  }
+}
+getFormLocationList()
+// 获取溢流库位
+const queryParms = {
+  type: 'OVERFLOW'
+}
+getFormLocationList(queryParms)
+// 选择仓库/库位/库位组/库区
+const changeWarehouse = (e) => {
+  formData.value.condition[0].Value = ''
+  if (e == 'WarehouseCode') {
+    getFormWarehouseList()
+  } else if (e == 'AreaCode') {
+    getFormAreaList()
+  } else if (e == 'LocationGroupCode') {
+    getFormLocationgrouList()
+  } else if (e == 'LocationCode') {
+    getFormLocationList()
+  }
+}
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, strategyCode: string, id?: number) => {
+  formStrategyCode.value = strategyCode
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      let data = await RuleApi.getRule(id)
+      formData.value.id = data.id
+      formData.value.strategyCode = data.strategyCode
+      formData.value.name = data.name
+      formData.value.description = data.description
+      formData.value.priority = data.priority
+      formData.value.status = data.status == 0 ? true : false
+      if (data.condition) {
+        formData.value.condition = JSON.parse(data.condition)
+      }
+      if (data.configuration) {
+        formData.value.configuration = JSON.parse(data.configuration)
+      }
 
+      // 判断是获取仓库/库位/库位组/库区列表
+      if (formData.value.configuration[0].ParamCode == 'WarehouseCode') {
+        getFormWarehouseList()
+      } else if (formData.value.configuration[0].ParamCode == 'AreaCode') {
+        getFormAreaList()
+      } else if (formData.value.configuration[0].ParamCode == 'LocationGroupCode') {
+        getFormLocationgrouList()
+      } else if (formData.value.configuration[0].ParamCode == 'LocationCode') {
+        getFormLocationList()
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -229,41 +327,68 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
+  if (!formRef) return
-  const valid2 = formRef2.value.validate()
+  const valid = await formRef.value.validate()
-  const valid1 = formRef1.value.validate()
+  if (!valid) return
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
   // 提交请求
   formLoading.value = true
-
+  try {
+    let data = {
+      id: formData.value.id,
+      strategyCode: formData.value.strategyCode,//策略代码
+      name: formData.value.name,//名称
+      description: formData.value.description,//描述
+      priority: formData.value.priority,//优先级
+      status: formData.value.status ? 0 : 1,//状态
+      //规则条件集合
+      condition: JSON.stringify(formData.value.condition),
+      configuration: JSON.stringify(formData.value.configuration)
+    }
+    if (formType.value === 'create') {
+      await RuleApi.createRule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RuleApi.updateRule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
 }
 
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    code: '',
+    id: '',
-    name: '',
+    strategyCode: formStrategyCode.value,//策略代码id
-    describe: '',
+    name: '',//名称
-    priority: '',
+    description: '',//描述
-    status: false,
+    priority: '',//优先级
-    // 物品类型
+    status: true,//状态
-    itemType: 1,//选择的物品类型
+    //规则条件集合
-    itemTypeRange: 1, //物品类型范围
+    condition: [
-    item: '',//选择的物品
+      // 物品类型/物品分组/物品/abc类/项目/
-
+      { ParamCode: 'ItemGroup', Operator: "IN", Value: "" },
-    // 仓库 库位
+      // 仓库
-    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
+      { ParamCode: 'LocationCode', Operator: "IN", Value: "" },
-    warehouseTypeRange: 1, //物品类型范围
+    ],
-    warehouse: '',//选择的仓库/库区/库位组/库位
+    configuration: [
-
+      // 存储类型
-
+      { ParamCode: 'StorageType', Value: 'NOTLIMIT' },
-    storageType: [],//存储类型
+      // 存储容量
-    storageCapacity: '',//存储容量
+      { ParamCode: 'StorageQty', Value: '' },
-    replaceStorageType: [],//替代存储类型
+      // 替代存储类型
-    replaceStorageCapacity: '',//替代容量
+      { ParamCode: 'AltStorageType', Value: 'NOTLIMIT' },
-    fixedPosition: false,//固定位置
+      // 替代容量
-    occupyWarehouse: false,//占用相邻库位
+      { ParamCode: 'AltStorageQty', Value: '' },
+      // 是否定制位置
+      { ParamCode: 'IsFixed', Value: false },
+      // 是否占用相邻库位
+      { ParamCode: 'IsOccupyAdjacent', Value: false },
+    ]
   }
 }
 
@@ -283,37 +408,7 @@ const buttonBaseClick = (val, item) => {
     dialogVisible.value = false
   }
 }
-// 存储类型全选
-const checkAll = ref(false)
-const isIndeterminate = ref(false)
-const handleCheckAllChange = (val: boolean) => {
-  console.log(formData.value.storageType);
-  formData.value.storageType = val ? options.storageTypeOptions : []
-  console.log(formData.value.storageType);
 
-  isIndeterminate.value = false
-}
-const handleCheckedCitiesChange = (value: string[]) => {
-  const checkedCount = value.length
-  checkAll.value = checkedCount === options.storageTypeOptions.length
-  isIndeterminate.value = checkedCount > 0 && checkedCount < options.storageTypeOptions.length
-}
-
-// 替代存储类型全选
-const replaceCheckAll = ref(false)
-const replaceIsIndeterminate = ref(false)
-const replaceHandleCheckAllChange = (val: boolean) => {
-  console.log(formData.value.storageType);
-  formData.value.replaceStorageType = val ? options.storageTypeOptions : []
-  console.log(formData.value.storageType);
-
-  replaceIsIndeterminate.value = false
-}
-const replaceHandleCheckedCitiesChange = (value: string[]) => {
-  const checkedCount = value.length
-  replaceCheckAll.value = checkedCount === options.storageTypeOptions.length
-  replaceIsIndeterminate.value = checkedCount > 0 && checkedCount < options.storageTypeOptions.length
-}
 </script>
 <style scoped lang="scss">
 .item {
@@ -352,4 +447,8 @@ const replaceHandleCheckedCitiesChange = (value: string[]) => {
 ::v-deep .err-120 .el-form-item__error {
   padding-left: 120px !important;
 }
+
+::v-deep .err-130 .el-form-item__error {
+  padding-left: 130px !important;
+}
 </style>

src/views/wms/strategy/storageCapacityStrategy/index.vue

@@ -2,27 +2,86 @@
 <template>
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="策略代码" prop="strategyCode" />
+      <el-table-column align="center" label="策略名称" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" label="策略描述" prop="description" />
+      <el-table-column align="center" label="优先级" prop="priority" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" fixed="right" width="240">
+        <template #default="scope">
+          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
+      @pagination="getList" />
+  </ContentWrap>
   <!-- 表单弹窗：添加/修改 -->
   <AddForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
+// import { dateFormatter } from '@/utils/formatTime'
+
+defineOptions({ name: 'SupplieDeliveryStrategy' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 字典表格数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  strategyCode: 'S006',
+})
+
+/** 查询字典类型列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await RuleApi.getRulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
 
-defineOptions({ name: 'StorageCapacityStrategy' })
 // 显示弹窗
 const formRef = ref()
-const openForm = (type: string) => {
+const openForm = (type: string, strategyCode: string, id: number) => {
-  formRef.value.open(type)
+  formRef.value.open(type, strategyCode, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await RuleApi.deleteRule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
 }
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn(null), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
-  defaultButtons.defaultFreshBtn(null), // 刷新
 ]
 
 
@@ -30,7 +89,7 @@ const HeadButttondata = [
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
-    openForm('create')
+    openForm('create', queryParams.strategyCode)
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -52,10 +111,15 @@ const butttondata = [
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', row.id)
+    openForm('update', queryParams.strategyCode, row.id)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
 
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+
 </script>

src/views/wms/strategy/warehouseStorageStrategy/AddForm copy.vue

@@ -1,350 +0,0 @@
-<!-- 库位存储策略弹窗 -->
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
-      <!-- 规则 -->
-      <div class="item">
-        <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="130px" label-position="left">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="代码" prop="code">
-                <el-input v-model="formData.code" placeholder="请输入代码" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="描述" prop="describe">
-                <el-input v-model="formData.describe" placeholder="请输入描述" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="1" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- 规则条件 -->
-      <div class="item mt-20px">
-        <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="130px" label-position="left">
-          <el-row>
-            <!-- 仓库 库区  库位组 库位 -->
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="warehouse" class="err-260">
-                <el-select v-model="formData.warehouseType" style="width: 120px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.warehouseTypeOptions"
-                    :key="item.value" />
-                </el-select>
-
-                <el-select v-model="formData.warehouseTypeRange" placeholder="请选择范围"
-                  style="width: 120px;;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.rangeOptions"
-                    :key="item.value" />
-                </el-select>
-                <el-select v-model="formData.warehouse" placeholder="请选择库位" style="flex: 1;" clearable>
-                  <el-option v-for="item in options.warehouseTypeList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- 规则配置 -->
-      <div class="item mt-20px">
-        <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="130px" label-position="left">
-          <el-row>
-            <!-- 默认库存状态 -->
-            <el-col :span="24">
-              <el-form-item label="默认库存状态" class="flex-top" prop="defaultInventoryStatus">
-                <div class="checkbox">
-                  <el-radio-group v-model="formData.defaultInventoryStatus">
-                    <el-radio :label="item.value" v-for="item in options.defaultInventoryStatusOptions"
-                      :key="item.value">{{
-                        item.label }}</el-radio>
-                  </el-radio-group>
-                </div>
-              </el-form-item>
-            </el-col>
-            <!-- 溢流库位 -->
-            <el-col :span="24">
-              <el-form-item label="溢流库位" prop="overflowWarehouse">
-                <el-select v-model="formData.overflowWarehouse" placeholder="请选择溢流库位" clearable>
-                  <el-option v-for="item in options.overflowWarehouseList" :key="item.value" :label="item.label"
-                    :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- 允许负库存 -->
-            <el-col :span="12">
-              <el-form-item label="允许负库存" prop="allowNegativeInventory">
-                <el-switch v-model="formData.allowNegativeInventory" />
-              </el-form-item>
-            </el-col>
-            <!-- 保留零库存 -->
-            <el-col :span="12">
-              <el-form-item label="保留零库存" prop="reserveZeroInventory">
-                <el-switch v-model="formData.reserveZeroInventory" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许领料 -->
-            <el-col :span="12">
-              <el-form-item label="允许领料" prop="allowPicking">
-                <el-switch v-model="formData.allowPicking" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许过量领料 -->
-            <el-col :span="12">
-              <el-form-item label="允许过量领料" prop="allowExcessPicking">
-                <el-switch v-model="formData.allowExcessPicking" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许整包存储 -->
-            <el-col :span="12">
-              <el-form-item label="允许整包存储" prop="allowPackageStorage">
-                <el-switch v-model="formData.allowPackageStorage" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许散量存储 -->
-            <el-col :span="12">
-              <el-form-item label="允许散量存储" prop="allowDispersionStorage">
-                <el-switch v-model="formData.allowDispersionStorage" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许出库 -->
-            <el-col :span="12">
-              <el-form-item label="允许出库" prop="allowOutbound">
-                <el-switch v-model="formData.allowOutbound" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许入库 -->
-            <el-col :span="12">
-              <el-form-item label="允许入库" prop="allowInbound">
-                <el-switch v-model="formData.allowInbound" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许退货到供应商 -->
-            <el-col :span="12">
-              <el-form-item label="允许退货到供应商" prop="allowReturn">
-                <el-switch v-model="formData.allowReturn" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许接收客户退货 -->
-            <el-col :span="12">
-              <el-form-item label="允许接收客户退货" prop="allowReceiveReturn">
-                <el-switch v-model="formData.allowReceiveReturn" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许拆箱 -->
-            <el-col :span="12">
-              <el-form-item label="允许拆箱" prop="allowOpenBox">
-                <el-switch v-model="formData.allowUnpacking" />
-              </el-form-item>
-            </el-col>
-            <!-- 允许拆托 -->
-            <el-col :span="12">
-              <el-form-item label="允许拆托" prop="allowOpenHolder">
-                <el-switch v-model="formData.allowOpenHolder" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <template #footer>
-      <!-- 按钮-->
-      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-defineOptions({ name: 'WarehouseStorageStrategyAddForm' })
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef1 = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref
-const formRef3 = ref() // 表单 Ref
-// form表单数据
-const formData = ref({
-  code: '',//代码
-  name: '',//名称
-  describe: '',//描述
-  priority: '',//优先级
-  status: false,//状态
-
-  // 仓库 库位
-  warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-  warehouseTypeRange: 1,//选择的仓库范围
-  warehouse: '',//选择的仓库/库区/库位组/库位
-
-  defaultInventoryStatus: 1,//默认库存状态
-  overflowWarehouse: '',//溢流库位
-  allowNegativeInventory: false,//允许负库存
-  reserveZeroInventory: false,//保留零库存
-  allowPicking: false,//允许领料
-  allowExcessPicking: false,//允许过量领料
-  allowPackageStorage: false,//允许整包存储
-  allowDispersionStorage: false,//允许散量存储
-  allowOutbound: false,//允许出库
-  allowInbound: false,//允许入库
-  allowReturn: false,//允许退货到供应商
-  allowReceiveReturn: false,//允许接收客户退货
-  allowOpenBox: false,//允许拆箱
-  allowOpenHolder: false,//允许拆托
-})
-// 验证规则
-const rules = ref({
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
-  describe: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  warehouse: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
-  overflowWarehouse: [{ required: true, message: '请选择溢流库位', trigger: 'blur' }],
-
-})
-// 下拉框列表集合
-const options = reactive({
-  // 范围下拉框列表
-  rangeOptions: [{ value: 1, label: '包含' }, { value: 2, label: '大于', }],
-  // 仓库类型
-  warehouseTypeOptions: [{ value: 1, label: '仓库' }, { value: 2, label: '库区' }, { value: 3, label: '库位组' }, { value: 4, label: '库位' }],
-  // 仓库列表
-  warehouseTypeList: [{ value: 1, label: '仓库1' }, { value: 2, label: '仓库2' }, { value: 3, label: '仓库3' }],
-  // 默认库存状态
-  defaultInventoryStatusOptions: [{ value: 1, label: '合格' }, { value: 2, label: '待检' }, { value: 3, label: '不合格' }, { value: 4, label: '隔离' }, { value: 5, label: '报废' }],
-  // 溢流库存列表
-  overflowWarehouseList: [{ value: 1, label: '溢流库存1' }, { value: 2, label: '溢流库存2' }],
-})
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef1 || !formRef2 || !formRef3) return
-  const valid2 = formRef2.value.validate()
-  const valid1 = formRef1.value.validate()
-  const valid3 = await formRef3.value.validate()
-  if (!valid1 || !valid2 || !valid3) return
-  // 提交请求
-  formLoading.value = true
-
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    code: '',
-    name: '',
-    describe: '',
-    priority: '',
-    status: false,
-
-    // 仓库 库位
-    warehouseType: 1,//选择的是仓库/库区/库位组/库位类型
-    warehouseTypeRange: 1,//选择的仓库范围
-    warehouse: '',//选择的仓库/库区/库位组/库位
-
-    defaultInventoryStatus: 1,//默认库存状态
-    overflowWarehouse: '',//溢流库位
-    allowNegativeInventory: false,//允许负库存
-    reserveZeroInventory: false,//保留零库存
-    allowPicking: false,//允许领料
-    allowExcessPicking: false,//允许过量领料
-    allowPackageStorage: false,//允许整包存储
-    allowDispersionStorage: false,//允许散量存储
-    allowOutbound: false,//允许出库
-    allowInbound: false,//允许入库
-    allowReturn: false,//允许退货到供应商
-    allowReceiveReturn: false,//允许接收客户退货
-    allowOpenBox: false,//允许拆箱
-    allowOpenHolder: false,//允许拆托
-  }
-}
-
-// 弹窗按钮
-const Butttondata = [
-  defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
-]
-// 按钮事件 
-const buttonBaseClick = (val, item) => {
-  // 保存
-  if (val == 'save') {
-    submitForm()
-  }
-  // 关闭
-  else if (val == 'close') {
-    dialogVisible.value = false
-  }
-}
-
-</script>
-<style scoped lang="scss">
-.item {
-  border: 1px solid #dedede;
-  border-radius: 4px;
-  padding: 30px 30px 5px;
-  position: relative;
-
-  .title {
-    position: absolute;
-    background: white;
-    padding: 0px 10px;
-    position: absolute;
-    top: 0px;
-    height: 30px;
-    line-height: 30px;
-    margin-top: -15px;
-  }
-}
-
-.checkbox {
-  background: #f5f5f5;
-  flex: 1;
-  padding: 0px 15px;
-  border-radius: 2px;
-}
-
-::v-deep .flex-top .el-form-item__content {
-  align-items: flex-start !important;
-}
-
-::v-deep .err-260 .el-form-item__error {
-  padding-left: 260px !important;
-}
-
-::v-deep .err-130 .el-form-item__error {
-  padding-left: 130px !important;
-}
-</style>

src/views/wms/supplier/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:supplier:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplier:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/supplieritem/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName"
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -121,6 +122,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:supplieritem:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplieritem:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -229,6 +231,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/systemcalendar/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:systemcalendar:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:systemcalendar:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/team/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -93,6 +94,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:team:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:team:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -192,6 +194,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/transactiontype/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -96,6 +97,7 @@ const HeadButttondata = [
   // defaultButtons.defaultImportBtn({hasPermi:'wms:transactiontype:import'}), // 导入
   // defaultButtons.defaultExportBtn({hasPermi:'wms:transactiontype:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -195,6 +197,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/warehouse/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -92,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:warehouse:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:warehouse:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -191,6 +193,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/workshop/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -92,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:workshop:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:workshop:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -191,6 +193,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()

src/views/wms/workstation/index.vue

@@ -10,6 +10,7 @@
    @button-base-click="buttonBaseClick"
    :route-name="routeName" 
    @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
    />
 
   <!-- 列表 -->
@@ -120,6 +121,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:workstation:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:workstation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -228,6 +230,15 @@ const importSuccess = () => {
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(async() => {
   getList()