Browse Source

资产清单和加计扣除汇总表修改

ljb 9 months ago
parent
commit
95833c896a

+ 1 - 2
src/api/externalReports/jjkcAuxiliarySumList.js

@@ -12,8 +12,7 @@ export const update = (row) => {
   return request({
   return request({
     url: '/api/kd-scientific/xm/cost/details/deduction-qt',
     url: '/api/kd-scientific/xm/cost/details/deduction-qt',
     method: 'post',
     method: 'post',
-    params: row
-    // data: row,
+    data: row,
   })
   })
 }
 }
 
 

+ 7 - 13
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -116,6 +116,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import moment from "moment";
 import moment from "moment";
 import {getToken} from "@/util/auth";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
 import {downloadXls} from "@/util/util";
+import Decimal from "decimal.js";
 
 
 
 
 export default window.$crudCommon({
 export default window.$crudCommon({
@@ -173,19 +174,8 @@ export default window.$crudCommon({
   },
   },
   methods: {
   methods: {
     getFormData() {
     getFormData() {
-      return { ...this.form, yearAndMonth: this.params.yearAndMonth };
-    },
-    getDelParams(row) {
-      return [{ id: row.id, yearAndMonth: this.params.yearAndMonth }];
-    },
-    getBatchDelParams() {
-      let delArr = [];
-      this.data.forEach(item => {
-        if (this.ids.indexOf(item.id) > -1) {
-          delArr.push({ yearAndMonth: this.params.yearAndMonth, id: item.id });
-        }
-      });
-      return delArr;
+      let jcz = new Decimal(this.form.jcz || 0).div(new Decimal(100));
+      return { ...this.form, jcz: Number(jcz), yearAndMonth: this.params.yearAndMonth };
     },
     },
     handleImport() {
     handleImport() {
       let excelParams = { yearAndMonth: this.params.yearAndMonth };
       let excelParams = { yearAndMonth: this.params.yearAndMonth };
@@ -257,6 +247,10 @@ export default window.$crudCommon({
   // 模块路径
   // 模块路径
   name: 'basicResource/kyAssetList',
   name: 'basicResource/kyAssetList',
   res: ({ data }) => {
   res: ({ data }) => {
+    data.records = data.records.map(item => {
+      item.jcz = new Decimal(item.jcz || 0).mul(new Decimal(100));
+      return item;
+    });
     return data;
     return data;
   },
   },
 });
 });

+ 15 - 15
src/views/external-reports/jjkc-standards/jjkc-auxiliary-sum-list.vue

@@ -97,21 +97,6 @@ export default window.$crudCommon({
             return item;
             return item;
           });
           });
           this.data.push({
           this.data.push({
-            typeName: '费用化小计',
-            yxjjkcjehj: data.data.yxjjkcjehj_fyh,
-            ryrgTotal: data.data.ryrgfy_fyh,
-            zjtrTotal: data.data.zjtrfy_fyh,
-            zjfyTotal: data.data.zjfy_fyh,
-            wxzctxTotal: data.data.wxzctx_fyh,
-            xcpsjfd: data.data.xcpsjfd_fyh,
-            total: data.data.total_fyh,
-            qtxgfyTotal: data.data.qtxgfyhj_fyh,
-            qtxgfyAdjustTotal: data.data.qtxgfyhj_adjust_fyh,
-            wtjnfy: data.data.wtjnjgfy_fyh,
-            wtjnfyAdjust: data.data.yxwtjnjgfy_fyh,
-            wtjwfy: data.data.wtjwjgfy_fyh,
-            wtjwfyAdjust: data.data.wtjwjgfy_adjust_fyh,
-          }, {
             typeName: '资本化小计',
             typeName: '资本化小计',
             yxjjkcjehj: data.data.yxjjkcjehj_zbh,
             yxjjkcjehj: data.data.yxjjkcjehj_zbh,
             ryrgTotal: data.data.ryrgfy_zbh,
             ryrgTotal: data.data.ryrgfy_zbh,
@@ -127,6 +112,21 @@ export default window.$crudCommon({
             wtjwfy: data.data.wtjwjgfy_zbh,
             wtjwfy: data.data.wtjwjgfy_zbh,
             wtjwfyAdjust: data.data.wtjwjgfy_adjust_zbh,
             wtjwfyAdjust: data.data.wtjwjgfy_adjust_zbh,
           }, {
           }, {
+            typeName: '费用化小计',
+            yxjjkcjehj: data.data.yxjjkcjehj_fyh,
+            ryrgTotal: data.data.ryrgfy_fyh,
+            zjtrTotal: data.data.zjtrfy_fyh,
+            zjfyTotal: data.data.zjfy_fyh,
+            wxzctxTotal: data.data.wxzctx_fyh,
+            xcpsjfd: data.data.xcpsjfd_fyh,
+            total: data.data.total_fyh,
+            qtxgfyTotal: data.data.qtxgfyhj_fyh,
+            qtxgfyAdjustTotal: data.data.qtxgfyhj_adjust_fyh,
+            wtjnfy: data.data.wtjnjgfy_fyh,
+            wtjnfyAdjust: data.data.yxwtjnjgfy_fyh,
+            wtjwfy: data.data.wtjwjgfy_fyh,
+            wtjwfyAdjust: data.data.wtjwjgfy_adjust_fyh,
+          }, {
             typeName: '其中:其他事项',
             typeName: '其中:其他事项',
             yxjjkcjehj: data.data.yxjjkcjehj_qt,
             yxjjkcjehj: data.data.yxjjkcjehj_qt,
             ryrgTotal: data.data.ryrgfy_qt,
             ryrgTotal: data.data.ryrgfy_qt,