Browse Source

问题处理

ljb 4 months ago
parent
commit
0b9ddb221a

+ 117 - 88
src/option/externalReports/jjkcAuxiliarySumList.js

@@ -65,122 +65,151 @@ export default {
       showOverflowTooltip: true,
     },
     {
-      label: '人员人工费用',
+      label: '',
       align: 'center',
       children: [{
-        label: '1',
-        prop: 'ryrgTotal',
-        span: 24,
-        width: 105,
-        align: 'center',
-        display: false,
-        showOverflowTooltip: true,
-      }, {
         label: '人员人工费用',
-        prop: 'ryrgfyQt',
-        type: 'number',
-        min: 0,
-        precision: 2,
-        span: 24,
-        hide: true,
-      }]
+        align: 'center',
+        children: [{
+          label: '1',
+          prop: 'ryrgTotal',
+          span: 24,
+          width: 105,
+          align: 'center',
+          display: false,
+          showOverflowTooltip: true,
+        }, {
+          label: '人员人工费用',
+          prop: 'ryrgfyQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
+        }]
+      }],
+      
     },
     {
-      label: '直接投入费用',
+      label: '',
       align: 'center',
       children: [{
-        label: '2',
-        prop: 'zjtrTotal',
-        span: 24,
-        width: 105,
-        align: 'center',
-        display: false,
-        showOverflowTooltip: true,
-      }, {
         label: '直接投入费用',
-        prop: 'zjtrfyQt',
-        type: 'number',
-        min: 0,
-        precision: 2,
-        span: 24,
-        hide: true,
-      }]
+        align: 'center',
+        children: [{
+          label: '2',
+          prop: 'zjtrTotal',
+          span: 24,
+          width: 105,
+          align: 'center',
+          display: false,
+          showOverflowTooltip: true,
+        }, {
+          label: '直接投入费用',
+          prop: 'zjtrfyQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
+        }]
+      }],
     },
     {
-      label: '折旧费用',
+      label: '',
       align: 'center',
       children: [{
-        label: '3',
-        prop: 'zjfyTotal',
-        span: 24,
-        width: 90,
-        align: 'center',
-        display: false,
-        showOverflowTooltip: true,
-      }, {
         label: '折旧费用',
-        prop: 'zjfyQt',
-        type: 'number',
-        min: 0,
-        precision: 2,
-        span: 24,
-        hide: true,
-      }]
+        align: 'center',
+        children: [{
+          label: '3',
+          prop: 'zjfyTotal',
+          span: 24,
+          width: 90,
+          align: 'center',
+          display: false,
+          showOverflowTooltip: true,
+        }, {
+          label: '折旧费用',
+          prop: 'zjfyQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
+        }]
+      }],
+      
     },
     {
-      label: '无形资产摊销',
+      label: '',
       align: 'center',
       children: [{
-        label: '4',
-        prop: 'wxzctxTotal',
-        span: 24,
-        width: 105,
-        align: 'center',
-        display: false,
-        showOverflowTooltip: true,
-      }, {
         label: '无形资产摊销',
-        prop: 'wxzctxQt',
-        type: 'number',
-        min: 0,
-        precision: 2,
-        span: 24,
-        hide: true,
-      }]
+        align: 'center',
+        children: [{
+          label: '4',
+          prop: 'wxzctxTotal',
+          span: 24,
+          width: 105,
+          align: 'center',
+          display: false,
+          showOverflowTooltip: true,
+        }, {
+          label: '无形资产摊销',
+          prop: 'wxzctxQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
+        }]
+      }],
+      
     },
     {
-      label: '新产品设计费等',
+      label: '',
       align: 'center',
       children: [{
-        label: '5',
-        prop: 'xcpsjfd',
-        span: 24,
-        width: 105,
-        align: 'center',
-        display: false,
-        showOverflowTooltip: true,
-      }, {
         label: '新产品设计费等',
-        prop: 'xcpsjfdQt',
-        type: 'number',
-        min: 0,
-        precision: 2,
-        span: 24,
-        hide: true,
-      }]
+        align: 'center',
+        children: [{
+          label: '5',
+          prop: 'xcpsjfd',
+          span: 24,
+          width: 105,
+          align: 'center',
+          display: false,
+          showOverflowTooltip: true,
+        }, {
+          label: '新产品设计费等',
+          prop: 'xcpsjfdQt',
+          type: 'number',
+          min: 0,
+          precision: 2,
+          span: 24,
+          hide: true,
+        }]
+      }],
+      
     },
     {
-      label: '前五项小计',
+      label: '',
       align: 'center',
       children: [{
-        label: '6',
-        prop: 'total',
-        span: 24,
-        width: 90,
+        label: '前五项小计',
         align: 'center',
-        display: false,
-        showOverflowTooltip: true,
-      }]
+        children: [{
+          label: '6',
+          prop: 'total',
+          span: 24,
+          width: 90,
+          align: 'center',
+          display: false,
+          showOverflowTooltip: true,
+        }]
+      }],
+      
     },
     {
       label: '其他相关费用',

+ 194 - 133
src/printOption/externalReports/jjkcAuxiliarySumList.js

@@ -1,172 +1,233 @@
 export default {
   column: [
     {
-      label: '研发项目编号',
-      prop: 'xmbh',
+      label: "研发项目编号",
+      prop: "xmbh",
       width: 100,
-      align: 'center',
-      rowspan: 3
+      align: "center",
+      rowspan: 3,
     },
     {
-      label: '研发项目名称',
-      prop: 'xmmc',
+      label: "研发项目名称",
+      prop: "xmmc",
       width: 300,
-      align: 'center',
-      rowspan: 3
+      align: "center",
+      rowspan: 3,
     },
     {
-      label: '完成情况',
-      prop: 'wcqk',
+      label: "完成情况",
+      prop: "wcqk",
       width: 80,
-      align: 'center',
-      rowspan: 3
+      align: "center",
+      rowspan: 3,
     },
-        {
-      label: '支出类型',
-      prop: 'typeName',
+    {
+      label: "支出类型",
+      prop: "typeName",
       width: 120,
-      align: 'center',
-      rowspan: 3
+      align: "center",
+      rowspan: 3,
     },
     {
-      label: '允许加计扣除金额合计',
-      prop: 'yxjjkcjehj',
+      label: "允许加计扣除金额合计",
+      prop: "yxjjkcjehj",
       width: 100,
-      align: 'center',
-      rowspan: 3
+      align: "center",
+      rowspan: 3,
     },
     {
-      label: '人员人工费用',
-      align: 'center',
+      label: "",
+      align: "center",
       children: [{
-        label: '1',
-        prop: 'ryrgTotal',
-        width: 105,
-        align: 'center',
-        rowspan: 2
-      }]
+        label: "人员人工费用",
+        align: "center",
+        children: [
+          {
+            label: "1",
+            prop: "ryrgTotal",
+            width: 105,
+            align: "center",
+            rowspan: 2,
+          },
+        ],
+      }],
     },
     {
-      label: '直接投入费用',
-      align: 'center',
+      label: "",
+      align: "center",
       children: [{
-        label: '2',
-        prop: 'zjtrTotal',
-        width: 105,
-        align: 'center',
-        rowspan: 2
-      }]
+        label: "直接投入费用",
+        align: "center",
+        children: [
+          {
+            label: "2",
+            prop: "zjtrTotal",
+            width: 105,
+            align: "center",
+            rowspan: 2,
+          },
+        ],
+      }],
+      
     },
     {
-      label: '折旧费用',
-      align: 'center',
+      label: "",
+      align: "center",
       children: [{
-        label: '3',
-        prop: 'zjfyTotal',
-        width: 90,
-        align: 'center',
-        rowspan: 2
-      }]
+        label: "折旧费用",
+        align: "center",
+        children: [
+          {
+            label: "3",
+            prop: "zjfyTotal",
+            width: 90,
+            align: "center",
+            rowspan: 2,
+          },
+        ],
+      }],
     },
     {
-      label: '无形资产摊销',
-      align: 'center',
+      label: "",
+      align: "center",
       children: [{
-        label: '4',
-        prop: 'wxzctxTotal',
-        width: 105,
-        align: 'center',
-        rowspan: 2
-      }]
+        label: "无形资产摊销",
+        align: "center",
+        children: [
+          {
+            label: "4",
+            prop: "wxzctxTotal",
+            width: 105,
+            align: "center",
+            rowspan: 2,
+          },
+        ],
+      }],
+      
     },
     {
-      label: '新产品设计费等',
-      align: 'center',
+      label: "",
+      align: "center",
       children: [{
-        label: '5',
-        prop: 'xcpsjfd',
-        width: 105,
-        align: 'center',
-        rowspan: 2
-      }]
+        label: "新产品设计费等",
+        align: "center",
+        children: [
+          {
+            label: "5",
+            prop: "xcpsjfd",
+            width: 105,
+            align: "center",
+            rowspan: 1,
+          },
+        ],
+      }],
+      
     },
     {
-      label: '前五项小计',
-      align: 'center',
-      children: [{
-        label: '6',
-        prop: 'total',
-        width: 90,
-        align: 'center',
-        rowspan: 2
-      }]
+      label: "",
+      align: "center",
+      children: [
+        {
+          label: "前五项小计",
+          align: "center",
+          children: [
+            {
+              label: "6",
+              prop: "total",
+              width: 90,
+              align: "center",
+              rowspan: 2,
+            },
+          ],
+        },
+      ],
     },
     {
-      label: '其他相关费用',
-      align: 'center',
-      children: [{
-        label: '其他相关费用合计',
-        align: 'center',
-        children: [{
-          label: '7.1',
-          prop: 'qtxgfyTotal',
-          width: 100,
-          align: 'center',
-        }]
-      }, {
-        label: '经限额调整后的其他相关费用',
-        align: 'center',
-        children: [{
-          label: '7.2',
-          prop: 'qtxgfyAdjustTotal',
-          width: 110,
-          align: 'center',
-        }]
-      }],
+      label: "其他相关费用",
+      align: "center",
+      children: [
+        {
+          label: "其他相关费用合计",
+          align: "center",
+          children: [
+            {
+              label: "7.1",
+              prop: "qtxgfyTotal",
+              width: 100,
+              align: "center",
+            },
+          ],
+        },
+        {
+          label: "经限额调整后的其他相关费用",
+          align: "center",
+          children: [
+            {
+              label: "7.2",
+              prop: "qtxgfyAdjustTotal",
+              width: 110,
+              align: "center",
+            },
+          ],
+        },
+      ],
     },
     {
-      label: '委托研发费用及限额',
-      align: 'center',
-      children: [{
-        label: '委托境内机构或个人进行研发活动所发生的费用',
-        align: 'center',
-        children: [{
-          label: '8.1',
-          prop: 'wtjnfy',
-          width: 120,
-          align: 'center',
-        }]
-      }, {
-        label: '允许加计扣除的委托境内机构或个人进行研发活动所发生的费用',
-        align: 'center',
-        children: [{
-          label: '8.2',
-          prop: 'wtjnfyAdjust',
-          width: 120,
-          align: 'center',
-        }]
-      }, {
-        label: '委托境外机构进行研发活动所发生的费用',
-        align: 'center',
-        children: [{
-          label: '8.3',
-          prop: 'wtjwfy',
-          span: 24,
-          width: 120,
-          align: 'center',
-          display: false,
-          showOverflowTooltip: true,
-        }]
-      }, {
-        label: '经限额调整后的委托境外机构进行研发活动所发生的费用',
-        align: 'center',
-        children: [{
-          label: '8.4',
-          prop: 'wtjwfyAdjust',
-          width: 120,
-          align: 'center',
-        }]
-      }],
+      label: "委托研发费用及限额",
+      align: "center",
+      children: [
+        {
+          label: "委托境内机构或个人进行研发活动所发生的费用",
+          align: "center",
+          children: [
+            {
+              label: "8.1",
+              prop: "wtjnfy",
+              width: 120,
+              align: "center",
+            },
+          ],
+        },
+        {
+          label: "允许加计扣除的委托境内机构或个人进行研发活动所发生的费用",
+          align: "center",
+          children: [
+            {
+              label: "8.2",
+              prop: "wtjnfyAdjust",
+              width: 120,
+              align: "center",
+            },
+          ],
+        },
+        {
+          label: "委托境外机构进行研发活动所发生的费用",
+          align: "center",
+          children: [
+            {
+              label: "8.3",
+              prop: "wtjwfy",
+              span: 24,
+              width: 120,
+              align: "center",
+              display: false,
+              showOverflowTooltip: true,
+            },
+          ],
+        },
+        {
+          label: "经限额调整后的委托境外机构进行研发活动所发生的费用",
+          align: "center",
+          children: [
+            {
+              label: "8.4",
+              prop: "wtjwfyAdjust",
+              width: 120,
+              align: "center",
+            },
+          ],
+        },
+      ],
     },
   ],
 };

