Merge branch 'dev' into test

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

@@ -298,6 +298,7 @@
               <!-- 选择运算符 -->
               <el-select
                 v-model="row._opSelect"
+                :key="row._opSelect + '_opSelect'"
                 placeholder="选择符号"
                 size="mini"
                 style="width: 100px; flex-shrink: 0"
@@ -315,13 +316,13 @@
               <el-select
                 v-if="row.activeIndex != undefined"
                 v-model="row._replaceOrAppend"
+                :key="row._replaceOrAppend + 'row._replaceOrAppend'"
                 placeholder="选择"
                 size="mini"
                 style="width: 80px; margin-left: 8px; flex-shrink: 0"
-                @change="$set(row, '_replaceOrAppend', $event)"
               >
-                <el-option label="追加" value="append" />
-                <el-option label="替换" value="replace" />
+                <el-option key="append" label="追加" value="append" />
+                <el-option key="replace" label="替换" value="replace" />
               </el-select>
             </div>
 
@@ -966,6 +967,9 @@
               } else {
                 this.$set(item, 'formulaParts', []);
               }
+              this.$set(item, '_paramSelect', null);
+              this.$set(item, '_opSelect', null);
+              this.$set(item, '_replaceOrAppend', '');
             }
           });
 
@@ -1330,6 +1334,7 @@
           formula: '',
           _paramSelect: null,
           _opSelect: null,
+          _replaceOrAppend: '',
           formulaParts: []
         });
         console.log('this.formData.details', this.formData.details);
@@ -1526,7 +1531,7 @@
       },
       // 基于详情返回selectOptions
       getSelectOptionsByDetails(statisticsType) {
-        const paramTypeOptions = [];
+        let paramTypeOptions = [];
         for (const detail of this.formData.details.filter(
           (i) => i.statisticsType == statisticsType
         )) {
@@ -1537,6 +1542,13 @@
             });
           }
         }
+        // 过滤空值
+        paramTypeOptions = paramTypeOptions.filter((i) => i.value);
+        // 追加一个 （要求生产数量）
+        paramTypeOptions.push({
+          value: '要求生产数量',
+          label: '要求生产数量'
+        });
         return paramTypeOptions;
       },
       paramSelectChange(val, row) {

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

@@ -168,7 +168,7 @@
       tabPaneList() {
         const list = this.dict['record_rules_report_work_type'] || [];
         // 排除过程监测
-        return list.filter((item) => item.dictCode != '2');
+        return list.filter((item) => item.dictCode != '2' && item.dictCode != '4');
         // return list;
       }
     },

vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
         // 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.116:18086', // 赵沙金
+        target: 'http://192.168.1.251:18086', // 开发
+        // target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {