平铺

src/views/dataChart/trendStatistics/index.vue

@@ -40,39 +40,64 @@ export default {
             valueFormat: 'yyyy-MM',
             placeholder: '选择月份'
           }
-        },
-        {
-          label: '维度',
-          prop: 'type',
-          type: 'select',
-          options: {
-            clearable: false,
-            items: [
-              { label: '绩效', value: 0 },
-              { label: '加班工资', value: 1 },
-              // { label: '通讯补贴', value: 2 },
-              // { label: '午餐费补贴', value: 3 },
-              { label: '网讯稿酬', value: 4 }
-            ]
-          }
-        },
-        {
-          label: '类型',
-          prop: 'avge',
-          type: 'select',
-          options: {
-            clearable: false,
-            items: [
-              { label: '总计', value: false },
-              { label: '平均值', value: true }
-            ]
-          }
         }
+        // {
+        //   label: '维度',
+        //   prop: 'type',
+        //   type: 'select',
+        //   options: {
+        //     clearable: false,
+        //     items: [
+        //       { label: '绩效', value: 0 },
+        //       { label: '加班工资', value: 1 },
+        //       // { label: '通讯补贴', value: 2 },
+        //       // { label: '午餐费补贴', value: 3 },
+        //       { label: '网讯稿酬', value: 4 }
+        //     ]
+        //   }
+        // },
+        // {
+        //   label: '类型',
+        //   prop: 'avge',
+        //   type: 'select',
+        //   options: {
+        //     clearable: false,
+        //     items: [
+        //       { label: '总计', value: false },
+        //       { label: '平均值', value: true }
+        //     ]
+        //   }
+        // }
       ],
       firstApis: [
         (query) => {
           return new Promise((resolve, reject) => {
-            getPayrollStatistics(query).then(resolve).catch(reject)
+            getPayrollStatistics({ type: 0, avge: true, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 0, avge: false, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 1, avge: true, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 1, avge: false, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 5, avge: true, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 5, avge: false, ...query }).then(resolve).catch(reject)
           })
         }
       ],

src/views/dataChart/welfareAnalysis/index.vue

@@ -31,36 +31,51 @@ export default {
             valueFormat: 'yyyy-MM',
             placeholder: '选择月份'
           }
-        },
-        {
-          label: '维度',
-          prop: 'type',
-          type: 'select',
-          options: {
-            clearable: false,
-            items: [
-              { label: '通讯补贴', value: 2 },
-              { label: '午餐费补贴', value: 3 }
-            ]
-          }
-        },
-        {
-          label: '类型',
-          prop: 'avge',
-          type: 'select',
-          options: {
-            clearable: false,
-            items: [
-              { label: '总计', value: false },
-              { label: '平均值', value: true }
-            ]
-          }
         }
+        // {
+        //   label: '维度',
+        //   prop: 'type',
+        //   type: 'select',
+        //   options: {
+        //     clearable: false,
+        //     items: [
+        //       { label: '通讯补贴', value: 2 },
+        //       { label: '午餐费补贴', value: 3 }
+        //     ]
+        //   }
+        // },
+        // {
+        //   label: '类型',
+        //   prop: 'avge',
+        //   type: 'select',
+        //   options: {
+        //     clearable: false,
+        //     items: [
+        //       { label: '总计', value: false },
+        //       { label: '平均值', value: true }
+        //     ]
+        //   }
+        // }
       ],
       firstApis: [
         (query) => {
           return new Promise((resolve, reject) => {
-            getPayrollStatistics(query).then(resolve).catch(reject)
+            getPayrollStatistics({ type: 2, avge: true, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 2, avge: false, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 3, avge: true, ...query }).then(resolve).catch(reject)
+          })
+        },
+        (query) => {
+          return new Promise((resolve, reject) => {
+            getPayrollStatistics({ type: 3, avge: false, ...query }).then(resolve).catch(reject)
           })
         }
       ]