+ 2 - 2
src/views/basic-resource/comp-basic-info/components/comp-info-table.vue

@@ -41,9 +41,9 @@
           <td>
             <avue-cascader v-model="form.highTechFields" :dic="HIGH_TECH_FIELDS" size="small" style="width: 100%;"></avue-cascader>
           </td>
-          <td class="label">其他说明</td>
+          <td class="label">职工总数</td>
           <td>
-            <input v-model="form.remark" style="width: 100%; border: none;" />
+            <avue-input-number v-model="form.remark" :min="0" :precision="0" style="width: 200px" />
           </td>
         </tr>
         <tr>

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

@@ -1,9 +1,10 @@
 <template>
-  <basic-container>
+  <basic-container class="jjkc-list">
     <avue-crud
       v-bind="bindVal"
       v-on="onEvent"
       v-model="form"
+      
     >
       <template slot="menuLeft">
         <el-button
@@ -219,3 +220,16 @@ export default window.$crudCommon({
   name: 'externalReports/jjkcAuxiliarySumList',
 });
 </script>
+
+<style lang="scss" scoped>
+  .jjkc-list {
+    ::v-deep .el-table .el-table__header .el-table__cell.el-table_2_column_56,
+    ::v-deep .el-table .el-table__header .el-table__cell.el-table_2_column_59,
+    ::v-deep .el-table .el-table__header .el-table__cell.el-table_2_column_62,
+    ::v-deep .el-table .el-table__header .el-table__cell.el-table_2_column_65,
+    ::v-deep .el-table .el-table__header .el-table__cell.el-table_2_column_68,
+    ::v-deep .el-table .el-table__header .el-table__cell.el-table_2_column_71 {
+      border-bottom: none;
+    }
+  }
+</style>

