Browse Source

加计扣除汇总表完善

ljb 9 months ago
parent
commit
63f78dcd0e

+ 12 - 6
src/api/externalReports/jjkcAuxiliarySumList.js

@@ -1,13 +1,19 @@
 import request from '@/router/axios';
 
-export const getList = (current, size, params) => {
+export const getList = (params) => {
   return request({
     url: '/api/kd-scientific/xm/cost/details/deduction-summary',
     method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
+    params
   })
 }
+
+export const update = (row) => {
+  return request({
+    url: '/api/kd-scientific/xm/cost/details/deduction-qt',
+    method: 'post',
+    params: row
+    // data: row,
+  })
+}
+

+ 2 - 2
src/api/techPerson/monthSjcyry.js

@@ -22,7 +22,7 @@ export const add = (row) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/apikd-scientific/technician/xm/monthly/remove',
+    url: '/api/kd-scientific/technician/xm/monthly/remove',
     method: 'delete',
     params: {
       ids,
@@ -33,7 +33,7 @@ export const remove = (ids) => {
 // 直接引用预算表名单
 export const yyysbmd = (params) => {
   return request({
-    url: '/apikd-scientific/technician/xm/monthly/yyysbmd',
+    url: '/api/kd-scientific/technician/xm/monthly/yyysbmd',
     method: 'get',
     params
   })

+ 4 - 1
src/components/print-wide-table/index.vue

@@ -10,7 +10,7 @@
     </div> -->
     
     <!-- 打印预览区域 -->
-    <div class="preview-container" v-if="isPreviewing">
+    <div class="preview-container" v-if="isPreviewing" style="zoom: 65%;">
       <div class="preview-content" :style="previewStyle">
         <div class="print-header">
           <h2>{{ printTitle }}</h2>
@@ -367,6 +367,9 @@ export default {
             <title>${this.printTitle}</title>
             <meta charset="UTF-8">
             <style>
+              @media print {
+                body { zoom: 55%; }
+              }
               body { margin: 0; padding: 0; font-family: Arial, sans-serif; }
               .print-page {
                 page-break-after: always;

+ 1 - 1
src/mixins/crud.js

@@ -13,7 +13,7 @@ export default (app, option = {}) => {
         option: require(`@/option/${option.name}`).default,
         page: {
           pageSizes: [10, 30, 50, 100, 200],
-          pageSize: 10
+          pageSize: 30
         },
       }
     },

+ 97 - 7
src/option/externalReports/jjkcAuxiliarySumList.js

@@ -1,5 +1,4 @@
 export default {
-  // height: 'auto' - 50,
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -9,9 +8,11 @@ export default {
   addBtn: false,
   selection: true,
   searchLabelWidth: 140,
-  labelWidth: 100,
-  menuWidth: 180,
-  menu: false,
+  labelWidth: 200,
+  menuWidth: 100,
+  menu: true,
+  delBtn: false,
+  editBtn: false,
   selection: false,
   dialogClickModal: false,
   dialogWidth: 500,
@@ -23,6 +24,7 @@ export default {
       span: 24,
       width: 100,
       align: 'center',
+      display: false,
       showOverflowTooltip: true,
     },
     {
@@ -32,6 +34,7 @@ export default {
       minWidth: 160,
       align: 'center',
       search: true,
+      display: false,
       showOverflowTooltip: true,
     },
     {
@@ -40,14 +43,25 @@ export default {
       span: 24,
       width: 80,
       align: 'center',
+      display: false,
+      showOverflowTooltip: true,
+    },
+        {
+      label: '支出类型',
+      prop: 'typeName',
+      span: 24,
+      width: 120,
+      align: 'center',
+      display: false,
       showOverflowTooltip: true,
     },
     {
       label: '允许加计扣除金额合计',
-      prop: 'jjkchj',
+      prop: 'yxjjkcjehj',
       span: 24,
       width: 100,
       align: 'center',
+      display: false,
       showOverflowTooltip: true,
     },
     {
@@ -59,7 +73,16 @@ export default {
         span: 24,
         width: 105,
         align: 'center',
+        display: false,
         showOverflowTooltip: true,
+      }, {
+        label: '人员人工费用',
+        prop: 'ryrgfyQt',
+        type: 'number',
+        min: 0,
+        precision: 2,
+        span: 24,
+        hide: true,
       }]
     },
     {
@@ -71,7 +94,16 @@ export default {
         span: 24,
         width: 105,
         align: 'center',
+        display: false,
         showOverflowTooltip: true,
+      }, {
+        label: '直接投入费用',
+        prop: 'zjtrfyQt',
+        type: 'number',
+        min: 0,
+        precision: 2,
+        span: 24,
+        hide: true,
       }]
     },
     {
@@ -83,7 +115,16 @@ export default {
         span: 24,
         width: 90,
         align: 'center',
+        display: false,
         showOverflowTooltip: true,
+      }, {
+        label: '折旧费用',
+        prop: 'zjfyQt',
+        type: 'number',
+        min: 0,
+        precision: 2,
+        span: 24,
+        hide: true,
       }]
     },
     {
@@ -95,7 +136,16 @@ export default {
         span: 24,
         width: 105,
         align: 'center',
+        display: false,
         showOverflowTooltip: true,
+      }, {
+        label: '无形资产摊销',
+        prop: 'wxzctxQt',
+        type: 'number',
+        min: 0,
+        precision: 2,
+        span: 24,
+        hide: true,
       }]
     },
     {
@@ -107,7 +157,16 @@ export default {
         span: 24,
         width: 105,
         align: 'center',
+        display: false,
         showOverflowTooltip: true,
+      }, {
+        label: '新产品设计费等',
+        prop: 'xcpsjfdQt',
+        type: 'number',
+        min: 0,
+        precision: 2,
+        span: 24,
+        hide: true,
       }]
     },
     {
@@ -119,6 +178,7 @@ export default {
         span: 24,
         width: 90,
         align: 'center',
+        display: false,
         showOverflowTooltip: true,
       }]
     },
@@ -134,7 +194,16 @@ export default {
           span: 24,
           width: 100,
           align: 'center',
+          display: false,
           showOverflowTooltip: true,
+        }, {
+          label: '其他相关费用合计',
+          prop: 'qtxgfyhjQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
         }]
       }, {
         label: '经限额调整后的其他相关费用',
@@ -145,6 +214,7 @@ export default {
           span: 24,
           width: 110,
           align: 'center',
+          display: false,
           showOverflowTooltip: true,
         }]
       }],
