ljb 1 mese fa
parent
commit
14bbcbee24
58 ha cambiato i file con 378 aggiunte e 129 eliminazioni
  1. 2 2
      src/components/second-unit-cascader/index.vue
  2. 1 1
      src/mixins/crud.js
  3. 4 3
      src/option/externalReports/107-1.js
  4. 7 2
      src/option/projectManage/designCost.js
  5. 7 2
      src/option/projectManage/otherCost.js
  6. 7 2
      src/option/projectManage/outsourcingCost.js
  7. 15 2
      src/option/projectManage/personCost.js
  8. 12 5
      src/option/projectManage/projectList.js
  9. 15 2
      src/option/projectManage/wxzctxCost.js
  10. 7 2
      src/option/projectManage/zbCost.js
  11. 19 2
      src/option/projectManage/zjfyycqdtfyCost.js
  12. 23 2
      src/option/projectManage/zztlCost.js
  13. 23 1
      src/option/techPerson/monthSjcyry.js
  14. 19 1
      src/option/yfCostManage/basicDataSetting/dtCostAllocationList.js
  15. 3 3
      src/printOption/externalReports/107-1.js
  16. 9 4
      src/printOption/projectManage/projectList.js
  17. 1 1
      src/printOption/projectManage/wxzctxCost.js
  18. 1 1
      src/printOption/projectManage/zjfyycqdtfyCost.js
  19. 6 0
      src/printOption/techPerson/monthSjcyry.js
  20. 1 1
      src/printOption/yfCostManage/basicDataSetting/dtCostAllocationList.js
  21. 4 4
      src/views/RD-system-manage/list.vue
  22. 4 4
      src/views/achievement/other-achievements.vue
  23. 2 2
      src/views/achievement/patent-achievement.vue
  24. 4 4
      src/views/achievement/research-paper.vue
  25. 2 2
      src/views/achievement/soft-works.vue
  26. 4 4
      src/views/achievement/technical-standard.vue
  27. 1 1
      src/views/basic-resource/basic-database/subject-setting.vue
  28. 1 1
      src/views/basic-resource/comp-basic-info/ky-asset-list.vue
  29. 1 1
      src/views/basic-resource/comp-basic-info/technician-month-avg-sales.vue
  30. 1 1
      src/views/basic-resource/comp-basic-info/technician-roster.vue
  31. 22 15
      src/views/external-reports/external-manage/107-1.vue
  32. 5 2
      src/views/external-reports/external-manage/high-comp-discount-details.vue
  33. 1 1
      src/views/external-reports/external-manage/torch-develop-annual-report.vue
  34. 1 1
      src/views/external-reports/high-tech/components/common-list.vue
  35. 1 1
      src/views/external-reports/jjkc-standards/components/common-list.vue
  36. 1 1
      src/views/external-reports/kj-standards/components/common-list.vue
  37. 1 1
      src/views/project-manage/components/all-budget-table.vue
  38. 2 2
      src/views/project-manage/components/apply-form.vue
  39. 12 3
      src/views/project-manage/components/design-cost.vue
  40. 11 3
      src/views/project-manage/components/other-cost.vue
  41. 11 3
      src/views/project-manage/components/outsourcing-cost.vue
  42. 11 3
      src/views/project-manage/components/person-cost.vue
  43. 15 3
      src/views/project-manage/components/wxzctx-cost.vue
  44. 11 3
      src/views/project-manage/components/zb-cost.vue
  45. 15 3
      src/views/project-manage/components/zjfyycqdtfy-cost.vue
  46. 11 3
      src/views/project-manage/components/zztl-cost.vue
  47. 1 1
      src/views/system/tenant.vue
  48. 8 4
      src/views/system/user.vue
  49. 2 2
      src/views/tech-person/high-tech-person-sum-list.vue
  50. 1 1
      src/views/yf-cost-manage/basic-data-setting/components/ww-project-cascader.vue
  51. 14 3
      src/views/yf-cost-manage/basic-data-setting/dt-cost-allocation-list.vue
  52. 1 1
      src/views/yf-cost-manage/basic-data-setting/month-salary-list.vue
  53. 4 0
      src/views/yf-cost-manage/basic-data-setting/other-cost-ledger.vue
  54. 1 1
      src/views/yf-cost-manage/basic-data-setting/wxzc-details.vue
  55. 1 1
      src/views/yf-cost-manage/yf-cost-statistics/wxzc-cost-statistics/amortize-cost-summary-list.vue
  56. 1 2
      src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/cl-cost/components/common-list.vue
  57. 6 1
      src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/cl-cost/components/common-page.vue
  58. 1 1
      src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/dev-cost/components/common-list.vue

+ 2 - 2
src/components/second-unit-cascader/index.vue

