Browse Source

科目设置模块代码提交

ljb 10 months ago
parent
commit
b6248cc4ea

+ 1 - 28
src/api/basicResource/auxiliaryAccounting.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/kd-scientific//page',
+    url: '/api/kd-scientific/xm/assist/list',
     method: 'get',
     params: {
       ...params,
@@ -11,30 +11,3 @@ export const getList = (current, size, params) => {
     }
   })
 }
-
-export const add = (row) => {
-  return request({
-    url: '/api/kd-scientific//save',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const update = (row) => {
-  return request({
-    url: '/api/kd-scientific//update',
-    method: 'post',
-    data: row
-  })
-}
-
-
-export const remove = (data) => {
-  return request({
-    url: '/api/kd-scientific//remove',
-    method: 'post',
-    data
-  })
-}
-

+ 8 - 6
src/api/basicResource/compSubjectSetting.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/kd-scientific//page',
+    url: '/api/kd-scientific/subject/enterprise/page',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/kd-scientific//save',
+    url: '/api/kd-scientific/subject/enterprise/submit',
     method: 'post',
     data: row
   })
@@ -23,18 +23,20 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/kd-scientific//update',
+    url: '/api/kd-scientific/subject/enterprise/submit',
     method: 'post',
     data: row
   })
 }
 
 
-export const remove = (data) => {
+export const remove = (ids) => {
   return request({
-    url: '/api/kd-scientific//remove',
+    url: '/api/kd-scientific/subject/enterprise/remove',
     method: 'post',
-    data
+    params: {
+      ids
+    }
   })
 }
 

+ 3 - 1
src/option/basicResource/auxiliaryAccounting.js

@@ -9,6 +9,8 @@ export default {
   labelWidth: 110,
   menuWidth: 140,
   menu: false,
+  addBtn: false,
+  index: true,
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
@@ -24,7 +26,7 @@ export default {
     },
     {
       label: '研发项目名称',
-      prop: 'name',
+      prop: 'xmmc',
       span: 24,
       minWidth: 200,
       search: true,

+ 3 - 3
src/option/basicResource/compSubjectSetting.js

@@ -66,7 +66,7 @@ export default {
     },
     {
       label: '对应会计科目',
-      prop: 'dykjkm',
+      prop: 'subjectName',
       minWidth: 160,
       search: true,
       showOverflowTooltip: true,
@@ -74,7 +74,7 @@ export default {
     },
     {
       label: '对应高新研发费用科目',
-      prop: 'dygxyffykm',
+      prop: 'rdSubject',
       minWidth: 160,
       search: true,
       showOverflowTooltip: true,
@@ -82,7 +82,7 @@ export default {
     },
     {
       label: '对应加计扣除研发费用科目',
-      prop: 'dyjjkcyffykm',
+      prop: 'adSubject',
       minWidth: 160,
       search: true,
       showOverflowTooltip: true,

+ 4 - 2
src/views/basic-resource/basic-database/auxiliary-accounting.vue

@@ -69,9 +69,8 @@ export default window.$crudCommon({
     }
   },
   methods: {
-    loadData() {},
     handleExport() {
-      exportBlob(`/api/kd-scientific/technician/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+      exportBlob(`/api/kd-scientific/xm/assist/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.params.yearAndMonth}辅助核算.xlsx`);
       });
     },
@@ -91,6 +90,9 @@ export default window.$crudCommon({
   // 模块路径
   name: 'basicResource/auxiliaryAccounting',
   res: ({ data }) => {
+    data.records = data.records.map(item => {
+      return { ...item, xmmc: item.XMMC, xmbh: item.XMBH }
+    })
     return data;
   },
 });

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

@@ -56,7 +56,7 @@
 
 <script>
 import { getList as getSubjectTreeList } from "@/api/basicResource/subjectSetting";
-import {exportBloByPost} from "@/api/common";
+import {exportBlob} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
@@ -77,7 +77,6 @@ export default window.$crudCommon({
     this.getMenuData();
   },
   methods: {
-    loadData() {},
     loopData(data, level) {
       level++;
       return data.map(item => {
@@ -102,15 +101,14 @@ export default window.$crudCommon({
       })
     },
     handleImport() {
-      let excelParams = { yearAndMonth: this.params.yearAndMonth };
-      this.$refs.uploadExcelDialog.open('/api/kd-scientific/technician/import', excelParams);
+      this.$refs.uploadExcelDialog.open('/api/kd-scientific/subject/enterprise/import');
     },
     uploadAfter() {
       this.page.currentPage = 1;
       this.getList(this.page);
     },
     handleExport() {
-      exportBloByPost(`/api/kd-scientific/technician/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+      exportBlob(`/api/kd-scientific/subject/enterprise/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `企业会计科目.xlsx`);
       });
     },