src/api/dashboard.js

@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-// 会员汇总数据
-export function getMemberSummary() {
-  return request({
-    url: '/system/manage/board/member-summary',
-    method: 'get'
-  })
-}
-
-// 日业绩数据
-export function getDailyPerformance(params) {
-  return request({
-    url: '/system/manage/board/day-achieve',
-    method: 'get',
-    params
-  })
-}
-
-// 月业绩数据
-export function getMonthlyPerformance() {
-  return request({
-    url: '/system/manage/board/month-achieve',
-    method: 'get'
-  })
-}
-
-// 充值汇总数据
-export function getRechargeSummary() {
-  return request({
-    url: '/system/manage/board/recharge-summary',
-    method: 'get'
-  })
-}
-

src/router/index.js

@@ -47,7 +47,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/summaryDashboard',
+    redirect: '/dashboard',
     name: 'index',
     // alwaysShow: true,
     meta: { title: '首页', icon: 'firstPage', icon1: 'firstPageSel' },
@@ -58,13 +58,6 @@ export const constantRoutes = [
         component: () => import('@/views/dashboard/index'),
         meta: { title: '首页', icon: 'firstPage', icon1: 'firstPageSel' }
       },
-      {
-        path: 'summaryDashboard',
-        name: 'SummaryDashboard',
-        component: () => import('@/views/dashboard/dashboard'),
-        meta: { title: '汇总', icon: 'dashboard' },
-        hidden: true
-      },
       {
         path: 'hasIndex',
         name: 'HasIndex',
@@ -675,12 +668,12 @@ export const constantRoutes = [
         component: () => import('@/views/settlementCenter/bonusCount/index'),
         meta: { title: '奖金计算' }
       },
-      {
+      // {
-        path: 'performanceTotal',
+      //   path: 'performanceTotal',
-        name: 'performanceTotal',
+      //   name: 'performanceTotal',
-        component: () => import('@/views/settlementCenter/performanceTotal/index'),
+      //   component: () => import('@/views/settlementCenter/performanceTotal/index'),
-        meta: { title: '业绩汇总' }
+      //   meta: { title: '业绩汇总' }
-      },
+      // },
       {
         path: 'performanceRatio',
         name: 'performanceRatio',

src/views/dashboard/hasIndex.vue

@@ -14,11 +14,11 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :top-list="topList"
+      :topList="topList"
       :moren="moren"
-      :wait-approval-num="waitApprovalNum"
+      :waitApprovalNum="waitApprovalNum"
-      :receive-approval-num="receiveApprovalNum"
+      :receiveApprovalNum="receiveApprovalNum"
-    />
+    ></topBar>
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
@@ -35,45 +35,45 @@
               </el-form-item> -->
               <el-form-item label="签呈编号">
                 <el-input
-                  v-model="select.approvalCode"
                   clearable
+                  v-model="select.approvalCode"
                   :placeholder="'请输入'"
-                />
+                ></el-input>
               </el-form-item>
             </el-col>
             <!-- 一层 -->
             <el-col :span="4">
               <el-form-item :label="'业务类型'">
                 <el-select
-                  v-model="select.approvalBusiness"
                   clearable
                   filterable
+                  v-model="select.approvalBusiness"
                 >
                   <el-option
                     v-for="item in ywsqList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  />
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item label="业务类型内容">
                 <el-input
-                  v-model="select.approvalBusinessVal"
                   clearable
+                  v-model="select.approvalBusinessVal"
                   :placeholder="'请输入'"
-                />
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item label="情况说明">
                 <el-input
-                  v-model="select.remark"
                   clearable
+                  v-model="select.remark"
                   :placeholder="'请输入'"
-                />
+                ></el-input>
               </el-form-item>
             </el-col>
             <!-- <el-col :span="4">
@@ -89,13 +89,13 @@
             </el-col> -->
             <el-col :span="4">
               <el-form-item :label="'签呈状态'">
-                <el-select v-model="select.approveStatus" clearable>
+                <el-select clearable v-model="select.approveStatus">
                   <el-option
                     v-for="item in approveStatusList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  />
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -108,7 +108,8 @@
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                />
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -120,12 +121,14 @@
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                />
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-button type="primary" @click="getDataList1">
-                {{ '搜索' }}</el-button>
+                {{ '搜索' }}</el-button
+              >
               <el-button @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
@@ -133,24 +136,27 @@
       </div>
       <div class="main_a">
         <div class="mainbtn">
-          <el-button size="small" class="exportBtn" @click="handleExport">
+          <el-button size="small" @click="handleExport" class="exportBtn">
-            {{ '导出' }}</el-button>
+            {{ '导出' }}</el-button
+          >
         </div>
       </div>
       <el-table
-        v-loading="loading"
         :data="tableData1"
         style="width: 100%"
         height="100%"
+        v-loading="loading"
         :header-cell-style="{ background: '#EEEEEE' }"
         :row-class-name="tableRowClassName"
       >
-        <el-table-column align="center" prop="approvalCode" label="签呈编号" />
+        <el-table-column align="center" prop="approvalCode" label="签呈编号">
+        </el-table-column>
         <el-table-column
           align="center"
           prop="approvalBusinessVal"
           :label="'业务类型'"
-        />
+        >
+        </el-table-column>
         <el-table-column
           align="center"
           prop="parentClassifyName"
@@ -173,19 +179,19 @@
           <template slot-scope="scope">
             <div class="bz_a">
               <div
+                class="bz_i"
                 v-for="(item, index) in scope.row.detailList"
                 :key="index"
-                class="bz_i"
               >
-                <div :class="item.useTime == undefined ? 'qiu' : 'quan'" />
+                <div :class="item.useTime == undefined ? 'qiu' : 'quan'"></div>
                 <div
-                  v-if="index != scope.row.detailList.length - 1"
                   :class="
                     scope.row.detailList[index + 1].useTime == undefined
                       ? 'gun1'
                       : 'gun'
                   "
-                />
+                  v-if="index != scope.row.detailList.length - 1"
+                ></div>
                 <div class="time">{{ item.useTime }}</div>
                 <div class="zhi">
                   <div>{{ item.nickName }}</div>
@@ -204,7 +210,7 @@
             <div
               :class="
                 scope.row.receiveList.length > 0 &&
-                  scope.row.receiveList[0].receiveStatus == 1
+                scope.row.receiveList[0].receiveStatus == 1
                   ? 'act'
                   : 'act2'
               "
@@ -217,7 +223,8 @@
           align="center"
           prop="useTime"
           :label="'总耗时'"
-        />
+        >
+        </el-table-column>
         <!-- <el-table-column align="center"
                          prop="approvalOperationVal"
                          :label="'审核状态'">
@@ -226,7 +233,8 @@
           align="center"
           prop="approveStatusVal"
           :label="'签呈状态'"
-        />
+        >
+        </el-table-column>
         <!-- <el-table-column align="center"
                          prop="remark"
                          label="情况说明">
@@ -235,8 +243,10 @@
           align="center"
           prop="creationTime"
           :label="'创建日期'"
-        />
+        >
-        <el-table-column align="center" prop="endTime" :label="'终审日期'" />
+        </el-table-column>
+        <el-table-column align="center" prop="endTime" :label="'终审日期'">
+        </el-table-column>
 
         <el-table-column
           align="center"
@@ -246,9 +256,9 @@
         >
           <template slot-scope="scope">
             <el-button
+              @click="toFixed(scope.row.approvalCode, 1)"
               type="text"
               size="small"
-              @click="toFixed(scope.row.approvalCode, 1)"
             >
               {{ '查看签呈' }}
             </el-button>
@@ -266,137 +276,159 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
-import * as api from '@/api/manage.js'
+import * as api from "@/api/manage.js";
-import topBar from '@/components/topBar'
+import topBar from "@/components/topBar";
-import topBarMixin from './mixins/top-bar-mixin'
-export default {
-  name: 'Dashboard',
-  mixins: [topBarMixin],
 
+export default {
+  name: "Dashboard",
+  components: {
+    topBar,
+  },
   computed: {
-    ...mapGetters(['name'])
+    ...mapGetters(["name"]),
   },
   data() {
     return {
       loading: false,
       queryParams: {
         pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
       },
       total: 0,
       tableData: [],
       tableData1: [],
       tabActive: 0,
       select: {},
-      moren: 'hasIndex',
+      moren: "hasIndex",
-
+      topList: [
+        {
+          name: "代办",
+          path: "dashboard",
+        },
+        {
+          name: "已办",
+          path: "hasIndex",
+        },
+        {
+          name: "抄送查阅/操作",
+          path: "receiveIndex",
+        },
+        // {
+        //   name: '商品审核',
+        //   path: 'goodsCheck',
+        // },
+        // {
+        //   name: '产品审核',
+        //   path: 'productCheck',
+        // },
+      ],
       ywsqList: [],
       checkList: [],
       sourceList: [],
       approveStatusList: [],
-      waitApprovalNum: '',
+      waitApprovalNum: "",
-      receiveApprovalNum: ''
+      receiveApprovalNum: "",
-    }
+    };
   },
   mounted() {
     // 获取列表
-    this.getDataList1()
+    this.getDataList1();
-    this.getApprove()
+    this.getApprove();
-    this.getSignType()
+    this.getSignType();
-    this.getSource()
+    this.getSource();
-    this.getApprovalStatus()
+    this.getApprovalStatus();
   },
   methods: {
     reset() {
-      this.select = {}
+      this.select = {};
-      this.getDataList1()
+      this.getDataList1();
     },
     getApprove() {
       api.approvalBusiness().then((res) => {
-        this.ywsqList = res.data
+        this.ywsqList = res.data;
-      })
+      });
     },
     getSource() {
       api.signSource().then((res) => {
-        this.sourceList = res.data
+        this.sourceList = res.data;
-      })
+      });
     },
     getSignType() {
       api.approvalOperation().then((res) => {
-        this.checkList = res.data
+        this.checkList = res.data;
-      })
+      });
     },
     getApprovalStatus() {
       api.approvalStatus().then((res) => {
-        this.approveStatusList = res.data
+        this.approveStatusList = res.data;
-      })
+      });
       api.waitApprovalNum().then((res) => {
-        this.waitApprovalNum = res.data
+        this.waitApprovalNum = res.data;
-      })
+      });
       api.receiveApprovalNum().then((res) => {
-        this.receiveApprovalNum = res.data
+        this.receiveApprovalNum = res.data;
-      })
+      });
     },
     // 切换tab
     handleLink(id) {
-      this.tabActive = id
+      this.tabActive = id;
       if (id == 0) {
         // 获取列表
-        this.getDataList()
+        this.getDataList();
       } else {
         // 获取列表
-        this.getDataList1()
+        this.getDataList1();
       }
     },
     getDataList() {
       api.waitApproval().then((res) => {
-        this.tableData = res.data
+        this.tableData = res.data;
-      })
+      });
     },
     getDataList1() {
-      this.loading = true
+      this.loading = true;
       api
         .completeApproval(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.loading = false
+          this.loading = false;
-          this.tableData1 = res.rows
+          this.tableData1 = res.rows;
-          this.total = res.total
+          this.total = res.total;
-        })
+        });
     },
     toFixed(id, index) {
       this.$router.push({
-        path: 'manageDetails',
+        path: "manageDetails",
         query: {
           id: id,
-          index: index
+          index: index,
-        }
+        },
-      })
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: "warning",
       }).then((_) => {
         this.download(
-          '/system/manage/index/export-approval',
+          "/system/manage/index/export-approval",
           Object.assign({}, this.queryParams, this.select),
           `已办${new Date().getTime()}.xlsx`
-        )
+        );
-      })
+      });
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return 'warning-row'
+        return "warning-row";
       } else if (rowIndex % 2 == 0) {
-        return 'success-row'
+        return "success-row";
       }
