update 订单编辑相关页面

2023-08-21 09:37:33 +08:00 · 2023-08-21 09:37:33 +08:00 · a33784740d
--- a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
@ -470,15 +470,10 @@
                :disabled="mode.includes('detail')"
                v-bind="{ placeholder: '选择托盘类型' }">
                <el-option
-                  v-for="opt in [
-                    { label: '非熏蒸', value: '0' },
-                    { label: '熏蒸', value: '1' },
-                  ]"
-                  :key="opt.label"
-                  :label="opt.label"
-                  :value="opt.value">
-                  <span>{{ opt.label }}</span>
-                </el-option>
+                  v-for="pt in palletType"
+                  :key="pt.dictValue"
+                  :label="pt.dictLabel"
+                  :value="pt.dictValue"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@ -493,16 +488,8 @@
                clearable
                :disabled="mode.includes('detail')"
                v-bind="{ placeholder: '选择贴纸板' }">
-                <el-option
-                  v-for="opt in [
-                    { label: '不要', value: '0' },
-                    { label: '要', value: '1' },
-                  ]"
-                  :key="opt.label"
-                  :label="opt.label"
-                  :value="opt.value">
-                  <span>{{ opt.label }}</span>
-                </el-option>
+                <el-option label="否" value="0"></el-option>
+                <el-option label="是" value="1"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@ -525,6 +512,7 @@
 <script>
 import { pick as __pick } from "@/utils/filters";
 import InputsArea from "./InputsArea.vue";
+import { getDictDataList } from "@/utils";

 export default {
  name: "OrderDetailTag",
@ -669,6 +657,11 @@ export default {
      promiseList: [],
    };
  },