+ 5 - 5
src/views/project-manage/project-list.vue

@@ -208,11 +208,11 @@ export default window.$crudCommon({
       item.jdxbg = item.jdxbgCount > 0 ? '已提交' : '未提交';
       item.ysbg = item.ysbgCount > 0 ? '已提交' : '未提交';
       item.status = String(item.status);
-      item.xmysze = Number(item.xmysze || 0).toFixed(4);
-      item.qzqygj = Number(item.qzqygj || 0).toFixed(4)
-      item.xmyszeCurrentYear = Number(item.xmyszeCurrentYear || 0).toFixed(4)
-      item.ndygjyffy = Number(item.ndygjyffy || 0).toFixed(4)
-      item.wwAmount = Number(item.wwAmount || 0).toFixed(4)
+      item.xmysze = Number(item.xmysze || 0).toFixed(2);
+      item.qzqygj = Number(item.qzqygj || 0).toFixed(2)
+      item.xmyszeCurrentYear = Number(item.xmyszeCurrentYear || 0).toFixed(2)
+      item.ndygjyffy = Number(item.ndygjyffy || 0).toFixed(2)
+      item.wwAmount = Number(item.wwAmount || 0).toFixed(2)
       return item;
     });
     return data;

+ 27 - 6
src/views/wel/index.vue