-      return ''
+      return "";
-    }
+    },
-  }
+  },
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/views/dashboard/index.vue

@@ -8,12 +8,12 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0 && userInfo.userType != 9"
-      :top-list="topList"
+      :topList="topList"
       :moren="moren"
-      :wait-approval-num="waitApprovalNum"
+      :waitApprovalNum="waitApprovalNum"
-      :receive-approval-num="receiveApprovalNum"
+      :receiveApprovalNum="receiveApprovalNum"
-    />
+    ></topBar>
-    <div v-if="userInfo.userType != 9" class="main">
+    <div class="main" v-if="userInfo.userType != 9">
       <div>
         <div class="form_all">
           <el-form ref="select" :model="select" label-width="auto">
@@ -21,45 +21,45 @@
               <el-col :span="6">
                 <el-form-item label="签呈编号">
                   <el-input
-                    v-model="select.approvalCode"
                     clearable
+                    v-model="select.approvalCode"
                     :placeholder="'请输入'"
-                  />
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <!-- 一层 -->
               <el-col :span="6">
                 <el-form-item :label="'业务类型'">
                   <el-select
-                    v-model="select.approvalBusiness"
                     clearable
                     filterable
+                    v-model="select.approvalBusiness"
                   >
                     <el-option
                       v-for="item in ywsqList"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
-                    />
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="业务类型内容">
                   <el-input
-                    v-model="select.approvalBusinessVal"
                     clearable
+                    v-model="select.approvalBusinessVal"
                     :placeholder="'请输入'"
-                  />
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="情况说明">
                   <el-input
-                    v-model="select.remark"
                     clearable
+                    v-model="select.remark"
                     :placeholder="'请输入'"
-                  />
+                  ></el-input>
                 </el-form-item>
               </el-col>
 
