Merge remote-tracking branch 'origin/fourthStage' into fourthStage

src/enums/commonEnums.js

@@ -567,7 +567,8 @@ export const InconformityItemState = {
 // 法规合规评估结果
 export const StandardEvaluationResultType = {
   accordWith: { text: '符合', value: '1' },
-  inconformity: { text: '不符合', value: '2' }
+  inconformity: { text: '不符合', value: '2' },
+  notInvolve: { text: '不涉及', value: '4' }
 }
 
 // 条款使用范围

src/views/projectLibrary/specialProjectLibrary/SpecialProjectLibrary.vue

@@ -11,7 +11,7 @@
                                  :placeholder="$t('pleaseSelect')+$t('standardSelect.source')"
                                  type="select"
                                  :triggerChange="false"
-                                 dict-code="standard_source" />
+                                 :options="standardSourceOptions" />
             </a-form-item>
           </a-col>
           <!--项目名称-->
@@ -154,6 +154,7 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import BasisDescriptionModal from './modules/BasisDescriptionModal'
 import SpecialProjectLibraryModal from './modules/SpecialProjectLibraryModal'
 import { StandardSource } from '../../../enums/commonEnums'
+import { ajaxGetDictItems } from '../../../api/api'
 
 export default {
   name: 'SpecialProjectLibrary',
@@ -271,10 +272,18 @@ export default {
           clickEvent: 'handleEdit',
           has: 'specialProjectLibrary:edit'
         }
-      ]
+      ],
+      standardSourceOptions: []
     }
   },
   methods: {
+    initDictConfig () {
+      ajaxGetDictItems('standard_source').then(res => {
+        if (res.success) {
+          this.standardSourceOptions = (res.result || []).filter(tt => tt.value !== StandardSource.ENTERPRISE.value)
+        }
+      })
+    },
     /**
      * 跳转标准详情
      * @param record

src/views/workCenter/standardComplianceProcess/components/DesignEngineerAssess.vue

@@ -35,7 +35,7 @@
         <!--评估结果-->
         <template v-slot:evaluationResult="text,record">
           <j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('projectLibrary.vehicleItemLibrary.evaluationResult')"
-                             dict-code="standards_assess_results"
+                             :options="resultOptions"
                              style="width: 100%"
                              :value="record.assessResults"
                              @change="value => handleEvaluationResultChange(value, record, record.dataSourceIndex)" />
@@ -98,6 +98,7 @@ import { StandardEvaluationResultType, YesOrNoEnum } from '../../../../enums/com
 import { getCarTypeProjectList } from '../../../../api/projectLibraryApi'
 import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail'
 import JTable from '../../../../components/jero/JTable'
+import { ajaxGetDictItems } from '../../../../api/api'
 
 export default {
   name: 'DesignEngineerAssess',
@@ -194,7 +195,8 @@ export default {
         showQuickJumper: true,
         showSizeChanger: true,
         total: 0
-      }
+      },
+      resultOptions: []
     }
   },
   watch: {
@@ -229,8 +231,16 @@ export default {
   },
   created () {
     this.getCarTypeList()
+    this.initDict()
   },
   methods: {
+    initDict () {
+      ajaxGetDictItems('standards_assess_results').then(res => {
+        if (res.success) {
+          this.resultOptions = (res.result || []).filter(tt => tt.value !== StandardEvaluationResultType.notInvolve.value)
+        }
+      })
+    },
     /**
      * 获取车型下拉数据
      */