+  computed: {
+    palletType() {
+      return getDictDataList("pallet_type");
+    },
+  },
  methods: {
    /**
     * 打开弹窗后，准备下拉选项数据
--- a/src/views/modules/pms/finishedOrder/components/tabs/subOrderDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/subOrderDetail.vue
@ -100,18 +100,18 @@ export default {
          filter: (val) => (val !== null && val !== undefined ? ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][val] : "-"),
        },
        { prop: "qty", label: "混料总量 [kg]" },
-        {
-          prop: "operations",
-          name: "操作",
-          fixed: "right",
-          width: 200,
-          subcomponent: TableOperaionComponent,
-          options: [
-            { name: "edit", label: "编辑", emitFull: true, icon: "edit-outline" },
-            { name: "view-batch", label: "查看批次", color: "#ff8000", toRouter: "pms-blenderBatch", icon: "document-copy" }, // 路由跳转至 pms-blenderBatch
-            { name: "detach", label: "下发", color: "#099", icon: "bottom-right" },
-          ],
-        },
+        // {
+        //   prop: "operations",
+        //   name: "操作",
+        //   fixed: "right",
+        //   width: 200,
+        //   subcomponent: TableOperaionComponent,
+        //   options: [
+        //     { name: "edit", label: "编辑", emitFull: true, icon: "edit-outline" },
+        //     { name: "view-batch", label: "查看批次", color: "#ff8000", toRouter: "pms-blenderBatch", icon: "document-copy" }, // 路由跳转至 pms-blenderBatch
+        //     { name: "detach", label: "下发", color: "#099", icon: "bottom-right" },
+        //   ],
+        // },
      ],
      refreshLayoutKey1: "",
      // 压制
@ -127,14 +127,14 @@ export default {
        { prop: "qtyComplete", label: "完成量" },
        { prop: "goodqty", label: "合格数量" },
        { prop: "badqty", label: "不合格数量" },
-        {
-          prop: "operations",
-          name: "操作",
-          fixed: "right",
-          width: 200,
-          subcomponent: TableOperaionComponent,
-          options: [{ name: "detach", label: "下发", icon: "bottom-right" }], // , url: '/pms/trans/pressDeli' }]
-        },
+        // {
+        //   prop: "operations",
+        //   name: "操作",
+        //   fixed: "right",
+        //   width: 200,
+        //   subcomponent: TableOperaionComponent,
+        //   options: [{ name: "detach", label: "下发", icon: "bottom-right" }], // , url: '/pms/trans/pressDeli' }]
+        // },
      ],
      refreshLayoutKey2: "",
      // 窑炉
--- a/src/views/modules/pms/order/components/order--edit.vue
+++ b/src/views/modules/pms/order/components/order--edit.vue
@ -21,7 +21,11 @@
          <el-col :span="6">
            <el-form-item label="订单状态" prop="statusDictValue" :rules="null">
              <span style="display: block; margin-top: 32px">
-                {{ ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][dataForm.statusDictValue] }}
+                {{
+                  ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][
+                    dataForm.statusDictValue
+                  ]
+                }}
              </span>
            </el-form-item>
          </el-col>
@ -172,7 +176,9 @@
                  :label="opt.label"
                  :value="opt.value"
                  style="display: flex; align-items: center">
-                  <span style="display: inline-block; width: 128px; text-overflow: ellipsis">{{ opt.label }}</span>
+                  <span style="display: inline-block; width: 128px; text-overflow: ellipsis">
+                    {{ opt.label }}
+                  </span>
                  <span
                    v-if="requestList[3].extraLabel"
                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
@ -388,9 +394,7 @@
        </el-row>
        <el-row :gutter="20">
          <el-col :span="6">
-            <el-form-item
-              label="销售订单号"
-              prop="saleNo">
+            <el-form-item label="销售订单号" prop="saleNo">
              <!-- :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }"> -->
              <el-input
                v-model="dataForm.saleNo"
@ -426,9 +430,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item
-              label="销售时间"
-              prop="deliveryTime">
+            <el-form-item label="销售时间" prop="deliveryTime">
              <!-- :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }"> -->
              <el-date-picker
                v-model="dataForm.deliveryTime"
@ -470,9 +472,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item
-              label="托盘类型"
-              prop="palletType">
+            <el-form-item label="托盘类型" prop="palletType">
              <!-- :rules="[{ required: true, message: '请选择托盘类型', trigger: 'blur' }]"> -->
              <el-select
                v-model="dataForm.palletType"
@ -480,8 +480,11 @@
                clearable
                :disabled="mode.includes('detail')"
                v-bind="{ placeholder: '选择托盘类型' }">
-                <el-option label="非熏蒸" value="0"></el-option>
-                <el-option label="熏蒸" value="1"></el-option>
+                <el-option
+                  v-for="pt in palletType"
+                  :key="pt.dictValue"
+                  :label="pt.dictLabel"
+                  :value="pt.dictValue"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@ -496,8 +499,8 @@
                clearable
                :disabled="mode.includes('detail')"
                v-bind="{ placeholder: '选择贴纸板' }">
-                <el-option label="不要" value="0"></el-option>
-                <el-option label="要" value="1"></el-option>
+                <el-option label="否" value="0"></el-option>
+                <el-option label="是" value="1"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@ -518,10 +521,18 @@
    <!-- footer  -->
    <div slot="footer">
      <!-- TODO: permission 相关内容 未添加  -->
-      <el-button v-if="mode.includes('create')" type="primary" @click="handleSave('POST')" :loading="btnLoading">
+      <el-button
+        v-if="mode.includes('create')"
+        type="primary"
+        @click="handleSave('POST')"
+        :loading="btnLoading">
        保存
      </el-button>
-      <el-button v-if="mode.includes('edit')" type="primary" @click="handleSave('PUT')" :loading="btnLoading">
+      <el-button
+        v-if="mode.includes('edit')"
+        type="primary"
+        @click="handleSave('PUT')"
+        :loading="btnLoading">
        更新
      </el-button>
      <el-button v-if="mode.includes('reset')" type="warning" @click="handleReset">重置</el-button>
@ -534,6 +545,7 @@
 import { pick as __pick } from "@/utils/filters";
 // import moment from "moment";
 import InputsArea from "./InputsArea.vue";
+import { getDictDataList } from "@/utils";

 export default {
  name: "DialogJustForm",
@ -684,7 +696,11 @@ export default {
      btnLoading: false,
    };
  },
-
+  computed: {
+    palletType() {
+      return getDictDataList("pallet_type");
+    },
+  },
  methods: {
    /**
     * 打开弹窗后，准备下拉选项数据
--- a/src/views/modules/pms/order/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/orderDetail.vue
@ -474,15 +474,10 @@
                :disabled="mode.includes('detail')"
                v-bind="{ placeholder: '选择托盘类型' }">
                <el-option
-                  v-for="opt in [
-                    { label: '非熏蒸', value: '0' },
-                    { label: '熏蒸', value: '1' },
-                  ]"
-                  :key="opt.label"
-                  :label="opt.label"
-                  :value="opt.value">
-                  <span>{{ opt.label }}</span>
-                </el-option>
+                  v-for="pt in palletType"
+                  :key="pt.dictValue"
+                  :label="pt.dictLabel"
+                  :value="pt.dictValue"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@ -497,16 +492,8 @@
                clearable
                :disabled="mode.includes('detail')"
                v-bind="{ placeholder: '选择贴纸板' }">
-                <el-option
-                  v-for="opt in [
-                    { label: '不要', value: '0' },
-                    { label: '要', value: '1' },
-                  ]"
-                  :key="opt.label"
-                  :label="opt.label"
-                  :value="opt.value">
-                  <span>{{ opt.label }}</span>
-                </el-option>
+                <el-option label="否" value="0"></el-option>
+                <el-option label="是" value="1"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@ -529,6 +516,7 @@
 <script>
 import { pick as __pick } from "@/utils/filters";
 import InputsArea from "./InputsArea.vue";
+import { getDictDataList } from "@/utils";

 export default {
  name: "OrderDetailTag",
@ -673,6 +661,11 @@ export default {
      promiseList: [],
    };
  },
+  computed: {
+    palletType() {
+      return getDictDataList("pallet_type");
+    },
+  },
  methods: {
    /**
     * 打开弹窗后，准备下拉选项数据