update firingstep

src/components/DialogWithMenu.vue

@@ -817,6 +817,15 @@ export default {
                   });
                 }
 
+                // const actualPayload = Object.assign({}, JSON.parse(JSON.stringify(this.dataForm)));
+                // if (this.configs.excludeProps && Array.isArray(this.configs.excludePropss)) {
+                //   // 如果配置里，有 excludeProps 选项
+                //   this.configs.excludeProps.forEach((prop) => {
+                //     delete actualPayload[prop];
+                //   });
+                //   console.log('actualPayload', actualPayload);
+                // }
+
                 // 实际发送请求
                 this.btnLoading = true;
                 this.$http({

src/views/modules/home.vue

@@ -6,10 +6,10 @@
  * @Description: 
 -->
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never" class="aui-card--fill bg-pms">
-    <div class="mod-home">
+    <!-- <div class="mod-home">
       基础框架-1
-    </div>
+    </div> -->
   </el-card>
 </template>
 
@@ -17,4 +17,8 @@
 .mod-home {
   line-height: 1.5;
 }
+
+.bg-pms {
+  background: url(../../assets/img/home-bg.png) left 10% / cover no-repeat;
+}
 </style>

src/views/modules/pms/blenderOrder/config.js

@@ -144,7 +144,7 @@ export default function () {
   // const dialogConfigs = {
   //   extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
   //   menu: [
-  //     { name: "烧制工艺", key: "info" },
+  //     { name: "烧成曲线", key: "info" },
   //     { name: "工艺参数", key: "attr", onlyEditMode: true },
   //   ],
   //   form: {
@@ -155,14 +155,14 @@ export default function () {
   //           label: "工艺名称",
   //           prop: "name",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺名称" },
+  //           elparams: { placeholder: "请输入烧成曲线名称" },
   //         },
   //         {
   //           input: true,
   //           label: "工艺编码",
   //           prop: "code",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺编码" },
+  //           elparams: { placeholder: "请输入烧成曲线编码" },
   //         },
   //         {
   //           select: true,

src/views/modules/pms/firingStep/config.js

@@ -9,7 +9,7 @@ export default function () {
     // { prop: "name", label: "工艺名称" },
     { prop: "code", label: "工艺编码" },
     // { prop: 'version', label: '配方号' },
-    { prop: "bomCode", label: "配方号" },
+    // { prop: "bomCode", label: "配方号" },
     // { prop: 'status', label: '状态', subcomponent: StatusComponent }, // subcomponent
     { prop: "description", label: "详情", subcomponent: TableTextComponent },
     { prop: "createTime", label: "添加时间", filter: timeFilter },
@@ -34,15 +34,15 @@ export default function () {
         placeholder: "请输入工艺名称或编码",
       },
     },
-    {
+    // {
-      prop: "bom",
+    //   prop: "bom",
-      label: "配方号",
+    //   label: "配方号",
-      input: true,
+    //   input: true,
-      default: { value: "" },
+    //   default: { value: "" },
-      bind: {
+    //   bind: {
-        placeholder: "请输入配方号",
+    //     placeholder: "请输入配方号",
-      },
+    //   },
-    },
+    // },
     // {
     //   prop: 'bom',
     //   label: '配方号',
@@ -70,8 +70,9 @@ export default function () {
   const dialogConfigs = {
     allowAdd: false,
     extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
+    // excludeProps: ['code'], // 在add或update时，不传递这个参数给后端
     menu: [
-      { name: "烧制工艺", key: "info" },
+      { name: "烧成曲线", key: "info" },
       { name: "工艺参数", key: "attr", onlyEditMode: true },
     ],
     form: {
@@ -82,31 +83,31 @@ export default function () {
           //   label: "工艺名称",
           //   prop: "name",
           //   rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-          //   elparams: { placeholder: "请输入烧制工艺名称" },
+          //   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'
+          //   }
           // },
-          {
-            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,
             label: "工艺编码",
             prop: "code",
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入烧制工艺编码" },
+            elparams: { placeholder: "请输入烧成曲线编码" },
           },
         ],
         // [

src/views/modules/pms/kilnOrder/config.js

@@ -87,7 +87,7 @@ export default function () {
   // const dialogConfigs = {
   //   extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
   //   menu: [
-  //     { name: "烧制工艺", key: "info" },
+  //     { name: "烧成曲线", key: "info" },
   //     { name: "工艺参数", key: "attr", onlyEditMode: true },
   //   ],
   //   form: {
@@ -98,14 +98,14 @@ export default function () {
   //           label: "工艺名称",
   //           prop: "name",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺名称" },
+  //           elparams: { placeholder: "请输入烧成曲线名称" },
   //         },
   //         {
   //           input: true,
   //           label: "工艺编码",
   //           prop: "code",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺编码" },
+  //           elparams: { placeholder: "请输入烧成曲线编码" },
   //         },
   //         {
   //           select: true,

src/views/modules/pms/pressOrder/config.js

@@ -90,7 +90,7 @@ export default function () {
   // const dialogConfigs = {
   //   extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
   //   menu: [
-  //     { name: "烧制工艺", key: "info" },
+  //     { name: "烧成曲线", key: "info" },
   //     { name: "工艺参数", key: "attr", onlyEditMode: true },
   //   ],
   //   form: {
@@ -101,14 +101,14 @@ export default function () {
   //           label: "工艺名称",
   //           prop: "name",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺名称" },
+  //           elparams: { placeholder: "请输入烧成曲线名称" },
   //         },
   //         {
   //           input: true,
   //           label: "工艺编码",
   //           prop: "code",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺编码" },
+  //           elparams: { placeholder: "请输入烧成曲线编码" },
   //         },
   //         {
   //           select: true,

src/views/modules/pms/qualityPackOrder/config.js

@@ -96,7 +96,7 @@ export default function () {
   // const dialogConfigs = {
   //   extraIds: { wsId: 3 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id
   //   menu: [
-  //     { name: "烧制工艺", key: "info" },
+  //     { name: "烧成曲线", key: "info" },
   //     { name: "工艺参数", key: "attr", onlyEditMode: true },
   //   ],
   //   form: {
@@ -107,14 +107,14 @@ export default function () {
   //           label: "工艺名称",
   //           prop: "name",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺名称" },
+  //           elparams: { placeholder: "请输入烧成曲线名称" },
   //         },
   //         {
   //           input: true,
   //           label: "工艺编码",
   //           prop: "code",
   //           rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-  //           elparams: { placeholder: "请输入烧制工艺编码" },
+  //           elparams: { placeholder: "请输入烧成曲线编码" },
   //         },
   //         {
   //           select: true,