@@ -16,6 +16,7 @@
             <avue-data-display :option="projectTotalOpt"></avue-data-display>
             <div style="position: relative;">
               <basic-chart
+                ref="projectStatusChart"
                 style="width: 100%; height: 300px"
                 :options="projectStatusOpt"
               />
@@ -27,6 +28,7 @@
             <avue-data-display :option="RD_costOpt"></avue-data-display>
             <div style="position: relative;">
               <basic-chart
+                ref="yffyPieChart"
                 style="width: 100%; height: 300px"
                 :options="yffyPieOptions"
               />
@@ -43,6 +45,7 @@
             <avue-data-display :option="RD_person_zb_opt"></avue-data-display>
             <div style="position: relative;">
               <basic-chart
+                ref="RD_personChart"
                 style="width: 100%; height: 300px"
                 :options="RD_personOpt"
               />
@@ -54,6 +57,7 @@
             <avue-data-display :option="zscqTotalOpt"></avue-data-display>
             <div style="position: relative;">
               <basic-chart
+                ref="zscqChart"
                 style="width: 100%; height: 300px"
                 :options="zscqOpt"
               />
@@ -68,6 +72,7 @@
         <el-row style="margin-top: 10px">
           <el-col :span="24">
             <basic-chart
+              ref="monthAggChart"
               style="width: 100%; height: 300px"
               :options="monthAggregationBarOpt"
             />
@@ -81,12 +86,14 @@
         <el-row v-if="xmList.length">
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <basic-chart
+              ref="currYearBudgetChart"
               style="width: 100%; height: 300px"
               :options="currYearBudgetOpt"
             />
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <basic-chart
+              ref="fullCycleBudgetChart"
               style="width: 100%; height: 300px"
               :options="fullCycleBudgetOpt"
             />
