diff --git a/nc_wms_web/dist.zip b/nc_wms_web/dist.zip deleted file mode 100644 index 475d647..0000000 Binary files a/nc_wms_web/dist.zip and /dev/null differ diff --git a/nc_wms_web/package-lock.json b/nc_wms_web/package-lock.json index 33bb59a..50c6a6d 100644 --- a/nc_wms_web/package-lock.json +++ b/nc_wms_web/package-lock.json @@ -42,6 +42,7 @@ }, "devDependencies": { "@types/lodash": "^4.17.16", + "@types/nprogress": "^0.2.3", "@types/pinyin": "^2.10.2", "@vitejs/plugin-vue": "5.1.4", "@vitejs/plugin-vue-jsx": "4.0.1", @@ -1618,6 +1619,12 @@ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", "dev": true }, + "node_modules/@types/nprogress": { + "version": "0.2.3", + "resolved": "https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.3.tgz", + "integrity": "sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==", + "dev": true + }, "node_modules/@types/parse-json": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.2.tgz", diff --git a/nc_wms_web/package.json b/nc_wms_web/package.json index 1a6b3b1..d319842 100644 --- a/nc_wms_web/package.json +++ b/nc_wms_web/package.json @@ -50,6 +50,7 @@ }, "devDependencies": { "@types/lodash": "^4.17.16", + "@types/nprogress": "^0.2.3", "@types/pinyin": "^2.10.2", "@vitejs/plugin-vue": "5.1.4", "@vitejs/plugin-vue-jsx": "4.0.1", diff --git a/nc_wms_web/src/router/index.ts b/nc_wms_web/src/router/index.ts index 3f78636..e1ddd8c 100644 --- a/nc_wms_web/src/router/index.ts +++ b/nc_wms_web/src/router/index.ts @@ -16,7 +16,7 @@ import { PAGE_PATH_404, PAGE_PATH_LOGIN, HOME_PAGE_PATH } from '/@/constants/com import { HOME_PAGE_NAME } from '/@/constants/system/home-const'; import SmartLayout from '../layout/index.vue'; import { useUserStore } from '/@/store/modules/system/user'; -import { localClear, localRead } from '/@/utils/local-util'; +import {localRead } from '/@/utils/local-util'; import _ from 'lodash'; import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js'; diff --git a/nc_wms_web/src/views/business/oa/enterprise/components/enterprise-employee-list.vue b/nc_wms_web/src/views/business/oa/enterprise/components/enterprise-employee-list.vue index 4960851..ecd9216 100644 --- a/nc_wms_web/src/views/business/oa/enterprise/components/enterprise-employee-list.vue +++ b/nc_wms_web/src/views/business/oa/enterprise/components/enterprise-employee-list.vue @@ -91,7 +91,7 @@ }, }); - const columns = reactive([ + let columns = reactive([ { title: '姓名', dataIndex: 'actualName', diff --git a/nc_wms_web/src/views/business/wms/base/address/address-list.vue b/nc_wms_web/src/views/business/wms/base/address/address-list.vue index 5f4138e..a71674b 100644 --- a/nc_wms_web/src/views/business/wms/base/address/address-list.vue +++ b/nc_wms_web/src/views/business/wms/base/address/address-list.vue @@ -187,7 +187,7 @@ const tableData = ref([]); // 总数 const total = ref(0); //列 -const columns = ref([ +let columns = ref([ { title: '收货地址id', dataIndex: 'addressId', diff --git a/nc_wms_web/src/views/business/wms/base/area/area-list.vue b/nc_wms_web/src/views/business/wms/base/area/area-list.vue index fdf8b8b..c9c6985 100644 --- a/nc_wms_web/src/views/business/wms/base/area/area-list.vue +++ b/nc_wms_web/src/views/business/wms/base/area/area-list.vue @@ -150,7 +150,7 @@ import {TABLE_ID_CONST} from "/@/constants/support/table-id-const"; import AreaSelect from "/@/views/business/wms/base/area/area-select.vue"; // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '库区id', dataIndex: 'areaId', diff --git a/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue b/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue index 7624e87..d9e8c6f 100644 --- a/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue +++ b/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue @@ -137,7 +137,7 @@ import CustomerSelect from "/@/views/business/wms/base/customer/customer-select. // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '客户id', dataIndex: 'customerId', diff --git a/nc_wms_web/src/views/business/wms/base/item/item-list.vue b/nc_wms_web/src/views/business/wms/base/item/item-list.vue index 8abb68d..873e792 100644 --- a/nc_wms_web/src/views/business/wms/base/item/item-list.vue +++ b/nc_wms_web/src/views/business/wms/base/item/item-list.vue @@ -189,7 +189,7 @@ import {UploadFile} from 'ant-design-vue'; import {fileApi} from "/@/api/support/file-api"; import DictLabel from "/@/components/support/dict-label/index.vue"; // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '物料id', dataIndex: 'itemId', diff --git a/nc_wms_web/src/views/business/wms/base/location/location-list.vue b/nc_wms_web/src/views/business/wms/base/location/location-list.vue index 0eee332..208063d 100644 --- a/nc_wms_web/src/views/business/wms/base/location/location-list.vue +++ b/nc_wms_web/src/views/business/wms/base/location/location-list.vue @@ -237,7 +237,7 @@ import {UploadFile} from 'ant-design-vue'; import {fileApi} from "/@/api/support/file-api"; // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '库位ID', dataIndex: 'locationId', diff --git a/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue b/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue index d70e7fc..ff70339 100644 --- a/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue +++ b/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue @@ -200,7 +200,7 @@ import LocationSelect from "/@/views/business/wms/base/location/location-select. import DictLabel from "/@/components/support/dict-label/index.vue"; // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '容器id', dataIndex: 'stockId', diff --git a/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue b/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue index bd955ee..69bdd9f 100644 --- a/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue +++ b/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue @@ -103,7 +103,7 @@ import ItemSelect from "/@/views/business/wms/base/item/item-select.vue"; import LocationSelect from "/@/views/business/wms/base/location/location-select.vue"; // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '库存id', dataIndex: 'inventoryId', diff --git a/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue b/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue index 7264c07..c4a9d15 100644 --- a/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue +++ b/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue @@ -160,7 +160,7 @@ import {useRoute, useRouter} from "vue-router"; // ---------------------------- 表格列 ---------------------------- -const columns = ref([ +let columns = ref([ { title: '入库单id', dataIndex: 'asnId', diff --git a/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue b/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue index 9d76489..507466a 100644 --- a/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue +++ b/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue @@ -41,20 +41,21 @@ 批量移除 - - +