Browse Source

Merge branch 'kd-dev' of https://gitee.com/zhoulisky/kd-web into kd-dev

zhoulisky 9 months ago
parent
commit
8aa4cfa577

+ 4 - 4
src/option/yfCostManage/basicDataSetting/yfCostBill.js

@@ -90,8 +90,8 @@ export default {
     },
     },
     {
     {
       label: '科目名称',
       label: '科目名称',
-      prop: 'subjectId',
-      type: 'tree',
+      prop: 'esubjectId',
+      type: 'select',
       dicData: [],
       dicData: [],
       props: {
       props: {
         label: 'name',
         label: 'name',
@@ -110,7 +110,7 @@ export default {
     },
     },
     {
     {
       label: '科目代码',
       label: '科目代码',
-      prop: 'subjectCode',
+      prop: 'esubjectCode',
       span: 24,
       span: 24,
       width: 100,
       width: 100,
       align: 'center',
       align: 'center',
@@ -119,7 +119,7 @@ export default {
     },
     },
     {
     {
       label: '科目名称',
       label: '科目名称',
-      prop: 'subjectName',
+      prop: 'esubjectName',
       span: 24,
       span: 24,
       width: 180,
       width: 180,
       display: false,
       display: false,

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

@@ -111,6 +111,7 @@ export default {
             type: "textarea",
             type: "textarea",
             span: 24,
             span: 24,
             minWidth: 160,
             minWidth: 160,
+            display: false,
             showOverflowTooltip: true,
             showOverflowTooltip: true,
           },
           },
           {
           {
@@ -119,6 +120,37 @@ export default {
             type: "textarea",
             type: "textarea",
             span: 24,
             span: 24,
             minWidth: 160,
             minWidth: 160,
+            display: false,
+            showOverflowTooltip: true,
+          },
+          {
+            label: "高新研发费用科目",
+            prop: "isRdSubject",
+            type: "radio",
+            dicData:[{
+              label: '是',
+              value: 1
+            },{
+              label: '否',
+              value: 0
+            }],
+            hide: true,
+            span: 24,
+            showOverflowTooltip: true,
+          },
+          {
+            label: "高新研发费用科目",
+            prop: "isAdSubject",
+            type: "radio",
+            dicData:[{
+              label: '是',
+              value: 1
+            },{
+              label: '否',
+              value: 0
+            }],
+            hide: true,
+            span: 24,
             showOverflowTooltip: true,
             showOverflowTooltip: true,
           },
           },
           {
           {
@@ -127,6 +159,7 @@ export default {
             type: "textarea",
             type: "textarea",
             span: 24,
             span: 24,
             minWidth: 160,
             minWidth: 160,
+            display: false,
             showOverflowTooltip: true,
             showOverflowTooltip: true,
           },
           },
           {
           {

+ 1 - 0
src/views/yf-cost-manage/basic-data-setting/dev-work-hours-register.vue

@@ -160,6 +160,7 @@ export default window.$crudCommon({
         }
         }
       });
       });
       newFormData.dailyHoursList = dailyHoursList;
       newFormData.dailyHoursList = dailyHoursList;
+      delete newFormData.id;
       return newFormData;
       return newFormData;
     },
     },
     getDelParams(row) {
     getDelParams(row) {

+ 8 - 48
src/views/yf-cost-manage/basic-data-setting/yf-cost-bill.vue

@@ -73,7 +73,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getList as getSubjectTreeList } from "@/api/basicResource/subjectSetting";
+import { getList as getCompSubjectList } from "@/api/basicResource/compSubjectSetting";
 import YearMonthSelect from "@/components/year-month-select";
 import YearMonthSelect from "@/components/year-month-select";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import projectSelect from "@/components/project-select";
@@ -95,7 +95,6 @@ export default window.$crudCommon({
         yearAndMonth: moment(new Date()).format('YYYYMM'),
         yearAndMonth: moment(new Date()).format('YYYYMM'),
       },
       },
       isSelAnnual: false,
       isSelAnnual: false,
-      treeData: [],
 
 
       wideTableColumns: [],
       wideTableColumns: [],
       printTitle: "",
       printTitle: "",
@@ -126,27 +125,13 @@ export default window.$crudCommon({
     this.getSubjectList();
     this.getSubjectList();
   },
   },
   methods: {
   methods: {
-    loopData(data, level) {
-      level++;
-      return data.map(item => {
-        item.level = level;
-        item.disabled = level === 4 ? false : true;
-
-        if (item.children && item.children.length) {
-          this.loopData(item.children, level);
-        }
-        
-        return item;
-      });
-    },
     getSubjectList() {
     getSubjectList() {
-      getSubjectTreeList().then(res => {
+      getCompSubjectList().then(res => {
         this.loading = false;
         this.loading = false;
         if (res.data.code == 200) {
         if (res.data.code == 200) {
 
 
-          const column = this.findObject(this.option.column, "subjectId");
-          column.dicData = this.loopData(JSON.parse(JSON.stringify(res.data.data)), 0);
-          this.treeData = column.dicData;
+          const column = this.findObject(this.option.column, "esubjectId");
+          column.dicData = res.data.data.records;
         }
         }
       })
       })
     },
     },
@@ -174,40 +159,15 @@ export default window.$crudCommon({
         this.$refs.printWideTable.printTable(isLandscape);
         this.$refs.printWideTable.printTable(isLandscape);
       })
       })
     },
     },
-    findParentNames(categories, childId, parentNames = []) {
-      const child = categories.find(cat => cat.id == childId);
-      
-      if (!child || !child.parentId) {
-        return parentNames;
-      }
-      
-      const parent = categories.find(cat => cat.id == child.parentId);
-      if (parent) {
-        parentNames.unshift(parent.name); // 添加到数组开头保持顺序
-        return this.findParentNames(categories, parent.id, parentNames);
-      }
-      
-      return parentNames;
-    },
     getFormData() {
     getFormData() {
-      let newList = [];
-      const getAllList = data => {
-        data.forEach(element => {
-          newList.push(element);
-          if (element.children && element.children.length) {
-            getAllList(element.children)
-          }
-        });
-      }
-      getAllList(this.treeData);
-      let parentNames = this.findParentNames(newList, this.form.subjectId);
-      let currSubjectObj = newList.find(item => item.id == this.form.subjectId);
+      const column = this.findObject(this.option.column, "esubjectId");
+      let currSubjectObj = column.dicData.find(item => item.id == this.form.esubjectId);
       
       
       return {
       return {
         ...this.form,
         ...this.form,
-        subjectName: `${parentNames.join('\\')}\\${this.form.$subjectId}`,
+        esubjectName: currSubjectObj ? currSubjectObj.name : '',
         yearAndMonth: this.params.yearAndMonth,
         yearAndMonth: this.params.yearAndMonth,
-        subjectCode: currSubjectObj ? currSubjectObj.code : ''
+        esubjectCode: currSubjectObj ? currSubjectObj.code : ''
       };
       };
     },
     },
   },
   },

+ 0 - 0
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/yf-material-des.vue