From f076e23a678c372051a548066a18c1d6c00fa358 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 5 Jul 2023 11:18:08 +0800
Subject: [PATCH] bugfix 0704zentao

---
 src/components/DialogCarPayload.vue           |  4 +--
 src/components/DialogJustForm.vue             | 12 ++++-----
 src/components/DialogUpload.vue               |  4 +--
 src/components/DialogWithMenu.vue             | 11 ++++----
 src/components/uploadBtn/index.vue            |  2 +-
 src/views/modules/pms/agvMission/config.js    |  2 +-
 .../blenderOrder/components/edit-dialog.vue   |  4 +--
 .../blenderPress/components/edit-dialog.vue   |  4 +--
 src/views/modules/pms/bom/config.js           |  4 +--
 src/views/modules/pms/car/config.js           |  2 +-
 .../components/temperatureDialog.vue          |  4 ++-
 src/views/modules/pms/carHistory/config.js    |  2 +-
 src/views/modules/pms/carPayload/config.js    |  2 +-
 .../modules/pms/currentCarLocation/config.js  |  2 +-
 .../modules/pms/detectionPlatform/config.js   |  6 ++---
 src/views/modules/pms/equipment/config.js     |  2 +-
 .../components/DialogWithMenu.vue             |  2 +-
 .../components/tabs/carDetail.vue             |  2 +-
 .../components/tabs/orderDetail.vue           |  2 +-
 .../components/tabs/temperatureDialog.vue     |  3 ++-
 src/views/modules/pms/finishedOrder/config.js |  4 +--
 src/views/modules/pms/firingStep/config.js    | 15 ++++++-----
 .../modules/pms/kilnWaitingRoom/config.js     |  6 ++---
 .../material/components/DialogJustForm.vue    |  4 +--
 .../pms/materialStorageDynamic/config.js      |  2 +-
 .../modules/pms/materialUpload/config.js      |  2 +-
 .../pms/order/components/DialogJustForm.vue   |  4 +--
 .../pms/order/components/DialogUpload.vue     |  4 +--
 .../pms/order/components/DialogWithMenu.vue   |  2 +-
 .../pms/order/components/tabs/carDetail.vue   |  2 +-
 .../pms/order/components/tabs/orderDetail.vue |  2 +-
 .../components/tabs/temperatureDialog.vue     |  3 ++-
 src/views/modules/pms/order/config.js         |  2 +-
 src/views/modules/pms/pallet/config.js        |  2 +-
 .../modules/pms/palletizingLine/config.js     |  6 ++---
 src/views/modules/pms/product/config.js       | 24 ++++++++++++++---
 .../modules/pms/productionLine/config.js      |  2 +-
 .../modules/pms/reportSheet/config copy.js    |  2 +-
 src/views/modules/pms/shape/config.js         | 26 +++++++++++++------
 src/views/modules/pms/shapeStep/config.js     | 15 ++++++-----
 src/views/modules/pms/supplier/config.js      |  2 +-
 src/views/modules/pms/testingStep/config.js   | 15 ++++++-----
 42 files changed, 127 insertions(+), 95 deletions(-)

diff --git a/src/components/DialogCarPayload.vue b/src/components/DialogCarPayload.vue
index cd4ecfe..61860f9 100644
--- a/src/components/DialogCarPayload.vue
+++ b/src/components/DialogCarPayload.vue
@@ -4,7 +4,7 @@
     :visible="dialogVisible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true"
+    :close-on-click-modal="configs.clickModalToClose ?? false"
     :width="configs.dialogWidth ?? '50%'"
     :append-to-body="true">
     <!-- title  -->
@@ -55,7 +55,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/components/DialogJustForm.vue b/src/components/DialogJustForm.vue
index eca6fcf..64b1ba8 100644
--- a/src/components/DialogJustForm.vue
+++ b/src/components/DialogJustForm.vue
@@ -4,7 +4,7 @@
     :visible="dialogVisible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true"