@@ -110,6 +117,7 @@ import { getList as getCyPersonList } from "@/api/techPerson/cyPersonRoster";
 import { getXmysygjqst, getZl } from "@/api/wel";
 import Decimal from "decimal.js";
 import { mapGetters } from "vuex";
+import { getEnterpriseInfo } from "@/api/basicResource/compInfoSetting";
 
 export default {
   name: "home",
@@ -223,6 +231,13 @@ export default {
     if (this.pageYear && this.currYear && this.currYear != this.pageYear) {
       this.currYear = this.pageYear;
     }
+    this.$refs.projectStatusChart.handleResize()
+    this.$refs.yffyPieChart.handleResize()
+    this.$refs.RD_personChart.handleResize()
+    this.$refs.zscqChart.handleResize()
+    this.$refs.monthAggChart.handleResize()
+    this.$refs.currYearBudgetChart.handleResize()
+    this.$refs.fullCycleBudgetChart.handleResize()
   },
   methods: {
     handleSearchBtn() {
@@ -358,12 +373,18 @@ export default {
     },
     // 获取年度参研人员
     getCyPersonListFunc() {
-      getCyPersonList(1, 99999, { yearAndMonth: this.currYear }).then(({ data }) => {
-        let _personList = data.data.records;
-        let yfPersonList = _personList.filter(item => item.personnelType == '研发人员');
+      Promise.all([
+        getCyPersonList(1, 99999, { yearAndMonth: this.currYear }),
+        getEnterpriseInfo(this.currYear)
+      ]).then(([res1, res2]) => {
+        let _personList = res1.data.data.records;
+        let zgzs = 0 // 职工总数
+        if (!isNaN(res2.data.data.remark)) {
+          zgzs = res2.data.data.remark
+        }
 
-        if (_personList.length) {
-          this.yfPersonZb = ((yfPersonList.length / _personList.length) * 100).toFixed(2);
+        if (_personList.length && zgzs > 0) {
+          this.yfPersonZb = ((_personList.length / zgzs) * 100).toFixed(2);
         } else {
           this.yfPersonZb = 0;
         }
@@ -372,7 +393,7 @@ export default {
           { value: _personList.filter(item => item.situation == '全职').length, name: "全职" },
           { value: _personList.filter(item => item.situation == '非全职').length, name: "非全职" },
         ]);
-      });
+      })
     },
     /**
      * 项目预算与归集趋势图

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/dev-depre-allocation.vue

@@ -172,7 +172,7 @@ export default window.$crudCommon({
       item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
       item.yzje = item.asset ? item.asset.yzje : '';
       item.attendanceHours = item.asset ? item.asset.zgs : '';
-      item.yanfaFenTanLv = new Decimal(item.yanfaFenTanLv).mul(new Decimal(100));
+      item.yanfaFenTanLv = new Decimal(item.yanfaFenTanLv).mul(new Decimal(100)).toFixed(2);
       item.yanfaTanXiao = Number(new Decimal(item.yzje || 0).mul(_yanfaFenTanLv || 0)).toFixed(2);
       return item;
     });

+ 2 - 2
src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/hourse-depre-allocation.vue

@@ -122,7 +122,7 @@ export default window.$crudCommon({
       return newParams;
     },
     getFormData() {
-      return { ...this.form, yanfaFenTanLv: new Decimal(this.form.yanfaFenTanLv || 0).div(new Decimal(100)).toFixed(2) };
+      return { ...this.form, yanfaFenTanLv: new Decimal(this.form.yanfaFenTanLv || 0).div(new Decimal(100)) };
     },
     handleExport() {
       exportBloByPost(`/api/kd-scientific/asset/kyfwjzwzjfyfpb/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
@@ -155,7 +155,7 @@ export default window.$crudCommon({
       item.zcyz = item.asset ? item.asset.zcyz : '';
       item.jcz = new Decimal(item.asset.jcz || 0).mul(new Decimal(100));
       item.yzje = item.asset ? item.asset.yzje : '';
-      item.yanfaFenTanLv = yanfaFenTanLvDec.mul(new Decimal(100));
+      item.yanfaFenTanLv = yanfaFenTanLvDec.mul(new Decimal(100)).toFixed(2);
       item.yanfaTanXiao = new Decimal(item.yzje || 0).mul(yanfaFenTanLvDec).toFixed(2);
       return item;
     });