@@ -83,7 +83,8 @@
                     :range-separator="'至'"
                     :start-placeholder="'开始日期'"
                     :end-placeholder="'结束日期'"
-                  />
+                  >
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="8">
@@ -99,16 +100,17 @@
             </el-col> -->
               <el-col :span="4">
                 <el-button type="primary" @click="getDataList">
-                  {{ '搜索' }}</el-button>
+                  {{ '搜索' }}</el-button
+                >
                 <el-button @click="reset"> {{ '重置' }}</el-button>
               </el-col>
             </el-row>
           </el-form>
         </div>
         <el-table
-          v-loading="loading"
           :data="tableData"
           height="700px"
+          v-loading="loading"
           :element-loading-text="'正在加载'"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
@@ -117,14 +119,17 @@
             align="center"
             prop="creation"
             :label="'发起人'"
-          />
+          >
-          <el-table-column align="center" prop="approvalCode" label="签呈编号" />
+          </el-table-column>
+          <el-table-column align="center" prop="approvalCode" label="签呈编号">
+          </el-table-column>
 
           <el-table-column
             align="center"
             prop="approvalBusinessVal"
             :label="'业务类型'"
-          />
+          >
+          </el-table-column>
           <el-table-column
             align="center"
             prop="parentClassifyName"
@@ -134,21 +139,21 @@
             <template slot-scope="scope">
               <div class="bz_a">
                 <div
+                  class="bz_i"
                   v-for="(item, index) in scope.row.detailList"
                   :key="index"
-                  class="bz_i"
                 >
                   <div
                     :class="item.useTime == undefined ? 'qiu' : 'quan'"
-                  />
+                  ></div>
                   <div
-                    v-if="index != scope.row.detailList.length - 1"
                     :class="
                       scope.row.detailList[index + 1].useTime == undefined
                         ? 'gun1'
                         : 'gun'
                     "
-                  />
+                    v-if="index != scope.row.detailList.length - 1"
+                  ></div>
                   <div class="time">{{ item.useTime }}</div>
                   <div class="zhi">
                     <div>{{ item.nickName }}</div>
@@ -167,9 +172,9 @@
             <template slot-scope="scope">
               <el-button
                 v-show="scope.row.approvalFlag == 0"
+                @click="toFixed(scope.row.approvalCode, 0)"
                 type="text"
                 size="small"
-                @click="toFixed(scope.row.approvalCode, 0)"
               >
                 {{ '审核' }}
               </el-button>
@@ -180,7 +185,8 @@
             prop="creationTime"
             width="100"
             :label="'创建日期'"
-          />
+          >
+          </el-table-column>
           <el-table-column
             align="center"
             prop="time"
@@ -190,9 +196,9 @@
           >
             <template slot-scope="scope">
               <el-button
+                @click="toFixed(scope.row.approvalCode, 0)"
                 type="text"
                 size="small"
-                @click="toFixed(scope.row.approvalCode, 0)"
               >
                 {{ '查看签呈' }}
               </el-button>
@@ -223,7 +229,7 @@
       <div class="title">
         {{ noticeObj.title }}
       </div>
-      <div class="img-auto" v-html="noticeObj.content" />
+      <div v-html="noticeObj.content" class="img-auto"></div>
       <!--      <span slot="footer"-->
       <!--            class="dialog-footer">-->
       <!--        <el-button type="primary"-->
@@ -234,30 +240,28 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
-import * as api from '@/api/manage.js'
+import * as api from "@/api/manage.js";
-import topBar from '@/components/topBar'
+import topBar from "@/components/topBar";
-import * as not from '@/api/notice.js'
+import * as not from "@/api/notice.js";
-import topBarMixin from './mixins/top-bar-mixin'
 
 export default {
-  name: 'Dashboard',
+  name: "Dashboard",
   components: {
-    topBar
+    topBar,
   },
-  mixins: [topBarMixin],
   computed: {
-    ...mapGetters(['name', 'user'])
+    ...mapGetters(["name", "user"]),
   },
   data() {
     return {
       queryParams: {
         pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
       },
       select: {
         websiteType: 2,
-        functionType: 1
+        functionType: 1,
       },
 
       approveStatusList: [],
@@ -267,127 +271,149 @@ export default {
       tabActive: 0,
       loading: false,
       select: {},
-      moren: 'dashboard',
+      moren: "dashboard",
+      topList: [
+        {
+          name: "代办",
+          path: "dashboard",
+        },
+        {
+          name: "已办",
+          path: "hasIndex",
+        },
+        {
+          name: "抄送查阅/操作",
+          path: "receiveIndex",
+        },
+        // {
+        //   name: '商品审核',
+        //   path: 'goodsCheck',
+        // },
+        // {
+        //   name: '产品审核',
+        //   path: 'productCheck',
+        // },
+      ],
       ywsqList: [],
       checkList: [],
       tableList: [],
-      userInfo: '',
+      userInfo: "",
       isNotice: false,
-      waitApprovalNum: '',
+      waitApprovalNum: "",
-      receiveApprovalNum: '',
+      receiveApprovalNum: "",
       noticeObj: [
         {
-          title: '',
+          title: "",
-          content: ''
+          content: "",
-        }
+        },
-      ]
+      ],
-    }
+    };
   },
   mounted() {
     // 获取列表
-    this.getDataList()
+    this.getDataList();
-    this.getApprove()
+    this.getApprove();
-    this.getSignType()
+    this.getSignType();
-    this.getNoticePop()
+    this.getNoticePop();
-    this.getApprovalStatus()
+    this.getApprovalStatus();
-    this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
+    this.userInfo = JSON.parse(localStorage.getItem("userInfo"));
   },
   methods: {
     reset() {
-      this.select = {}
+      this.select = {};
-      this.getDataList()
+      this.getDataList();
     },
     handleClose() {
-      this.isNotice = false
+      this.isNotice = false;
     },
     getNoticePop() {
       // this.getUser
-      const userInfo = JSON.parse(localStorage.getItem('userInfo'))
+      let userInfo = JSON.parse(localStorage.getItem("userInfo"));
       api
         .noticeShow({
-          roles: userInfo.roleIds
+          roles: userInfo.roleIds,
         })
         .then((res) => {
           if (res.data.length > 0) {
-            this.noticeObj = res.data[0]
+            this.noticeObj = res.data[0];
-            this.isNotice = true
+            this.isNotice = true;
           }
-        })
+        });
     },
     getApprovalStatus() {
       api.approvalStatus().then((res) => {
-        this.approveStatusList = res.data
+        this.approveStatusList = res.data;
-      })
+      });
       api.waitApprovalNum().then((res) => {
-        this.waitApprovalNum = res.data
+        this.waitApprovalNum = res.data;
-      })
+      });
       api.receiveApprovalNum().then((res) => {
-        this.receiveApprovalNum = res.data
+        this.receiveApprovalNum = res.data;
-      })
+      });
     },
     goNotice(item) {
       this.$router.push({
-        path: '/announcement/noticeList/details',
+        path: "/announcement/noticeList/details",
         query: {
           pkId: item.pkId,
-          type: 1
+          type: 1,
           // functionType:this.select.functionType
-        }
+        },
-      })
+      });
     },
     openNotice() {
       this.$router.push({
-        path: '/announcement/noticeList/details',
+        path: "/announcement/noticeList/details",
         query: {
-          isAdmin: true
+          isAdmin: true,
-        }
+        },
-      })
+      });
     },
     getApprove() {
       api.approvalBusiness().then((res) => {
-        this.ywsqList = res.data
+        this.ywsqList = res.data;
-      })
+      });
     },
     getSignType() {
       api.approvalOperation().then((res) => {
-        this.checkList = res.data
+        this.checkList = res.data;
-      })
+      });
     },
     getDataList() {
-      this.loading = true
+      this.loading = true;
       api.waitApproval(this.select).then((res) => {
-        this.tableData = res.data
+        this.tableData = res.data;
-        this.loading = false
+        this.loading = false;
-      })
+      });
       not.indexNoticeAdminList(this.select).then((res) => {
-        this.tableList = res.rows
+        this.tableList = res.rows;
         this.tableList.forEach((item) => {
           if (item.title.length > 20) {
-            item.title = item.title.substring(0, 20) + '...'
+            item.title = item.title.substring(0, 20) + "...";
           }
-          item.creationTime = item.creationTime.substring(0, 10)
+          item.creationTime = item.creationTime.substring(0, 10);
-        })
+        });
-      })
+      });
     },
     toFixed(id, index) {
       this.$router.push({
-        path: 'manageDetails',
+        path: "manageDetails",
         query: {
           id: id,
-          index: index
+          index: index,
-        }
+        },
-      })
+      });
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return 'warning-row'
+        return "warning-row";
       } else if (rowIndex % 2 == 0) {
-        return 'success-row'
+        return "success-row";
       }
