diff --git a/src/views/modules/pms/order/components/DialogJustForm.vue b/src/views/modules/pms/order/components/DialogJustForm.vue index d6c1da6..333e4aa 100644 --- a/src/views/modules/pms/order/components/DialogJustForm.vue +++ b/src/views/modules/pms/order/components/DialogJustForm.vue @@ -16,6 +16,74 @@ + + + + + + + + + + + + + + +
+ + +
+ +
+
+
+
+
+
+
+
@@ -100,12 +168,14 @@ import { pick as __pick } from "@/utils/filters"; import Cookies from "js-cookie"; import moment from "moment"; +import InputsArea from "./InputsArea.vue"; export default { name: "DialogJustForm", - components: {}, + components: { InputsArea }, props: { - configs: { type: Object, + configs: { + type: Object, default: () => ({ clickModalToClose: true, forms: null, diff --git a/src/views/modules/pms/order/components/InputsArea.vue b/src/views/modules/pms/order/components/InputsArea.vue new file mode 100644 index 0000000..7ff729b --- /dev/null +++ b/src/views/modules/pms/order/components/InputsArea.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js index 327f8a5..a20c667 100644 --- a/src/views/modules/pms/order/config.js +++ b/src/views/modules/pms/order/config.js @@ -223,37 +223,81 @@ export default function () { const dictList = JSON.parse(localStorage.getItem("dictList")); const dialogConfigs = { form: { + field: [ + { + title: '订单', + rows: [ + [ + { + label: "订单状态", + prop: "statusDictValue", + component: textOnlyComponent, + }, + { + input: true, + label: "订单号", + prop: "code", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入订单号" }, + }, + { + input: true, + label: "订单子号", + prop: "cate", + rules: [ + { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入订单子号" }, + }, + { + input: true, + label: "生产订单类型", + prop: "specifications", + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入生产订单类型" }, + } + ] + ] + }, + { + title: '设备', + rows: [ + { + select: true, + label: "压机", + prop: "press", + options: [], + optionLabel: "code", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Press' } }), + elparams: { placeholder: "请选择压机号", filterable: true }, + }, + { + select: true, + label: "混料机号", + prop: "blender", + options: [], + optionLabel: "code", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Mix' } }), + elparams: { placeholder: "请选择混料机号", filterable: true }, + }, + { + select: true, + label: "隧道窑号", + prop: "kiln", + options: [], + optionLabel: "code", + fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Kiln' } }), + elparams: { placeholder: "请选择隧道窑号", filterable: true }, + }, + ] + } + ], rows: [ [ - { - label: "订单状态", - prop: "statusDictValue", - component: textOnlyComponent, - }, - { - input: true, - label: "订单号", - prop: "code", - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入订单号" }, - }, - { - input: true, - label: "订单子号", - prop: "cate", - rules: [ - { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入订单子号" }, - }, - { - input: true, - label: "生产订单类型", - prop: "specifications", - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入生产订单类型" }, - }, + { select: true, label: "物料编号", @@ -333,16 +377,7 @@ export default function () { // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), elparams: { placeholder: "请选择砖型", filterable: true }, }, - { - select: true, - label: "压机", - prop: "press", - options: [], - optionLabel: "code", - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Press' } }), - elparams: { placeholder: "请选择压机号", filterable: true }, - }, + ], [ { @@ -382,25 +417,7 @@ export default function () { useBuiltin: false, }, }, - { - select: true, - label: "混料机号", - prop: "blender", - options: [], - optionLabel: "code", - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Mix' } }), - elparams: { placeholder: "请选择混料机号", filterable: true }, - }, - { - select: true, - label: "隧道窑号", - prop: "kiln", - options: [], - optionLabel: "code", - fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Kiln' } }), - elparams: { placeholder: "请选择隧道窑号", filterable: true }, - }, + { input: true, label: "烧成温度 ℃",