diff --git a/src/api/wms/carrier/index.ts b/src/api/wms/carrier/index.ts
index 6d9fb44e1..18d1c88fd 100644
--- a/src/api/wms/carrier/index.ts
+++ b/src/api/wms/carrier/index.ts
@@ -54,7 +54,12 @@ export const deleteCarrier = async (id: number) => {
// 导出承运商 Excel
export const exportCarrier = async (params) => {
- return await request.download({ url: `/wms/carrier/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/carrier/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/carrier/export-excel`, params })
+ }
}
// 下载用户导入模板
diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts
index 5e8c5c40f..9c4260ea0 100644
--- a/src/api/wms/owner/index.ts
+++ b/src/api/wms/owner/index.ts
@@ -54,7 +54,12 @@ export const deleteOwner = async (id: number) => {
// 导出货主 Excel
export const exportOwner = async (params) => {
- return await request.download({ url: `/wms/owner/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/owner/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/owner/export-excel`, params })
+ }
}
// 下载用户导入模板
diff --git a/src/api/wms/shift/index.ts b/src/api/wms/shift/index.ts
index 973f4c9c2..f663b794f 100644
--- a/src/api/wms/shift/index.ts
+++ b/src/api/wms/shift/index.ts
@@ -46,7 +46,12 @@ export const deleteShift = async (id: number) => {
// 导出班次 Excel
export const exportShift = async (params) => {
- return await request.download({ url: `/wms/shift/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/shift/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/shift/export-excel`, params })
+ }
}
// 下载用户导入模板
diff --git a/src/api/wms/team/index.ts b/src/api/wms/team/index.ts
index 0abb2de21..6c978a410 100644
--- a/src/api/wms/team/index.ts
+++ b/src/api/wms/team/index.ts
@@ -44,7 +44,12 @@ export const deleteTeam = async (id: number) => {
// 导出班组 Excel
export const exportTeam = async (params) => {
- return await request.download({ url: `/wms/team/export-excel`, params })
+ if (params.isSearch) {
+ const data = {...params}
+ return await request.downloadPost({ url: `/wms/team/export-excel-senior`, data })
+ } else {
+ return await request.download({ url: `/wms/team/export-excel`, params })
+ }
}
// 下载用户导入模板
diff --git a/src/views/wms/basicDataManage/labelManage/package/index.vue b/src/views/wms/basicDataManage/labelManage/package/index.vue
index 06de855d2..bb5472c22 100644
--- a/src/views/wms/basicDataManage/labelManage/package/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/package/index.vue
@@ -253,6 +253,5 @@ const searchFormClick = (searchData) => {
/** 初始化 **/
onMounted(async () => {
getList()
- importTemplateData.templateUrl = await PackageApi.importTemplate()
})
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
index 4a35464f4..895e0d8ed 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
await message.exportConfirm()
// 发起导出
exportLoading.value = true
- const data = await CarrierApi.exportCarrier(setSearchParams)
+ const data = await CarrierApi.exportCarrier(tableObject.params)
download.excel(data, '承运商.xls')
} catch {
} finally {
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
index 8dfc7082b..d3408ac53 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
await message.exportConfirm()
// 发起导出
exportLoading.value = true
- const data = await OwnerApi.exportOwner(setSearchParams)
+ const data = await OwnerApi.exportOwner(tableObject.params)
download.excel(data, '货主.xls')
} catch {
} finally {
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index f167c9cb7..cbe35e0a5 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
await message.exportConfirm()
// 发起导出
exportLoading.value = true
- const data = await ShiftApi.exportShift(setSearchParams)
+ const data = await ShiftApi.exportShift(tableObject.params)
download.excel(data, '班次.xls')
} catch {
} finally {
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
index 6cbd98ef4..a6fe602eb 100644
--- a/src/views/wms/basicDataManage/orderManage/team/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
await message.exportConfirm()
// 发起导出
exportLoading.value = true
- const data = await TeamApi.exportTeam(setSearchParams)
+ const data = await TeamApi.exportTeam(tableObject.params)
download.excel(data, '班组.xls')
} catch {
} finally {
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 1892c5bc5..9066e2d00 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -1,18 +1,22 @@
-
+
+ :HeadButttondata="HeadButttondata"
+ @button-base-click="buttonBaseClick"
+ :route-name="routeName"
+ @updataTableColumns="updataTableColumns"
+ @searchFormClick="searchFormClick"
+ :allSchemas="Configurationsetting.allSchemas"
+ />
@@ -27,23 +31,23 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
+
{{ formatter(row.strategyType) }}
-
+
-
-
+
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
index 010d268a4..f1e6fd953 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
+++ b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
@@ -14,6 +14,7 @@ export const Rule = useCrudSchemas(reactive([
width: 150,
fixed: 'left'
},
+ isSearch:true
},
{
label: '优先级',
@@ -36,6 +37,7 @@ export const Rule = useCrudSchemas(reactive([
table: {
width: 150
},
+ isSearch:true
},
{
label: '名称',
@@ -44,6 +46,7 @@ export const Rule = useCrudSchemas(reactive([
table: {
width: 150
},
+ isSearch:true
},
{
label: '条件',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 95fb7ad4f..4a8ba5184 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -102,12 +102,16 @@ const updataTableColumns = (val) => {
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => {
if (type == 'tableForm') {
- row['fromPackingNumber'] = val[0]['packingNumber']
- row['fromContainerNumber'] = val[0]['containerNumber']
- row['itemCode'] = val[0]['itemCode']
- row['fromBatch'] = val[0]['batch']
- row['fromInventoryStatus'] = val[0]['inventoryStatus']
- row['fromLocationCode'] = val[0]['locationCode']
+ if(formField == 'fromPackingNumber'){
+ row['fromPackingNumber'] = val[0]['packingNumber']
+ row['fromContainerNumber'] = val[0]['containerNumber']
+ row['itemCode'] = val[0]['itemCode']
+ row['fromBatch'] = val[0]['batch']
+ row['fromInventoryStatus'] = val[0]['inventoryStatus']
+ row['fromLocationCode'] = val[0]['locationCode']
+ } else {
+ row[formField] = val[0][searchField]
+ }
} else {
const setV = {}
setV[formField] = val[0][searchField]
@@ -119,13 +123,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
- setV[formField] = val[0][searchField]
- setV['fromPackingNumber'] = val[0]['packingNumber']
- setV['fromContainerNumber'] = val[0]['containerNumber']
- setV['itemCode'] = val[0]['itemCode']
- setV['fromBatch'] = val[0]['batch']
- setV['fromInventoryStatus'] = val[0]['inventoryStatus']
- setV['fromLocationCode'] = val[0]['locationCode']
+ if(formField == 'fromPackingNumber') {
+ setV['fromPackingNumber'] = val[0]['packingNumber']
+ setV['fromContainerNumber'] = val[0]['containerNumber']
+ setV['itemCode'] = val[0]['itemCode']
+ setV['fromBatch'] = val[0]['batch']
+ setV['fromInventoryStatus'] = val[0]['inventoryStatus']
+ setV['fromLocationCode'] = val[0]['locationCode']
+ } else {
+ setV[formField] = val[0][searchField]
+ }
formRef.setValues(setV)
})
}
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 0854aed05..b73dec95d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -5,6 +5,9 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
@@ -546,8 +549,25 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
table: {
width: 150
},
- isTableForm: false,
- isForm: false,
+ tableForm:{
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择到库位代码',
+ searchField: 'code',
+ searchTitle: '库位信息',
+ searchAllSchemas: Location.allSchemas,
+ searchPage: LocationApi.getLocationPage
+ },
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择到库位代码',
+ searchField: 'code',
+ searchTitle: '库位信息',
+ searchAllSchemas: Location.allSchemas,
+ searchPage: LocationApi.getLocationPage
+ }
+ }
},
{
label: '到库存状态',