需求处理、bug修复

src/components/selectReleaseRules/search.vue

@@ -11,7 +11,8 @@
     mixins: [dictMixins],
     data() {
       return {
-        typeList: []
+        typeList: [],
+        reportWorkTypeList: []
       };
     },
     computed: {
@@ -36,6 +37,13 @@
             type: 'select',
             placeholder: '记录表分类',
             planList: this.typeList
+          },
+          {
+            label: '模块分类',
+            value: 'reportWorkType',
+            type: 'select',
+            placeholder: '模块分类',
+            planList: this.reportWorkTypeList
           }
           //,
           // {
@@ -70,6 +78,15 @@
           });
         }
       });
+      this.requestDict('记录规则报工类型').then(() => {
+        if (this.$store.state.dict['record_rules_report_work_type']) {
+          this.reportWorkTypeList = this.$store.state.dict[
+            'record_rules_report_work_type'
+          ].map((i) => {
+            return { label: i.dictValue, value: i.dictCode };
+          });
+        }
+      });
     },
     methods: {
       /* 搜索 */

src/components/selectReleaseRules/select-release-rules.vue

@@ -93,6 +93,16 @@
               return this.getDictValue('记录规则类型', row.classify);
             }
           },
+          {
+            prop: 'reportWorkType',
+            label: '模块分类',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            formatter: (row) => {
+              return this.getDictValue('记录规则报工类型', row.reportWorkType);
+            }
+          },
           {
             prop: 'version',
             label: '版本号',

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -740,6 +740,7 @@
           <userSettingMatterProcess
             :produce-task-id="rowData.id"
             :produce-task-name="rowData.name"
+            :produce-task-code="rowData.code"
             ref="userSettingMatterProcessRef"
           ></userSettingMatterProcess>
         </el-tab-pane>

src/views/rulesManagement/releaseRules/components/search.vue

@@ -11,7 +11,8 @@
     mixins: [dictMixins],
     data() {
       return {
-        typeList: []
+        typeList: [],
+        reportWorkTypeList: []
       };
     },
     computed: {
@@ -37,6 +38,13 @@
             placeholder: '记录表分类',
             planList: this.typeList
           },
+          {
+            label: '模块分类',
+            value: 'reportWorkType',
+            type: 'select',
+            placeholder: '模块分类',
+            planList: this.reportWorkTypeList
+          },
           {
             label: '状态:',
             value: 'publishStatus',
@@ -69,6 +77,15 @@
           });
         }
       });
+      this.requestDict('记录规则报工类型').then(() => {
+        if (this.$store.state.dict['record_rules_report_work_type']) {
+          this.reportWorkTypeList = this.$store.state.dict[
+            'record_rules_report_work_type'
+          ].map((i) => {
+            return { label: i.dictValue, value: i.dictCode };
+          });
+        }
+      });
     },
     methods: {
       /* 搜索 */

src/views/rulesManagement/releaseRules/index.vue

@@ -172,6 +172,16 @@
               return this.getDictValue('记录规则类型', row.classify);
             }
           },
+          {
+            prop: 'reportWorkType',
+            label: '模块分类',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110,
+            formatter: (row) => {
+              return this.getDictValue('记录规则报工类型', row.reportWorkType);
+            }
+          },
           {
             prop: 'version',
             label: '版本号',

src/views/technology/production/components/user-setting-matter-process.vue

@@ -87,6 +87,17 @@
       produceTaskName: {
         type: String,
         required: true
+      },
+      // 工序code
+      produceTaskCode: {
+        type: String,
+        required: false,
+        default: ''
+      }
+    },
+    watch: {
+      produceTaskId() {
+        this.getMatterList();
       }
     },
     data() {

vue.config.js

@@ -35,13 +35,13 @@ module.exports = {
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
 
-        // target: 'http://192.168.1.251:18086', // 开发
+        target: 'http://192.168.1.251:18086', // 开发
         // target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域