Browse Source

企业会计科目bug修改

ljb 9 months ago
parent
commit
895d103db2

+ 0 - 2
src/option/basicResource/compSubjectSetting.js

@@ -78,7 +78,6 @@ export default {
       label: '对应高新研发费用科目',
       label: '对应高新研发费用科目',
       prop: 'rdSubject',
       prop: 'rdSubject',
       minWidth: 160,
       minWidth: 160,
-      search: true,
       showOverflowTooltip: true,
       showOverflowTooltip: true,
       display: false
       display: false
     },
     },
@@ -86,7 +85,6 @@ export default {
       label: '对应加计扣除研发费用科目',
       label: '对应加计扣除研发费用科目',
       prop: 'adSubject',
       prop: 'adSubject',
       minWidth: 160,
       minWidth: 160,
-      search: true,
       showOverflowTooltip: true,
       showOverflowTooltip: true,
       display: false
       display: false
     },
     },

+ 5 - 0
src/views/basic-resource/basic-database/comp-subject-setting.vue

@@ -162,6 +162,11 @@ export default window.$crudCommon({
   // 模块路径
   // 模块路径
   name: 'basicResource/compSubjectSetting',
   name: 'basicResource/compSubjectSetting',
   res: ({ data }) => {
   res: ({ data }) => {
+    data.records = data.records.map(item => {
+      item.rdSubject = item.rdSubjectEnable === 1 ? item.subjectName : '';
+      item.adSubject = item.adSubjectEnable === 1 ? item.subjectName : '';
+      return item;
+    });
     return data;
     return data;
   },
   },
 });
 });