diff --git a/smart-admin-web-typescript/src/api/business/base/location/location-api.ts b/smart-admin-web-typescript/src/api/business/base/location/location-api.ts index 6657ed4..f0d9689 100644 --- a/smart-admin-web-typescript/src/api/business/base/location/location-api.ts +++ b/smart-admin-web-typescript/src/api/business/base/location/location-api.ts @@ -48,7 +48,7 @@ export const locationApi = { /** * 下拉查询 @author hj */ - queryLocation: (param: number[]) => { + queryLocation: (param: object) => { return postRequest('/location/queryLocation', param); }, @@ -58,4 +58,11 @@ export const locationApi = { multipleAdjust: (param: object) => { return postRequest('/location/multipleAdjust', param); }, + + /** + * 批量新建 @author hj + */ + multipleInsert: (param: object) => { + return postRequest('/location/multipleInsert', param); + }, }; diff --git a/smart-admin-web-typescript/src/views/business/base/area/area-list.vue b/smart-admin-web-typescript/src/views/business/base/area/area-list.vue index 603f4f6..51ebcdd 100644 --- a/smart-admin-web-typescript/src/views/business/base/area/area-list.vue +++ b/smart-admin-web-typescript/src/views/business/base/area/area-list.vue @@ -215,7 +215,7 @@ function onSearch() { queryData(); } -//选择库位 +//选择库区 function changeAreaSelect(selectValue: any) { if(selectValue){ queryForm.areaId = selectValue.areaId; @@ -314,7 +314,7 @@ async function requestBatchDelete() { if (success) { message.success(success); } - queryData(); + await queryData(); } catch (e) { smartSentry.captureError(e); } finally { diff --git a/smart-admin-web-typescript/src/views/business/base/item/item-form.vue b/smart-admin-web-typescript/src/views/business/base/item/item-form.vue index 8d5c589..96e4499 100644 --- a/smart-admin-web-typescript/src/views/business/base/item/item-form.vue +++ b/smart-admin-web-typescript/src/views/business/base/item/item-form.vue @@ -82,8 +82,6 @@ import {message} from 'ant-design-vue'; import {SmartLoading} from '/@/components/framework/smart-loading'; import {itemApi} from '/@/api/business/base/item/item-api.js'; import {smartSentry} from '/@/lib/smart-sentry'; -import BooleanSelect from '/@/components/framework/boolean-select/index.vue'; -import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue'; import DictSelect from "/@/components/support/dict-select/index.vue"; // ------------------------ 事件 ------------------------ diff --git a/smart-admin-web-typescript/src/views/business/base/item/item-list.vue b/smart-admin-web-typescript/src/views/business/base/item/item-list.vue index a3e7292..8844aec 100644 --- a/smart-admin-web-typescript/src/views/business/base/item/item-list.vue +++ b/smart-admin-web-typescript/src/views/business/base/item/item-list.vue @@ -278,7 +278,7 @@ async function requestDelete(data: any) { try { await itemApi.delete(data.itemId); message.success('删除成功'); - queryData(); + await queryData(); } catch (e) { smartSentry.captureError(e); } finally { @@ -317,7 +317,7 @@ async function requestBatchDelete() { SmartLoading.show(); await itemApi.batchDelete(selectedRowKeyList.value); message.success('删除成功'); - queryData(); + await queryData(); } catch (e) { smartSentry.captureError(e); } finally { diff --git a/smart-admin-web-typescript/src/views/business/base/location/location-list.vue b/smart-admin-web-typescript/src/views/business/base/location/location-list.vue index 926ebf2..f108e8f 100644 --- a/smart-admin-web-typescript/src/views/business/base/location/location-list.vue +++ b/smart-admin-web-typescript/src/views/business/base/location/location-list.vue @@ -60,12 +60,20 @@ 批量删除 - + 批量调整 + + + + 批量新建 + +
@@ -145,13 +153,18 @@ :total="total" @change="queryData" @showSizeChange="queryData" - :show-total="(total:any) => `共${total}条`" + :show-total="(total:number) => `共${total}条`" />
+ - + + + + + @@ -164,13 +177,15 @@ import {PAGE_SIZE_OPTIONS} from '/@/constants/common-const'; import {smartSentry} from '/@/lib/smart-sentry'; import TableOperator from '/@/components/support/table-operator/index.vue'; import LocationForm from '/@/views/business/base/location/location-form.vue'; -import LocationAdjustForm from '/@/views/business/base/location/multiple-adjust.vue'; +import MultipleAdjust from "/@/views/business/base/location/multiple-adjust.vue"; import {TABLE_ID_CONST} from "/@/constants/support/table-id-const"; import LocationSelect from "/@/views/business/base/location/location-select.vue"; import AreaSelect from "/@/views/business/base/area/area-select.vue"; import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue'; import DictPreview from '/@/components/dict-preview/index.vue'; import {useDict} from '/@/utils/dict'; +import MultipleInsert from "/@/views/business/base/location/multiple-insert.vue"; + const locType = useDict('LOC_TYPE'); // ---------------------------- 表格列 ---------------------------- @@ -332,7 +347,7 @@ async function requestDelete(data: any) { try { await locationApi.delete(data.locationId); message.success('删除成功'); - queryData(); + await queryData(); } catch (e) { smartSentry.captureError(e); } finally { @@ -371,7 +386,7 @@ async function requestBatchDelete() { SmartLoading.show(); await locationApi.batchDelete(selectedRowKeyList.value); message.success('删除成功'); - queryData(); + await queryData(); } catch (e) { smartSentry.captureError(e); } finally { @@ -382,7 +397,14 @@ async function requestBatchDelete() { // ---------------------------- 批量调整 ---------------------------- const multipleAdjustFormRef = ref(); -function showmultipleAdjustForm() { +function showMultipleAdjustForm() { multipleAdjustFormRef.value.showMultipleAdjust(); } + +// ---------------------------- 批量新建 ---------------------------- +const multipleInsertFormRef = ref(); + +function showMultipleInsertForm() { + multipleInsertFormRef.value.showMultipleInsert(); +} diff --git a/smart-admin-web-typescript/src/views/business/base/location/multiple-adjust.vue b/smart-admin-web-typescript/src/views/business/base/location/multiple-adjust.vue index 6fe4f69..278905e 100644 --- a/smart-admin-web-typescript/src/views/business/base/location/multiple-adjust.vue +++ b/smart-admin-web-typescript/src/views/business/base/location/multiple-adjust.vue @@ -121,7 +121,7 @@ function changeLocationSelect(selectValue: []) { async function onSubmit() { try { await formRef.value.validateFields(); - save(); + await save(); } catch (err) { message.error('参数验证错误,请仔细填写表单数据!'); } diff --git a/smart-admin-web-typescript/src/views/business/base/location/multiple-insert.vue b/smart-admin-web-typescript/src/views/business/base/location/multiple-insert.vue new file mode 100644 index 0000000..5ca1736 --- /dev/null +++ b/smart-admin-web-typescript/src/views/business/base/location/multiple-insert.vue @@ -0,0 +1,237 @@ + + +