-      return ''
+      return "";
-    }
+    },
-  }
+  },
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/views/dashboard/mixins/top-bar-mixin.js

@@ -1,73 +0,0 @@
-import * as api from '@/api/manage.js'
-import { mapGetters } from 'vuex'
-import { getRouters } from '@/api/settle'
-export default {
-  data() {
-    return {
-      waitApprovalNum: '',
-      receiveApprovalNum: '',
-      defaultTabItem: 'dashboard',
-      topList: [
-        {
-          name: '看板',
-          path: 'summaryDashboard'
-        },
-        {
-          name: '代办',
-          path: 'dashboard'
-        },
-        {
-          name: '已办',
-          path: 'hasIndex'
-        },
-        {
-          name: '抄送查阅/操作',
-          path: 'receiveIndex'
-        }
-        // {
-        //   name: '商品审核',
-        //   path: 'goodsCheck',
-        // },
-        // {
-        //   name: '产品审核',
-        //   path: 'productCheck',
-        // },
-      ],
-      roleMenu: []
-    }
-  },
-  computed: {
-    ...mapGetters(['name', 'user'])
-  },
-  created() {
-    this.getRoles()
-  },
-  methods: {
-    getApprovalStatus() {
-      api.waitApprovalNum().then((res) => {
-        this.waitApprovalNum = res.data
-      })
-      api.receiveApprovalNum().then((res) => {
-        this.receiveApprovalNum = res.data
-      })
-    },
-    getRoles() {
-      return new Promise((resolve, reject) => {
-        getRouters().then((res) => {
-          this.roleMenu = res.data || []
-          if (!this.roleMenu.find((item) => item.routeName === 'summaryDashboard')) {
-            this.topList.splice(0, 1)
-            if (this.$route.name === 'SummaryDashboard') {
-              this.$router.replace({
-                name: 'Dashboard'
-              })
-            }
-            reject()
-            return
-          }
-          resolve()
-        })
-      })
-    }
-  }
-}

src/views/dashboard/receiveIndex.vue

@@ -14,11 +14,11 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :top-list="topList"
+      :topList="topList"
       :moren="moren"
-      :wait-approval-num="waitApprovalNum"
+      :waitApprovalNum="waitApprovalNum"
-      :receive-approval-num="receiveApprovalNum"
+      :receiveApprovalNum="receiveApprovalNum"
-    />
+    ></topBar>
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
@@ -27,37 +27,37 @@
             <el-col :span="4">
               <el-form-item :label="'业务类型'">
                 <el-select
-                  v-model="select.approvalBusiness"
                   clearable
                   filterable
+                  v-model="select.approvalBusiness"
                 >
                   <el-option
                     v-for="item in ywsqList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  />
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'发起人'">
                 <el-input
-                  v-model="select.userName"
                   clearable
+                  v-model="select.userName"
                   :placeholder="'请输入'"
-                />
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'签呈状态'">
-                <el-select v-model="select.receiveStatus" clearable>
+                <el-select clearable v-model="select.receiveStatus">
                   <el-option
                     v-for="item in readStateList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  />
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -70,7 +70,8 @@
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                />
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -82,12 +83,14 @@
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
-                />
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-button type="primary" @click="getDataList1">
-                {{ '搜索' }}</el-button>
+                {{ '搜索' }}</el-button
+              >
               <el-button @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
@@ -98,33 +101,37 @@
           <el-button
             size="small"
             :disabled="pkIdList.length == 0"
-            type="success"
             @click="toReceive(0)"
-          >{{ '接收' }}</el-button>
+            type="success"
-          <el-button size="small" class="exportBtn" @click="handleExport">
+            >{{ '接收' }}</el-button
-            {{ '导出' }}</el-button>
+          >
+          <el-button size="small" @click="handleExport" class="exportBtn">
+            {{ '导出' }}</el-button
+          >
         </div>
       </div>
       <el-table
-        v-loading="loading"
         :data="tableData1"
         style="width: 100%"
         height="100%"
+        v-loading="loading"
+        @selection-change="handleSelectionChange"
         :header-cell-style="{ background: '#EEEEEE' }"
         :row-class-name="tableRowClassName"
-        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column
           align="center"
           prop="userName"
           :label="'发起人'"
-        />
+        >
+        </el-table-column>
         <el-table-column
           align="center"
           prop="approvalBusinessVal"
           :label="'业务类型'"
-        />
+        >
+        </el-table-column>
 
         <el-table-column
           align="center"
@@ -142,8 +149,10 @@
           align="center"
           prop="creationTime"
           :label="'创建日期'"
-        />
+        >
-        <el-table-column align="center" prop="sendTime" :label="'终审日期'" />
+        </el-table-column>
+        <el-table-column align="center" prop="sendTime" :label="'终审日期'">
+        </el-table-column>
 
         <el-table-column
           align="center"
@@ -154,18 +163,18 @@
           <template slot-scope="scope">
             <el-button
               style="color: #48b2fd"
