diff --git a/public/index.html b/public/index.html index c743726..3abd097 100644 --- a/public/index.html +++ b/public/index.html @@ -38,9 +38,9 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> diff --git a/src/views/modules/pms/materialStorage/config.js b/src/views/modules/pms/materialStorage/config.js index 2ef3251..e458c71 100644 --- a/src/views/modules/pms/materialStorage/config.js +++ b/src/views/modules/pms/materialStorage/config.js @@ -12,6 +12,10 @@ export default function () { { prop: "code", label: "料仓编码" }, { prop: "typeDictValue", label: "料仓类型", filter: dictFilter('liaocang') }, // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent + { prop: "materialTypeDictValue", label: "物料类型", filter: dictFilter('material_category') }, + { prop: "density", label: "物料堆积密度" }, + { prop: "dosHigh", label: "加料上限" }, + { prop: "dosLow", label: "加料下限" }, { prop: "description", label: "描述" }, { prop: "remark", label: "备注" }, { @@ -112,8 +116,8 @@ export default function () { fields: headFormFields, // 名称是由 BaseSearchForm.vue 组件固定的 }, urls: { - base: "/pms/materialStorage", - page: "/pms/materialStorage/page", + base: "/pms/materialStorageDynamic", + page: "/pms/materialStorageDynamic/page", // subase: '/pms/blenderStepParam', // subpage: '/pms/blenderStepParam/page', // more... diff --git a/src/views/modules/pms/materialStorageQty/components/storageBox.vue b/src/views/modules/pms/materialStorageQty/components/storageBox.vue index 0dafdc9..7cf84ed 100644 --- a/src/views/modules/pms/materialStorageQty/components/storageBox.vue +++ b/src/views/modules/pms/materialStorageQty/components/storageBox.vue @@ -26,9 +26,9 @@ {{ qty }} {{ computedUnit }} -
+
diff --git a/src/views/modules/pms/materialStorageQty/index.vue b/src/views/modules/pms/materialStorageQty/index.vue index b8e0af8..e7e0a03 100644 --- a/src/views/modules/pms/materialStorageQty/index.vue +++ b/src/views/modules/pms/materialStorageQty/index.vue @@ -126,7 +126,7 @@ export default { getList(storageType) { this.resetAllStorages(); const params = storageType ? { limit: this.limit, page: this.page, typeDictValue: storageType } : { limit: this.limit, page: this.page }; - this.$http.get("/pms/materialStorageQty/page", { params }).then(({ data: res }) => { + this.$http.get("/pms/materialStorageDynamic/page", { params }).then(({ data: res }) => { if (res.code === 0) { if ("list" in res.data) { res.data.list.forEach((item) => {