+    :close-on-click-modal="configs.clickModalToClose ?? false"
     :width="configs.dialogWidth ?? '50%'">
     <!-- title  -->
     <div slot="title" class="dialog-title">
@@ -81,11 +81,6 @@
                   {{ opt[col.customLabel] || "-" }}
                 </span>
               </el-option>
-              <!-- <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"
@@ -172,7 +167,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
@@ -195,6 +190,7 @@ export default {
 
     this.configs.form.rows.forEach((row) => {
       row.forEach((col) => {
+        if (col == null) return
         if (!col.eraseOnSubmit && col.prop) dataForm[col.prop] = col.default ?? null;
         else shadowDataForm[col.prop] = col.default ?? null;
 
@@ -405,6 +401,7 @@ export default {
 
     this.configs.form.rows.forEach((row) => {
       row.forEach((col) => {
+        if (col == null) return
         if (col.fetchData && typeof col.fetchData === "function" && !col.hasPrev) {
           getData(col);
         }
@@ -414,6 +411,7 @@ export default {
     /** 必须要遍历两遍 */
     this.configs.form.rows.forEach((row) => {
       row.forEach((col) => {
+        if (col == null) return
         if (col.fetchData && typeof col.fetchData === "function" && col.hasPrev) {
           console.log("[hasPrev] set watcher: ", col.hasPrev);
 
diff --git a/src/components/DialogUpload.vue b/src/components/DialogUpload.vue
index 2b710d2..489fd13 100644
--- a/src/components/DialogUpload.vue
+++ b/src/components/DialogUpload.vue
@@ -6,7 +6,7 @@
     width="30%"
     :title="title"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
+    :close-on-click-modal="configs.clickModalToClose ?? false">
     <el-upload
       style="margin-top: 24px; text-align: center"
       drag
@@ -69,7 +69,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/components/DialogWithMenu.vue b/src/components/DialogWithMenu.vue
index 38e1e21..9be8f89 100644
--- a/src/components/DialogWithMenu.vue
+++ b/src/components/DialogWithMenu.vue
@@ -279,7 +279,9 @@ export default {
         if (col.upload) dataForm[col.prop] = col.default ?? [];
         else dataForm[col.prop] = col.default ?? null;
 
-        if (col.autoDisabled) autoDisabledQueue.push(col.prop);
+        if (col.autoDisabled) {
+          autoDisabledQueue.push(col.prop);
+        }
         if (!!col.refreshOptionsAfterConfirm) watingToRefreshQueue.push(col);
 
         if (col.fetchData)
@@ -373,7 +375,6 @@ export default {
       baseDialogConfig: null,
       subList: [],
       showSubDialog: false,
-      disableXXX: false,
       defaultQuillConfig: {
         modules: {
           toolbar: [
@@ -480,7 +481,7 @@ export default {
 
   methods: {
     disableCondition(prop) {
-      return this.detailMode || (this.disableXXX && this.autoDisabledQueue.indexOf(prop) !== -1);
+      return this.detailMode || this.autoDisabledQueue.indexOf(prop) !== -1;
     },
     /** utitilities */
     showButton(operate) {
@@ -497,11 +498,11 @@ export default {
       setTimeout(
         () => {
           Object.keys(this.dataForm).forEach((key) => {
-            console.log('reset form, key', key)
+            console.log("reset form, key", key);
             if (excludeId && key === "id") return;
             if ("files" in this.dataForm) this.dataForm.files = [];
             else if ("fileIds" in this.dataForm) this.dataForm.fileIds = [];
-            else this.$set(this.dataForm, key, null)
+            else this.$set(this.dataForm, key, null);
             if (Array.isArray(this.fileList)) {
               this.fileList = [];
             }
diff --git a/src/components/uploadBtn/index.vue b/src/components/uploadBtn/index.vue
index 61b6204..2d47b34 100644
--- a/src/components/uploadBtn/index.vue
+++ b/src/components/uploadBtn/index.vue
@@ -137,7 +137,7 @@ export default {
 
 <style scoped>
 .upload-demo {
-  margin-top: 48px;
+  margin-top: 40px;
 }
 
 /* .upload-demo >>> .el-upload__tip {
diff --git a/src/views/modules/pms/agvMission/config.js b/src/views/modules/pms/agvMission/config.js
index 9c9a7bb..288e2b2 100644
--- a/src/views/modules/pms/agvMission/config.js
+++ b/src/views/modules/pms/agvMission/config.js
@@ -145,7 +145,7 @@ export default function () {
         //     label: "所属工厂",
         //     prop: "factoryId",
         //     fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
-        //     option: [],
+        //     options: [],
         //     rules: { required: true, message: "必填项不能为空", trigger: "change" },
         //   },
         //   {
diff --git a/src/views/modules/pms/blenderOrder/components/edit-dialog.vue b/src/views/modules/pms/blenderOrder/components/edit-dialog.vue
index d79edf6..73e0153 100644
--- a/src/views/modules/pms/blenderOrder/components/edit-dialog.vue
+++ b/src/views/modules/pms/blenderOrder/components/edit-dialog.vue
@@ -4,7 +4,7 @@
     :visible="dialogVisible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true"
+    :close-on-click-modal="configs.clickModalToClose ?? false"
   >
     <!-- title  -->
     <div slot="title" class="dialog-title">
@@ -93,7 +93,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/blenderPress/components/edit-dialog.vue b/src/views/modules/pms/blenderPress/components/edit-dialog.vue
index d79edf6..73e0153 100644
--- a/src/views/modules/pms/blenderPress/components/edit-dialog.vue
+++ b/src/views/modules/pms/blenderPress/components/edit-dialog.vue
@@ -4,7 +4,7 @@
     :visible="dialogVisible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true"
+    :close-on-click-modal="configs.clickModalToClose ?? false"
   >
     <!-- title  -->
     <div slot="title" class="dialog-title">
@@ -93,7 +93,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js
index e9e0962..9f684be 100644
--- a/src/views/modules/pms/bom/config.js
+++ b/src/views/modules/pms/bom/config.js
@@ -44,11 +44,11 @@ export default function () {
 
   const headFormFields = [
     {
-      label: "关键字",
+      label: "物料配方",
       prop: "key",
       input: true,
       default: { value: "" },
-      bind: { placeholder: "请输入关键字" },
+      bind: { placeholder: "请输入物料配方" },
     },
     {
       button: {
diff --git a/src/views/modules/pms/car/config.js b/src/views/modules/pms/car/config.js
index 4e89056..a8757c0 100644
--- a/src/views/modules/pms/car/config.js
+++ b/src/views/modules/pms/car/config.js
@@ -61,7 +61,7 @@ export default function () {
    * 此为后者的配置:
    */
   const dialogJustFormConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
diff --git a/src/views/modules/pms/carHistory/components/temperatureDialog.vue b/src/views/modules/pms/carHistory/components/temperatureDialog.vue
index cfa109b..8030f57 100644
--- a/src/views/modules/pms/carHistory/components/temperatureDialog.vue
+++ b/src/views/modules/pms/carHistory/components/temperatureDialog.vue
@@ -5,7 +5,9 @@
     class="temperature-dialog"
     width="80%"
     @close="handleClose"
-    :destroy-on-close="false">
+    :destroy-on-close="false"
+    :close-on-click-modal="false"
+    >
     <div class="data-list">
       <BaseListTable
         v-loading="tableLoading"
diff --git a/src/views/modules/pms/carHistory/config.js b/src/views/modules/pms/carHistory/config.js
index bba79e3..9e461ee 100644
--- a/src/views/modules/pms/carHistory/config.js
+++ b/src/views/modules/pms/carHistory/config.js
@@ -72,7 +72,7 @@ export default function () {
   const carPayloadDialogConfigs = {
     dialogWidth: '70%',
     carPayloadDialog: true,
-    clickModalToClose: true,
+    clickModalToClose: false,
     tableConfig: {
       table: null,
       column: [
diff --git a/src/views/modules/pms/carPayload/config.js b/src/views/modules/pms/carPayload/config.js
index 1a60a06..8d7350b 100644
--- a/src/views/modules/pms/carPayload/config.js
+++ b/src/views/modules/pms/carPayload/config.js
@@ -61,7 +61,7 @@ export default function () {
    * 此为后者的配置:
    */
   const dialogJustFormConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
diff --git a/src/views/modules/pms/currentCarLocation/config.js b/src/views/modules/pms/currentCarLocation/config.js
index 2978197..790e709 100644
--- a/src/views/modules/pms/currentCarLocation/config.js
+++ b/src/views/modules/pms/currentCarLocation/config.js
@@ -66,7 +66,7 @@ export default function () {
   const carPayloadDialogConfigs = {
     dialogWidth: '70%',
     carPayloadDialog: true,
-    clickModalToClose: true,
+    clickModalToClose: false,
     tableConfig: {
       table: null,
       column: [
diff --git a/src/views/modules/pms/detectionPlatform/config.js b/src/views/modules/pms/detectionPlatform/config.js
index c23d4f9..c620259 100644
--- a/src/views/modules/pms/detectionPlatform/config.js
+++ b/src/views/modules/pms/detectionPlatform/config.js
@@ -69,7 +69,7 @@ export default function () {
   ];
 
   const dialogJustFormConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
@@ -132,7 +132,7 @@ export default function () {
   };
 
   const carPayloadAddConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
@@ -210,7 +210,7 @@ export default function () {
     showAdd: true, // 是否显示新增 装载详情，默认为 否
     dialogWidth: '70%',
     carPayloadDialog: true,
-    clickModalToClose: true,
+    clickModalToClose: false,
     tableConfig: {
       table: null,
       column: [
diff --git a/src/views/modules/pms/equipment/config.js b/src/views/modules/pms/equipment/config.js
index 923c136..4f889f2 100644
--- a/src/views/modules/pms/equipment/config.js
+++ b/src/views/modules/pms/equipment/config.js
@@ -68,7 +68,7 @@ export default function () {
 
 
   const dialogConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     menu: [{ name: '设备信息', key: 'info' }, { name: '设备属性信息', key: 'attr', onlyEditMode: true }],
     form: {
       rows: [
diff --git a/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue b/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
index 6346361..ee50522 100644
--- a/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
+++ b/src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
@@ -6,7 +6,7 @@
     :visible="visible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
+    :close-on-click-modal="configs.clickModalToClose ?? false">
     <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>
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
index 932dd38..50b3d08 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
@@ -92,7 +92,7 @@ export default {
       carPayloadDialogConfigs: {
         dialogWidth: "70%",
         carPayloadDialog: true,
-        clickModalToClose: true,
+        clickModalToClose: false,
         tableConfig: {
           table: null,
           column: [
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
index 574435b..73f6419 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
@@ -83,7 +83,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/temperatureDialog.vue b/src/views/modules/pms/finishedOrder/components/tabs/temperatureDialog.vue
index 919c800..c9b46d7 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/temperatureDialog.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/temperatureDialog.vue
@@ -6,7 +6,8 @@
     width="80%"
     @close="handleClose"
     :append-to-body="true"
-    :destroy-on-close="false">
+    :destroy-on-close="false"
+    :close-on-click-modal="false">
     <div class="data-list">
       <BaseListTable
         v-loading="tableLoading"
diff --git a/src/views/modules/pms/finishedOrder/config.js b/src/views/modules/pms/finishedOrder/config.js
index 039bc5e..bb10882 100644
--- a/src/views/modules/pms/finishedOrder/config.js
+++ b/src/views/modules/pms/finishedOrder/config.js
@@ -309,7 +309,7 @@ export default function () {
   //           select: true,
   //           label: "客户",
   //           prop: "customerId",
-  //           option: [],
+  //           options: [],
   //           optionLabel: "name",
   //           fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
@@ -583,7 +583,7 @@ export default function () {
                 select: true,
                 label: "客户",
                 prop: "customerId",
-                option: [],
+                options: [],
                 optionLabel: "name",
                 fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
                 rules: { required: true, message: "必填项不能为空", trigger: "blur" },
diff --git a/src/views/modules/pms/firingStep/config.js b/src/views/modules/pms/firingStep/config.js
index 3a04bdd..72d0878 100644
--- a/src/views/modules/pms/firingStep/config.js
+++ b/src/views/modules/pms/firingStep/config.js
@@ -84,13 +84,6 @@ export default function () {
           //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
           //   elparams: { placeholder: "请输入烧制工艺名称" },
           // },
-          {
-            input: true,
-            label: "工艺编码",
-            prop: "code",
-            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入烧制工艺编码" },
-          },
           {
             select: true,
             label: "配方",
@@ -107,6 +100,14 @@ export default function () {
               toProp: 'code'
             }
           },
+          {
+            input: true,
+            autoDisabled: true,
+            label: "工艺编码",
+            prop: "code",
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { placeholder: "请输入烧制工艺编码" },
+          },
         ],
         // [
         // {
diff --git a/src/views/modules/pms/kilnWaitingRoom/config.js b/src/views/modules/pms/kilnWaitingRoom/config.js
index 1498353..ce81467 100644
--- a/src/views/modules/pms/kilnWaitingRoom/config.js
+++ b/src/views/modules/pms/kilnWaitingRoom/config.js
@@ -69,7 +69,7 @@ export default function () {
   ];
 
   const dialogJustFormConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
@@ -133,7 +133,7 @@ export default function () {
 
   const carPayloadAddConfigs = null
   // const carPayloadAddConfigs = {
-  //   clickModalToClose: true,
+  //   clickModalToClose: false,
   //   form: {
   //     rows: [
   //       [
@@ -200,7 +200,7 @@ export default function () {
   const carPayloadDialogConfigs = {
     dialogWidth: '70%',
     carPayloadDialog: true,
-    clickModalToClose: true,
+    clickModalToClose: false,
     tableConfig: {
       table: null,
       column: [
diff --git a/src/views/modules/pms/material/components/DialogJustForm.vue b/src/views/modules/pms/material/components/DialogJustForm.vue
index 1e2a82f..19aa253 100644
--- a/src/views/modules/pms/material/components/DialogJustForm.vue
+++ b/src/views/modules/pms/material/components/DialogJustForm.vue
@@ -4,7 +4,7 @@
     :visible="dialogVisible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true"
+    :close-on-click-modal="configs.clickModalToClose ?? false"
   >
     <!-- title  -->
     <div slot="title" class="dialog-title">
@@ -97,7 +97,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/materialStorageDynamic/config.js b/src/views/modules/pms/materialStorageDynamic/config.js
index 78e5bba..5b0eed8 100644
--- a/src/views/modules/pms/materialStorageDynamic/config.js
+++ b/src/views/modules/pms/materialStorageDynamic/config.js
@@ -13,7 +13,7 @@ export default function () {
     // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
     { prop: "material", label: "原料" },
     { prop: "qty", label: "料位" },
-    { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
+    // { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
     { prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter('material_category') },
     { prop: "density", label: "原料堆积密度" },
     { prop: "dosLow", label: "加料下限" },
diff --git a/src/views/modules/pms/materialUpload/config.js b/src/views/modules/pms/materialUpload/config.js
index bc1c3c5..5c3fa34 100644
--- a/src/views/modules/pms/materialUpload/config.js
+++ b/src/views/modules/pms/materialUpload/config.js
@@ -117,7 +117,7 @@ export default function () {
    * 此为后者的配置:
    */
   const dialogJustFormConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
diff --git a/src/views/modules/pms/order/components/DialogJustForm.vue b/src/views/modules/pms/order/components/DialogJustForm.vue
index 36b02c8..5240889 100644
--- a/src/views/modules/pms/order/components/DialogJustForm.vue
+++ b/src/views/modules/pms/order/components/DialogJustForm.vue
@@ -5,7 +5,7 @@
     :visible="visible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
+    :close-on-click-modal="configs.clickModalToClose ?? false">
     <!-- title  -->
     <div slot="title" class="dialog-title">
       <h2 class="">
@@ -109,7 +109,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/order/components/DialogUpload.vue b/src/views/modules/pms/order/components/DialogUpload.vue
index c7efb42..d6c4a1f 100644
--- a/src/views/modules/pms/order/components/DialogUpload.vue
+++ b/src/views/modules/pms/order/components/DialogUpload.vue
@@ -6,7 +6,7 @@
     width="30%"
     :title="title"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
+    :close-on-click-modal="configs.clickModalToClose ?? false">
     <el-upload
       style="margin-top: 24px; text-align: center"
       drag
@@ -68,7 +68,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/order/components/DialogWithMenu.vue b/src/views/modules/pms/order/components/DialogWithMenu.vue
index 6346361..ee50522 100644
--- a/src/views/modules/pms/order/components/DialogWithMenu.vue
+++ b/src/views/modules/pms/order/components/DialogWithMenu.vue
@@ -6,7 +6,7 @@
     :visible="visible"
     @close="handleClose"
     :destroy-on-close="false"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
+    :close-on-click-modal="configs.clickModalToClose ?? false">
     <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>
diff --git a/src/views/modules/pms/order/components/tabs/carDetail.vue b/src/views/modules/pms/order/components/tabs/carDetail.vue
index 932dd38..50b3d08 100644
--- a/src/views/modules/pms/order/components/tabs/carDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/carDetail.vue
@@ -92,7 +92,7 @@ export default {
       carPayloadDialogConfigs: {
         dialogWidth: "70%",
         carPayloadDialog: true,
-        clickModalToClose: true,
+        clickModalToClose: false,
         tableConfig: {
           table: null,
           column: [
diff --git a/src/views/modules/pms/order/components/tabs/orderDetail.vue b/src/views/modules/pms/order/components/tabs/orderDetail.vue
index 574435b..73f6419 100644
--- a/src/views/modules/pms/order/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/orderDetail.vue
@@ -83,7 +83,7 @@ export default {
     configs: {
       type: Object,
       default: () => ({
-        clickModalToClose: true,
+        clickModalToClose: false,
         forms: null,
       }),
     },
diff --git a/src/views/modules/pms/order/components/tabs/temperatureDialog.vue b/src/views/modules/pms/order/components/tabs/temperatureDialog.vue
index 919c800..c9b46d7 100644
--- a/src/views/modules/pms/order/components/tabs/temperatureDialog.vue
+++ b/src/views/modules/pms/order/components/tabs/temperatureDialog.vue
@@ -6,7 +6,8 @@
     width="80%"
     @close="handleClose"
     :append-to-body="true"
-    :destroy-on-close="false">
+    :destroy-on-close="false"
+    :close-on-click-modal="false">
     <div class="data-list">
       <BaseListTable
         v-loading="tableLoading"
diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js
index e7435bf..2f45630 100644
--- a/src/views/modules/pms/order/config.js
+++ b/src/views/modules/pms/order/config.js
@@ -499,7 +499,7 @@ export default function () {
                 select: true,
                 label: "客户",
                 prop: "customerId",
-                option: [],
+                options: [],
                 optionLabel: "name",
                 fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
                 rules: { required: true, message: "必填项不能为空", trigger: "blur" },
diff --git a/src/views/modules/pms/pallet/config.js b/src/views/modules/pms/pallet/config.js
index 3d9ac1b..3f46cf4 100644
--- a/src/views/modules/pms/pallet/config.js
+++ b/src/views/modules/pms/pallet/config.js
@@ -121,7 +121,7 @@ export default function () {
   const carPayloadDialogConfigs = {
     dialogWidth: '70%',
     carPayloadDialog: true,
-    clickModalToClose: true,
+    clickModalToClose: false,
     tableConfig: {
       table: null,
       column: [
diff --git a/src/views/modules/pms/palletizingLine/config.js b/src/views/modules/pms/palletizingLine/config.js
index ec828a2..0697572 100644
--- a/src/views/modules/pms/palletizingLine/config.js
+++ b/src/views/modules/pms/palletizingLine/config.js
@@ -69,7 +69,7 @@ export default function () {
   ];
 
   const dialogJustFormConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
@@ -132,7 +132,7 @@ export default function () {
   };
 
   const carPayloadAddConfigs = {
-    clickModalToClose: true,
+    clickModalToClose: false,
     form: {
       rows: [
         [
@@ -209,7 +209,7 @@ export default function () {
     showAdd: true,
     dialogWidth: '70%',
     carPayloadDialog: true,
-    clickModalToClose: true,
+    clickModalToClose: false,
     tableConfig: {
       table: null,
       column: [
diff --git a/src/views/modules/pms/product/config.js b/src/views/modules/pms/product/config.js
index 0f6e550..3a00eb9 100644
--- a/src/views/modules/pms/product/config.js
+++ b/src/views/modules/pms/product/config.js
@@ -43,7 +43,7 @@ export default function () {
 
   const headFormFields = [
     {
-      label: "关键字",
+      label: "物料名称/编码",
       prop: "key",
       input: true,
       default: { value: "" },
@@ -94,7 +94,7 @@ export default function () {
         [
           {
             input: true,
-            label: "物料名称/砖型名称",
+            label: "物料描述",
             prop: "name",
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入设备名称" },
@@ -139,12 +139,28 @@ export default function () {
           },
           {
             input: true,
-            label: "产线完成单位产品用时(s)",
+            label: "产线完成单位产品用时",
             prop: "processTime",
-            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: "weight",
+            rules: [
+              { required: true, message: "必填项不能为空", trigger: "blur" },
+              { type: 'number', message: "请输入数字类型", trigger: "blur", transform: val => Number(val) }
+            ],
+            elparams: { placeholder: "请输入重量" },
+          },
+
+        ],
         [{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
       ],
       operations: [
diff --git a/src/views/modules/pms/productionLine/config.js b/src/views/modules/pms/productionLine/config.js
index 77e23c5..ff1fdf0 100644
--- a/src/views/modules/pms/productionLine/config.js
+++ b/src/views/modules/pms/productionLine/config.js
@@ -81,7 +81,7 @@ export default function () {
             label: "所属工厂",
             prop: "factoryId",
             fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
-            option: [],
+            options: [],
             rules: { required: true, message: "必填项不能为空", trigger: "change" },
           },
         ],
diff --git a/src/views/modules/pms/reportSheet/config copy.js b/src/views/modules/pms/reportSheet/config copy.js
index 7adc194..7030557 100644
--- a/src/views/modules/pms/reportSheet/config copy.js	
+++ b/src/views/modules/pms/reportSheet/config copy.js	
@@ -131,7 +131,7 @@ export default async function () {
               label: "所属工厂",
               prop: "factoryId",
               fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
-              option: [],
+              options: [],
               rules: { required: true, message: "必填项不能为空", trigger: "change" },
             },
           ],
diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js
index 7ba19d3..ea46aae 100644
--- a/src/views/modules/pms/shape/config.js
+++ b/src/views/modules/pms/shape/config.js
@@ -2,6 +2,7 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationC
 import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
 import request from "@/utils/request";
 import { timeFilter, dictFilter } from "@/utils/filters";
+import { getDictDataList } from '@/utils'
 
 export default function () {
   const tableProps = [
@@ -82,7 +83,7 @@ export default function () {
         //     label: "所属工厂",
         //     prop: "factoryId",
         //     fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
-        //     option: [],
+        //     options: [],
         //     rules: { required: true, message: "必填项不能为空", trigger: "change" },
         //   },
         //   {
@@ -107,14 +108,23 @@ export default function () {
           },
           { input: true, label: "短描述", prop: "shortDesc", elparams: { placeholder: "短描述" } },
         ],
+        [
+          {
+            select: true,
+            label: "中心线颜色",
+            prop: "line",
+            options: getDictDataList('line').map(_ => ({ label: _.dictLabel, value: _.dictValue })),
+            rules: { required: true, message: "必填项不能为空", trigger: "change" },
+          },
+          {
+            upload: true,
+            actionUrl: window.SITE_CONFIG['apiURL'] + '/pms/attachment/uploadFileFormData?typeCode=shape',
+            label: "上传资料",
+            prop: "files",
+            elparams: null
+          }
+        ],
         [{ textarea: true, label: "描述", prop: "description", elparams: { placeholder: "描述" } }],
-        [{
-          upload: true,
-          actionUrl: window.SITE_CONFIG['apiURL'] + '/pms/attachment/uploadFileFormData?typeCode=shape',
-          label: "上传资料",
-          prop: "files",
-          elparams: null
-        }],
         [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
       ],
       operations: [
diff --git a/src/views/modules/pms/shapeStep/config.js b/src/views/modules/pms/shapeStep/config.js
index 11ff0f1..52c4d6e 100644
--- a/src/views/modules/pms/shapeStep/config.js
+++ b/src/views/modules/pms/shapeStep/config.js
@@ -84,13 +84,6 @@ export default function () {
           //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
           //   elparams: { placeholder: "请输入混料程序名称" },
           // },
-          {
-            input: true,
-            label: "工艺编码",
-            prop: "code",
-            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入混料程序编码" },
-          },
           {
             select: true,
             label: "砖型",
@@ -106,6 +99,14 @@ export default function () {
               toProp: 'code'
             }
           },
+          {
+            input: true,
+            autoDisabled: true,
+            label: "工艺编码",
+            prop: "code",
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { placeholder: "请输入混料程序编码" }, // disabled: true },
+          },
         ],
         // [
         // {
diff --git a/src/views/modules/pms/supplier/config.js b/src/views/modules/pms/supplier/config.js
index dbaa901..de2c303 100644
--- a/src/views/modules/pms/supplier/config.js
+++ b/src/views/modules/pms/supplier/config.js
@@ -114,7 +114,7 @@ export default function () {
           //   label: "所属工厂",
           //   prop: "factoryId",
           //   fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
-          //   option: [],
+          //   options: [],
           //   rules: { required: true, message: "必填项不能为空", trigger: "change" },
           // },
           // {
diff --git a/src/views/modules/pms/testingStep/config.js b/src/views/modules/pms/testingStep/config.js
index 25fe6aa..1ecd3c2 100644
--- a/src/views/modules/pms/testingStep/config.js
+++ b/src/views/modules/pms/testingStep/config.js
@@ -85,13 +85,6 @@ export default function () {
           //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
           //   elparams: { placeholder: "请输入混料程序名称" },
           // },
-          {
-            input: true,
-            label: "工艺编码",
-            prop: "code",
-            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入混料程序编码" },
-          },
           {
             select: true,
             label: "砖型",
@@ -108,6 +101,14 @@ export default function () {
               toProp: 'code'
             }
           },
+          {
+            input: true,
+            autoDisabled: true,
+            label: "工艺编码",
+            prop: "code",
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { placeholder: "请输入混料程序编码" },
+          },
         ],
         // [
           // {