From 3956a0c1595acef82ef4604f3025f3e1f90c02b1 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 31 Jul 2023 15:17:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogWithMenu.vue             |  13 +-
 .../components/ListViewWithHead.vue           |   6 +-
 .../components/tabs/orderDetail.vue           | 964 ++++++++++++------
 .../components/tabs/orderDetailWrapper.vue    |   6 +-
 4 files changed, 662 insertions(+), 327 deletions(-)

diff --git a/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue b/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
index ee50522..0aef682 100644
--- a/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
+++ b/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
@@ -5,8 +5,7 @@
     :fullscreen="fullscreen"
     :visible="visible"
     @close="handleClose"
-    :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? false">
+    @closed="$emit('destroy')">
     <div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
       <el-checkbox-group v-model="activeTab" @change="handleTabClick">
         <el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
@@ -21,7 +20,7 @@
       <SubOrderDetail v-if="activeTab === 1 && order !== null" :order="order" />
       <CarDetail v-if="activeTab === 2 && order !== null" :order-id="order.id" :table-layout="carLayoutKey" />
       <TrayDetail v-if="activeTab === 3" />
-      <OrderDetailWrapper v-if="activeTab === 4" :order="order" :order-detail-configs="configs" />
+      <OrderDetailWrapper v-if="activeTab === 4" :order="order" />
     </transition>
 
     <!-- footer  -->