@@ -161,17 +231,27 @@ export default {
           span: 24,
           width: 120,
           align: 'center',
+          display: false,
           showOverflowTooltip: true,
+        }, {
+          label: '委托境内机构或个人进行研发活动所发生的费用',
+          prop: 'wtjnjgfyQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
         }]
       }, {
         label: '允许加计扣除的委托境内机构或个人进行研发活动所发生的费用',
         align: 'center',
         children: [{
           label: '8.2',
-          prop: 'wtjnfyRate',
+          prop: 'wtjnfyAdjust',
           span: 24,
           width: 120,
           align: 'center',
+          display: false,
           showOverflowTooltip: true,
         }]
       }, {
@@ -183,17 +263,27 @@ export default {
           span: 24,
           width: 120,
           align: 'center',
+          display: false,
           showOverflowTooltip: true,
+        }, {
+          label: '委托境外机构进行研发活动所发生的费用',
+          prop: 'wtjwjgfyQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
         }]
       }, {
         label: '经限额调整后的委托境外机构进行研发活动所发生的费用',
         align: 'center',
         children: [{
           label: '8.4',
-          prop: 'wtjwfyRate',
+          prop: 'wtjwfyAdjust',
           span: 24,
           width: 120,
           align: 'center',
+          display: false,
           showOverflowTooltip: true,
         }]
       }],

+ 1 - 1
src/views/external-reports/jjkc-standards/jjkc-auxiliary-details.vue

@@ -9,7 +9,7 @@
     <div>
     </div>
     <div style="display: flex; align-items: center;">
-      <year-month-select v-model="yearAndMonth" :showMonth="false" style="margin: 6px 0 20px;"></year-month-select>
+      <year-month-select v-model="yearAndMonth" :showAllYear="false" style="margin: 6px 0 20px;"></year-month-select>
       <el-radio-group v-model="costType" size="mini" style="margin: 8px 0 20px 8px;">
         <el-radio-button :label="1">费用化明细表</el-radio-button>
         <el-radio-button :label="2">资本化明细表</el-radio-button>

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

