diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index df31c9da1..a00b3f51d 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -17,7 +17,10 @@ export interface AreaVO { export const getAreaPage = async (params) => { return await request.get({ url: `/wms/areabasic/page`, params }) } - +// 查询库区列表 +export const getAreaList = async (params) => { + return await request.get({ url: `/wms/areabasic/list`, params }) +} // 查询库区详情 export const getArea = async (id: number) => { return await request.get({ url: `/wms/areabasic/get?id=` + id }) diff --git a/src/api/wms/customer/index.ts b/src/api/wms/customer/index.ts index 494b920a8..fa1d7d487 100644 --- a/src/api/wms/customer/index.ts +++ b/src/api/wms/customer/index.ts @@ -25,7 +25,10 @@ export interface CustomerVO { export const getCustomerPage = async (params) => { return await request.get({ url: `/wms/customer/page`, params }) } - +// 查询客户列表 +export const getCustomerList = async (params) => { + return await request.get({ url: `/wms/customer/list`, params }) +} // 查询客户详情 export const getCustomer = async (id: number) => { return await request.get({ url: `/wms/customer/get?id=` + id }) diff --git a/src/api/wms/locationgroup/index.ts b/src/api/wms/locationgroup/index.ts index b7e316b1a..b7f245edc 100644 --- a/src/api/wms/locationgroup/index.ts +++ b/src/api/wms/locationgroup/index.ts @@ -16,6 +16,10 @@ export interface LocationgroupVO { export const getLocationgroupPage = async (params) => { return await request.get({ url: `/wms/locationgroup/page`, params }) } +// 查询库位组列表 +export const getLocationgroupList = async (params) => { + return await request.get({ url: `/wms/locationgroup/list`, params }) +} // 查询库位组详情 export const getLocationgroup = async (id: number) => { diff --git a/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue index b12ac061b..563ee2b05 100644 --- a/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/strategy/purchaseReceiptStrategy/AddForm.vue @@ -124,9 +124,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' @@ -173,7 +170,7 @@ const formData = ref({ // 验证规则 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' }] @@ -208,12 +205,7 @@ const options = reactive({ supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'), //供应商列表 supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }], - //仓库列表 - warehouseList: [], - //月台列表 - dockList: [], - //在途库位列表 - locationList: [], + }) // 获取供应商列表的参数 const querySupplierParams = ref({ @@ -231,24 +223,8 @@ const changeSupplierType = (e) => { 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) => { diff --git a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue index 94c557193..ac0a9f41e 100644 --- a/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/strategy/supplieDeliveryStrategy/AddForm.vue @@ -51,7 +51,6 @@ - @@ -206,7 +205,7 @@ const formData = ref({ // 验证规则 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' }], @@ -229,18 +228,17 @@ const formatRangeOptions = (...rest) => { // 交集 let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem)); return result - } // 下拉框列表集合 const options = reactive({ // 供应商类型范围下拉框列表 supplierTypeRangeOptions: formatRangeOptions('=='), // 供应商列表 - supplierTypeOptions: [{ value: 1, label: '标准' }, { value: 2, label: '委外' }, { value: 3, label: '其他' }], + supplierTypeOptions: [], // 供应商范围下拉框列表 supplierRangeOptions: formatRangeOptions('IN', 'NOT IN'), //供应商列表 - supplierList: [{ value: 1, label: '供应商1' }, { value: 2, label: '供应商2' }, { value: 3, label: '供应商3' }], + supplierList: [], // 星期几范围下拉框列表 weekRangeOptions: formatRangeOptions('IN', 'NOT IN'), //星期几列表 diff --git a/src/views/wms/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/strategy/upShelfStrategy/AddForm.vue index c25643cc7..c365c722a 100644 --- a/src/views/wms/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/strategy/upShelfStrategy/AddForm.vue @@ -4,187 +4,172 @@
-
-
规则
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
规则
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
规则条件
- - - - - - + + + + + - - + + - - + + - - - - - + + + - - + + - - + + - - - - - - - + + - - + + + + + + + + - - + + + - - - - - - + + + + - - + + - - - - - - + + + + - - + + - - - - - - - - - + + + + +
-
规则配置
- - - - + + + + - - + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + @@ -200,6 +185,15 @@