Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/api/modules/http.js

@@ -834,3 +834,13 @@ export function operationStatistics(query) {
     params:query
   })
 }
+
+//运营工作统计详情
+export function operationStatisticsDetail(query) {
+  return request({
+    url: 'autoSR/cusStageStatistics/operationStatisticsDetail',
+    method: 'get',
+    params:query
+  })
+}
+

src/views/houseData/count.vue

@@ -54,11 +54,6 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <!--
-
-houseQuantityInService; //服务中楼盘数
-
- -->
       <el-table :data="tableData" stripe style="width: 100%" >
         <el-table-column prop="operationName" label="运营" align="center"></el-table-column>
         <el-table-column prop="houseQuantityInService" label="服务中楼盘数" width="120" align="center"></el-table-column>
@@ -102,7 +97,7 @@ houseQuantityInService; //服务中楼盘数
             <el-date-picker
               v-model="erfromdata.starTime"
               @change="timeChange1"
-              style="width: 200px"
+              style="width: 220px"
               type="daterange"
               range-separator="-"
               :default-time="['00:00:00', '23:59:59']"
@@ -118,19 +113,20 @@ houseQuantityInService; //服务中楼盘数
                 style="width: 180px"
                   maxlength="30"
                   clearable
-                  v-model="erfromdata.name"
+                  v-model="erfromdata.houseName"
                   placeholder="请输入内容"
                 ></el-input>
            </div>
              <div class="div-lab1">
               <div class="label1"> 操作类型： </div>
-               <el-input
-                style="width: 180px"
-                  maxlength="30"
-                  clearable
-                  v-model="erfromdata.name"
-                  placeholder="请输入内容"
-                ></el-input>
+              <el-select v-model="erfromdata.operationTypeid" placeholder="请选择">
+                <el-option
+                  v-for="item in operationType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+               </el-select>
            </div>
              <div class="div-lab1">
               <div class="label1"> 操作内容： </div>
@@ -138,40 +134,40 @@ houseQuantityInService; //服务中楼盘数
                 style="width:180px"
                   maxlength="30"
                   clearable
-                  v-model="erfromdata.name"
+                  v-model="erfromdata.title"
                   placeholder="请输入内容"
                 ></el-input>
            </div>
              <div class="div-lab1">
-              <div class="label1">搜索</div>
+              <div class="label1" @click="operationStatisticsDetail()">搜索</div>
            </div>
         </div>
         <div style="width:100%;margin-top: 8px;">
-          <el-table :data="tableData" stripe style="width: 100%" height="300"
-	:header-cell-style="{background:'#E0E0E0'}">
+          <el-table :data="infodata" stripe style="width: 100%;overflow-y:scroll;" height="340"
+	        :header-cell-style="{background:'#E0E0E0'}">
             <el-table-column
-              prop="propertyName"
+              prop="createTime"
               label="操作时间"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="startWorking"
+              prop="houseName"
               label="楼盘"
               align="center"
             >
             </el-table-column>
-            <el-table-column prop="endWorking"  label="操作类型" align="center">
+            <el-table-column prop="operationTypeName"  label="操作类型" align="center">
             </el-table-column>
 
-            <el-table-column prop="endWorking" label="操作内容"  align="center">
+            <el-table-column prop="title" label="操作内容"  align="center">
             </el-table-column>
           </el-table>
         </div>
         <div style="display: flex; justify-content: flex-end; margin-top: 10px">
         <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange111"
+          @current-change="handleCurrentChange111"
           :current-page="erfromdata.currentPage"
           :page-sizes="[10, 30, 50]"
           :page-size="erfromdata.size"
@@ -182,7 +178,6 @@ houseQuantityInService; //服务中楼盘数
       </div>
     </el-dialog>
 
-
   </div>
 </template>
 
@@ -192,7 +187,6 @@ import { getAreaList } from "@/api/modules/api";
 export default {
   data() {
     return {
-
       fromdata:{
          datatime:'',
          operationStaffId:'',
@@ -203,21 +197,56 @@ export default {
          endDate:''
       },
       erfromdata:{
-        name:'',
+        houseName:'',
+        title:'',
         starTime:"",
         statime:'',
         endtime:'',
         total:0,
         size:10,
-        currentPage:1
+        currentPage:1,
+        operationTypeid:''
       },
-      tableData:[
-        {propertyName:'还是卡顿和'}
-      ],
+      tableData:[],
       operaList:[],
       texteditorishow:false,
       orgType: localStorage.getItem("orgType"),
-
+      operationType:[
+        {
+          value: "0",
+          label: "添加常错词",
+        },
+        {
+          value: "1",
+          label: "接待错词修改",
+        },
+         {
+          value: "2",
+          label: "标记顾问",
+        },
+         {
+          value: "3",
+          label: "未标记顾问接待",
+        },
+         {
+          value: "4",
+          label: "新增违禁词条",
+        },
+         {
+          value: "5",
+          label: "客户标签修改 ",
+        },
+         {
+          value: "6",
+          label: "销讲话术修改",
+        },
+         {
+          value: "7",
+          label: "登录楼盘",
+        },
+      ],
+      createBy:'',
+      infodata:[]
     };
   },
   computed: {
@@ -246,6 +275,7 @@ export default {
         });
       }
     },
+    //获取列表
     operationStatistics(){
       let form={
         createBy:this.fromdata.operationStaffId,
@@ -260,8 +290,37 @@ export default {
         });
     },
     //查看工作明细
-    toinfo(){
-          this.texteditorishow=true
+    toinfo(row){
+      this.infodata=[]
+      this.texteditorishow=true;
+      this.erfromdata.starTime=this.fromdata.datatime;
+      this.erfromdata.statime= this.fromdata.startDate;
+      this.erfromdata.endtime= this.fromdata.endDate;
+      this.erfromdata.houseName='';
+      this.erfromdata.operationTypeid='';
+      this.erfromdata.title='';
+      this.createBy=row.createBy;
+      this.erfromdata.total=0;
+      this.erfromdata.size=10;
+      this.erfromdata.currentPage=1;
+      console.log(this.createBy)
+      this.operationStatisticsDetail()
+    },
+    //获取工作明细表格
+    operationStatisticsDetail(){
+       this.infodata=[];
+      let form={
+          startDate:this.erfromdata.statime,
+          endDate:this.erfromdata.endtime,
+          houseName:this.erfromdata.houseName,
+          operationType:this.erfromdata.operationTypeid,
+          title:this.erfromdata.title,
+          createBy: this.createBy
+      }
+      this.$api.http.operationStatisticsDetail(form).then((res) => {
+        this.infodata=res.data.records;
+         this.erfromdata.total=res.data.total;
+      });
     },
     //清空
     empty(){
@@ -276,8 +335,8 @@ export default {
     },
     // 时间选择
     timeChange1(){
-        this.statime=this.starTime[0]
-        this.endtime=this.starTime[1]
+        this.erfromdata.statime=this.erfromdata.starTime[0]
+        this.erfromdata.endtime=this.erfromdata.starTime[1]
     },
     timeChange(){
       this.fromdata.startDate=this.fromdata.datatime[0];
@@ -295,6 +354,16 @@ export default {
       this.operationStatistics()
     },
 
+    handleSizeChange111(val) {
+      console.log(`每页 ${val} 条`);
+      this.erfromdata.size = val;
+      this.operationStatisticsDetail()
+    },
+    handleCurrentChange111(val) {
+      console.log(`当前页: ${val}`);
+      this.erfromdata.currentPage = val;
+      this.operationStatisticsDetail()
+    },
   },
 };
 </script>