@@ -41,10 +40,6 @@ export default {
   name: "DialogWithMenu--OrderVersion",
   components: { CarDetail, OrderDetailWrapper, SubOrderDetail, TrayDetail },
   props: {
-    configs: {
-      type: Object,
-      default: () => null,
-    },
     fullscreen: {
       type: Boolean,
       default: true,
@@ -102,10 +97,6 @@ export default {
 
     handleClose() {
       this.visible = false;
-
-      setTimeout(() => {
-        this.$emit("destroy-dialog");
-      }, 200);
     },
   },
 };
diff --git a/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue b/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue
index 6407e66..62cf651 100644
--- a/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue
+++ b/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue
@@ -26,11 +26,9 @@
 
     <DialogWithMenu
       ref="edit-dialog"
-      v-if="!!dialogConfigs && dialogVisible"
-      :configs="dialogConfigs"
+      v-if="dialogVisible"
       @refreshDataList="getList"
-      @destroy-dialog="dialogVisible = false" />
-    <!-- :dialog-visible.sync="dialogVisible" :configs="dialogConfigs" @refreshDataList="getList" /> -->
+      @destroy="dialogVisible = false" />
   </div>
 </template>
 
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
index 73f6419..d6c33a3 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
@@ -1,67 +1,471 @@
 <template>
-  <div class="order-detail" style="padding-bottom: 6px;">
-    <el-skeleton v-if="loadingStatus" />
+  <div class="order-detail" style="padding-bottom: 6px">
+    <el-skeleton v-if="optionsLoading || formLoading" />
     <el-form ref="dataForm" :model="dataForm" v-else size="small" style="padding: 0">
-      <!-- <el-form ref="dataForm" :model="dataForm" v-loading="loadingStatus" size="small" style="padding:0 "> -->
-      <InputsArea v-for="field in configs.form.field" :key="field.title" :title="field.title">
-        <el-row v-for="(row, rowIndex) in field.rows" :key="'row_' + rowIndex" :gutter="20">
-          <el-col v-for="(col, colIndex) in row" :key="colIndex" :span="24 / row.length" :class="{ h0: col.hidden }">
-            <!-- 通过多个 col === null 可以控制更灵活的 span 大小 -->
-            <el-form-item v-if="col !== null" :label="col.label" :prop="col.prop" :rules="col.rules || null">
+      <InputsArea title="生产订单">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="订单状态" prop="statusDictValue" :rules="null">
+              <span style="display: block; margin-top: 32px">
+                {{ ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝", "已下发"][dataForm.statusDictValue] }}
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="订单号"
+              prop="code"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
               <el-input
-                v-if="col.input"
-                v-model="dataForm[col.prop]"
-                clearable
-                :disabled="detailMode"
-                v-bind="col.elparams" />
-              <el-cascader
-                v-if="col.cascader"
-                v-model="dataForm[col.prop]"
-                :options="col.options"
-                :disabled="detailMode"
-                v-bind="col.elparams"></el-cascader>
-              <el-select
-                v-if="col.select"
-                v-model="dataForm[col.prop]"
-                clearable
-                :disabled="detailMode"
-                v-bind="col.elparams">
-                <el-option
-                  v-for="(opt, optIdx) in col.options"
-                  :key="'option_' + optIdx"
-                  :label="opt.label"
-                  :value="opt.value" />
-              </el-select>
-              <el-switch
-                v-if="col.switch"
-                v-model="dataForm[col.prop]"
-                :active-value="col.activeValue ?? 1"
-                :inactive-value="col.activeValue ?? 0"
-                @change="handleSwitchChange"
-                :disabled="detailMode" />
+                v-model="dataForm.code"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入订单号' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="订单子号"
+              prop="cate"
+              :rules="[
+                { required: true, message: '必填项不能为空', trigger: 'blur' },
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
               <el-input
-                v-if="col.textarea"
-                type="textarea"
-                v-model="dataForm[col.prop]"
-                :disabled="detailMode"
-                v-bind="col.elparams" />
+                v-model="dataForm.cate"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入订单子号' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="计划开始时间"
+              prop="planStartTime"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
               <el-date-picker
-                v-if="col.datetime"
-                v-model="dataForm[col.prop]"
-                :disabled="detailMode"
-                v-bind="col.elparams" />
+                v-model="dataForm.planStartTime"
+                v-bind="{
+                  placeholder: '选择计划开始时间',
+                  type: 'datetime',
+                  'value-format': 'yyyy-MM-ddTHH:mm:ss',
+                }"
+                :disabled="mode.includes('detail')"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </InputsArea>
 
-              <div class="" v-if="col.component" style="margin: 32px 0 0">
-                <!-- 下面这个 component 几乎是为 富文本 quill 定制的了... TODO：后续可能会根据业务需求创建新的版本  -->
-                <component
-                  :is="col.component"
-                  :key="'component_' + col.prop"
-                  @update:modelValue="handleComponentModelUpdate(col.prop, $event)"
-                  :modelValue="dataForm[col.prop] ?? ''"
-                  :mode="detailMode ? 'detail' : dataForm.id ? 'edit' : 'create'"
-                  v-bind="col.bind" />
-              </div>
-              <!-- add more...  -->
+      <InputsArea title="设备与参数">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item
+              label="压机"
+              prop="press"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.press"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择压机', filterable: true }">
+                <el-option
+                  v-for="opt in pressOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[0].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.code }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="混料机号"
+              prop="blender"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.blender"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择混料机', filterable: true }">
+                <el-option
+                  v-for="opt in blenderOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[1].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.code }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="隧道窑号" prop="kiln" :rules="null">
+              <el-select
+                v-model="dataForm.kiln"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择隧道窑', filterable: true }">
+                <el-option
+                  v-for="opt in kilnOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[2].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.code }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="Add on" prop="sapParam1" :rules="null">
+              <el-input
+                v-model="dataForm.sapParam1"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入addon' }"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="配方号" prop="bomId" :rules="null">
+              <el-select
+                v-model="dataForm.bomId"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择配方号', filterable: true }">
+                <el-option
+                  v-for="opt in bomOptions"
+                  :key="opt.label + opt.value"
+                  :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
+                    v-if="requestList[3].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.name }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="牌号" prop="brand" :rules="null">
+              <span style="display: block; margin-top: 32px">{{ dataForm.brand }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="版本号" prop="ai" :rules="null">
+              <!-- <span style="display: block; margin-top: 32px">{{ dataForm.ai }}</span> -->
+              <el-select
+                v-model="dataForm.ai"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '请选择版本' }">
+                <el-option
+                  v-for="opt in versionList"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="包装代码" prop="packTech" :rules="null">
+              <el-select
+                v-model="dataForm.packTech"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择包装代码', filterable: true }">
+                <el-option
+                  v-for="opt in packOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[4].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.code }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="物料" prop="productId" :rules="null">
+              <el-select
+                v-model="dataForm.productId"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择物料', filterable: true }">
+                <el-option
+                  v-for="opt in productOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[5].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.code }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="砖型" prop="shape" :rules="null">
+              <el-select
+                v-model="dataForm.shape"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择砖型', filterable: true }">
+                <el-option
+                  v-for="opt in shapeOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[6].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.code }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="烧成温度"
+              prop="sapParam6"
+              :rules="[
+                { required: true, message: '必填项不能为空', trigger: 'blur' },
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
+              <el-input
+                v-model="dataForm.sapParam6"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入烧成温度' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="烧成时间 H"
+              prop="sapParam7"
+              :rules="[
+                { required: true, message: '必填项不能为空', trigger: 'blur' },
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
+              <el-input
+                v-model="dataForm.sapParam7"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入烧成时间' }"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </InputsArea>
+
+      <InputsArea title="其他">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产订单类型" prop="specifications" :rules="null">
+              <el-input
+                v-model="dataForm.specifications"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入生产订单类型' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="生产订单砖数"
+              prop="prodqty"
+              :rules="[
+                { required: true, message: '必填项不能为空', trigger: 'blur' },
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
+              <el-input
+                v-model="dataForm.prodqty"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入要求生产的数量' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="已生产数"
+              prop="yieldqty"
+              :rules="[
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
+              <el-input
+                v-model="dataForm.yieldqty"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入已经生产的数量' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="托盘码放砖数"
+              prop="pcsKilnCar"
+              :rules="[
+                { required: true, message: '必填项不能为空', trigger: 'blur' },
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
+              <el-input
+                v-model="dataForm.pcsKilnCar"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入托盘码放砖数' }"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item
+              label="销售订单号"
+              prop="saleNo"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-input
+                v-model="dataForm.saleNo"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入销售订单号' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="销售订单item号" prop="saleOrderItem" :rules="null">
+              <el-input
+                v-model="dataForm.saleOrderItem"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入销售订单item号' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="销售订单砖数"
+              prop="soqty"
+              :rules="[
+                { required: true, message: '必填项不能为空', trigger: 'blur' },
+                {
+                  type: 'number',
+                  message: '输入正确的数字类型',
+                  trigger: 'blur',
+                  transform: (val) => Number(val),
+                },
+              ]">
+              <el-input
+                v-model="dataForm.soqty"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '输入销售订单砖数' }"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="销售时间"
+              prop="deliveryTime"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-date-picker
+                v-model="dataForm.deliveryTime"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择销售时间' }"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item
+              label="客户"
+              prop="customerId"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.customerId"
+                filterable
+                clearable
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '选择客户' }">
+                <el-option
+                  v-for="opt in clientOptions"
+                  :key="opt.label + opt.value"
+                  :label="opt.label"
+                  :value="opt.value">
+                  <span>{{ opt.label }}</span>
+                  <span
+                    v-if="requestList[7].extraLabel"
+                    style="display: inline-block; margin-left: 12px; font-size: 0.9em">
+                    {{ opt.name }}
+                  </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物料号销售文本" prop="shortDesc" :rules="null">
+              <span style="display: block; margin-top: 32px">{{ dataForm.shortDesc }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col>
+            <el-form-item label="备注" prop="remark" :rules="null">
+              <el-input
+                v-model="dataForm.remark"
+                :disabled="mode.includes('detail')"
+                v-bind="{ placeholder: '备注' }"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,266 +475,222 @@
 </template>
 
 <script>
-// import textOnlyComponent from "@/components/noTemplateComponents/textOnlyComponent.js";
-import moment from "moment";
 import { pick as __pick } from "@/utils/filters";
 import InputsArea from "./InputsArea.vue";
 
 export default {
   name: "OrderDetailTag",
   components: { InputsArea },
-  props: {
-    configs: {
-      type: Object,
-      default: () => ({
-        clickModalToClose: false,
-        forms: null,
-      }),
-    },
-  },
+  props: {},
   inject: ["urls"],
   data() {
-    const dataForm = {};
-    const watchList = [];
-    const cachedList = {};
-
-    this.configs.form.field.forEach((field) => {
-      field.rows.forEach((row) => {
-        row.forEach((col) => {
-          if (!col.prop) return;
-
-          dataForm[col.prop] = col.default ?? null;
-
-          if (col.fetchData)
-            col.fetchData().then(({ data: res }) => {
-              if (res.code === 0) {
-                if (typeof res.data === "object" && "list" in res.data) {
-                  if ("injectTo" in col) {
-                    // 保存完整的数据列表，用于自动更新关联字段
-                    cachedList[col.prop] = res.data.list;
-                  }
-                  this.$set(
-                    col,
-                    "options",
-                    res.data.list.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                  );
-                } else if (Array.isArray(res.data)) {
-                  this.$set(
-                    col,
-                    "options",
-                    res.data.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                  );
-                }
-              } else {
-                // error 静默失败
-                col.options.splice(0);
-              }
-            });
-          else if (col.fetchTreeData) {
-            // 获取设备类型时触发的，用于前端构建属性结构，约定，parentId 为0时是顶级节点
-            col.fetchTreeData().then(({ data: res }) => {
-              // console.log("[DialogJustForm fetchTreeData -->]", res.data);
-              if (res.code === 0 && res.data) {
-                if ("list" in res.data) {
-                  this.$set(col, "options", res.data.list);
-                } else if (Array.isArray(res.data)) {
-                  this.$set(col, "options", res.data);
-                }
-              } else {
-                col.options.splice(0);
-              }
-            });
-          }
-        });
-      });
-    });
-
     return {
-      loadingStatus: false,
-      detailMode: false,
-      dataForm,
-      watchList,
-      cachedList,
+      mode: "#detail",
+      formLoading: false,
+      optionsLoading: false,
+      pressOptions: [], // 压机列表
+      blenderOptions: [], // 混料机列表
+      kilnOptions: [], // 窑炉列表
+      bomOptions: [], // 牌号列表
+      packOptions: [], // 包装代码列表
+      productOptions: [], // 物料代码
+      shapeOptions: [], // 砖型代码
+      clientOptions: [], // 客户礼拜
+      versionList: [], // 版本列表
+      cachedList: {}, // 用来缓存请求回来的原始列表数据
+      dataForm: {
+        statusDictValue: null,
+        code: null,
+        cate: null,
+        planStartTime: null,
+        press: null,
+        blender: null,
+        kiln: null,
+        sapParam1: null,
+        bomId: null,
+        brand: null, // 牌号
+        ai: null, // 版本号
+        packTech: null,
+        productId: null,
+        shape: null,
+        sapParam6: null,
+        sapParam7: null,
+        specifications: null,
+        prodqty: null,
+        yieldqty: null,
+        pcsKilnCar: null,
+        saleNo: null,
+        saleOrderItem: null,
+        soqty: null,
+        deliveryTime: null,
+        customerId: null,
+        shortDesc: null,
+        remark: null,
+      },
+      requestList: [
+        {
+          url: "/pms/equipment/search",
+          params: {
+            equipmentTypeCode: "Press",
+          },
+          method: "get",
+          target: "pressOptions",
+          label: "code",
+        },
+        {
+          url: "/pms/equipment/search",
+          params: {
+            equipmentTypeCode: "Mix",
+          },
+          method: "get",
+          target: "blenderOptions",
+          label: "code",
+        },
+        {
+          url: "/pms/equipment/search",
+          params: {
+            equipmentTypeCode: "Kiln",
+          },
+          method: "get",
+          target: "kilnOptions",
+          label: "code",
+        },
+        {
+          url: "/pms/bom/page",
+          params: {
+            limit: 999,
+            page: 1,
+            key: "",
+            externalCode: "",
+          },
+          method: "get",
+          target: "bomOptions",
+          label: "code",
+          extraLabel: "name",
+          cache: true,
+        },
+        {
+          url: "/pms/equipmentTech/pageView",
+          params: {
+            limit: 999,
+            page: 1,
+            key: "",
+            shape: "",
+            wsId: 5,
+          },
+          method: "post",
+          target: "packOptions",
+          label: "code",
+        },
+        {
+          url: "/pms/product/page",
+          params: {
+            limit: 999,
+            page: 1,
+            key: "",
+          },
+          method: "get",
+          target: "productOptions",
+          label: "code",
+        },
+        {
+          url: "/pms/shape/page",
+          params: {
+            limit: 999,
+            page: 1,
+            key: "",
+          },
+          method: "get",
+          target: "shapeOptions",
+          label: "code",
+        },
+        {
+          url: "/pms/customer/page",
+          params: {
+            limit: 999,
+            page: 1,
+            name: "",
+          },
+          method: "get",
+          target: "clientOptions",
+          label: "name",
+        },
+      ],
+      promiseList: [],
     };
   },
-  mounted() {
-    /** 处理 injectTo 选项 */
-    this.configs.form.field.forEach((field) => {
-      field.rows.forEach((row) => {
-        row.forEach((col) => {
-          if (!col.prop) return;
-          if ("injectTo" in col && Array.isArray(col.injectTo)) {
-            // console.log("watching options ..... ", col);
-            col.injectTo.map((item) => {
-              const unwatch = this.$watch(
-                () => this.dataForm[col.prop],
-                (newVal) => {
-                  const chosenObject = this.cachedList[col.prop].find((i) => i.id === newVal);
-                  if (chosenObject) {
-                    // 如果找到了
-                    this.$set(this.dataForm, item[0], chosenObject[item[1]]);
-                  }
-                },
-                {
-                  immediate: false,
-                }
+  methods: {
+    /**
+     * 打开弹窗后，准备下拉选项数据
+     * 复用方式：
+     * 1. 在 data 里定义 requestList
+     * 2. 复制本方法到组件中去
+     * 3. requestList 参考上面的 data
+     */
+    async prepareSelectOptions() {
+      this.optionsLoading = true;
+
+      this.requestList.forEach((req) => {
+        this.promiseList.push(async () => {
+          const { data: res } = await this.$http[req.method](
+            req.url,
+            req.method.toLowerCase() == "post" ? req.params : { params: req.params }
+          );
+          if (res.code == 0) {
+            if ("list" in res.data) {
+              // 从 target 中抽取缓存名称
+              if (req.cache) this.cachedList[req.target.replace(/options/i, "")] = res.data.list;
+              this[req.target] = res.data.list.map((item) =>
+                req.extraLabel
+                  ? {
+                      [req.extraLabel]: item[req.extraLabel],
+                      label: item[req.label],
+                      value: item.id,
+                    }
+                  : {
+                      label: item[req.label],
+                      value: item.id,
+                    }
               );
-              this.watchList.push(unwatch);
-            });
+            } else if (Array.isArray(res.data)) {
+              if (req.cache) this.cachedList[req.target.replace(/options/i, "")] = res.data;
+              this[req.target] = res.data.map((item) =>
+                req.extraLabel
+                  ? {
+                      [req.extraLabel]: item[req.extraLabel],
+                      label: item[req.label],
+                      value: item.id,
+                    }
+                  : {
+                      label: item[req.label],
+                      value: item.id,
+                    }
+              );
+            }
           }
         });
       });
-    });
-  },
-  methods: {
-    /** utitilities */
-    showButton(operate) {
-      const notDetailMode = !this.detailMode;
-      const showAlways = operate.showAlways ?? false;
-      const editMode = operate.showOnEdit && this.dataForm.id;
-      const addMode = !operate.showOnEdit && !this.dataForm.id;
-      const permission = operate.permission ? this.$hasPermission(operate.permission) : true;
-      return notDetailMode && (showAlways || ((editMode || addMode) && permission));
-    },
 
-    resetForm(excludeId = false, immediate = false) {
-      setTimeout(
-        () => {
-          Object.keys(this.dataForm).forEach((key) => {
-            if (excludeId && key === "id") return;
-            this.dataForm[key] = null;
-          });
-          this.$refs.dataForm.clearValidate();
-          this.$emit("dialog-closed"); // 触发父组件销毁自己
-          this.watchList.map((unwatch) => unwatch());
-          this.cachedList = {};
-        },
-        immediate ? 0 : 200
-      );
-    },
-
-    handleComponentModelUpdate(propName, { subject, payload: { data } }) {
-      this.dataForm[propName] = JSON.stringify(data);
-    },
-
-    addOrUpdate(method = "POST") {
-      if ("parentId" in this.dataForm) {
-        // 对特殊的键做特殊处理，如 parentId 是一个 cascader，获取的值是 ["xxx"]，后端只需要xxx
-        const lastItem = this.dataForm.parentId.length - 1;
-        this.dataForm.parentId = this.dataForm.parentId[lastItem];
+      try {
+        await Promise.all(this.promiseList.map((fn) => fn()));
+      } catch (err) {
+        this.$message.error("获取数据失败，请刷新页面重试");
+        this.optionsLoading = false;
       }
 
-      this.$refs.dataForm.validate((passed, result) => {
-        if (passed) {
-          this.loadingStatus = true;
-
-          let httpPayload = null;
-          /** 针对有文件上传选项的弹窗提供特殊的 payload */
-          if (this.dataForm.files) {
-            httpPayload = {
-              ...this.dataForm,
-              fileIds: this.dataForm.files.map((file) => file.id),
-            };
-          } else {
-            httpPayload = this.dataForm;
-          }
-
-          /** 针对时间段设置 payload */
-          if ("startTime" in this.dataForm && "endTime" in this.dataForm) {
-            const { startTime, endTime } = this.dataForm;
-            httpPayload = {
-              ...httpPayload,
-              startTime: startTime
-                ? moment(startTime).format("YYYY-MM-DDTHH:mm:ss")
-                : moment().format("YYYY-MM-DDTHH:mm:ss"),
-              endTime: endTime ? moment(endTime).format("YYYY-MM-DDTHH:mm:ss") : moment().format("YYYY-MM-DDTHH:mm:ss"),
-            };
-          }
-
-          // /** 针对时间段设置 payload */
-          // if ("updateTime" in this.dataForm) {
-          //   const { updateTime } = this.dataForm;
-          //   httpPayload = {
-          //     ...httpPayload,
-          //     updateTime: updateTime ? moment(updateTime).format("YYYY-MM-DDTHH:mm:ss") : moment().format("YYYY-MM-DDTHH:mm:ss"),
-          //   };
-          // }
-          /** 针对时间段设置 payload */
-          if ("deliveryTime" in this.dataForm) {
-            const { deliveryTime } = this.dataForm;
-            httpPayload = {
-              ...httpPayload,
-              deliveryTime: deliveryTime ? moment(deliveryTime).format("YYYY-MM-DDTHH:mm:ss") : null,
-            };
-          }
-
-          /** 发送 */
-          return this.$http({
-            url: this.urls.base,
-            method,
-            data: httpPayload,
-          })
-            .then(({ data: res }) => {
-              // console.log("[add&update] res is: ", res);
-              this.loadingStatus = false;
-              if (res.code === 0) {
-                this.$message.success(method === "POST" ? "添加成功" : "更新成功");
-                this.$emit("refreshDataList");
-                if (method === "POST") this.handleClose();
-              } else {
-                this.$message({
-                  message: `${res.code}: ${res.msg}`,
-                  type: "error",
-                  duration: 2000,
-                });
-              }
-            })
-            .catch((errMsg) => {
-              this.$message.error("参数错误：" + errMsg);
-              if (this.loadingStatus) this.loadingStatus = false;
-            });
-        } else {
-          this.$message.error("请核查字段信息");
-        }
-      });
+      this.optionsLoading = false;
     },
 
-    handleBtnClick(payload) {
-      if ("name" in payload) {
-        switch (payload.name) {
-          case "cancel":
-            this.handleClose();
-            break;
-          case "reset":
-            this.resetForm(true, true); // true means exclude id, immediate execution
-            break;
-          case "add":
-          case "update":
-            this.addOrUpdate(payload.name === "add" ? "POST" : "PUT");
-            break;
-        }
-      } else {
-        console.log("[x] 不是这么用的! 缺少name属性");
-      }
-    },
+    async init(id, detail_mode) {
+      this.visible = true;
+      this.mode = "#detail"; // 强制预览模式
+      await this.prepareSelectOptions();
 
-    init(orderId, detailMode) {
-      if (this.$refs.dataForm) {
-        this.$refs.dataForm.clearValidate();
-      }
-
-      this.detailMode = detailMode ?? false;
       this.$nextTick(() => {
-        this.dataForm.id = orderId || null;
+        this.dataForm.id = id || null;
         if (this.dataForm.id) {
           // 如果是编辑
-          this.loadingStatus = true;
+          this.formLoading = true;
 
           // 获取基本信息
           this.$http
@@ -338,18 +698,8 @@ export default {
             .then(({ data: res }) => {
               // 特供 emit
               this.$emit("detail-loaded");
-
               if (res && res.code === 0) {
                 this.dataForm = __pick(res.data, Object.keys(this.dataForm));
-                /** 格式化文件上传列表 */
-                if (Array.isArray(this.dataForm.files)) {
-                  this.dataForm.files = this.dataForm.files.map((file) => ({
-                    id: file.id,
-                    name: file.fileUrl.split("/").pop(),
-                    typeCode: file.typeCode,
-                    url: file.fileUrl,
-                  }));
-                }
               } else {
                 this.$message({
                   message: `${res.code}: ${res.msg}`,
@@ -357,10 +707,10 @@ export default {
                   duration: 1500,
                 });
               }
-              this.loadingStatus = false;
+              this.formLoading = false;
             })
             .catch((err) => {
-              this.loadingStatus = false;
+              this.formLoading = false;
               this.$message({
                 message: `${err}`,
                 type: "error",
@@ -369,7 +719,7 @@ export default {
             });
         } else {
           // 如果不是编辑
-          this.loadingStatus = false;
+          this.formLoading = false;
         }
       });
     },
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/orderDetailWrapper.vue b/src/views/modules/pms/finishedOrder/components/tabs/orderDetailWrapper.vue
index beb52e3..de5e769 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/orderDetailWrapper.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/orderDetailWrapper.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="height: 100%;">
     <el-skeleton v-show="orderNotReady" />
-    <OrderDetail v-show="!orderNotReady" ref="order-detail-tag" :configs="orderDetailConfigs" @detail-loaded="orderNotReady = false" />
+    <OrderDetail v-show="!orderNotReady" ref="order-detail-tag" @detail-loaded="orderNotReady = false" />
   </div>
 </template>
 
@@ -12,10 +12,6 @@ export default {
   name: "OrderDetailWrapper",
   components: { OrderDetail },
   props: {
-    orderDetailConfigs: {
-      type: Object,
-      default: () => null,
-    },
     order: {
       type: Object,
       default: () => null