lucw hai 7 meses
pai
achega
d5945f7edf

+ 8 - 1
src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -1531,7 +1531,7 @@
       },
       // 基于详情返回selectOptions
       getSelectOptionsByDetails(statisticsType) {
-        const paramTypeOptions = [];
+        let paramTypeOptions = [];
         for (const detail of this.formData.details.filter(
           (i) => i.statisticsType == statisticsType
         )) {
@@ -1542,6 +1542,13 @@
             });
           }
         }
+        // 过滤空值
+        paramTypeOptions = paramTypeOptions.filter((i) => i.value);
+        // 追加一个 (要求生产数量)
+        paramTypeOptions.push({
+          value: '要求生产数量',
+          label: '要求生产数量'
+        });
         return paramTypeOptions;
       },
       paramSelectChange(val, row) {

+ 1 - 1
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;
       }
     },

+ 2 - 2
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: {