Browse Source

1、去除列表无用的复选框;2、合计行增加“合计”标注

ljb 9 months ago
parent
commit
900c9b4207
22 changed files with 17 additions and 19 deletions
  1. 0 1
      src/option/externalReports/gxAuxiliarySumList.js
  2. 0 1
      src/option/externalReports/kjAuxiliarySumList.js
  3. 1 0
      src/option/yfCostManage/basicDataSetting/leaseRecords.js
  4. 2 1
      src/option/yfCostManage/basicDataSetting/monthSalaryList.js
  5. 2 1
      src/option/yfCostManage/basicDataSetting/otherCostLedger.js
  6. 2 1
      src/option/yfCostManage/basicDataSetting/pickingDetail.js
  7. 2 1
      src/option/yfCostManage/basicDataSetting/projectZjtrCost.js
  8. 2 1
      src/option/yfCostManage/basicDataSetting/wwCostLedger.js
  9. 2 1
      src/option/yfCostManage/basicDataSetting/yfCostBill.js
  10. 0 1
      src/option/yfCostManage/yfCostStatistics/amortizeCostSummaryList.js
  11. 1 1
      src/option/yfCostManage/yfCostStatistics/depreSummaryList.js
  12. 0 1
      src/option/yfCostManage/yfCostStatistics/devDepreAllocation.js
  13. 0 1
      src/option/yfCostManage/yfCostStatistics/hourseDepreAllocation.js
  14. 0 1
      src/option/yfCostManage/yfCostStatistics/personAllocationList.js
  15. 0 1
      src/option/yfCostManage/yfCostStatistics/projectAllocationList.js
  16. 0 1
      src/option/yfCostManage/yfCostStatistics/yfCostSummaryList.js
  17. 0 1
      src/views/external-reports/high-tech/components/common-list.vue
  18. 0 1
      src/views/external-reports/jjkc-standards/components/common-list.vue
  19. 0 1
      src/views/external-reports/kj-standards/components/common-list.vue
  20. 1 1
      src/views/yf-cost-manage/yf-cost-statistics/zjfy-cost-statistics/hourse-depre-allocation.vue
  21. 1 0
      src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/cl-cost/components/common-list.vue
  22. 1 0
      src/views/yf-cost-manage/yf-cost-statistics/zjtl-cost-statistics/dev-cost/components/common-list.vue

+ 0 - 1
src/option/externalReports/gxAuxiliarySumList.js

@@ -7,7 +7,6 @@ export default {
   border: true,
   index: true,
   addBtn: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 100,
   menuWidth: 180,

+ 0 - 1
src/option/externalReports/kjAuxiliarySumList.js

@@ -7,7 +7,6 @@ export default {
   border: true,
   index: true,
   addBtn: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 100,
   menuWidth: 180,

+ 1 - 0
src/option/yfCostManage/basicDataSetting/leaseRecords.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'quantity',
       type: 'sum',
     },

+ 2 - 1
src/option/yfCostManage/basicDataSetting/monthSalaryList.js

@@ -93,7 +93,7 @@ export default {
       min: 0,
       precision: 2,
       span: 24,
-      width: 80,
+      width: 110,
       align: 'center',
       showOverflowTooltip: true,
     },
@@ -225,6 +225,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'averageMonthlySalary',
       type: 'sum'
     },

+ 2 - 1
src/option/yfCostManage/basicDataSetting/otherCostLedger.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'amount',
       type: 'sum',
     },
@@ -113,7 +114,7 @@ export default {
       prop: 'amount',
       type: 'number',
       span: 24,
-      width: 100,
+      width: 120,
       align: 'center',
       min: 0,
       precision: 2,

+ 2 - 1
src/option/yfCostManage/basicDataSetting/pickingDetail.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'useQuantity',
       type: 'sum',
     },
@@ -169,7 +170,7 @@ export default {
       prop: 'useQuantity',
       type: 'number',
       span: 24,
-      width: 80,
+      width: 120,
       align: 'center',
       min: 0,
       precision: 0,

+ 2 - 1
src/option/yfCostManage/basicDataSetting/projectZjtrCost.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'amount',
       type: 'sum',
     },
