diff --git a/src/views/modules/pms/order/components/DialogWithMenu.vue b/src/views/modules/pms/order/components/DialogWithMenu.vue
index 7fedd01..a383112 100644
--- a/src/views/modules/pms/order/components/DialogWithMenu.vue
+++ b/src/views/modules/pms/order/components/DialogWithMenu.vue
@@ -13,13 +13,13 @@
-
+
-
+
@@ -50,8 +50,7 @@ export default {
detailMode: false,
visible: false,
activeTab: "sub",
- orderId: null,
- orderSubId: null,
+ order: null,
carLayoutKey: 0,
};
},
@@ -59,7 +58,6 @@ export default {
methods: {
handleTabClick(tab, event) {
console.log("handle tab click", tab, event);
- // tab.getAList(this.orderId)
switch (tab.label) {
case "子订单进度":
break;
@@ -75,11 +73,14 @@ export default {
/** init **/
init(order, detailMode) {
- this.orderId = order.id;
console.log("init menu dialog,", order);
+ this.order = order;
+ this.detailMode = detailMode ?? false;
this.visible = true;
- this.detailMode = detailMode ?? false;
+ this.$nextTick(() => {
+ this.$refs["order-detail-tag"].init(this.order.id, this.detailMode);
+ });
},
handleClose() {
diff --git a/src/views/modules/pms/order/components/tabs/orderDetail.vue b/src/views/modules/pms/order/components/tabs/orderDetail.vue
index 1c03885..d3a5de0 100644
--- a/src/views/modules/pms/order/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/orderDetail.vue
@@ -13,14 +13,7 @@
:disabled="detailMode"
v-bind="col.elparams"
>
-
+
{
- // this.dataForm.id = id || null;
+ this.dataForm.id = orderId || null;
if (this.dataForm.id) {
// 如果是编辑
this.loadingStatus = true;
@@ -309,7 +299,6 @@ export default {
url: file.fileUrl,
}));
}
- // console.log("[DialogJustForm] init():", this.dataForm);
} else {
this.$message({
message: `${res.code}: ${res.msg}`,
@@ -337,4 +326,10 @@ export default {
};
-
+
diff --git a/src/views/modules/pms/order/components/tabs/t.js b/src/views/modules/pms/order/components/tabs/t.js
deleted file mode 100644
index a1c5ce3..0000000
--- a/src/views/modules/pms/order/components/tabs/t.js
+++ /dev/null
@@ -1,233 +0,0 @@
-formRows: [
- [
- {
- 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",
- elparams: { placeholder: "请输入生产订单类型" },
- },
- {
- select: true,
- label: "物料编号",
- prop: "productId",
- options: [],
- optionLabel: "code",
- fetchData: () => this.$http.get("/pms/product/page", { params: { limit: 999, page: 1, key: "" } }),
- elparams: { placeholder: "请选择物料", filterable: true },
- },
- {
- select: true,
- label: "包装代码",
- prop: "packTech",
- options: [],
- optionLabel: "code",
- fetchData: () => this.$http.post("/pms/equipmentTech/pageView", { limit: 999, page: 1, key: "", shape: "", wsId: 5 }),
- elparams: { placeholder: "请选择物料", filterable: true },
- },
- ],
- [
- {
- input: true,
- label: "生产订单砖数",
- prop: "prodqty",
- rules: [
- { required: true, message: "必填项不能为空", trigger: "blur" },
- { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
- ],
- elparams: { placeholder: "请输入要求生产的数量" },
- },
- {
- input: true,
- label: "已生产数",
- prop: "yieldqty",
- // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- rules: [
- // { required: true, message: "必填项不能为空", trigger: "blur" },
- { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
- ],
- elparams: { placeholder: "请输入已经生产的数量" },
- },
- {
- input: true,
- label: "托盘码放砖数",
- prop: "pcsKilnCar",
- rules: [
- { required: true, message: "必填项不能为空", trigger: "blur" },
- { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
- ],
- elparams: { placeholder: "请输入要求生产的数量" },
- },
- {
- input: true,
- label: "Add on",
- prop: "sapParam1",
- rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- elparams: { placeholder: "请输入addon" },
- },
- {
- select: true,
- label: "砖型",
- prop: "shape",
- optionLabel: "code",
- options: [],
- fetchData: () => this.$http.get("/pms/shape/page", { params: { limit: 999, page: 1, key: "" } }),
- elparams: { placeholder: "请选择砖型", filterable: true },
- },
- {
- select: true,
- label: "压机",
- prop: "press",
- options: [],
- optionLabel: "code",
- rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- fetchData: () => this.$http.get("/pms/equipment/page", { params: { limit: 999, page: 1, name: "" } }),
- elparams: { placeholder: "请选择压机号", filterable: true },
- },
- ],
- [
- {
- select: true,
- label: "牌号",
- prop: "bomId",
- options: [],
- // optionLabel: '',
- fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "", externalCode: "" } }),
- elparams: { placeholder: "请选择牌号", filterable: true },
- injectTo: [
- ["bomCode", "code"],
- ["ai", "externalCode"],
- ],
- },
- {
- label: "配方号代码",
- prop: "bomCode",
- component: textOnlyComponent,
- bind: {
- useBuiltin: false,
- },
- },
- {
- label: "版本号",
- prop: "ai",
- component: textOnlyComponent,
- bind: {
- useBuiltin: false,
- },
- },
- {
- select: true,
- label: "混料机号",
- prop: "blender",
- options: [],
- optionLabel: "code",
- rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- fetchData: () => this.$http.get("/pms/equipment/page", { params: { limit: 999, page: 1, name: "" } }),
- elparams: { placeholder: "请选择混料机号", filterable: true },
- },
- {
- select: true,
- label: "隧道窑号",
- prop: "kiln",
- options: [],
- optionLabel: "code",
- fetchData: () => this.$http.get("/pms/equipment/page", { params: { limit: 999, page: 1, name: "" } }),
- elparams: { placeholder: "请选择隧道窑号", filterable: true },
- },
- {
- input: true,
- label: "烧成温度 ℃",
- prop: "sapParam6",
- rules: [
- { required: true, message: "必填项不能为空", trigger: "blur" },
- { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
- ],
- elparams: { placeholder: "请输入烧成温度" },
- },
- ],
- [
- {
- input: true,
- label: "烧成时间 H",
- prop: "sapParam7",
- rules: [
- { required: true, message: "必填项不能为空", trigger: "blur" },
- { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
- ],
- elparams: { placeholder: "请输入烧成时间" },
- },
- {
- input: true,
- label: "销售订单号",
- prop: "saleNo",
- rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- elparams: { placeholder: "请输入销售订单号" },
- },
- {
- input: true,
- label: "销售订单item号",
- prop: "saleOrderItem",
- // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- elparams: { placeholder: "请输入销售订单item号" },
- },
- {
- input: true,
- label: "销售订单砖数",
- prop: "soqty",
- rules: [
- { required: true, message: "必填项不能为空", trigger: "blur" },
- { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) },
- ],
- elparams: { placeholder: "请输入销售订单砖数" },
- },
- {
- datetime: true,
- label: "销售时间",
- prop: "deliveryTime",
- rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- elparams: { placeholder: "请选择销售时间" },
- },
- {
- select: true,
- label: "客户",
- prop: "customerId",
- option: [],
- optionLabel: "name",
- fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
- rules: { required: true, message: "必填项不能为空", trigger: "blur" },
- elparams: { placeholder: "请选择客户" },
- },
- ],
- [
- {
- label: "物料号销售文本",
- prop: "shortDesc",
- component: textOnlyComponent,
- bind: {
- useBuiltin: false,
- },
- },
- ],
- [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
-],
\ No newline at end of file