From 09c6a609b8c9d684b5354f44f40350a78a2ac609 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 10 Aug 2023 15:46:24 +0800
Subject: [PATCH] update docs_0810

---
 public/index.html                             |  4 +-
 src/views/atomViews/ListViewWithHead.vue      | 84 +++++++++-------
 src/views/modules/pms/carHistory/config.js    |  6 +-
 .../components/tabs/orderDetail.vue           | 70 +++++++++++--
 src/views/modules/pms/finishedOrder/config.js |  6 +-
 src/views/modules/pms/firingStep/config.js    | 41 +-------
 .../pms/materialStorageDynamic/config.js      |  8 +-
 .../pms/order/components/tabs/orderDetail.vue | 72 ++++++++++++--
 src/views/modules/pms/order/config.js         |  4 +-
 src/views/modules/pms/order/index.vue         |  2 +-
 src/views/modules/pms/packingStep/config.js   | 97 ++++++++++++++-----
 src/views/modules/pms/shape/config.js         | 26 ++++-
 src/views/modules/pms/shapeStep/config.js     |  6 +-
 src/views/modules/pms/testingStep/config.js   |  6 +-
 14 files changed, 291 insertions(+), 141 deletions(-)

diff --git a/public/index.html b/public/index.html
index c231a41..eab3827 100644
--- a/public/index.html
+++ b/public/index.html
@@ -38,8 +38,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.103:8080/pms-am';
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.67:8080/pms-am'; // wenzhang
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.67:8080/pms-am'; // wenzhang
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
     // window.SITE_CONFIG['apiURL'] = 'http://localhost:3000/p//////ms-am'; // xv
diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue
index 3c2095b..f4f80a1 100644
--- a/src/views/atomViews/ListViewWithHead.vue
+++ b/src/views/atomViews/ListViewWithHead.vue
@@ -151,7 +151,8 @@ export default {
       if (val && val !== oldVal) {
         // get list
         this.page = 1;
-        this.size = "defaultPageSize" in this.tableConfig.column ? this.tableConfig.column.defaultPageSize : 20;
+        this.size =
+          "defaultPageSize" in this.tableConfig.column ? this.tableConfig.column.defaultPageSize : 20;
         this.getList();
       }
     },