+              @click="toFixed(scope.row.approvalCode, 2, scope.row.pkId)"
               type="text"
               size="small"
-              @click="toFixed(scope.row.approvalCode, 2, scope.row.pkId)"
             >
               {{ '查看签呈' }}
             </el-button>
             <el-button
-              v-show="scope.row.receiveStatus == 1"
               style="color: #53b11e"
+              v-show="scope.row.receiveStatus == 1"
+              @click="toReceive(1, scope.row.pkId)"
               type="text"
               size="small"
-              @click="toReceive(1, scope.row.pkId)"
             >
               {{ '接收' }}
             </el-button>
@@ -183,166 +192,186 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
-import * as api from '@/api/manage.js'
+import * as api from "@/api/manage.js";
-import topBar from '@/components/topBar'
+import topBar from "@/components/topBar";
-import topBarMixin from './mixins/top-bar-mixin'
+
 export default {
-  name: 'Dashboard',
+  name: "Dashboard",
   components: {
-    topBar
+    topBar,
   },
-  mixins: [topBarMixin],
   computed: {
-    ...mapGetters(['name'])
+    ...mapGetters(["name"]),
   },
   data() {
     return {
       loading: false,
       queryParams: {
         pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
       },
       total: 0,
       tableData: [],
       tableData1: [],
       tabActive: 0,
       select: {},
-      moren: 'receiveIndex',
+      moren: "receiveIndex",
-
+      topList: [
+        {
+          name: "代办",
+          path: "dashboard",
+        },
+        {
+          name: "已办",
+          path: "hasIndex",
+        },
+        {
+          name: "抄送查阅/操作",
+          path: "receiveIndex",
+        },
+        // {
+        //   name: '商品审核',
+        //   path: 'goodsCheck',
+        // },
+        // {
+        //   name: '产品审核',
+        //   path: 'productCheck',
+        // },
+      ],
       ywsqList: [],
       checkList: [],
       sourceList: [],
       approveStatusList: [],
       pkIdList: [],
       readStateList: [],
-      waitApprovalNum: '',
+      waitApprovalNum: "",
-      receiveApprovalNum: ''
+      receiveApprovalNum: "",
-    }
+    };
   },
   mounted() {
     // 获取列表
-    this.getDataList1()
+    this.getDataList1();
-    this.getApprove()
+    this.getApprove();
-    this.getSignType()
+    this.getSignType();
-    this.getSource()
+    this.getSource();
-    this.getreadState()
+    this.getreadState();
-    this.getApprovalStatus()
+    this.getApprovalStatus();
   },
   methods: {
     reset() {
-      this.select = {}
+      this.select = {};
-      this.getDataList1()
+      this.getDataList1();
     },
     getApprove() {
       api.approvalBusiness().then((res) => {
-        this.ywsqList = res.data
+        this.ywsqList = res.data;
-      })
+      });
     },
     getreadState() {
       api.readState().then((res) => {
-        this.readStateList = res.data
+        this.readStateList = res.data;
-      })
+      });
     },
     getSource() {
       api.signSource().then((res) => {
-        this.sourceList = res.data
+        this.sourceList = res.data;
-      })
+      });
     },
     getSignType() {
       api.approvalOperation().then((res) => {
-        this.checkList = res.data
+        this.checkList = res.data;
-      })
+      });
     },
     getApprovalStatus() {
       api.approvalStatus().then((res) => {
-        this.approveStatusList = res.data
+        this.approveStatusList = res.data;
-      })
+      });
       api.waitApprovalNum().then((res) => {
-        this.waitApprovalNum = res.data
+        this.waitApprovalNum = res.data;
-      })
+      });
       api.receiveApprovalNum().then((res) => {
-        this.receiveApprovalNum = res.data
+        this.receiveApprovalNum = res.data;
-      })
+      });
     },
     getDataList1() {
-      this.loading = true
+      this.loading = true;
       api
         .receiveApprovalList(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.loading = false
+          this.loading = false;
-          this.tableData1 = res.rows
+          this.tableData1 = res.rows;
-          this.total = res.total
+          this.total = res.total;
-        })
+        });
     },
     handleSelectionChange(val) {
       if (val.length > 0) {
-        const pkIdList = val.map((item) => {
+        let pkIdList = val.map((item) => {
-          return item.pkId
+          return item.pkId;
-        })
+        });
-        this.pkIdList = pkIdList
+        this.pkIdList = pkIdList;
         console.log(
-          '%c [ this.pkIdList ]-274',
+          "%c [ this.pkIdList ]-274",
-          'font-size:13px; background:#69b38c; color:#adf7d0;',
+          "font-size:13px; background:#69b38c; color:#adf7d0;",
           this.pkIdList
-        )
+        );
       } else {
-        this.pkIdList = []
+        this.pkIdList = [];
       }
     },
     toReceive(index, id) {
       if (index) {
-        this.pkIdList = [id]
+        this.pkIdList = [id];
       }
       api
         .receiveApproval({
-          pkIdList: this.pkIdList
+          pkIdList: this.pkIdList,
         })
         .then((res) => {
           if (res.code == 200) {
             this.$message({
-              type: 'success',
+              type: "success",
-              message: res.msg
+              message: res.msg,
-            })
+            });
-            this.getDataList1()
+            this.getDataList1();
-            this.getApprovalStatus()
+            this.getApprovalStatus();
           }
-        })
+        });
     },
     toFixed(id, index, pkId) {
       this.$router.push({
-        path: 'manageDetails',
+        path: "manageDetails",
         query: {
           id: id,
           index: index,
-          pkId: pkId
+          pkId: pkId,
-        }
+        },
-      })
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: "warning",
       }).then((_) => {
         this.download(
-          '/system/manage/index/receive-approval-export',
+          "/system/manage/index/receive-approval-export",
           Object.assign({}, this.queryParams, this.select),
           `签呈接收${new Date().getTime()}.xlsx`
-        )
+        );
-      })
+      });
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return 'warning-row'
+        return "warning-row";
       } else if (rowIndex % 2 == 0) {
-        return 'success-row'
+        return "success-row";
       }
-      return ''
+      return "";
-    }
+    },
-  }
+  },
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/views/settlementCenter/performanceTotal/index.vue

@@ -6,83 +6,65 @@
 -->
 <template>
   <div class="page">
-    <topBar
+    <topBar v-if="topList.length > 0"
-      v-if="topList.length > 0"
+            :topList="topList"
-      :top-list="topList"
+            :moren="moren"></topBar>
-      :moren="moren"
-    />
     <div class="main">
-      <el-form
+      <el-form ref="select"
-        ref="select"
+               :model="select"
-        :model="select"
+               style="padding:0 10px 0 10px;background: #fff"
-        style="padding:0 10px 0 10px;background: #fff"
+               label-width="auto">
-        label-width="auto"
-      >
         <el-row :gutter="20">
           <!-- 一层 -->
           <el-col :span="4">
             <el-form-item :label="'结算期数'">
