From 7fd75beeed301f049d62b48d1f67801e0fab4364 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 27 Apr 2023 14:17:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8E=9F=E6=96=99=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=A2=84=E8=AE=A1=E5=92=8C=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 4 +- src/views/atomViews/ListViewWithHead.vue | 4 +- .../pms/materialUsageEstimate/config.js | 167 ++++++++++++++++++ .../pms/materialUsageEstimate/index.vue | 37 ++++ .../modules/pms/opcAndBatchConfig/index.vue | 29 +++ 5 files changed, 237 insertions(+), 4 deletions(-) create mode 100644 src/views/modules/pms/materialUsageEstimate/config.js create mode 100644 src/views/modules/pms/materialUsageEstimate/index.vue create mode 100644 src/views/modules/pms/opcAndBatchConfig/index.vue diff --git a/public/index.html b/public/index.html index 11c8690..78aa5e3 100644 --- a/public/index.html +++ b/public/index.html @@ -39,8 +39,8 @@ <% } %> diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index 7423b28..db8f90c 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -141,7 +141,7 @@ export default { dialogVisible: false, carPayloadDialogVisible: false, topBtnConfig: null, - totalPage: 100, + totalPage: 0, page: 1, size: 20, // 默认20 dataList: [], @@ -555,7 +555,7 @@ export default { Object.assign(this.cachedSearchCondition, payload); if ("timerange" in payload) { if (!!payload.timerange) { - const [startTime, endTime] = params["timerange"]; + const [startTime, endTime] = payload["timerange"]; this.cachedSearchCondition.startTime = moment(startTime).format("YYYY-MM-DDTHH:mm:ss"); this.cachedSearchCondition.endTime = moment(endTime).format("YYYY-MM-DDTHH:mm:ss"); } else { diff --git a/src/views/modules/pms/materialUsageEstimate/config.js b/src/views/modules/pms/materialUsageEstimate/config.js new file mode 100644 index 0000000..c45f5c8 --- /dev/null +++ b/src/views/modules/pms/materialUsageEstimate/config.js @@ -0,0 +1,167 @@ +import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; +// import switchBtn from "@/components/noTemplateComponents/switchBtn"; +import request from "@/utils/request"; +import { dictFilter } from '@/utils/filters' +import { timeFilter } from '@/utils/filters' + +const kgFilter = val => { + if (val !== undefined && val !== null) return +val + ' kg' + else return '-' +} + +export default function () { + const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "matCode", label: "原料编码" }, + { prop: "matDesc", label: "原料描述" }, + { prop: "sum", label: "计算用量", filter: kgFilter }, + { prop: "store", label: "料仓存量", filter: kgFilter }, + // { + // prop: "operations", + // name: "操作", + // fixed: "right", + // width: 90, + // subcomponent: TableOperaionComponent, + // options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialStorage:delete" }], + // }, + ]; + + const headFormFields = [ + // { + // prop: 'name', + // label: "料仓名称", + // input: true, + // default: { value: "" }, + // bind: { + // // placeholder: '请输入产线名称或编码' + // placeholder: '请输入料仓名称' + // } + // }, + { + timerange: true, + prop: 'timerange', + label: "时间段", + bind: { + placeholder: '请选择时间段', + type: "datetimerange", + "start-placeholder": "开始时间", + "end-placeholder": "结束时间", + } + }, + { + button: { + type: "primary", + name: "查询", + }, + }, + // { + // button: { + // type: "primary", + // name: "新增", + // permission: "" + // }, + // bind: { + // plain: true, + // } + // }, + ]; + + + const dialogJustFormConfigs = { + form: { + rows: [ + [ + { + input: true, + label: "料仓名称", + prop: "name", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入料仓名称" }, + }, + ], + [ + { + input: true, + label: "料仓编码", + prop: "code", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入料仓编码" }, + }, + ], + [ + { + select: true, + label: "料仓类型", + prop: "typeDictValue", + // fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }), + options: [ + // TODO: 或许映射可以全权交给数据字典 + { label: '中间仓', value: '0' }, + { label: '日料仓', value: '1' }, + ], + rules: { required: true, message: "必填项不能为空", trigger: "change" }, + elparams: { placeholder: "请选择料仓类型" }, + }, + // { + // select: true, + // label: "物料", + // prop: "materialId", + // fetchData: () => this.$http.get("/pms/material/page", { params: { key: '', limit: 999, page: 1 } }), + // options: [], + // rules: { required: true, message: "必填项不能为空", trigger: "change" }, + // elparams: { placeholder: "请选择物料" }, + // }, + // { + // input: true, + // label: "加料下限", + // prop: "dosLow", + // rules: [ + // { required: true, message: "必填项不能为空", trigger: "blur" }, + // { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) }, + // ], + // elparams: { placeholder: "请输入加料下限" }, + // }, + // { + // input: true, + // label: "加料上限", + // prop: "dosHigh", + // rules: [ + // { required: true, message: "必填项不能为空", trigger: "blur" }, + // { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) }, + // ], + // elparams: { placeholder: "请输入加料上限" }, + // }, + ], + [{ textarea: true, label: "描述信息", prop: "description", elparams: { placeholder: "描述信息" } }], + // [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }], + ], + operations: [ + { name: "add", label: "保存", type: "primary", permission: "pms:materialStorage:save", showOnEdit: false }, + { name: "update", label: "更新", type: "primary", permission: "pms:materialStorage:update", showOnEdit: true }, + { name: "reset", label: "重置", type: "warning", showAlways: true }, + // { name: 'cancel', label: '取消', showAlways: true }, + ], + }, + }; + // 备注：弹窗弹出的时间和网速有关...... + + return { + dialogConfigs: dialogJustFormConfigs, + tableConfig: { + table: null, // 此处可省略，el-table 上的配置项 + column: tableProps, // el-column-item 上的配置项 + }, + headFormConfigs: { + rules: null, // 名称是由 BaseSearchForm.vue 组件固定的 + fields: headFormFields, // 名称是由 BaseSearchForm.vue 组件固定的 + }, + urls: { + // base: "/pms/materialStorage", + page: "/pms/order/matCal", + pageIsPostApi: true + // subase: '/pms/blenderStepParam', + // subpage: '/pms/blenderStepParam/page', + // more... + }, + }; +} diff --git a/src/views/modules/pms/materialUsageEstimate/index.vue b/src/views/modules/pms/materialUsageEstimate/index.vue new file mode 100644 index 0000000..7d3d853 --- /dev/null +++ b/src/views/modules/pms/materialUsageEstimate/index.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/views/modules/pms/opcAndBatchConfig/index.vue b/src/views/modules/pms/opcAndBatchConfig/index.vue new file mode 100644 index 0000000..ef052f1 --- /dev/null +++ b/src/views/modules/pms/opcAndBatchConfig/index.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file