提交一下

1

src/views/main/baseinfo/management.vue

@@ -14,12 +14,12 @@
     <el-tabs v-model="activeName">
       <el-tab-pane label="总览" name="first">
         <div v-if="activeName == 'first'">
-          <manageOrganAll :data="data" :search="search" ref='manageOrganAll'/>
+          <manageOrganAll :data="data" :search="search" ref="manageOrganAll" />
         </div>
       </el-tab-pane>
       <el-tab-pane label="分部数据" name="second">
-        <div  v-if="activeName == 'second'">
-         <manageOrgan :data="data" :search="search" ref='manageOrgan'/>
+        <div v-if="activeName == 'second'">
+          <manageOrgan :data="data" :search="search" ref="manageOrgan" />
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -45,7 +45,7 @@ export default {
     "ve-histogram": histogram,
     searchHeader,
     manageOrganAll,
-    manageOrgan
+    manageOrgan,
   },
   computed: {
     legend() {
@@ -77,6 +77,12 @@ export default {
         "VIP_AMOUNT",
         "PRACTICE_AMOUNT",
         "OTHER_AMOUNT",
+        "ORGAN_ORGAN_APPLY_AMOUNT",
+        "ORGAN_RENEW_AMOUNT",
+        "ORGAN_ORGAN_VIP_AMOUNT",
+        "ORGAN_PRACTICE_AMOUN",
+        "ORGAN_OTHER_AMOUNT",
+        "ORGAN_TOTAL_AMOUNT",
       ];
       arr.forEach((str) => {
         if (this.data[str]) {
@@ -237,8 +243,8 @@ export default {
       // 请求更改数据
       this.mdate = date;
       // this.isDayOrMoth(date);
-      if(this.$refs.manageOrganAll&&this.$refs.manageOrganAll.isDayOrMoth){
-        this.$refs.manageOrganAll.isDayOrMoth(date)
+      if (this.$refs.manageOrganAll && this.$refs.manageOrganAll.isDayOrMoth) {
+        this.$refs.manageOrganAll.isDayOrMoth(date);
       }
       this.FetchDetail();
     },
@@ -293,9 +299,9 @@ export default {
         .format("YYYY-MM-DD");
       return [start, end];
     },
-    changeTimer(val){
-      this.timer = val
-    }
+    changeTimer(val) {
+      this.timer = val;
+    },
   },
 };
 </script>

src/views/main/baseinfo/modals/manageOrgan.vue

@@ -61,7 +61,7 @@ export default {
     items() {
       let obj = {};
       let arr = [
-        "TOTAL_AMOUNT",
+        "ORGAN_TOTAL_AMOUNT",
         // "FINANCE_AMOUNT",
         // "FINANCE_BALANCE_AMOUNT",
         // "FINANCE_PAY",
@@ -77,11 +77,11 @@ export default {
     items2() {
       let obj = {};
       let arr = [
-        "APPLY_AMOUNT",
-        "RENEW_AMOUNT",
-        "VIP_AMOUNT",
-        "PRACTICE_AMOUNT",
-        "OTHER_AMOUNT",
+        "ORGAN_ORGAN_APPLY_AMOUNT",
+        "ORGAN_RENEW_AMOUNT",
+        "ORGAN_ORGAN_VIP_AMOUNT",
+        "ORGAN_PRACTICE_AMOUN",
+        "ORGAN_OTHER_AMOUNT",
       ];
       arr.forEach((str) => {
         if (this.data[str]) {
@@ -194,7 +194,7 @@ export default {
       const organ = {};
       const organNameList = [];
       // 计算总的百分比
-      for (const row of values[0].organIndexMonthData || []) {
+      for (const row of values[0].indexMonthData || []) {
         const key = row.organName;
         organ[key] = {
           分部: row.organName,
@@ -213,7 +213,7 @@ export default {
         }
       }
       for (const item of values) {
-        for (const row of item.organIndexMonthData || []) {
+        for (const row of item.indexMonthData || []) {
           if (item.title == row.title) {
             organ[row.organName][row.title] = row.percent;
           }