-              <el-input
+              <el-input clearable
-                v-model="select.memberSettlePeriodId"
+                        v-model="select.memberSettlePeriodId"></el-input>
-                clearable
-              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'币种展示'">
-              <el-select
+              <el-select clearable
-                v-model="select.pkCurrency"
+                         placeholder=""
-                clearable
+                         v-model="select.pkCurrency">
-                placeholder=""
+                <el-option v-for="item in acList"
-              >
+                           :key="item.value"
-                <el-option
+                           :label="item.label"
-                  v-for="item in acList"
+                           :value="item.value"></el-option>
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="'结算日期'">
-              <el-date-picker
+              <el-date-picker v-model="creationTime"
-                v-model="creationTime"
+                              @change="changeTime"
-                value-format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd"
-                type="daterange"
+                              type="daterange"
-                format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
-                :range-separator="'至'"
+                              :range-separator="'至'"
-                :start-placeholder="'开始日期'"
+                              :start-placeholder="'开始日期'"
-                :end-placeholder="'结束日期'"
+                              :end-placeholder="'结束日期'">
-                @change="changeTime"
+              </el-date-picker>
-              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item :label="'隶属体系'">
-              <el-cascader
+              <el-cascader :options="verList"
-                v-model="select.pkBdVertexStred"
+                           v-model="select.pkBdVertexStred"
-                :options="verList"
+                           @change="getPkBdVertexStr"
-                :props="props"
+                           :props="props"
-                collapse-tags
+                           collapse-tags
-                clearable
+                           clearable></el-cascader>
-                @change="getPkBdVertexStr"
-              />
             </el-form-item>
           </el-col>
-          <el-col
+          <el-col :span="4"
-            :span="4"
+                 >
-          >
+            <el-button type="primary"
-            <el-button
+            size="small"
-              type="primary"
+                       class="my_search"
-              size="small"
+                       @click="getDataList"> {{ '搜索' }}</el-button>
-              class="my_search"
+            <el-button class="my_reset"
-              @click="getDataList"
+                       @click="reset"> {{ '重置' }}</el-button>
-            > {{ '搜索' }}</el-button>
-            <el-button
-              class="my_reset"
-              @click="reset"
-            > {{ '重置' }}</el-button>
           </el-col>
         </el-row>
         <!-- <el-row>
@@ -116,12 +98,10 @@
       </el-form>
       <div class="maintop">
         <div class="mainbtn">
-          <el-button
+          <el-button size="small"
-            v-has-buttons="['performanceTotalExport']"
+                     v-has-buttons="['performanceTotalExport']"
-            size="small"
+                     @click="handleExport"
-            class="thebtn2"
+                     class="thebtn2"> {{ '导出' }}</el-button>
-            @click="handleExport"
-          > {{ '导出' }}</el-button>
         </div>
         <!-- <div>
           <el-dropdown :hide-on-click="false">
@@ -139,127 +119,382 @@
       </div>
       <div class="maintable">
         <div class="itemTrading">
-          <el-table
+          <el-table :data="tableData"
-            ref="mainTable"
+                    ref="mainTable"
-            v-loading="loading"
+                    v-loading="loading"
-            :data="tableData"
+                    height='730px'
-            height="730px"
+                    style="width: 100%"
-            style="width: 100%"
+                    :header-cell-style="{ background: '#EEEEEE' }"
-            :header-cell-style="{ background: '#EEEEEE' }"
+                    :row-class-name="tableRowClassName"
-            :row-class-name="tableRowClassName"
+                    @selection-change="handleSelectionChange"
-            :summary-method="getSummaries"
+                    :summary-method="getSummaries"
-            show-summary
+                    show-summary>
-            @selection-change="handleSelectionChange"
+            <el-table-column type="selection"
-          >
+                             width="55"> </el-table-column>
-            <el-table-column
-              type="selection"
-              width="55"
-            />
             <!-- <el-table-column align="center"
                              prop="numberPeriods"
                              width="150"
                              v-if="dataList[0].key"
                              :label="'结算期数'">
             </el-table-column> -->
-            <el-table-column
+            <el-table-column align="center"
-              v-if="allTxt.settleDate"
+                             prop="settleDate"
-              align="center"
+                             width="150"
-              prop="settleDate"
+                             v-if="allTxt.settleDate"
-              width="150"
+                             :label="'结算时间'">
-              :label="'结算时间'"
+            </el-table-column>
-            />
+            <el-table-column align="center"
-            <el-table-column
+                             prop="registerAmount"
-              v-if="allTxt.registerAmount"
+                             v-if="allTxt.registerAmount"
-              align="center"
+                             :formatter="stateFormat"
-              prop="registerAmount"
+                             width="160"
-              :formatter="stateFormat"
+                             :label="'注册金额'+`(￥)`">
-              width="160"
+            </el-table-column>
-              :label="'注册金额'"
+            <el-table-column align="center"
-            />
+                             prop="registerAmountDollar"
+                             v-if="allTxt.registerAmountDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'注册金额'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="registerAmountLocality"
+                             v-if="allTxt.registerAmountLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'注册金额'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="registerPv"
+                             v-if="allTxt.registerPv"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'注册业绩'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="registerPvDollar"
+                             v-if="allTxt.registerPvDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'注册业绩'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="registerPvLocality"
+                             v-if="allTxt.registerPvLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'注册业绩'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="upgradeAmount"
+                             v-if="allTxt.upgradeAmount"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'升级金额'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="upgradeAmountDollar"
+                             v-if="allTxt.upgradeAmountDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'升级金额'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="upgradeAmountLocality"
+                             v-if="allTxt.upgradeAmountLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'升级金额'+`(${isLocalSymbol()})`">
+            </el-table-column>
 
-            <el-table-column
+            <el-table-column align="center"
-              v-if="allTxt.registerPv"
+                             prop="upgradePv"
-              align="center"
+                             v-if="allTxt.upgradePv"
-              prop="registerPv"
+                             :formatter="stateFormat"
-              :formatter="stateFormat"
+                             width="160"
-              width="160"
+                             :label="'升级业绩'+`(￥)`">
-              :label="'注册业绩'"
+            </el-table-column>
-            />
+            <el-table-column align="center"
+                             prop="upgradePvDollar"
+                             v-if="allTxt.upgradePvDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'升级业绩'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="upgradePvLocality"
+                             v-if="allTxt.upgradePvLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'升级业绩'+`(${isLocalSymbol()})`">
+            </el-table-column>
 