@@ -4,7 +4,6 @@
       v-bind="bindVal"
       v-on="onEvent"
       v-model="form"
-      :page.sync="page"
     >
       <template slot="menuLeft">
         <el-button
@@ -23,27 +22,8 @@
         </div>
       </template>
 
-      <template slot="footer">
-        <div class="table-footer-container">
-          <!-- <div class="info-row">
-            <div class="info-col">资本化金额小计:</div>
-            <div class="info-col">费用化金额小计:</div>
-            <div class="info-col">其中:</div>
-            <div class="info-col">金额合计:</div>
-          </div> -->
-          <div class="footer-row">
-            <div class="col">资本化金额小计:</div>
-          </div>
-          <div class="footer-row">
-            <div class="col">费用化金额小计:</div>
-          </div>
-          <div class="footer-row">
-            <div class="col" style="padding-left: 30px;">其中</div>
-          </div>
-          <div class="footer-row">
-            <div class="col">金额合计:</div>
-          </div>
-        </div>
+      <template slot="menu" slot-scope="{ row }">
+        <el-button v-if="row.isEdit" type="text" size="mini" icon="el-icon-edit" @click="handleEditClick(row)">编辑</el-button>
       </template>
       
     </avue-crud>
@@ -88,6 +68,99 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    handleEditClick(row) {
+      const rowData = {
+        ryrgfyQt: row.ryrgTotal,
+        zjtrfyQt: row.zjtrTotal,
+        zjfyQt: row.zjfyTotal,
+        wxzctxQt: row.wxzctxTotal,
+        xcpsjfdQt: row.xcpsjfd,
+        qtxgfyhjQt: row.qtxgfyTotal,
+        wtjnjgfyQt: row.wtjnfy,
+        wtjwjgfyQt: row.wtjwfy,
+      };
+      this.$refs.crud.rowEdit(rowData);
+    },
+    getFormData() {
+      const { ryrgfyQt, zjtrfyQt, zjfyQt, wxzctxQt, xcpsjfdQt, qtxgfyhjQt, wtjnjgfyQt, wtjwjgfyQt } = this.form;
+      return { ryrgfyQt, zjtrfyQt, zjfyQt, wxzctxQt, xcpsjfdQt, qtxgfyhjQt, wtjnjgfyQt, wtjwjgfyQt, yearAndMonth: this.params.yearAndMonth }
+    },
+    loadData() {
+      this.loading = true;
+      this.api.getList(this.getSearchParams()).then(res => {
+        const { data } = res;
+        this.loading = false;
+        if (data.code == 200) {
+          this.data = data.data.itemList.map(item => {
+            let typeEnum = {1: '费用化', 2: '资本化'};
+            item.typeName = typeEnum[item.type];
+            return item;
+          });
+          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: '资本化小计',
+            yxjjkcjehj: data.data.yxjjkcjehj_zbh,
+            ryrgTotal: data.data.ryrgfy_zbh,
+            zjtrTotal: data.data.zjtrfy_zbh,
+            zjfyTotal: data.data.zjfy_zbh,
+            wxzctxTotal: data.data.wxzctx_zbh,
+            xcpsjfd: data.data.xcpsjfd_zbh,
+            total: data.data.total_zbh,
+            qtxgfyTotal: data.data.qtxgfyhj_zbh,
+            qtxgfyAdjustTotal: data.data.qtxgfyhj_adjust_zbh,
+            wtjnfy: data.data.wtjnjgfy_zbh,
+            wtjnfyAdjust: data.data.yxwtjnjgfy_zbh,
+            wtjwfy: data.data.wtjwjgfy_zbh,
+            wtjwfyAdjust: data.data.wtjwjgfy_adjust_zbh,
+          }, {
+            typeName: '其中:其他事项',
+            yxjjkcjehj: data.data.yxjjkcjehj_qt,
+            ryrgTotal: data.data.ryrgfy_qt,
+            zjtrTotal: data.data.zjtrfy_qt,
+            zjfyTotal: data.data.zjfy_qt,
+            wxzctxTotal: data.data.wxzctx_qt,
+            xcpsjfd: data.data.xcpsjfd_qt,
+            total: data.data.total_qt,
+            qtxgfyTotal: data.data.qtxgfyhj_qt,
+            qtxgfyAdjustTotal: data.data.qtxgfyhj_adjust_qt,
+            wtjnfy: data.data.wtjnjgfy_qt,
+            wtjnfyAdjust: data.data.yxwtjnjgfy_qt,
+            wtjwfy: data.data.wtjwjgfy_qt,
+            wtjwfyAdjust: data.data.wtjwjgfy_adjust_qt,
+            isEdit: true,
+          }, {
+            typeName: '金额合计',
+            yxjjkcjehj: data.data.yxjjkcjehj_hjje,
+            ryrgTotal: data.data.ryrgfy_hjje,
+            zjtrTotal: data.data.zjtrfy_hjje,
+            zjfyTotal: data.data.zjfy_hjje,
+            wxzctxTotal: data.data.wxzctx_hjje,
+            xcpsjfd: data.data.xcpsjfd_hjje,
+            total: data.data.total_hjje,
+            qtxgfyTotal: data.data.qtxgfyhj_hjje,
+            qtxgfyAdjustTotal: data.data.qtxgfyhj_adjust_hjje,
+            wtjnfy: data.data.wtjnjgfy_hjje,
+            wtjnfyAdjust: data.data.yxwtjnjgfy_hjje,
+            wtjwfy: data.data.wtjwjgfy_hjje,
+            wtjwfyAdjust: data.data.wtjwjgfy_adjust_hjje,
+          });
+        }
+      });
+    },
     handleExport() {
       exportBlob(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.params.yearAndMonth}研发费用汇总表.xlsx`);
@@ -108,56 +181,5 @@ export default window.$crudCommon({
 }, {
   // 模块路径
   name: 'externalReports/jjkcAuxiliarySumList',
-  res: ({ data }) => {
-    data.records = data.records.map(item => {
-      item.ryrgTotal = item.ryrgTotal.toFixed(2);
-      item.zjtrTotal = item.zjtrTotal.toFixed(2);
-      item.zjfyTotal = item.zjfyTotal.toFixed(2);
-      item.wxzctxTotal = item.wxzctxTotal.toFixed(2);
-      item.xcpsjfd = item.xcpsjfd.toFixed(2);
-      item.total = item.total.toFixed(2);
-      item.qtxgfyTotal = item.qtxgfyTotal.toFixed(2);
-      item.qtxgfyAdjustTotal = item.qtxgfyAdjustTotal.toFixed(2);
-      item.wtjnfy = item.wtjnfy.toFixed(2);
-      item.wtjnfyRate = item.wtjnfyRate.toFixed(2);
-      item.wtjwfy = item.wtjwfy.toFixed(2);
-      item.wtjwfyRate = item.wtjwfyRate.toFixed(2);
-      return item;
-    });
-    return data;
-  },
 });
 </script>
-
-<style lang="scss" scoped>
-.table-footer-container {
-  border: 1px solid #EBEEF5;
-  // .info-row {
-  //   display: flex;
-  //   font-size: 14px;
-  //   font-weight: 600;
-  //   .info-col {
-  //     padding: 8px 12px;
-  //     border-right: 1px solid #EBEEF5;
-  //     padding-right: 60px;
-  //     &:last-child {
-  //       border-right: 0;
-  //     }
-  //   }
-  // }
-  .footer-row {
-    border-bottom: 1px solid #EBEEF5;
-    
-    font-size: 14px;
-    &:last-child {
-      border-bottom: 0;
-    }
-    .col {
-      width: 491px;
-      padding: 6px 8px;
-      border-right: 1px solid #EBEEF5;
-      box-sizing: border-box;
-    }
-  }
-}
-</style>

+ 1 - 1
src/views/yf-cost-manage/basic-data-setting/working-hours-records.vue

@@ -130,7 +130,7 @@ export default window.$crudCommon({
           type: 'number',
           precision: 1,
           min: 0,
-          width: 45,
+          width: 50,
           align: 'center',
           isWorkDay: ChineseHoliday.isWorkday(item.dateString),
           showOverflowTooltip: true,