导粉记录

stdiet-ui/src/components/ImportFanRecord/ImportFan/index.vue

@@ -4,7 +4,7 @@
         <div style="height: 500px; overflow: auto">
             <el-table v-loading="loading" :data="wxAccountList">
                 <!--<el-table-column label="微信昵称" align="center" prop="wxNickName" />-->
-                <el-table-column label="微信号" align="center" prop="wxAccount" width="120"/>
+                <el-table-column label="微信号" align="center" prop="wxAccount" width="160"/>
                 <el-table-column label="销售" align="center" prop="saleName" width="120"/>
                 <el-table-column label="已导粉数量" align="center" prop="importFanNum" width="120"/>
                 <el-table-column label="进粉渠道" align="center" prop="importFanChannel" >
@@ -48,7 +48,7 @@
                             <el-input-number v-model="scope.row.fanNum" :min="1" :max="10000" label="导粉数量" style="width:160px"></el-input-number>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
                     <template slot-scope="scope">
                     <el-button
                         size="normal"
@@ -91,7 +91,9 @@ export default {
       wxAccountList:[],
       fanChanneloptions:[],
       //当日直播间
-      liveSchedukList:[]
+      liveSchedukList:[],
+      //总导粉统计
+      fanNumList:[]
     };
   },
   created(){
@@ -129,16 +131,17 @@ export default {
     //获取所有可接粉的微信号
     getListWxAccount() {
         this.loading = true;
-        getWxAccountAndSale().then((response) => {
-            response.rows.forEach((item,index) => {
+        getWxAccountAndSale({'importFanDate': this.data.importFanDate}).then((response) => {
+            response.data.wxSaleAccountList.forEach((item,index) => {
                 item.fanNum = 1;
-            })
-            this.wxAccountList = response.rows;
+                item.importFanNum =  this.getTotalFanNum(response.data.fanNumList, item.id);
+            });
+            this.wxAccountList = response.data.wxSaleAccountList;
+            this.fanNumList = response.data.fanNumList;
             this.loading = false;
         });
     },
     getAllLiveSchedulByDate(){
-      console.log("--");
       getAllLiveSchedulByDate({'liveSchedulDate':this.data.importFanDate}).then((response) => {
           response.data.forEach((item,index) => {
             item.liveRoomName = item.liveNutritionistName + " " + item.liveRoomName;
@@ -146,6 +149,18 @@ export default {
           this.liveSchedukList = response.data;  
       });
     },
+    getTotalFanNum(fanNumList, wxAccountId){
+        if(wxAccountId == null || fanNumList == null){
+          return 0;
+        }
+        let num = 0;
+        fanNumList.forEach((item,index) => {
+            if(item.wxAccountId == wxAccountId){
+                num = item.fanNum;
+            }
+        });
+        return num;
+    },
     addImportFanRecord(row){
         //账号渠道、进粉数量不能为空
         if(row.importFanChannel == undefined || row.importFanChannel == null){
@@ -177,6 +192,7 @@ export default {
                 row.importFanChannel = null;
                 row.fanNum = 1;
                 row.importFanLive = null;
+                row.importFanNum += row.fanNum;
             }
         });
         

stdiet-ui/src/views/custom/importFanRecord/index.vue

@@ -92,10 +92,29 @@
       <el-table-column label="进粉账号渠道" align="center" prop="importFanChannelName" />
       <el-table-column label="所属直播间" align="center" prop="liveRoomName" >
         <template slot-scope="scope">
-            {{scope.row.liveRoomName + "—" + scope.row.liveNutritionistName}}
+            {{(scope.row.liveRoomName != null || scope.row.liveNutritionistName != null) ? (scope.row.liveRoomName + "—" + scope.row.liveNutritionistName) : ""}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="导粉总数" align="center" prop="wxAccountList" :formatter="getTotalFanNum">
+      </el-table-column>
+      <el-table-column label="导粉微信号" align="center" prop="wxAccountList" >
+        <template slot-scope="scope">
+          <el-popover
+          placement="left"
+          width="390"
+          trigger="click">
+          <el-table :data="scope.row.wxAccountList" style="width:370;height: 400px;overflow: auto;">
+            <el-table-column width="100" property="saleName" label="销售" align="center"></el-table-column>
+            <el-table-column width="160" property="wxAccount" label="微信号" align="center"></el-table-column>
+            <el-table-column width="80" property="importFanNum" label="导粉数量" align="center"></el-table-column>
+          </el-table>
+          <el-button slot="reference">详情</el-button>
+          </el-popover>
+        </template>
+      </el-table-column>
+      
+      
+     <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -112,7 +131,7 @@
             v-hasPermi="['custom:importFanRecord:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
     
     <pagination
@@ -334,6 +353,15 @@ export default {
         this.$refs.importFanRef.showDialog(data,()=>{
             this.getList();
         }, this.fanChanneloptions);
+    },
+    getTotalFanNum(row, column){
+      let fanNum = 0;
+      if(row.wxAccountList != null){
+        row.wxAccountList.forEach((item,index) => {
+          fanNum += item.importFanNum == null ? 0 : item.importFanNum;
+        });
+      }
+      return fanNum;
     }
   }
 };