-            <el-table-column
+            <el-table-column align="center"
-              v-if="allTxt.upgradeAmount"
+                             v-if="allTxt.firstPurchaseAmount"
-              align="center"
+                             prop="firstPurchaseAmount"
-              prop="upgradeAmount"
+                             :formatter="stateFormat"
-              :formatter="stateFormat"
+                             width="160"
-              width="160"
+                             :label="'首购金额'+`(￥)`">
-              :label="'升级金额'"
+            </el-table-column>
-            />
+            <el-table-column align="center"
-            <el-table-column
+                             v-if="allTxt.firstPurchaseAmountDollar"
-              v-if="allTxt.upgradePv"
+                             prop="firstPurchaseAmountDollar"
-              align="center"
+                             :formatter="stateFormat"
-              prop="upgradePv"
+                             width="160"
-              :formatter="stateFormat"
+                             :label="'首购金额'+`($)`">
-              width="160"
+            </el-table-column>
-              :label="'升级业绩'"
+            <el-table-column align="center"
-            />
+                             v-if="allTxt.firstPurchaseAmountLocality"
+                             prop="firstPurchaseAmountLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'首购金额'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.firstPurchasePv"
+                             prop="firstPurchasePv"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'首购业绩'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.firstPurchasePvDollar"
+                             prop="firstPurchasePvDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'首购业绩'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.firstPurchasePvLocality"
+                             prop="firstPurchasePvLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'首购业绩'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="tripartiteAmount"
+                             v-if="allTxt.tripartiteAmount&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'三方' +'金额'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="tripartiteAmountDollar"
+                             v-if="allTxt.tripartiteAmountDollar&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'三方' +'金额'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="tripartiteAmountLocality"
+                             v-if="allTxt.tripartiteAmountLocality&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'三方' +'金额'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="tripartitePv"
+                             v-if="allTxt.tripartitePv&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'三方' +'业绩'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="tripartitePvDollar"
+                             v-if="allTxt.tripartitePvDollar&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'三方' +'业绩'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="tripartitePvLocality"
+                             v-if="allTxt.tripartitePvLocality&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'三方' +'业绩'+`(${isLocalSymbol()})`">
+            </el-table-column>
 
-            <el-table-column
+            <!-- <el-table-column align="center"
-              v-if="allTxt.firstPurchaseAmount"
+                             prop="directSupplyAmount"
-              align="center"
+                             v-if="allTxt.directSupplyAmount"
-              prop="firstPurchaseAmount"
+                             :formatter="stateFormat"
-              :formatter="stateFormat"
+                             width="160"
-              width="160"
+                             :label="'直供金额'+`(￥)`">
-              :label="'首购金额'"
+            </el-table-column>
-            />
+            <el-table-column align="center"
+                             prop="directSupplyAmountDollar"
+                             v-if="allTxt.directSupplyAmountDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'直供金额'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="directSupplyAmountLocality"
+                             v-if="allTxt.directSupplyAmountLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'直供金额'+`(${isLocalSymbol()})`">
+            </el-table-column> -->
+            <!-- <el-table-column align="center"
+                             prop="directSupplyPv"
+                             v-if="allTxt.directSupplyPv"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'直供业绩'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="directSupplyPvDollar"
+                             v-if="allTxt.directSupplyPvDollar"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'直供业绩'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="directSupplyPvLocality"
+                             v-if="allTxt.directSupplyPvLocality"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'直供业绩'+`(${isLocalSymbol()})`">
+            </el-table-column> -->
+            <el-table-column align="center"
+                             prop="fansAmount"
+                             v-if="allTxt.fansAmount&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'海粉金额'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="fansAmountDollar"
+                             v-if="allTxt.fansAmountDollar&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'海粉金额'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="fansAmountLocality"
+                             v-if="allTxt.fansAmountLocality&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'海粉金额'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="hiFunPv"
+                             v-if="allTxt.hiFunPv&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'海粉业绩'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="hiFunPvDollar"
+                             v-if="allTxt.hiFunPvDollar&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'海粉业绩'+`($)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="hiFunPvLocality"
+                             v-if="allTxt.hiFunPvLocality&&getUser.user.pkCountry==1"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'海粉业绩'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             prop="repurchaseAmount"
+                             v-if="allTxt.repurchaseAmount"
+                             :formatter="stateFormat"
+                             width="160"
+                             :label="'复购金额'+`(￥)`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.repurchaseAmountDollar"
+                             prop="repurchaseAmountDollar"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'复购金额'+'($)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.repurchaseAmountLocality"
+                             prop="repurchaseAmountLocality"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'复购金额'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.repurchasePv"
+                             prop="repurchasePv"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'复购业绩'+'(￥)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.repurchasePvDollar"
+                             prop="repurchasePvDollar"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'复购业绩'+'($)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.repurchasePvLocality"
+                             prop="repurchasePvLocality"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'复购业绩'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.amountTotal"
+                             prop="amountTotal"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'金额总计'+'(￥)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.amountTotalDollar"
+                             prop="amountTotalDollar"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'金额总计'+'($)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.amountTotalLocality"
+                             prop="amountTotalLocality"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'金额总计'+`(${isLocalSymbol()})`">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.pvTotal"
+                             prop="pvTotal"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'业绩汇总'+'(￥)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.pvTotalDollar"
+                             prop="pvTotalDollar"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'业绩汇总'+'($)'">
+            </el-table-column>
+            <el-table-column align="center"
+                             v-if="allTxt.pvTotalLocality"
+                             prop="pvTotalLocality"
+                             :formatter="stateFormat"
+                             width="150"
+                             :label="'业绩汇总'+`(${isLocalSymbol()})`">
+            </el-table-column>
            
-            <el-table-column
-              v-if="allTxt.firstPurchasePv"
-              align="center"
-              prop="firstPurchasePv"
-              :formatter="stateFormat"
-              width="160"
-              :label="'首购业绩'"
-            />
-
-            <el-table-column
-              v-if="allTxt.repurchaseAmount"
-              align="center"
-              prop="repurchaseAmount"
-              :formatter="stateFormat"
-              width="160"
-              :label="'复购金额'"
-            />
-
-            <el-table-column
-              v-if="allTxt.repurchasePv"
-              align="center"
-              prop="repurchasePv"
-              :formatter="stateFormat"
-              width="150"
-              :label="'复购业绩'"
-            />
-
-            <el-table-column
-              v-if="allTxt.amountTotal"
-              align="center"
-              prop="amountTotal"
-              :formatter="stateFormat"
-              width="150"
-              :label="'金额总计'"
-            />
-
-            <el-table-column
-              v-if="allTxt.pvTotal"
-              align="center"
-              prop="pvTotal"
-              :formatter="stateFormat"
-              width="150"
-              :label="'业绩汇总'"
-            />
           
           </el-table>
         </div>
-
+        <!-- <div class="heji">
+          <div class="dis"
+               v-for="item in menuList"
+               :key="item.id"
+               v-if="item.checked&&item.id != 0&&item.id > 13">
+            <div>{{ item.text }}</div>
+            <div>{{ tableData[item.prop] }}</div>
+          </div>
+        </div> -->
       </div>
     </div>
     <!-- <pagination v-show="total>0"