@@ -180,7 +181,8 @@ export default {
   inject: ["urls"],
   mounted() {
     // 更新页面默认 size
-    const size = "defaultPageSize" in this.tableConfig.column ? this.tableConfig.column.defaultPageSize : 20;
+    const size =
+      "defaultPageSize" in this.tableConfig.column ? this.tableConfig.column.defaultPageSize : 20;
     this.size = size;
 
     this.initDataWhenLoad && this.getList();
@@ -521,7 +523,9 @@ export default {
           })
             .then(() => {
               this.$http
-                .post(this.urls.detach, data /* { id: data } */, { headers: { "Content-Type": "application/json" } })
+                .post(this.urls.detach, data /* { id: data } */, {
+                  headers: { "Content-Type": "application/json" },
+                })
                 .then(({ data: res }) => {
                   if (res.code === 0) {
                     this.$message({
@@ -562,41 +566,49 @@ export default {
           break;
         }
         case "sync": {
-          let shouldShowOverlay = false;
-          let payload = "";
-          console.log("sync...", type, data);
-          if (typeof data === "object") {
-            const head = data.head;
-            const syncOpt =
-              ("options" in head && Array.isArray(head.options) && head.options.find((item) => item.name === "sync")) ||
-              null;
-            if (syncOpt && "showOverlay" in syncOpt && syncOpt.showOverlay) {
-              this.overlayVisible = true;
-              shouldShowOverlay = true;
-              payload = data.id;
-            }
-          } else payload = data;
+          this.$confirm(`是否开始同步`, "提示", {
+            confirmButtonText: "同步",
+            cancelButtonText: "我再想想",
+            type: "warning",
+          }).then(() => {
+            let shouldShowOverlay = false;
+            let payload = "";
+            // console.log("sync...", type, data);
+            if (typeof data === "object") {
+              const head = data.head;
+              const syncOpt =
+                ("options" in head &&
+                  Array.isArray(head.options) &&
+                  head.options.find((item) => item.name === "sync")) ||
+                null;
+              if (syncOpt && "showOverlay" in syncOpt && syncOpt.showOverlay) {
+                this.overlayVisible = true;
+                shouldShowOverlay = true;
+                payload = data.id;
+              }
+            } else payload = data;
 
-          this.$message({
-            message: "正在发起同步...",
-            type: "success",
-          });
-
-          // 同步单个料仓数据
-          this.$http
-            .post(this.urls.syncSingleUrl, payload, {
-              headers: {
-                "Content-Type": "application/json",
-              },
-            })
-            .then(({ data: res }) => {
-              this.$message({
-                message: res.msg,
-                type: res.code === 0 ? "success" : "error",
-              });
-              this.getList();
-              if (shouldShowOverlay) this.overlayVisible = false;
+            this.$message({
+              message: "正在发起同步...",
+              type: "success",
             });
+
+            // 同步单个料仓数据
+            this.$http
+              .post(this.urls.syncSingleUrl, payload, {
+                headers: {
+                  "Content-Type": "application/json",
+                },
+              })
+              .then(({ data: res }) => {
+                this.$message({
+                  message: res.msg,
+                  type: res.code === 0 ? "success" : "error",
+                });
+                this.getList();
+                if (shouldShowOverlay) this.overlayVisible = false;
+              });
+          });
         }
       }
     },
diff --git a/src/views/modules/pms/carHistory/config.js b/src/views/modules/pms/carHistory/config.js
index 4ba710d..323b2e5 100644
--- a/src/views/modules/pms/carHistory/config.js
+++ b/src/views/modules/pms/carHistory/config.js
@@ -1,6 +1,6 @@
 import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
-import StateSelect from "@/components/StateSelect.vue";
-import request from "@/utils/request";
+// import StateSelect from "@/components/StateSelect.vue";
+// import request from "@/utils/request";
 import { timeFilter } from "@/utils/filters";
 
 export default function () {
@@ -8,7 +8,7 @@ export default function () {
     // { type: 'index', label: '序号' },
     // { prop: "createTime", label: "添加时间", filter: timeFilter },
     { prop: "code", label: "窑车号" },
-    { prop: "stateDictValue", label: "状态", subcomponent: StateSelect },
+    // { prop: "stateDictValue", label: "状态", subcomponent: StateSelect },
     // { prop: "stateDictValue", label: "状态", filter: v => (v !== null && v !== undefined) ? ['没有数据', '正常', '判废', '过渡'][v] : '-' }, // subcomponent
     { prop: "orderCode", label: "订单号" },
     { prop: "posCode", label: "位置" },
diff --git a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
index 044fb78..58256e3 100644
--- a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
@@ -7,7 +7,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>
@@ -160,7 +164,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">
@@ -375,9 +381,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"
@@ -413,9 +417,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"
@@ -456,8 +458,54 @@
               <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-col :span="6">
+            <el-form-item
+              label="托盘类型"
+              prop="palletType"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.palletType"
+                filterable
+                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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="贴纸板"
+              prop="paperboard"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.paperboard"
+                filterable
+                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-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col>
@@ -526,6 +574,8 @@ export default {
         customerId: null,
         shortDesc: null,
         remark: null,
+        palletType: null,
+        paperboard: null,
       },
       requestList: [
         {
diff --git a/src/views/modules/pms/finishedOrder/config.js b/src/views/modules/pms/finishedOrder/config.js
index cb2f37b..7b5eeb7 100644
--- a/src/views/modules/pms/finishedOrder/config.js
+++ b/src/views/modules/pms/finishedOrder/config.js
@@ -8,8 +8,8 @@ import { getDictDataList } from '@/utils';
 
 export default function () {
   const tableProps = [
-    { width: 60, type: "index", label: "序号", fixed: true },
     { width: 120, prop: "code", label: "订单号", fixed: "left" },
+    { width: 60, type: "index", label: "序号", fixed: true },
     { width: 60, prop: "cate", label: "子号" },
     { width: 100, prop: "productCode", label: "物料" },
     { width: 100, prop: "shapeCode", label: "砖型" },
@@ -23,7 +23,7 @@ export default function () {
     { width: 120, prop: "planStartTime", label: "计划开始时间", filter: timeFilter },
     { width: 120, prop: "startTime", label: "开始时间", filter: timeFilter },
     { width: 120, prop: "sapParam6", label: "烧成温度" },
-    { width: 120, prop: "sapParam7", label: "烧成时间(h)" },
+    { width: 120, prop: "sapParam7", label: "烧成时间(min)" },
     { width: 200, prop: "packTechCode", label: "包装工艺代码" },
     { width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" },
     { width: 120, prop: "customerCode", label: "客户" },
@@ -495,7 +495,7 @@ export default function () {
               },
               {
                 input: true,
-                label: "烧成时间 H",
+                label: "烧成时间(min)",
                 prop: "sapParam7",
                 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 7af7d05..df3610c 100644
--- a/src/views/modules/pms/firingStep/config.js
+++ b/src/views/modules/pms/firingStep/config.js
@@ -88,29 +88,6 @@ export default function () {
     form: {
       rows: [
         [
-          // {
-          //   input: true,
-          //   label: "工艺名称",
-          //   prop: "name",
-          //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-          //   elparams: { placeholder: "请输入烧成曲线名称" },
-          // },
-          // {
-          //   select: true,
-          //   label: "配方",
-          //   prop: "bomId",
-          //   options: [],
-          //   refreshOptionsAfterConfirm: true,
-          //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-          //   elparams: { clearable: true, filterable: true, placeholder: "请选择配方" },
-          //   fetchData: (techId = -1) => this.$http.get("/pms/bom/listUnR", { params: { wsId: 3, version: '', key: '', techId } }),
-          //   cacheFetchedData: true,
-          //   changeReflects: {
-          //     fromKey: ['code', 'version'],
-          //     delimiter: '-',
-          //     toProp: 'code'
-          //   }
-          // },
           {
             input: true,
             autoDisabled: true,
@@ -120,13 +97,6 @@ export default function () {
             elparams: { placeholder: "请输入烧成曲线编码" },
           },
         ],
-        // [
-        // {
-        //   forceDisabled: true,
-        //   prop: 'bomCode',
-        //   label: '当前配方'
-        // },
-        // ],
         [{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
       ],
       operations: [
@@ -139,14 +109,9 @@ export default function () {
     table: {
       extraParams: ["techId", "key"],
       props: [
-        // { type: 'index', label: '序号' },
-        // { prop: "createTime", label: "添加时间", filter: timeFilter },
         { prop: "name", label: "参数名称", isEditField: true },
         { prop: "code", label: "参数编码", isEditField: true },
-        // { prop: "specifications", label: "规格", isEditField: true },
         { width: 80, prop: "value", label: "参数值", isEditField: true },
-        // { prop: "valueFloor", label: "参数值下限", isEditField: true },
-        // { prop: "valueTop", label: "参数值上限", isEditField: true },
         { prop: "description", label: "描述", isEditField: true },
         {
           prop: "operations",
@@ -155,7 +120,7 @@ export default function () {
           width: 90,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
+            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:equipmentTechParam:update" },
             // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
@@ -200,8 +165,8 @@ export default function () {
         ],
       ],
       operations: [
-        { name: "add", label: "保存", type: "primary", showOnEdit: false },
-        { name: "update", label: "更新", type: "primary", showOnEdit: true },
+        { name: "add", label: "保存", type: "primary", showOnEdit: false, permission: 'pms:equipmentTechParam:save' },
+        { name: "update", label: "更新", type: "primary", showOnEdit: true, permission: 'pms:equipmentTechParam:update' },
         // { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
         //  { name: 'reset', label: '重置', type: 'warning', showAlways: true },
         // { name: 'cancel', label: '取消', showAlways: true },
diff --git a/src/views/modules/pms/materialStorageDynamic/config.js b/src/views/modules/pms/materialStorageDynamic/config.js
index 8b2beab..5e9b545 100644
--- a/src/views/modules/pms/materialStorageDynamic/config.js
+++ b/src/views/modules/pms/materialStorageDynamic/config.js
@@ -12,14 +12,14 @@ export default function () {
     { width: 90, prop: "typeDictValue", label: "料仓类型", filter: dictFilter("liaocang") },
     // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
     { width: 220, prop: "materialDescription", label: "原料" },
+    { width: 128, prop: "materialName", label: "中文描述" },
     { prop: "qty", label: "料位[kg]" },
     // { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
     { width: 128, prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter("material_category") },
-    { width: 128, prop: "density", label: "原料堆积密度" },
-    { width: 90, prop: "dosLow", label: "加料下限" },
-    { width: 90, prop: "dosHigh", label: "加料上限" },
+    // { width: 128, prop: "density", label: "原料堆积密度" },
+    // { width: 90, prop: "dosLow", label: "加料下限" },
+    // { width: 90, prop: "dosHigh", label: "加料上限" },
     { width: 128, prop: "description", label: "描述" },
-    { width: 128, prop: "materialName", label: "中文描述" },
     // { prop: "remark", label: "备注" },
     { width: 128, prop: "createTime", label: "添加时间", filter: timeFilter },
     {
diff --git a/src/views/modules/pms/order/components/tabs/orderDetail.vue b/src/views/modules/pms/order/components/tabs/orderDetail.vue
index d6c33a3..8d5266a 100644
--- a/src/views/modules/pms/order/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/orderDetail.vue
@@ -7,7 +7,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>
@@ -160,7 +164,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">
@@ -266,7 +272,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
+            <!-- <el-form-item
               label="烧成温度"
               prop="sapParam6"
               :rules="[
@@ -282,11 +288,11 @@
                 v-model="dataForm.sapParam6"
                 :disabled="mode.includes('detail')"
                 v-bind="{ placeholder: '输入烧成温度' }"></el-input>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="烧成时间 H"
+            <!-- <el-form-item
+              label="烧成时间(min)"
               prop="sapParam7"
               :rules="[
                 { required: true, message: '必填项不能为空', trigger: 'blur' },
@@ -301,7 +307,7 @@
                 v-model="dataForm.sapParam7"
                 :disabled="mode.includes('detail')"
                 v-bind="{ placeholder: '输入烧成时间' }"></el-input>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
       </InputsArea>
@@ -456,8 +462,54 @@
               <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-col :span="6">
+            <el-form-item
+              label="托盘类型"
+              prop="palletType"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.palletType"
+                filterable
+                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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="贴纸板"
+              prop="paperboard"
+              :rules="{ required: true, message: '必填项不能为空', trigger: 'blur' }">
+              <el-select
+                v-model="dataForm.paperboard"
+                filterable
+                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-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col>
@@ -526,6 +578,8 @@ export default {
         customerId: null,
         shortDesc: null,
         remark: null,
+        palletType: null,
+        paperboard: null
       },
       requestList: [
         {
diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js
index 57a0e3a..63259c7 100644
--- a/src/views/modules/pms/order/config.js
+++ b/src/views/modules/pms/order/config.js
@@ -76,7 +76,7 @@ export default function () {
     { width: 120, prop: "planStartTime", label: "计划开始时间", filter: timeFilter }, // "订单砖数" },
     ...startTimeProp(type),
     { width: 120, prop: "sapParam6", label: "烧成温度" },
-    { width: 120, prop: "sapParam7", label: "烧成时间(h)" },
+    { width: 120, prop: "sapParam7", label: "烧成时间(min)" },
     { width: 200, prop: "packTechCode", label: "包装工艺代码" }, // select, filterable
     { width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" },
     { width: 120, prop: "customerCode", label: "客户" },
@@ -431,7 +431,7 @@ export default function () {
               },
               {
                 input: true,
-                label: "烧成时间 H",
+                label: "烧成时间(min)",
                 prop: "sapParam7",
                 rules: [
                   { required: true, message: "必填项不能为空", trigger: "blur" },
diff --git a/src/views/modules/pms/order/index.vue b/src/views/modules/pms/order/index.vue
index 166d5ea..ba87d7c 100644
--- a/src/views/modules/pms/order/index.vue
+++ b/src/views/modules/pms/order/index.vue
@@ -90,7 +90,7 @@ export default {
 
     cellClassName({ row, column, rowIndex, columnIndex }) {
       if ("statusDictValue" in row && row.statusDictValue == "2") {
-        console.log("setting cell style.....", row);
+        // console.log("setting cell style.....", row);
         return "cell-in-production";
       }
     },
diff --git a/src/views/modules/pms/packingStep/config.js b/src/views/modules/pms/packingStep/config.js
index 934dbde..502f495 100644
--- a/src/views/modules/pms/packingStep/config.js
+++ b/src/views/modules/pms/packingStep/config.js
@@ -8,7 +8,11 @@ export default function () {
     { type: "index", label: "序号" },
     // { prop: "name", label: "工艺名称" },
     { prop: "code", label: "工艺编码" },
-    // { prop: 'version', label: '配方号' },
+    {
+      prop: "externalCode",
+      label: "托盘类型",
+      filter: (val) => (val?.toString() == "0" || val?.toString() == 1 ? ["非熏蒸", "熏蒸"][val] : ""),
+    },
     // { prop: "shapeCode", label: "砖型" },
     // { prop: 'status', label: '状态', subcomponent: StatusComponent }, // subcomponent
     // { prop: "description", label: "详情", subcomponent: TableTextComponent },
@@ -24,7 +28,13 @@ export default function () {
       options: [
         // { name: "copy", label: "复制", icon: "copy-document" },
         { name: "edit", label: "编辑", icon: "edit-outline" },
-        { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:packingStep:delete" },
+        {
+          name: "delete",
+          icon: "delete",
+          label: "删除",
+          emitFull: true,
+          permission: "pms:packingStep:delete",
+        },
       ],
     },
   ];
@@ -82,13 +92,6 @@ export default function () {
     form: {
       rows: [
         [
-          // {
-          //   input: true,
-          //   label: "工艺名称",
-          //   prop: "name",
-          //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-          //   elparams: { placeholder: "请输入工艺名称" },
-          // },
           {
             input: true,
             label: "工艺编码",
@@ -97,16 +100,23 @@ export default function () {
             elparams: { placeholder: "请输入工艺编码" },
           },
           // {
-          //   select: true,
-          //   label: "砖型",
-          //   prop: "shapeId",
-          //   options: [],
-          //   refreshOptionsAfterConfirm: true,
+          //   input: true,
+          //   label: "托盘类型",
+          //   prop: "name",
           //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-          //   elparams: { clearable: true, filterable: true, placeholder: "请选择砖型" },
-          //   // 下面参数的 techId 是为 /pms/xxx/listUnR 接口定制的，默认为 -1，新增时使用，编辑时传对应的 工艺id
-          //   fetchData: (techId = -1) => this.$http.get("/pms/shape/listUnR", { params: { wsId: 5, externalCode: '', key: '', techId } }),
+          //   elparams: { placeholder: "请输入工艺名称" },
           // },
+          {
+            select: true,
+            label: "托盘类型",
+            prop: "externalCode",
+            options: [
+              { value: "0", label: "非熏蒸" },
+              { value: "1", label: "熏蒸" },
+            ],
+            // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { clearable: true, filterable: true, placeholder: "请选择托盘类型" },
+          },
         ],
         // [
         // {
@@ -126,8 +136,20 @@ export default function () {
         [{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
       ],
       operations: [
-        { name: "add", label: "保存", type: "primary", permission: "pms:packingStep:save", showOnEdit: false },
-        { name: "update", label: "更新", type: "primary", permission: "pms:packingStep:update", showOnEdit: true },
+        {
+          name: "add",
+          label: "保存",
+          type: "primary",
+          permission: "pms:packingStep:save",
+          showOnEdit: false,
+        },
+        {
+          name: "update",
+          label: "更新",
+          type: "primary",
+          permission: "pms:packingStep:update",
+          showOnEdit: true,
+        },
         { name: "reset", label: "重置", type: "warning", showAlways: true },
         // { name: 'cancel', label: '取消', showAlways: true },
       ],
@@ -151,7 +173,12 @@ export default function () {
           width: 120,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
+            {
+              name: "edit",
+              label: "编辑",
+              icon: "edit-outline",
+              permission: "pms:blenderStepParam:update",
+            },
             // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
@@ -181,8 +208,18 @@ export default function () {
           },
         ],
         [
-          { input: true, label: "参数值上限", prop: "valueTop", elparams: { placeholder: "请输入参数值上限" } },
-          { input: true, label: "参数值下限", prop: "valueFloor", elparams: { placeholder: "请输入参数值下限" } },
+          {
+            input: true,
+            label: "参数值上限",
+            prop: "valueTop",
+            elparams: { placeholder: "请输入参数值上限" },
+          },
+          {
+            input: true,
+            label: "参数值下限",
+            prop: "valueFloor",
+            elparams: { placeholder: "请输入参数值下限" },
+          },
         ],
         [
           { input: true, label: "参数值", prop: "value", elparams: { placeholder: "请输入参数值" } },
@@ -196,8 +233,20 @@ export default function () {
         ],
       ],
       operations: [
-        { name: "add", label: "保存", type: "primary", permission: "pms:blenderStepParam:save", showOnEdit: false },
-        { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
+        {
+          name: "add",
+          label: "保存",
+          type: "primary",
+          permission: "pms:blenderStepParam:save",
+          showOnEdit: false,
+        },
+        {
+          name: "update",
+          label: "更新",
+          type: "primary",
+          permission: "pms:blenderStepParam:update",
+          showOnEdit: true,
+        },
         //  { name: 'reset', label: '重置', type: 'warning', showAlways: true },
         // { name: 'cancel', label: '取消', showAlways: true },
       ],
diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js
index 14cdb82..a45e39e 100644
--- a/src/views/modules/pms/shape/config.js
+++ b/src/views/modules/pms/shape/config.js
@@ -116,10 +116,24 @@ export default function () {
             input: true,
             label: "砖型ID",
             prop: "externalCode",
-            rules: [{ type: "number", trigger: "blur", message: "请输入数字类型", transform: (val) => Number(val) }],
+            rules: [
+              { required: true, message: "必填项不能为空", trigger: "blur" },
+              {
+                type: "number",
+                trigger: "blur",
+                message: "请输入数字类型",
+                transform: (val) => Number(val),
+              },
+            ],
             elparams: { placeholder: "外部编码" },
           },
-          { input: true, label: "短描述", prop: "shortDesc", elparams: { placeholder: "短描述" } },
+          {
+            input: true,
+            label: "喷码描述",
+            prop: "shortDesc",
+            rules: [{ required: true, message: "必填项不能为空", trigger: "blur" }],
+            elparams: { placeholder: "喷码描述" },
+          },
         ],
         [
           {
@@ -142,7 +156,13 @@ export default function () {
       ],
       operations: [
         { name: "add", label: "保存", type: "primary", permission: "pms:shape:save", showOnEdit: false },
-        { name: "update", label: "更新", type: "primary", permission: "pms:shape:update", showOnEdit: true },
+        {
+          name: "update",
+          label: "更新",
+          type: "primary",
+          permission: "pms:shape:update",
+          showOnEdit: true,
+        },
         { name: "reset", label: "重置", type: "warning", showAlways: true },
         // { name: 'cancel', label: '取消', showAlways: true },
       ],
diff --git a/src/views/modules/pms/shapeStep/config.js b/src/views/modules/pms/shapeStep/config.js
index 1cfa809..20182ae 100644
--- a/src/views/modules/pms/shapeStep/config.js
+++ b/src/views/modules/pms/shapeStep/config.js
@@ -153,7 +153,7 @@ export default function () {
           width: 90,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
+            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:equipmentTechParam:update" },
             // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
@@ -198,8 +198,8 @@ export default function () {
         ],
       ],
       operations: [
-        { name: "add", label: "保存", type: "primary", permission: "pms:blenderStepParam:save", showOnEdit: false },
-        { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
+        { name: "add", label: "保存", type: "primary", permission: "pms:equipmentTechParam:save", showOnEdit: false },
+        { name: "update", label: "更新", type: "primary", permission: "pms:equipmentTechParam:update", showOnEdit: true },
         //  { name: 'reset', label: '重置', type: 'warning', showAlways: true },
         // { name: 'cancel', label: '取消', showAlways: true },
       ],
diff --git a/src/views/modules/pms/testingStep/config.js b/src/views/modules/pms/testingStep/config.js
index 9da6afe..7d73338 100644
--- a/src/views/modules/pms/testingStep/config.js
+++ b/src/views/modules/pms/testingStep/config.js
@@ -155,7 +155,7 @@ export default function () {
           width: 90,
           subcomponent: TableOperaionComponent,
           options: [
-            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" },
+            { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:equipmentTechParam:update" },
             // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
           ],
         },
@@ -200,8 +200,8 @@ export default function () {
         ],
       ],
       operations: [
-        { name: "add", label: "保存", type: "primary", permission: "pms:blenderStepParam:save", showOnEdit: false },
-        { name: "update", label: "更新", type: "primary", permission: "pms:blenderStepParam:update", showOnEdit: true },
+        { name: "add", label: "保存", type: "primary", permission: "pms:equipmentTechParam:save", showOnEdit: false },
+        { name: "update", label: "更新", type: "primary", permission: "pms:equipmentTechParam:update", showOnEdit: true },
         //  { name: 'reset', label: '重置', type: 'warning', showAlways: true },
         // { name: 'cancel', label: '取消', showAlways: true },
       ],