@@ -89,7 +89,7 @@ export default {
     findValName(val) {
       let nameArr = [];
       let _valObj = this.list.find(item => item.id === val);
-      if (!!_valObj) {
+      if (_valObj) {
         if (_valObj.parentId) {
           let _parentObj = this.list.find(item => item.id === _valObj.parentId);
           nameArr = [_parentObj.name, _valObj.name];
@@ -103,7 +103,7 @@ export default {
     findValArr(val) {
       let _valObj = this.list.find(item => item.id === val);
       let valueArr = [];
-      if (!!_valObj) {
+      if (_valObj) {
         if (_valObj.parentId) {
           valueArr = [_valObj.parentId, _valObj.id];
         } else {

+ 1 - 1
src/mixins/crud.js

@@ -216,7 +216,7 @@ export default (app, option = {}) => {
             delete this.params[ele];
           }
         })
-        if (!!this.extraParams) {
+        if (this.extraParams) {
           this.extraParams = {};
         }
       },

+ 4 - 3
src/option/externalReports/107-1.js

@@ -7,6 +7,7 @@ export default {
   border: true,
   index: false,
   addBtn: false,
+  editBtn: false,
   delBtn: false,
   refreshBtn: false,
   gridBtn: false,
@@ -24,7 +25,7 @@ export default {
       align: 'center',
       children: [{
         label: '甲',
-        prop: 'xuhao',
+        prop: 'xh',
         width: 60,
         align: 'center',
         display: false,
@@ -120,7 +121,7 @@ export default {
       align: 'center',
       children: [{
         label: '5',
-        prop: 'kssj',
+        prop: 'kssjStr',
         width: 95,
         align: 'center',
         display: false,
@@ -132,7 +133,7 @@ export default {
       align: 'center',
       children: [{
         label: '6',
-        prop: 'jssj',
+        prop: 'jssjStr',
         width: 95,
         align: 'center',
         display: false,

+ 7 - 2
src/option/projectManage/designCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,13 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "ysje",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '设计内容或详情',

+ 7 - 2
src/option/projectManage/otherCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,13 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "ysje",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '费用内容',

+ 7 - 2
src/option/projectManage/outsourcingCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,13 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "wwfy",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '受托单位名称',

+ 15 - 2
src/option/projectManage/personCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,21 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "zzsc",
+      type: "sum",
+    },
+    {
+      name: "pjrgfy",
+      type: "sum",
+    },
+    {
+      name: "total",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '姓名',

+ 12 - 5
src/option/projectManage/projectList.js

@@ -126,21 +126,21 @@ export default {
           label: '总预算(万元)',
           prop: 'xmysze',
           type: 'number',
-          width: 100,
+          width: 90,
           align: 'center',
           showOverflowTooltip: true,
         }, {
           label: '全周期已归集(万元)',
           prop: 'qzqygj',
           type: 'number',
-          width: 130,
+          width: 90,
           align: 'center',
           showOverflowTooltip: true,
         }, {
           label: '总预算完成率(%)',
           prop: 'zyswcl',
           type: 'number',
-          width: 120,
+          width: 90,
           align: 'center',
           showOverflowTooltip: true,
         }]
@@ -152,14 +152,21 @@ export default {
           label: '年度预算(万元)',
           prop: 'xmyszeCurrentYear',
           type: 'number',
-          width: 105,
+          width: 80,
           align: 'center',
           showOverflowTooltip: true,
         }, {
           label: '年度已归集研发费用(万元)',
           prop: 'ndygjyffy',
           type: 'number',
-          width: 165,
+          width: 110,
+          align: 'center',
+          showOverflowTooltip: true,
+        }, {
+          label: '年度已归集金额/年度预算(%)',
+          prop: 'ndygjjel',
+          type: 'number',
+          width: 110,
           align: 'center',
           showOverflowTooltip: true,
         }]

+ 15 - 2
src/option/projectManage/wxzctxCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,21 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "zzsc",
+      type: "sum",
+    },
+    {
+      name: "ytxe",
+      type: "sum",
+    },
+    {
+      name: "yshj",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '资产名称',

+ 7 - 2
src/option/projectManage/zbCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,13 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "ysje",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '费用内容',

+ 19 - 2
src/option/projectManage/zjfyycqdtfyCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,25 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "zzsc",
+      type: "sum",
+    },
+    {
+      name: "yzje",
+      type: "sum",
+    },
+    {
+      name: "yshj",
+      type: "sum",
+    },
+    {
+      name: "cqdtfyysje",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '资产名称',

+ 23 - 2
src/option/projectManage/zztlCost.js

@@ -1,5 +1,4 @@
 export default {
-  height: 'auto',
   calcHeight: 30,
   tip: false,
   searchShow: true,
@@ -14,7 +13,29 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
-  height: '600',
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "yongLiang",
+      type: "sum",
+    },
+    {
+      name: "danJia",
+      type: "sum",
+    },
+    {
+      name: "wzysje",
+      type: "sum",
+    },
+    {
+      name: 'ysje',
+      type: 'sum'
+    },
+    {
+      name: 'zlfyys',
+      type: 'sum'
+    },
+  ],
   column: [
     {
       label: '1-物资名称',

+ 23 - 1
src/option/techPerson/monthSjcyry.js

@@ -128,6 +128,28 @@ export default {
       },
       showOverflowTooltip: true,
       display: false
-    }
+    },
+    {
+      label: '人员类型',
+      prop: 'personnelType',
+      type: 'select',
+      span: 12,
+      width: 80,
+      align: 'center',
+      search: true,
+      dicUrl: '/api/kd-system/dict/dictionary?code=renyuanleixing',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: '请选择人员类型',
+          trigger: 'change',
+        },
+      ],
+    },
   ],
 };

+ 19 - 1
src/option/yfCostManage/basicDataSetting/dtCostAllocationList.js

@@ -12,6 +12,21 @@ export default {
   dialogClickModal: false,
   dialogWidth: 500,
   dialogType: "drawer",
+  showSummary: true,
+  sumColumnList: [
+    {
+      name: "sysm",
+      type: "sum",
+    },
+    {
+      name: "ysyys",
+      type: "sum",
+    },
+    {
+      name: "zcyz",
+      type: "sum",
+    },
+  ],
   column: [
     {
       label: '月份',
@@ -192,7 +207,10 @@ export default {
         required: true,
         message: '请输入使用占比',
         trigger: 'blur'
-      }]
+      }],
+      formatter: (obj, value) => {
+        return value+'%'
+      }
     },
     {
       label: '占比依据',

+ 3 - 3
src/printOption/externalReports/107-1.js

@@ -21,7 +21,7 @@ export default {
       align: 'center',
       children: [{
         label: '甲',
-        prop: 'xuhao',
+        prop: 'xh',
         width: 60,
         align: 'center',
         display: false,
@@ -117,7 +117,7 @@ export default {
       align: 'center',
       children: [{
         label: '5',
-        prop: 'kssj',
+        prop: 'kssjStr',
         width: 95,
         align: 'center',
         display: false,
@@ -129,7 +129,7 @@ export default {
       align: 'center',
       children: [{
         label: '6',
-        prop: 'jssj',
+        prop: 'jssjStr',
         width: 95,
         align: 'center',
         display: false,

+ 9 - 4
src/printOption/projectManage/projectList.js

@@ -85,12 +85,12 @@ export default {
         }, {
           label: '全周期已归集(万元)',
           prop: 'qzqygj',
-          width: 130,
+          width: 90,
           align: 'center',
         }, {
           label: '总预算完成率(%)',
           prop: 'zyswcl',
-          width: 120,
+          width: 90,
           align: 'center',
         }]
       }, {
@@ -100,12 +100,17 @@ export default {
         children: [{
           label: '年度预算(万元)',
           prop: 'xmyszeCurrentYear',
-          width: 105,
+          width: 90,
           align: 'center',
         }, {
           label: '年度已归集研发费用(万元)',
           prop: 'ndygjyffy',
-          width: 165,
+          width: 110,
+          align: 'center',
+        }, {
+          label: '年度已归集金额/年度预算(%)',
+          prop: 'ndygjjel',
+          width: 110,
           align: 'center',
         }]
       }]

+ 1 - 1
src/printOption/projectManage/wxzctxCost.js

@@ -2,7 +2,7 @@ export default {
   column: [
     {
       label: '资产名称',
-      prop: 'zcmc',
+      prop: 'zcbm',
       width: 360,
     },
     {

+ 1 - 1
src/printOption/projectManage/zjfyycqdtfyCost.js

@@ -2,7 +2,7 @@ export default {
   column: [
     {
       label: '资产名称',
-      prop: 'zcmc',
+      prop: 'assetId',
       width: 260,
     },
     {

+ 6 - 0
src/printOption/techPerson/monthSjcyry.js

@@ -46,6 +46,12 @@ export default {
       prop: 'situation',
       width: 70,
       align: 'center',
+    },
+    {
+      label: '人员类型',
+      prop: 'personnelType',
+      width: 80,
+      align: 'center'
     }
   ],
 };

+ 1 - 1
src/printOption/yfCostManage/basicDataSetting/dtCostAllocationList.js

@@ -66,7 +66,7 @@ export default {
     },
     {
       label: '使用占比(%)',
-      prop: 'syzb',
+      prop: 'syzbStr',
       width: 80,
       align: 'center',
     },

+ 4 - 4
src/views/RD-system-manage/list.vue

@@ -157,7 +157,7 @@ export default window.$crudCommon({
   methods: {
     getSearchParams() {
       let searchParams = { ...this.params };
-      if (!!searchParams.createTime) {
+      if (searchParams.createTime) {
         searchParams.createTimeStart = searchParams.createTime[0];
         searchParams.createTimeEnd = searchParams.createTime[1];
       }
@@ -238,7 +238,7 @@ export default window.$crudCommon({
         downloadXls(res.data, `${this.pageTitle}.zip`);
       }).catch(() => {
         loading.close();
-      });;
+      });
     },
   },
 
@@ -250,8 +250,8 @@ export default window.$crudCommon({
     Object.keys(data).forEach(fileType => {
       if (data[fileType].length) {
         data[fileType].forEach(item => {
-          let zdwjdz = !!item.zdwjdz ? JSON.parse(item.zdwjdz) : [];
-          let zdsszm = !!item.zdsszm ? JSON.parse(item.zdsszm) : [];
+          let zdwjdz = item.zdwjdz ? JSON.parse(item.zdwjdz) : [];
+          let zdsszm = item.zdsszm ? JSON.parse(item.zdsszm) : [];
           newList.push({
             wjlx: fileType,
             ...item,

+ 4 - 4
src/views/achievement/other-achievements.vue

@@ -207,15 +207,15 @@ export default window.$crudCommon({
     },
     getFormData() {
       let newFormData = { ...this.form, qlr: this.form.qlr.join(";"), fmr: this.form.fmr.join(";"), canyunZhuchi: this.form.canyunZhuchi.join(";") };
-      if (!!newFormData.xmId) {
+      if (newFormData.xmId) {
         let projectList = this.$refs.proSelect.projectList;
         let selPro = projectList.find(item => item.id === newFormData.xmId );
-        if (!!selPro) {
+        if (selPro) {
           newFormData.xmmc = selPro.xmmc;
           newFormData.xmbh = selPro.xmbh;
         }
       }
-      if (!!newFormData.attachment) {
+      if (newFormData.attachment) {
         newFormData.attachment = JSON.stringify(newFormData.attachment);
       }
       return newFormData;
@@ -252,7 +252,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.xmId = item.xmId === 0 ? '' : item.xmId;
-      item.attachment = !!item.attachment ? JSON.parse(item.attachment) : [];
+      item.attachment = item.attachment ? JSON.parse(item.attachment) : [];
       return item;
     })
 

+ 2 - 2
src/views/achievement/patent-achievement.vue

@@ -152,7 +152,7 @@ export default window.$crudCommon({
     },
     getFormData() {
       let newFormData = { ...this.form, zlqr: this.form.zlqr.join(";"), gyqr: this.form.gyqr.join(";"), fmr: this.form.fmr.join(";") };
-      if (!!newFormData.attachment) {
+      if (newFormData.attachment) {
         newFormData.attachment = JSON.stringify(newFormData.attachment);
       }
       return newFormData;
@@ -203,7 +203,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.xmId = item.xmId === 0 ? '' : item.xmId;
-      item.attachment = !!item.attachment ? JSON.parse(item.attachment) : [];
+      item.attachment = item.attachment ? JSON.parse(item.attachment) : [];
       return item;
     });
 

+ 4 - 4
src/views/achievement/research-paper.vue

@@ -114,15 +114,15 @@ export default window.$crudCommon({
     },
     getFormData() {
       let newFormData = { ...this.form };
-      if (!!newFormData.xmId) {
+      if (newFormData.xmId) {
         let projectList = this.$refs.proSelect.projectList;
         let selPro = projectList.find(item => item.id === newFormData.xmId );
-        if (!!selPro) {
+        if (selPro) {
           newFormData.xmmc = selPro.xmmc;
           newFormData.xmbh = selPro.xmbh;
         }
       }
-      if (!!newFormData.attachment) {
+      if (newFormData.attachment) {
         newFormData.attachment = JSON.stringify(newFormData.attachment);
       }
       return newFormData;
@@ -159,7 +159,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.xmId = item.xmId === 0 ? '' : item.xmId;
-      item.attachment = !!item.attachment ? JSON.parse(item.attachment) : [];
+      item.attachment = item.attachment ? JSON.parse(item.attachment) : [];
       return item;
     })
 

+ 2 - 2
src/views/achievement/soft-works.vue

@@ -169,7 +169,7 @@ export default window.$crudCommon({
     },
     getFormData() {
       let newFormData = { ...this.form };
-      if (!!newFormData.attachment) {
+      if (newFormData.attachment) {
         newFormData.attachment = JSON.stringify(newFormData.attachment);
       }
       return newFormData;
@@ -216,7 +216,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.xmId = item.xmId === 0 ? '' : item.xmId;
-      item.attachment = !!item.attachment ? JSON.parse(item.attachment) : [];
+      item.attachment = item.attachment ? JSON.parse(item.attachment) : [];
       return item;
     });
 

+ 4 - 4
src/views/achievement/technical-standard.vue

@@ -157,15 +157,15 @@ export default window.$crudCommon({
     },
     getFormData() {
       let newFormData = { ...this.form, cyr: this.form.cyr.join(";"), cyZc: this.form.cyZc.join(";"), };
-      if (!!newFormData.xmId) {
+      if (newFormData.xmId) {
         let projectList = this.$refs.proSelect.projectList;
         let selPro = projectList.find(item => item.id === newFormData.xmId );
-        if (!!selPro) {
+        if (selPro) {
           newFormData.xmmc = selPro.xmmc;
           newFormData.xmbh = selPro.xmbh;
         }
       }
-      if (!!newFormData.attachment) {
+      if (newFormData.attachment) {
         newFormData.attachment = JSON.stringify(newFormData.attachment);
       }
       return newFormData;
@@ -202,7 +202,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.xmId = item.xmId === 0 ? '' : item.xmId;
-      item.attachment = !!item.attachment ? JSON.parse(item.attachment) : [];
+      item.attachment = item.attachment ? JSON.parse(item.attachment) : [];
       return item;
     })
 

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

@@ -320,7 +320,7 @@ export default {
         getAllList(this.data);
         parentNames = this.findParentNames(newList, params.parentId);
         let currParent = newList.find(item => item.id == params.parentId);
-        if (!!currParent) {
+        if (currParent) {
           parentNames.push(currParent.name);
         }
       }

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

@@ -191,7 +191,7 @@ export default window.$crudCommon({
   methods: {
     getSearchParams() {
       let searchParams = { ...this.params, ...this.extraParams };
-      if (!!searchParams.kssjRange) {
+      if (searchParams.kssjRange) {
         searchParams.kssjMin = searchParams.kssjRange[0];
         searchParams.kssjMax = searchParams.kssjRange[1];
       }

+ 1 - 1
src/views/basic-resource/comp-basic-info/technician-month-avg-sales.vue

@@ -120,7 +120,7 @@ export default window.$crudCommon({
     newOption.column.forEach(item => {
       if (item.prop == "name") {
         item.change = ({ item }) => {
-          if (!!item) {
+          if (item) {
             this.form = {
               ...this.form,
               name: item.name,

+ 1 - 1
src/views/basic-resource/comp-basic-info/technician-roster.vue

@@ -177,7 +177,7 @@ export default window.$crudCommon({
   methods: {
     getSearchParams() {
       let searchParams = { ...this.params, ...this.extraParams };
-      if (!!searchParams.hireDateRange) {
+      if (searchParams.hireDateRange) {
         searchParams.hireDateMin = searchParams.hireDateRange[0];
         searchParams.hireDateMax = searchParams.hireDateRange[1];
       }

+ 22 - 15
src/views/external-reports/external-manage/107-1.vue

@@ -34,6 +34,10 @@
         </div>
         
       </template>
+
+      <template slot="menu" slot-scope="{ row }">
+        <el-button v-if="row.xh != '合计'" type="text" size="mini" icon="el-icon-edit" @click="handleEditClick(row)">编辑</el-button>
+      </template>
     </avue-crud>
 
   </basic-container>
@@ -75,21 +79,24 @@ export default window.$crudCommon({
       this.getList();
     },
     loadData() {
-        this.loading = true;
-        const params = { ...this.getSearchParams(), year: this.params.yearAndMonth };
-        delete params.yearAndMonth;
-        this.api.getList(params).then(res => {
-          this.loading = false;
-          if (res.data.code == 200) {
-            this.data = res.data.data.map((item, idx) => {
-              item.xuhao = idx + 1;
-              item.xmStageField = item.xmStage;
-              item.govBonusField = item.govBonus;
-              return item;
-            });
-          }
-        })
-      },
+      this.loading = true;
+      const params = { ...this.getSearchParams(), year: this.params.yearAndMonth };
+      delete params.yearAndMonth;
+      this.api.getList(params).then(res => {
+        this.loading = false;
+        if (res.data.code == 200) {
+          this.data = res.data.data.map((item, idx) => {
+            item.xuhao = idx + 1;
+            item.xmStageField = item.xmStage;
+            item.govBonusField = item.govBonus;
+            return item;
+          });
+        }
+      })
+    },
+    handleEditClick(row) {
+      this.$refs.crud.rowEdit(row);
+    },
     getFormData() {
       return { yearAndMonth: this.params.yearAndMonth, xmId: this.form.xmId, id: this.form.id, xmStage: this.form.xmStageField, govBonus: this.form.govBonusField };
     },

+ 5 - 2
src/views/external-reports/external-manage/high-comp-discount-details.vue

@@ -155,7 +155,7 @@
           <tr>
             <td width="30px" align="center">13</td>
             <td colspan="4">六、本年科技人员占企业当年职工总数的比例</td>
-            <td align="center">{{ formData.d13 }}</td>
+            <td align="center">{{ formData.d13 }}%</td>
           </tr>
 
           <tr>
@@ -445,7 +445,10 @@ export default {
           this.loading = false;
           if (data.code == 200) {
             this.isLoad = true;
-            this.formData = data.data;
+            this.formData = {
+              ...data.data,
+              d13: (data.data.d13 * 100).toFixed(2)
+            };
           }
         })
         .catch(() => {

+ 1 - 1
src/views/external-reports/external-manage/torch-develop-annual-report.vue

@@ -704,7 +704,7 @@ export default {
     },
     handleSubmit(form, done) {
       let params = { yearAndMonth: this.yearAndMonth };
-      if (!!form.torchDevUrl) {
+      if (form.torchDevUrl) {
         params.torchDevUrl = JSON.stringify(form.torchDevUrl);
       }
       settingAttachment(params).then(({ data }) => {

+ 1 - 1
src/views/external-reports/high-tech/components/common-list.vue

@@ -3,7 +3,7 @@
     <div style="width: 100%; display: flex; align-items: center; justify-content: space-between;">
       <div class="left" style="display: flex;">
         <div style="margin-right: 50px;">研发项目编号:{{ currProjectObj.xmbh }}</div>
-        <div>项目项目名称:{{ currProjectObj.xmmc }}</div>
+        <div>研发项目名称:{{ currProjectObj.xmmc }}</div>
       </div>
       <div class="right">
         <el-button

+ 1 - 1
src/views/external-reports/jjkc-standards/components/common-list.vue

@@ -3,7 +3,7 @@
     <div style="width: 100%; display: flex; align-items: center; justify-content: space-between;">
       <div class="left" style="display: flex;">
         <div style="margin-right: 50px;">研发项目编号:{{ currProjectObj.xmbh }}</div>
-        <div style="margin-right: 50px;">项目项目名称:{{ currProjectObj.xmmc }}</div>
+        <div style="margin-right: 50px;">研发项目名称:{{ currProjectObj.xmmc }}</div>
         <div style="margin-right: 50px;">支出类型:<span style="color: #409EFF;">{{ getCostName }}</span></div>
         <div>金额单位:元</div>
       </div>

+ 1 - 1
src/views/external-reports/kj-standards/components/common-list.vue

@@ -3,7 +3,7 @@
     <div style="width: 100%; display: flex; align-items: center; justify-content: space-between;">
       <div class="left" style="display: flex;">
         <div style="margin-right: 50px;">研发项目编号:{{ currProjectObj.xmbh }}</div>
-        <div style="margin-right: 50px;">项目项目名称:{{ currProjectObj.xmmc }}</div>
+        <div style="margin-right: 50px;">研发项目名称:{{ currProjectObj.xmmc }}</div>
         <div>单位:元</div>
       </div>
       <div class="right">

+ 1 - 1
src/views/project-manage/components/all-budget-table.vue

@@ -122,7 +122,7 @@ export default {
       }
     },
     currProjectId(newVal) {
-      if (!!newVal) {
+      if (newVal) {
         this.getAllBudgetData(newVal);
       }
     }

+ 2 - 2
src/views/project-manage/components/apply-form.vue

@@ -469,7 +469,7 @@ export default {
       }
     },
     getDocTile() {
-      let tit = '研发项目资料';
+      let tit = '研发项目立项资料';
       if (this.formData.xmmc) {
         return `${this.formData.xmmc}${tit}`;
       }
@@ -487,7 +487,7 @@ export default {
       return `年 月 日至 年 月 日`;
     },
     yearAndMonth() {
-      return !!this.formData.xmkssj ? moment(this.formData.xmkssj).format('yyyy') : '';
+      return this.formData.xmkssj ? moment(this.formData.xmkssj).format('yyyy') : '';
     }
   },
   mounted() {

+ 12 - 3
src/views/project-manage/components/design-cost.vue

@@ -16,6 +16,8 @@
       v-on="onEvent"
       v-model="form"
       :page.sync="page"
+      :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -61,7 +63,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import Decimal from "decimal.js";
 
 
@@ -102,9 +104,12 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'sjnr');
+    },
     handleBeforeOpen(done, type) {
       if (!this.params.xmId) {
         this.$message.warning("请选择项目!");
@@ -148,9 +153,13 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 100
       });

+ 11 - 3
src/views/project-manage/components/other-cost.vue

@@ -18,6 +18,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -63,7 +64,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import Decimal from "decimal.js";
 
 
@@ -104,9 +105,12 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'fynr');
+    },
     handleBeforeOpen(done, type) {
       if (!this.params.xmId) {
         this.$message.warning("请选择项目!");
@@ -150,9 +154,13 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 100
       });

+ 11 - 3
src/views/project-manage/components/outsourcing-cost.vue

@@ -18,6 +18,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -63,7 +64,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import Decimal from "decimal.js";
 
 
@@ -104,9 +105,12 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'zznr');
+    },
     handleBeforeOpen(done, type) {
       if (!this.params.xmId) {
         this.$message.warning("请选择项目!");
@@ -150,9 +154,13 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 100
       });

+ 11 - 3
src/views/project-manage/components/person-cost.vue

@@ -17,6 +17,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -67,7 +68,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import projectPersonSelect from "@/components/project-person-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import Decimal from "decimal.js";
 import moment from "moment";
 
@@ -95,7 +96,6 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   watch: {
     projectId(newVal, oldVal) {
@@ -115,6 +115,10 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'idCard');
+    },
     handleBeforeOpen(done, type) {
       if (!this.params.xmId) {
         this.$message.warning("请选择项目!");
@@ -159,9 +163,13 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 95
       });

+ 15 - 3
src/views/project-manage/components/wxzctx-cost.vue

@@ -17,6 +17,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -74,7 +75,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import moment from "moment";
 import Decimal from "decimal.js";
 import assetSelect from "@/components/asset-select";
@@ -104,7 +105,6 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   watch: {
     projectId(newVal, oldVal) {
@@ -124,6 +124,10 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'zcbm');
+    },
     validCustom() {
       const { sysm, ysysm } = this.currZcObj;
       const { xmkssj, xmjssj } = this.selProject
@@ -203,9 +207,17 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
+      wideTableData = wideTableData.map(item => {
+        item.zcbm = item.zcbm == '合计' ? '合计' : item.zcmc
+        return item
+      })
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 95
       });

+ 11 - 3
src/views/project-manage/components/zb-cost.vue

@@ -18,6 +18,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -63,7 +64,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import Decimal from "decimal.js";
 
 
@@ -104,9 +105,12 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'fyje');
+    },
     handleBeforeOpen(done, type) {
       if (!this.params.xmId) {
         this.$message.warning("请选择项目!");
@@ -150,9 +154,13 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 100
       });

+ 15 - 3
src/views/project-manage/components/zjfyycqdtfy-cost.vue

@@ -17,6 +17,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -74,7 +75,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import moment from "moment";
 import Decimal from "decimal.js";
 import assetSelect from "@/components/asset-select";
@@ -119,9 +120,12 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'assetId');
+    },
     validCustom() {
       const { sysm, ysysm } = this.currZcObj;
       const { xmkssj, xmjssj } = this.selProject
@@ -200,9 +204,17 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
+      wideTableData = wideTableData.map(item => {
+        item.assetId = item.assetId == '合计' ? '合计' : item.zcmc
+        return item
+      })
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 95
       });

+ 11 - 3
src/views/project-manage/components/zztl-cost.vue

@@ -16,6 +16,7 @@
       v-model="form"
       :page.sync="page"
       :before-open="handleBeforeOpen"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
         <el-button
@@ -61,7 +62,7 @@ import {exportBloByPost} from "@/api/common";
 import UploadExcelDialog from "@/components/upload-excel-dialog";
 import projectSelect from "@/components/project-select";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 import Decimal from "decimal.js";
 
 
@@ -103,9 +104,12 @@ export default window.$crudCommon({
   },
   created() {
     this.params.xmId = this.projectId;
-    this.option.height = window.innerHeight - 340;
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'wzmc');
+    },
     handleBeforeOpen(done, type) {
       if (!this.params.xmId) {
         this.$message.warning("请选择项目!");
@@ -149,9 +153,13 @@ export default window.$crudCommon({
      * @param isLandscape 是否横向打印
      */
     printTable(isLandscape) {
+      let wideTableData = JSON.parse(JSON.stringify(this.data))
+      if (wideTableData.length) {
+        wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$emit("printClick", {
         column: this.printOption.column,
-        data: this.data,
+        data: wideTableData,
         pageTitle: this.pageTitle,
         zoom: 90
       });

+ 1 - 1
src/views/system/tenant.vue

@@ -844,7 +844,7 @@ export default {
         this.page.total = data.total;
         this.data = data.records.map(item => {
           let vipYears = [];
-          if (!!item.vipYears) {
+          if (item.vipYears) {
             vipYears = JSON.parse(item.vipYears);
           }
           item.vipYears = vipYears.join(",");

+ 8 - 4
src/views/system/user.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-col :span="5">
+    <!-- <el-col :span="5">
       <div class="box">
         <el-scrollbar>
           <basic-container>
@@ -8,8 +8,8 @@
           </basic-container>
         </el-scrollbar>
       </div>
-    </el-col>
-    <el-col :span="19">
+    </el-col> -->
+    <el-col :span="24">
       <basic-container>
         <avue-crud :option="option"
                    :search.sync="search"
@@ -229,6 +229,8 @@
   export default {
     name: 'userManage',
     data() {
+      const { user } = this.$store.state
+      console.log(user)
       const validatePass = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入密码'));
@@ -328,7 +330,9 @@
               label: "所属企业",
               prop: "tenantName",
               slot: true,
-              display: false
+              display: false,
+              search: user.tenantId === '000000' ? true : false,
+              searchOrder: 99
             },
             {
               label: "用户姓名",

+ 2 - 2
src/views/tech-person/high-tech-person-sum-list.vue

@@ -88,13 +88,13 @@ export default window.$crudCommon({
     ...mapGetters(['tag']),
     pageTitle() {
       let yearAndMonthCN = this.params.yearAndMonth ? moment(this.params.yearAndMonth).format("yyyy年") : '';
-      return `${yearAndMonthCN}${this.tag.label}`.replace(/年度/g, '');;
+      return `${yearAndMonthCN}${this.tag.label}`.replace(/年度/g, '');
     }
   },
   methods: {
     getSearchParams() {
       let searchParams = { ...this.params, ...this.extraParams };
-      if (!!searchParams.hireDateRange) {
+      if (searchParams.hireDateRange) {
         searchParams.hireDateMin = searchParams.hireDateRange[0];
         searchParams.hireDateMax = searchParams.hireDateRange[1];
       }

+ 1 - 1
src/views/yf-cost-manage/basic-data-setting/components/ww-project-cascader.vue

@@ -39,7 +39,7 @@ export default {
           let list = [];
           data.data.forEach((item, index) => {
             let oldListItem = list.find(listItem => listItem.value === item.xmId);
-            if (!!oldListItem) {
+            if (oldListItem) {
               oldListItem.children.push({ label: item.stfqc, value: item.wwId });
             } else {
               list.push({ label: item.xmmc, value: item.xmId, children: [{ label: item.stfqc, value: item.wwId }] });

+ 14 - 3
src/views/yf-cost-manage/basic-data-setting/dt-cost-allocation-list.vue

@@ -5,6 +5,7 @@
       v-on="onEvent"
       v-model="form"
       :page.sync="page"
+      :summary-method="summaryMethod"
     >
       <template slot="menuLeft">
          <el-button
@@ -101,7 +102,7 @@
     <WideTablePrinter
       ref="printWideTable"
       :columns="wideTableColumns"
-      :data="data"
+      :data="wideTableData"
       :print-title="pageTitle"
       :rows-per-page="30"
       :default-landscape="true"
@@ -122,7 +123,7 @@ import { isAlphanumericCombination } from "@/util/regex";
 import { mapGetters } from "vuex";
 import {exportBloByPost} from "@/api/common";
 import {getToken} from "@/util/auth";
-import {downloadXls} from "@/util/util";
+import {downloadXls, summaryMethod} from "@/util/util";
 
 
 export default window.$crudCommon({
@@ -139,6 +140,7 @@ export default window.$crudCommon({
       },
 
       wideTableColumns: [],
+      wideTableData: [],
       printTitle: "",
     };
   },
@@ -156,6 +158,10 @@ export default window.$crudCommon({
     }
   },
   methods: {
+    // 合计
+    summaryMethod({ columns, data }) {
+      return summaryMethod(columns, data, this.option.sumColumnList, 'txksrq');
+    },
     getSearchParams() {
       const newParams = { ...this.params, ...this.extraParams };
       if (newParams.txksrq && newParams.txksrq.length) {
@@ -209,9 +215,13 @@ export default window.$crudCommon({
      */
     printTable(isLandscape) {
       this.wideTableColumns = this.printOption.column;
+      this.wideTableData = [...this.$refs.crud.list];
+      if (this.wideTableData.length) {
+        this.wideTableData.push(this.$refs.crud.sumsList);
+      }
       this.$nextTick(() => {
         this.$refs.printWideTable.printTable(isLandscape);
-      })
+      });
     },
     handleReadyLastData() {
       const _pageLoading = this.getPageLoading("数据读取中,请耐心等待...");
@@ -235,6 +245,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {      
       item.syzb = new Decimal(item.syzb || 0).mul(new Decimal(100)).toNumber();
+      item.syzbStr = item.syzb+'%';
       let syzbNum = new Decimal(Number(item.syzb)).div(new Decimal(100));
       item.yftxe = new Decimal(item.ytxe || 0).mul(new Decimal(syzbNum)).toFixed(2);
 

+ 1 - 1
src/views/yf-cost-manage/basic-data-setting/month-salary-list.vue

@@ -153,7 +153,7 @@ export default window.$crudCommon({
     newOption.column.forEach(item => {
       if (item.prop == "name") {
         item.change = ({ item }) => {
-          if (!!item) {
+          if (item) {
             this.form = {
               ...this.form,
               name: item.name,

+ 4 - 0
src/views/yf-cost-manage/basic-data-setting/other-cost-ledger.vue

@@ -165,6 +165,10 @@ export default window.$crudCommon({
         item.level = level;
         item.disabled = level === 4 && '40,95'.indexOf(item.parentId) > -1 ? false : true;
 
+        if (level == 2) {
+          item.children.sort((a, b) => Number(b.id) - Number(a.id))
+        }
+
         if (item.children && item.children.length) {
           this.loopData(item.children, level);
         }

+ 1 - 1
src/views/yf-cost-manage/basic-data-setting/wxzc-details.vue

@@ -247,7 +247,7 @@ export default window.$crudCommon({
     getFormData() {
       const { id, xmId, assetId, zcbm_form, userUnicode } = this.form;
       let userName;
-      if (!!userUnicode) {
+      if (userUnicode) {
         let personObj = this.cyPersonList.find(item => item.unicode === userUnicode);
         userName = personObj ? personObj.name : undefined;
       }

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/wxzc-cost-statistics/amortize-cost-summary-list.vue

@@ -188,7 +188,7 @@ export default window.$crudCommon({
       item.ytxe = item.asset ? item.asset.yzje : '';
       item.attendanceHours = (item.attendanceHours || 0).toFixed(1);
       item.workHours = (item.workHours || 0).toFixed(1);
-      item.yanfaFenTanLv = (item.yanfaFenTanLv * 100).toFixed(2);
+      item.yanfaFenTanLv = (item.yanfaFenTanLv * 100).toFixed(2) + '%';
       item.yanfaTanXiao = (item.yanfaTanXiao || 0).toFixed(2);
       return item;
     });

+ 1 - 2
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/cl-cost/components/common-list.vue

@@ -4,7 +4,7 @@
       <div class="left">
         <div style="display: flex; align-items: center;">
           <div style="margin-right: 50px;">研发项目编号:{{ currProjectObj.xmbh }}</div>
-          <div>项目项目名称:{{ currProjectObj.xmmc }}</div>
+          <div>研发项目名称:{{ currProjectObj.xmmc }}</div>
         </div>
       </div>
       <div class="right">
@@ -62,7 +62,6 @@ export default {
         gridBtn: false,
         sumColumnList: [
           {
-            label: '合计:',
             name: "useQuantity",
             type: "sum",
           },

+ 6 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/cl-cost/components/common-page.vue

@@ -187,7 +187,12 @@ export default {
     },
     handleExportClick({ xmId, useDate, yearAndMonth }) {
       const exportParams = { useDate, xmId, yearAndMonth, type: this.type };
-      exportBloByPost(`/api/kd-scientific/goods/yanfalingliaodan/export?${this.website.tokenHeader}=${getToken()}`, exportParams).then(res => {
+      let exportApi = {
+        '燃料': '/api/kd-scientific/goods/yanfaranliaohaoyongdan/export',
+        '材料': '/api/kd-scientific/goods/yanfalingliaodan/export',
+        '动力': '/api/kd-scientific/goods/export'
+      }
+      exportBloByPost(`${exportApi[this.type]}?${this.website.tokenHeader}=${getToken()}`, exportParams).then(res => {
         downloadXls(res.data, `${this.pageTitle}.xlsx`);
       });
     },

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/dev-cost/components/common-list.vue

@@ -4,7 +4,7 @@
       <div class="left">
         <div style="display: flex; align-items: center;">
           <div style="margin-right: 50px;">研发项目编号:{{ currProjectObj.xmbh }}</div>
-          <div>项目项目名称:{{ currProjectObj.xmmc }}</div>
+          <div>研发项目名称:{{ currProjectObj.xmmc }}</div>
         </div>
       </div>
       <div class="right">