diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index af34c98c3..b72b2b9ec 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -20,12 +20,12 @@ export default defineComponent({ const dictData = ref() let dictDataList:any[] = [] const getDictObj = (dictType: string, value: string) => { + dictDataList = [] // 判断 是否多个回显标签 if (value.indexOf(',') == -1) { const dictOptions = getDictOptions(dictType) dictData.value = dictOptions.find(dictOptionsItem => (dictOptionsItem.value == value)) } else { - dictDataList = [] value.split(',').forEach(item => { const dictOptions = getDictOptions(dictType) dictDataList.push(dictOptions.find(dictOptionsItem => (dictOptionsItem.value == item))) diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index 1c6c1a567..f78defa36 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -194,10 +194,10 @@ const formsSuccess = async (formType, data) => { data.inInventoryStatuses = data.inInventoryStatuses.join(',') if (formType === 'create') { await BusinesstypeApi.createBusinesstype(data) - .then(() => { + .then(async () => { message.success(t('common.createSuccess')) basicFormRef.value.dialogVisible = false - getList() + await getList() }) .catch(() => { data.itemTypes = data.itemTypes.split(',') @@ -208,10 +208,10 @@ const formsSuccess = async (formType, data) => { }) } else { await BusinesstypeApi.updateBusinesstype(data) - .then(() => { + .then(async () => { message.success(t('common.updateSuccess')) basicFormRef.value.dialogVisible = false - getList() + await getList() }) .catch(() => { data.itemTypes = data.itemTypes.split(',') @@ -296,7 +296,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { await getList() - // console.log(300, tableObject.tableList) + importTemplateData.templateUrl = await BusinesstypeApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index 02cded762..6cab88afa 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -203,7 +203,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await DocumentsettingApi.exportDocumentsetting(setSearchParams) + const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params) download.excel(data, '单据设置.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index 84228a530..5b56549e4 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -203,7 +203,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await JobsettingApi.exportJobsetting(setSearchParams) + const data = await JobsettingApi.exportJobsetting(tableObject.params) download.excel(data, '任务单设置.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index 12dbf482f..f56ca6181 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -203,7 +203,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await RecordsettingApi.exportRecordsetting(setSearchParams) + const data = await RecordsettingApi.exportRecordsetting(tableObject.params) download.excel(data, '记录单设置.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index d9a5f100e..a8dac16c9 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -203,7 +203,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await RequestsettingApi.exportRequestsetting(setSearchParams) + const data = await RequestsettingApi.exportRequestsetting(tableObject.params) download.excel(data, '申请单设置.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index 1e793b9f5..2157545ea 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -203,7 +203,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await TransactiontypeApi.exportTransactiontype(setSearchParams) + const data = await TransactiontypeApi.exportTransactiontype(tableObject.params) download.excel(data, '事务类型.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue index 19359df3f..def5b33c9 100644 --- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue @@ -198,7 +198,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await BarbasicApi.exportBarbasic(setSearchParams) + const data = await BarbasicApi.exportBarbasic(tableObject.params) download.excel(data, '条码实体基类.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue index 071c0795e..a13addbe3 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue +++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue @@ -206,7 +206,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await LabeltypeApi.exportLabeltype(setSearchParams) + const data = await LabeltypeApi.exportLabeltype(tableObject.params) download.excel(data, '标签定义.xlsx') } catch { } finally { diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue index 5462720e6..4daa71e6a 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue @@ -200,7 +200,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await SupplierUserApi.exportSupplierUser(setSearchParams) + const data = await SupplierUserApi.exportSupplierUser(tableObject.params) download.excel(data, '供应商用户关联信息.xls') } catch { } finally { diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 99edab679..22ef6d0f9 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -193,7 +193,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await BalanceApi.exportBalance(setSearchParams) + const data = await BalanceApi.exportBalance(tableObject.params) download.excel(data, '库存余额.xlsx') } catch { } finally { diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index e711a7929..10a5957a9 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -179,7 +179,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ExpectinApi.exportExpectin(setSearchParams) + const data = await ExpectinApi.exportExpectin(tableObject.params) download.excel(data, '预计入库存.xlsx') } catch { } finally { diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index 71b658224..378331143 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -179,7 +179,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ExpectoutApi.exportExpectout(setSearchParams) + const data = await ExpectoutApi.exportExpectout(tableObject.params) download.excel(data, '预计出库存.xlsx') } catch { } finally { diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue index daaaba3e9..2b9b228e9 100644 --- a/src/views/wms/inventoryManage/locationcapacity/index.vue +++ b/src/views/wms/inventoryManage/locationcapacity/index.vue @@ -179,7 +179,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await LocationcapacityApi.exportLocationcapacity(setSearchParams) + const data = await LocationcapacityApi.exportLocationcapacity(tableObject.params) download.excel(data, '库位容量.xlsx') } catch { } finally { diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue index d34e9f64a..3333d94ce 100644 --- a/src/views/wms/inventoryManage/transaction/index.vue +++ b/src/views/wms/inventoryManage/transaction/index.vue @@ -66,6 +66,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +// 库存事务 defineOptions({ name: 'Transaction' }) const message = useMessage() // 消息弹窗 @@ -179,7 +180,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await TransactionApi.exportTransaction(setSearchParams) + const data = await TransactionApi.exportTransaction(tableObject.params) download.excel(data, '事务类型.xlsx') } catch { } finally { diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue index e632f0306..f9e7663fe 100644 --- a/src/views/wms/inventoryManage/transferlog/index.vue +++ b/src/views/wms/inventoryManage/transferlog/index.vue @@ -179,7 +179,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ExpectinApi.exportTransferlog(setSearchParams) + const data = await ExpectinApi.exportTransferlog(tableObject.params) download.excel(data, '库存转移日志.xlsx') } catch { } finally { diff --git a/src/views/wms/moveManage/itemChange/index.vue b/src/views/wms/moveManage/itemChange/index.vue index 89bacff06..0e1632f26 100644 --- a/src/views/wms/moveManage/itemChange/index.vue +++ b/src/views/wms/moveManage/itemChange/index.vue @@ -174,7 +174,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await BalanceApi.exportBalance(setSearchParams) + const data = await BalanceApi.exportBalance(tableObject.params) download.excel(data, '库存余额.xlsx') } catch { } finally {