@@ -99,7 +100,7 @@ export default {
       prop: 'amount',
       type: 'number',
       span: 24,
-      width: 100,
+      width: 130,
       align: 'center',
       min: 0,
       precision: 2,

+ 2 - 1
src/option/yfCostManage/basicDataSetting/wwCostLedger.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'payAmount',
       type: 'sum',
     },
@@ -117,7 +118,7 @@ export default {
     {
       label: '委外费用金额(元)',
       prop: 'payAmount',
-      width: 100,
+      width: 130,
       align: 'center',
       span: 24,
       type: 'number',

+ 2 - 1
src/option/yfCostManage/basicDataSetting/yfCostBill.js

@@ -16,6 +16,7 @@ export default {
   showSummary: true,
   sumColumnList: [
     {
+      label: '合计:',
       name: 'amount',
       type: 'sum',
     },
@@ -146,7 +147,7 @@ export default {
       min: 0,
       precision: 2,
       span: 24,
-      width: 100,
+      width: 120,
       align: 'center',
       search: true,
       showOverflowTooltip: true,

+ 0 - 1
src/option/yfCostManage/yfCostStatistics/amortizeCostSummaryList.js

@@ -8,7 +8,6 @@ export default {
   index: true,
   addBtn: false,
   menu: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 140,
   menuWidth: 290,

+ 1 - 1
src/option/yfCostManage/yfCostStatistics/depreSummaryList.js

@@ -6,7 +6,7 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
-  selection: true,
+  selection: false,
   addBtn: false,
   menu: false,
   searchLabelWidth: 140,

+ 0 - 1
src/option/yfCostManage/yfCostStatistics/devDepreAllocation.js

@@ -8,7 +8,6 @@ export default {
   index: true,
   addBtn: false,
   menu: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 140,
   menuWidth: 290,

+ 0 - 1
src/option/yfCostManage/yfCostStatistics/hourseDepreAllocation.js

@@ -8,7 +8,6 @@ export default {
   index: true,
   addBtn: false,
   delBtn: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 110,
   menuWidth: 80,

+ 0 - 1
src/option/yfCostManage/yfCostStatistics/personAllocationList.js

@@ -7,7 +7,6 @@ export default {
   border: true,
   index: true,
   addBtn: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 100,
   menuWidth: 180,

+ 0 - 1
src/option/yfCostManage/yfCostStatistics/projectAllocationList.js

@@ -7,7 +7,6 @@ export default {
   border: true,
   index: true,
   addBtn: false,
-  selection: true,
   searchLabelWidth: 140,
   labelWidth: 100,
   menuWidth: 180,

+ 0 - 1
src/option/yfCostManage/yfCostStatistics/yfCostSummaryList.js

@@ -6,7 +6,6 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
-  selection: true,
   addBtn: false,
   menu: false,
   searchLabelWidth: 140,

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

@@ -45,7 +45,6 @@ export default {
         border: true,
         index: true,
         addBtn: false,
-        selection: true,
         searchLabelWidth: 140,
         labelWidth: 100,
         menuWidth: 180,

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

@@ -49,7 +49,6 @@ export default {
         border: true,
         index: true,
         addBtn: false,
-        selection: true,
         searchLabelWidth: 140,
         labelWidth: 100,
         menuWidth: 180,

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

@@ -45,7 +45,6 @@ export default {
         border: true,
         index: true,
         addBtn: false,
-        selection: true,
         searchLabelWidth: 140,
         labelWidth: 100,
         menuWidth: 180,

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

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

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

@@ -43,6 +43,7 @@ export default {
         gridBtn: false,
         sumColumnList: [
           {
+            label: '合计:',
             name: "useQuantity",
             type: "sum",
           },

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

@@ -32,6 +32,7 @@ export default {
         gridBtn: false,
         sumColumnList: [
           {
+            label: '合计:',
             name: "quantity",
             type: "sum",
           },