yusheng 1 месяц назад
Родитель
Сommit
f911a9fcb7
3 измененных файлов с 12 добавлено и 9 удалено
  1. 6 6
      src/components/releaseRules/index.vue
  2. 5 2
      src/enum/dict.js
  3. 1 1
      src/views/inspectionTemplate/AddorUpdate.vue

+ 6 - 6
src/components/releaseRules/index.vue

@@ -141,7 +141,7 @@
             showOverflowTooltip: true,
             showOverflowTooltip: true,
             minWidth: 110,
             minWidth: 110,
             formatter: (row) => {
             formatter: (row) => {
-              return this.getDictValue('记录规则报工类型', row.reportWorkType);
+              return this.getDictValue('实验报工类型', row.reportWorkType);
             }
             }
           },
           },
           {
           {
@@ -151,7 +151,7 @@
             showOverflowTooltip: true,
             showOverflowTooltip: true,
             minWidth: 110,
             minWidth: 110,
             formatter: (row) => {
             formatter: (row) => {
-              return this.getDictValue('记录规则类型', row.classify);
+              return this.getDictValue('实验规则类型', row.classify);
             }
             }
           },
           },
           {
           {
@@ -162,7 +162,7 @@
             minWidth: 110,
             minWidth: 110,
             formatter: (row) => {
             formatter: (row) => {
               return this.getDictValue(
               return this.getDictValue(
-                '记录表模板样式',
+                '实验模板样式',
                 row.recordTemplateStyle
                 row.recordTemplateStyle
               );
               );
             }
             }
@@ -288,9 +288,9 @@
     created() {
     created() {
       this.requestDict('行业类别');
       this.requestDict('行业类别');
       this.requestDict('业务类型');
       this.requestDict('业务类型');
-      this.requestDict('记录规则报工类型');
-      this.requestDict('记录规则类型');
-      this.requestDict('记录表模板样式');
+      this.requestDict('实验报工类型');
+      this.requestDict('实验规则类型');
+      this.requestDict('实验模板样式');
     },
     },
     methods: {
     methods: {
       open(type) {
       open(type) {

+ 5 - 2
src/enum/dict.js

@@ -28,7 +28,9 @@ export default {
   放行类型: 'checklist_type',
   放行类型: 'checklist_type',
   记录规则报工类型: 'record_rules_report_work_type',
   记录规则报工类型: 'record_rules_report_work_type',
   紧急程度: 'urgent_type',
   紧急程度: 'urgent_type',
-
+  实验报工类型: 'experiment_rules_report_work_type',
+  实验规则类型: 'experiment_sheet',
+  实验模板样式: 'experiment_template_style'
 };
 };
 
 
 export const numberList = [
 export const numberList = [
@@ -47,7 +49,8 @@ export const numberList = [
   'business_type',
   'business_type',
   'record_template_style',
   'record_template_style',
   'checklist_type',
   'checklist_type',
-  'record_rules_report_work_type','record_sheet'
+  'record_rules_report_work_type',
+  'record_sheet'
 ];
 ];
 
 
 //审核状态
 //审核状态

+ 1 - 1
src/views/inspectionTemplate/AddorUpdate.vue

@@ -427,7 +427,7 @@
 <script>
 <script>
   import termPop from '@/views/inspectionTemplate/inspectionClassify/index.vue';
   import termPop from '@/views/inspectionTemplate/inspectionClassify/index.vue';
   import EquipmentDialog from '@/views/unqualifiedProduct/unqualifiedList/components/EquipmentDialog.vue';
   import EquipmentDialog from '@/views/unqualifiedProduct/unqualifiedList/components/EquipmentDialog.vue';
-  import { getByCode } from '@/api/system/dictionary-data';
+  // import { getByCode } from '@/api/system/dictionary-data';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import taskinstanceDialog from '@/components/procedure/taskinstanceDialog.vue';
   import taskinstanceDialog from '@/components/procedure/taskinstanceDialog.vue';
   import releaseRules from '@/components/releaseRules/index.vue';
   import releaseRules from '@/components/releaseRules/index.vue';