@@ -283,7 +518,7 @@ import { mapGetters } from 'vuex'
 export default {
   name: 'Bzpz',
   components: {
-    topBar
+    topBar,
   },
   filters: {
     isAgree(val) {
@@ -292,60 +527,60 @@ export default {
       } else {
         return '禁止'
       }
-    }
+    },
   },
   data() {
     return {
       typeList: [
         {
           value: 0,
-          label: '前台'
+          label: '前台',
         },
         {
           value: 1,
-          label: '后台'
+          label: '后台',
-        }
+        },
       ],
       digList: [
         {
           value: 0,
-          label: '允许'
+          label: '允许',
         },
         {
           value: 1,
-          label: '禁止'
+          label: '禁止',
-        }
+        },
       ],
       creationTime: [],
       creationTime1: [],
       select: {
         pkVertex: [],
-        pkMemberTeam: []
+        pkMemberTeam: [],
       },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
       },
       addOrEdit: '',
       total: 0,
       dialogVisible: false,
       tableData: [],
-      loading: false,
+      loading:false,
       moren: '/settlementCenter/performanceTotal',
       topList: [
         {
           name: '业绩汇总',
-          path: '/settlementCenter/performanceTotal'
+          path: '/settlementCenter/performanceTotal',
-        }
+        },
       ],
       form: {
-        name: ''
+        name: '',
       },
       rules: {
         name: [
-          { required: true, message: '请输入规格类型', trigger: 'blur' }
+          { required: true, message: '请输入规格类型', trigger: 'blur' },
-        ]
+        ],
       },
       acList: [],
       verList: [],
@@ -357,8 +592,8 @@ export default {
         expandTrigger: 'hover',
         value: 'pkId',
         label: 'vertexName',
-        children: 'childList'
+        children: 'childList',
-      }
+      },
     }
   },
   computed: {
@@ -380,15 +615,15 @@ export default {
   methods: {
     getPkBdVertexStr(e) {
       console.log('%c [ e ]-616', 'font-size:13px; background:#d9149a; color:#ff58de;', e)
-      const arr = e.map((item) => item[1])
+      let arr = e.map((item) => item[1])
-      const pkBdVertexStr = arr.join(',')
+      let pkBdVertexStr = arr.join(',')
       this.$set(this.select, 'pkBdVertexStr', pkBdVertexStr)
     },
     getStartTime() {
-      const date = new Date()
+      let date = new Date()
       // console.error(date.getDate()==1?date.getMonth():date.getMonth() + 1)
-      const year = date.getFullYear() // 得到当前年份
+      let year = date.getFullYear() // 得到当前年份
-      let month = date.getDate() === 1 ? date.getMonth() : date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      let month = date.getDate()===1?date.getMonth():date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
       date.setDate(1) // 将当前时间的日期设置成第一天
       month = month >= 10 ? month : '0' + month // 补零
       let day = date.getDate() // 得到当前天数，实际是本月第一天，因为前面setDate(1) 设置过了
@@ -396,32 +631,32 @@ export default {
       return year + '-' + month + '-' + day
     },
     getEndTime() {
-      var date = new Date()
+      var date = new Date();
       var year = date.getFullYear() // 年
-      let month = date.getDate() === 1 ? date.getMonth() : date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
+      let month = date.getDate()===1?date.getMonth():date.getMonth() + 1 // 得到当前月份（0-11月份，+1是当前月份）
       var day = date.getDate() 
-      const day1 = date.getDate()
+      let day1 = date.getDate()
       // 给一位数的数据前面加 “0”
       if (month >= 1 && month <= 9) {
-        month = '0' + month
+        month = "0" + month;
       }
       if (day >= 0 && day <= 9) {
-        day = '0' + day
+        day = "0" + day;
       }
-      if (day1 == 1) {
+      if(day1==1){
         var date2 = new Date()
         var year2 = date2.getFullYear()
         var month2 = date2.getMonth()
-        var dates = new Date(year2, month2, 0).getDate()
+        var dates = new Date(year2, month2 , 0).getDate()
         day = dates
       }
-      return year + '-' + month + '-' + day
+      return year + "-" + month + "-" + day
     },
     isLocalSymbol,
     toThousandthAndKeepDecimal,
     getUserRole() {
       getRoleMenu('performanceTotal').then((res) => {
-        const obj = {}
+        let obj = {}
         res.data.forEach((item) => {
           obj[item] = 1
         })
@@ -436,7 +671,7 @@ export default {
       this.creationTime = ''
       this.select = {
         pkVertex: [],
-        pkMemberTeam: []
+        pkMemberTeam: [],
       }
     },
     getData() {
@@ -470,8 +705,8 @@ export default {
       this.$router.push({
         path: 'noticeList/details',
         query: {
-          pkId: id
+          pkId: id,
-        }
+        },
       })
     },
     /** 导出按钮操作 */
@@ -479,7 +714,7 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       }).then((_) => {
         this.download(
           'member/manage/member-structure/export',
@@ -516,10 +751,10 @@ export default {
         }
       })
       // sums
-      const arr = ['', '小计']
+      let arr = ['', '小计']
 
       sums.forEach((item) => {
-        if (typeof item === 'number') {
+        if (typeof item == 'number') {
           arr.push(toThousandthAndKeepDecimal(item))
         }
       })
@@ -533,7 +768,7 @@ export default {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         api.classifyDel(id).then((res) => {
           this.getDataList()
@@ -553,7 +788,7 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: 'success'
+                type: 'success',
               })
               this.dialogVisible = false
               // 充值数据
@@ -574,7 +809,7 @@ export default {
     },
     openDig() {
       this.$router.push({
-        path: 'noticeList/details'
+        path: 'noticeList/details',
       })
     },
     getDataList() {
@@ -586,7 +821,8 @@ export default {
       api
         .memberStructure(Object.assign({}, this.queryParams, this.select))
         .then((res) => {
-          this.loading = false
+
+this.loading = false
           this.tableData = res.data
           // this.total = res.total
         })
@@ -614,8 +850,8 @@ export default {
         return 'success-row'
       }
       return ''
-    }
+    },
-  }
+  },
 }
 </script>
 <style scoped lang="scss">

src/views/settlementCenter/totalBonus/index.vue

@@ -230,7 +230,7 @@
 
             <el-table-column
               align="center"
-              prop="backPoints"
+              prop="backPointsOri"
               width="130"
               :label="$t('重消收益') + `(${isLocalSymbol()})`"
               :formatter="stateFormat"
@@ -267,14 +267,7 @@
               :label="'开始日期'"
               v-if="allTxt.settleDate"
             /> -->
-            <el-table-column
+
-              v-if="allTxt.realIncomeTotal"
-              align="center"
-              prop="realIncomeTotal"
-              width="130"
-              :label="'实发收益总计' + '(¥)'"
-              :formatter="stateFormat"
-            />
             <el-table-column
               align="center"
               prop="time"