客户列表

src/config/api.js

@@ -173,6 +173,10 @@ const apis = {
     recommendCustomerList: {
       method:'get',
       url: `${commPrefix}/customer/recommend/:id`
+    },
+    taPointsRecords: { // 积分列表
+      method: `get`,
+      url: `${commPrefix}/taPointsRecords/:id`
     }
   },
   goods:{

src/store/modules/customer.js

@@ -82,6 +82,19 @@ export default {
           reject(message)
         })
       })
+    },
+    taPointsRecords({ commit }, payload) { // 积分列表
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.recommendCustomer.taPointsRecords,
+          urlData: { id: payload.customerId},
+          params: payload
+        }).then((data) => {
+          resolve(data)
+        }).catch(({ message }) => {
+          reject(message)
+        })
+      })
     }
 
     

src/views/customer/editCustomer.vue

@@ -3,63 +3,67 @@
     <div class="form-wrapper">
       <el-form label-width="200px" :model="detail">
         <el-form-item label="意向项目：">
-          <el-input v-model="detail.name"></el-input>
+          <el-input v-model="detail.intention"></el-input>
         </el-form-item>
         <el-form-item label="客户照片：">
-        <el-upload
-            :action="upFileUrl"
-            name='file'
-            list-type="picture-card"
-            :headers="uploadHeaders"
-            :file-list="imgList"
-            :show-file-list="true"
-            :before-upload="beforeImgUpload"
-            :on-success="handleAvatarSuccess"
-            :on-remove="handleRemove">
-            <i class="el-icon-plus"></i>
+          <el-upload
+                  :headers="uploadHeaders"
+                  :action="upFileUrl"
+                  :show-file-list="false"
+                  :on-success="handleAvatarSuccess">
+            <img v-if="imageUrl" :src="imageUrl" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-          <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-          </el-dialog>
-      </el-form-item>
+        </el-form-item>
         <el-form-item label="客户姓名：">
-          <el-input v-model="detail.company"></el-input>
+          <el-input v-model="detail.name"></el-input>
         </el-form-item>
         <el-form-item label="客户电话：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.phone"></el-input>
         </el-form-item>
         <el-form-item label="客户性别：">
-          <el-radio-group v-model="detail.isMain">
+          <el-radio-group v-model="detail.sex">
             <el-radio :label="1">男</el-radio>
             <el-radio :label="0">女</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="预约到访时间：">
-          <el-input v-model="detail.department"></el-input>
+          <el-date-picker
+                  v-model="detail.appointmentTime"
+                  type="datetime"
+                  placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="到访人数：">
-          <el-input v-model="detail.department"></el-input>
-        </el-form-item>
-        <el-form-item label="客户描述：">
-            <el-input type="textarea" :rows="5"  v-model="detail.introduction"></el-input>
+          <el-input v-model="detail.visiteNum"></el-input>
         </el-form-item>
         <el-form-item label="物业类型：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.realtyManageType"></el-input>
         </el-form-item>
         <el-form-item label="需求类型：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.demandType"></el-input>
         </el-form-item>
         <el-form-item label="价格区间：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.priceRange"></el-input>
+        </el-form-item>
+        <el-form-item label="报备日期：">
+          <el-date-picker
+                  v-model="detail.reportDate"
+                  type="datetime"
+                  placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="状态：">
-          <el-select v-model="detail.buildings" placeholder="请选择">
-            <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
+          <el-select v-model="detail.status" placeholder="请选择">
+            <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="客户描述：">
+          <el-input type="textarea" :rows="5"  v-model="detail.describe"></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm">保存</el-button>
-          <el-button @click="$router.go(-1)">返回</el-button>
+          <el-button @click="$router.go(-1)">驳回</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -67,169 +71,225 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex";
-import apis from "../../config/api";
-import E from "wangeditor";
+  import { createNamespacedHelpers } from "vuex";
+  import apis from "../../config/api";
+  import E from "wangeditor";
 
-const { mapActions: mapPersonActions } = createNamespacedHelpers("persons");
-const {
-  mapState: mapBuildingState,
-  mapActions: mapBuildingActions
-} = createNamespacedHelpers("building");
-export default {
-  name: "consultantEdit",
-  data() {
-    return {
-      upFileUrl: apis.file.upload.url,
-      detail: {
-        name: undefined,
-        company: undefined,
-        department: undefined,
-        post: undefined,
-        tel: undefined,
-        photo: undefined,
-        status: 1,
-        buildings: []
-      },
-      imgList: [],
-      dialogVisible: false,
-      dialogImageUrl: "",
-      
-    };
-  },
-  created() {
-    this.init();
-  },
-  computed: {
-    ...mapBuildingState({
-      buildings: x => x.buildings
-    }),
-    uploadHeaders() {
-      const token = localStorage.getItem("x-token") || "";
+  const { mapActions: mapPersonActions } = createNamespacedHelpers("persons");
+  const {
+    mapState: mapBuildingState,
+    mapActions: mapBuildingActions
+  } = createNamespacedHelpers("building");
+  export default {
+    name: "consultantEdit",
+    data() {
       return {
-        Authorization: `Bearer ${token}`
+        upFileUrl: apis.file.upload.url,
+        detail: {
+          customerId: '',
+          consultantName: '',
+          name: undefined,
+          company: undefined,
+          department: undefined,
+          post: undefined,
+          tel: undefined,
+          photo: undefined,
+          status: '1',
+          buildings: [],
+        },
+        dialogForm: {
+          pageNumber: 1,
+          pageSize: 100
+        },
+        dialogTotal: 0,
+        consultantList: [],
+        imageUrl: '',
+        dialogVisible: false,
+        dialogImageUrl: "",
+        dialogTableVisible: false, //选择置业顾问弹框
+        consultant:"",
+        gridData: [
+          {
+            name: "报备",
+            value: '1'
+          },
+          {
+            name: "到访",
+            value: '2'
+          },
+          {
+            name: "认购",
+            value: '3'
+          },
+          {
+            name: "签约",
+            value: '4'
+          }
+        ]
       };
-    }
-  },
-  methods: {
-    ...mapBuildingActions(["getBuildings"]),
-    ...mapPersonActions(["getConsultant", "editConsultant"]),
-
-    init() {
-      if (this.$route.params.id) {
-        this.getConsultant({ id: this.$route.params.id }).then(data => {
-          this.detail = data;
-        });
-      }
-    },
-
-    beforeImgUpload(file) {
-      if (file.type !== "image/jpeg" && file.type !== "image/png") {
-        this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
-        return false;
-      }
-      // if (file.size / 1024 > 300) {
-      //   this.$message.error('图片大小不允许超过300k!')
-      //   return false
-      // }
-      this.loading = this.$loading({
-        lock: true,
-        text: "上传中...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
-
-      return true;
     },
-    handleAvatarSuccess(res) {
-      this.imgList = [
-        ...this.imgList,
-        {
-          url: res.data
-        }
-      ];
-      this.hideLoadding();
+    created() {
+      this.init();
+      this.getConsultantsList()
     },
-    handleRemove(file, fileList) {
-      this.imgList = fileList;
+    computed: {
+      ...mapBuildingState({
+        buildings: x => x.buildings
+      }),
+      uploadHeaders() {
+        const token = localStorage.getItem("x-token") || "";
+        return {
+          Authorization: `Bearer ${token}`
+        };
+      }
     },
-    submitForm() {
-      this.showLoadding("保存中...");
-      this.editConsultant(this.detail)
-        .then(res => {
-          if (res.personId) {
-            this.detail = res;
-          }
+    methods: {
+      ...mapBuildingActions(["getBuildings"]),
+      ...mapPersonActions(["getConsultant", "editConsultant"]),
 
-          this.hideLoadding();
-          this.$notify.info("保存成功");
+      init() {
+        this.detail.customerId = this.$route.query.id
+        if (this.detail.customerId !== undefined) {
+          this.$store.dispatch('customer/getRecommendCustomersGetById',this.detail).then(data => {
+            this.detail = data;
+            this.dialogImageUrl = data.picture
+            this.imageUrl = data.picture
+          });
+        }
+      },
+      handleDel(row) {
+        this.$confirm("确定选择此置业顾问?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
-        .catch(err => {
-          this.hideLoadding();
-          this.$notify.error(err.message);
+                .then(() => {
+                  this.$message({
+                    type: "success",
+                    message: "选择成功!"
+                  });
+                  this.detail.realtyConsultant = row.personId
+                  this.detail.consultantName = row.name
+                  this.dialogTableVisible = false;
+                })
+                .catch(() => {
+                  this.$message({
+                    type: "info",
+                    message: "已取消选择"
+                  });
+                });
+      },
+      beforeImgUpload(file) {
+        if (file.type !== "image/jpeg" && file.type !== "image/png") {
+          this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+          return false;
+        }
+        // if (file.size / 1024 > 300) {
+        //   this.$message.error('图片大小不允许超过300k!')
+        //   return false
+        // }
+        this.loading = this.$loading({
+          lock: true,
+          text: "上传中...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
         });
-    },
 
-    showLoadding(text) {
-      this.loading = this.$loading({
-        text,
-        lock: true,
-        spinner: "el-icon-loading",
-        background: "rgba(255, 255, 255, 0.7)"
-      });
-    },
+        return true;
+      },
+      handleAvatarSuccess(res) {
+        this.imageUrl = res.data
+        this.detail.picture = res.data
+        this.hideLoadding();
+      },
+      handleRemove(file, fileList) {
+        this.imgList = fileList;
+      },
+      submitForm() {
+        this.showLoadding("保存中...");
+        this.$store.dispatch('customer/getRecommendCustomersUpdate',this.detail)
+                .then(res => {
+                  if (res.personId) {
+                    this.detail = res;
+                  }
 
-    hideLoadding() {
-      if (this.loading) this.loading.close();
-    }
-  },
-  mounted() {
-    const _that = this;
+                  this.hideLoadding();
+                  this.$notify.success("保存成功");
+                  this.$router.go(-1)
+                })
+                .catch(err => {
+                  this.hideLoadding();
+                  this.$notify.error(err.message);
+                });
+      },
 
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100
-    }).then(() => {
-      if ((this.$route.query.id || "") !== "") {
-        this.getDetail({ id: this.$route.query.id }).then(data => {});
+      showLoadding(text) {
+        this.loading = this.$loading({
+          text,
+          lock: true,
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.7)"
+        });
+      },
+
+      hideLoadding() {
+        if (this.loading) this.loading.close();
+      },
+      getConsultantsList() {
+        this.$store.dispatch('persons/getConsultants', this.dialogForm).then((res) => {
+          this.consultantList = res.records
+          this.dialogForm.pageNumber = res.current
+          this.dialogForm.pageSize = res.size
+          this.dialogTotal = res.total
+        }).catch(()=> {
+          console.log('persons/getConsultants err')
+        })
+      },
+      dialogHandleSizeChange(value) {
+        this.dialogForm.pageSize = value
+        this.getConsultantsList()
+      },
+      dialogHandleCurrentChange(value) {
+        this.dialogForm.pageNumber = 1
+        this.dialogForm.pageSize = value
+        this.getConsultantsList()
       }
-    });
-  }
-};
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-.form-wrapper {
-  width: 60%;
-}
+  .form-wrapper {
+    width: 60%;
+  }
 </style>
 
 <style lang="scss">
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-.choose {
-  color: blue;
-  margin-left: 15px;
-}
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409eff;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  .choose {
+    color: blue;
+    margin-left: 15px;
+  }
 </style>

src/views/customer/editRecommend.vue

@@ -57,7 +57,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="状态：">
-          <el-select v-model="detail.status" placeholder="请选择">
+          <el-select v-model="detail.verifyStatus" placeholder="请选择">
             <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
@@ -118,7 +118,7 @@ export default {
         post: undefined,
         tel: undefined,
         photo: undefined,
-        status: '1',
+        verifyStatus: '0',
         buildings: [],
         realtyConsultant: ''
       },
@@ -135,20 +135,16 @@ export default {
       consultant:"",
       gridData: [
         {
-          name: "报备",
-          value: '1'
-        },
-        {
-          name: "到访",
-          value: '2'
+          name: "未通过",
+          value: '0'
         },
         {
-          name: "认购",
-          value: '3'
+          name: "已通过",
+          value: '1'
         },
         {
-          name: "签约",
-          value: '4'
+          name: "已驳回",
+          value: '2'
         }
       ]
     };

src/views/customer/integralRecord.vue

@@ -1,35 +1,41 @@
 <template>
   <div>
-    <h5>当前可用积分：200</h5>
+    <h5>当前可用积分：{{ totalPoints || 0 }}</h5>
     <el-table
-      :data="dynamics.list || []"
+       border
+      :data="list || []"
       >
       <el-table-column
+        label="序号"
+        width="50"
         type="index">
-        <template slot-scope="scope">
-          <span>{{ GetIndex(scope.$index) }}</span>
-        </template>
       </el-table-column>
       <el-table-column
-        prop="title"
+        prop="changeType"
         label="积分类型">
+        <template slot-scope="scope">{{ showChangeType(scope.row.changeType) }}</template>
       </el-table-column>
       <el-table-column
-        prop="title"
+        prop="pointsAmount"
         label="积分变化">
+        <template slot-scope="scope">
+          <span v-if="subPoints(scope.row.pointsAmount)" style="color: red;">{{ scope.row.pointsAmount }}</span>
+          <span v-else>{{ scope.row.pointsAmount }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="createDate"
         label="发生时间">
+        <template slot-scope="scope">{{ formateDate(scope.row.createDate) }}</template>
       </el-table-column>
     </el-table>
     <el-pagination
       small
       style="margin-top:10px;"
       layout="prev, pager, next"
-      :current-page.sync="currentPage"
-      :pageSize="pageSize"
-      :total="dynamics.total || 0"
+      :current-page.sync="form.pageNum"
+      :pageSize="form.pageSize"
+      :total="total || 0"
       @current-change="getList"
     >
     </el-pagination>
@@ -38,7 +44,7 @@
 
 <script>
 import { createNamespacedHelpers } from "vuex";
-
+import dayjs from 'dayjs'
 const {
   mapState: mapDynamicState,
   mapActions: mapDynamicActions
@@ -51,10 +57,14 @@ const {
 export default {
   data() {
     return {
-      pageSize: 20,
-      currentPage: 1,
-      name: "",
-      buildingId: "",
+      form: {
+        customerId: '',
+        pageSize: 20,
+        pageNum: 1,
+      },
+      totalPoints: '', // 当前可用积分
+      total: '',
+      list: []
     };
   },
   computed: {
@@ -85,12 +95,17 @@ export default {
       }
     },
     getList() {
-      this.getDynamics({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        name: this.name,
-        buildingId: this.buildingId
-      });
+      this.$store.dispatch('customer/taPointsRecords', this.form).then((res) => {
+        console.log('customer/taPointsRecords: ', res)
+        this.total = res.result.total
+        this.form.pageNum = res.result.current
+        this.form.pageSize = res.result.size
+        this.list = res.result.records
+        this.totalPoints = res.totalPoints
+
+      }).catch(() => {
+        console.log('customer/taPointsRecords err')
+      })
     },
     getBuildingName(id) {
       return (
@@ -98,15 +113,35 @@ export default {
           .buildingName || ""
       );
     },
-  
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
+    showChangeType(str) { // 积分类型
+      switch (str) {
+        case 'goods':
+          return '兑换商品'
+        case 'checkin':
+          return '签到'
+        case 'share':
+          return '分享'
+        case 'authorize':
+          return '授权'
+        default:
+          return '未知类型'
+      }
+    },
+    subPoints(points) { // 判断是否是 - 开头
+      let subStr = points.toString().substring(0, 1)
+      if (subStr === '-') {
+        return true
+      }
+
+      return false
+    }
   },
   created() {
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100
-    }).then(() => {
-      this.getList();
-    });
+    this.form.customerId = this.$route.query.id
+    this.getList()
   }
 };
 </script>

src/views/customer/list.vue

@@ -5,314 +5,411 @@
         <ul>
           <li>
             <span>姓名</span>
-            <el-input v-model="name" ></el-input>
+            <el-input v-model="form.name" ></el-input>
           </li>
           <li>
             <span>电话</span>
-            <el-input v-model="name" ></el-input>
+            <el-input v-model="form.tel" ></el-input>
           </li>
           <li>
-            <span>置业顾问</span>
-            <el-input v-model="name" ></el-input>
+            <span>推荐人</span>
+            <el-input v-model="form.consultName" ></el-input>
           </li>
           <li>
-            <span>置业顾问电话</span>
-            <el-input v-model="name" ></el-input>
+            <span>推荐人电话</span>
+            <el-input v-model="form.consultTel" ></el-input>
           </li>
+          <!--          <li>-->
+          <!--            <span>状态</span>-->
+          <!--            <el-select v-model="form.status" placeholder="请选择">-->
+          <!--              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>-->
+          <!--            </el-select>-->
+          <!--          </li>-->
         </ul>
         <el-button
-          size="mini"
-          type="primary" @click="search">查询</el-button>
+                size="mini"
+                type="primary" @click="search">查询</el-button>
       </div>
     </div>
-    <el-table :data="dynamics.list || []" style="width: 100%">
+    <el-table :data="list || []"
+              border
+              style="width: 100%">
       <el-table-column
-        type="index"
-        width="50">
-        <template slot-scope="scope">
-          <span>{{ GetIndex(scope.$index) }}</span>
-        </template>
+              type="index"
+              width="50">
       </el-table-column>
       <el-table-column
-        label="头像">
+              label="头像">
         <template slot-scope="scope">
           <div class="header">
-            <img :src="scope.row.imgUrl" alt="" />
+            <img :src="scope.row.picture" alt="" />
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="title"
-        label="姓名">
+              prop="name"
+              label="姓名">
       </el-table-column>
       <el-table-column
-        prop="phone"
-        label="电话">
+              prop="phone"
+              label="电话">
       </el-table-column>
       <el-table-column
-        prop="sex"
-        label="性别">
+              prop="sex"
+              label="性别">
+        <template slot-scope="scope">{{ scope.row.sex === 1 ? '男' : '女' }}</template>
       </el-table-column>
-      <el-table-column   label="置业顾问">
+      <el-table-column  label="置业顾问">
         <template slot-scope="scope">
-          <span>{{scope.row.desc}}</span>
-          <p>{{scope.row.tel}}</p>
+          <span>{{scope.row.name}}</span>
+          <p>{{scope.row.phone}}</p>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" width="300" label="操作">
+      <el-table-column fixed="right"  width="200" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" @click="toEditCustomer(scope.row)"   size="small">编辑</el-button>
-          <el-button type="text" @click="adjustment(scope.row)" size="small">调整归属</el-button>
-          <el-button type="text" @click="toIntegralRecord(scope.row)" size="small">积分记录</el-button>
-          <el-button type="text" @click="recommend(scope.row)" size="small">推荐客户</el-button>
-          <el-button type="text" size="small" @click="toDetail(scope.row)">查看详情</el-button>
+          <router-link :to="{ name:'editCustomer', query: { id: scope.row.customerId } }" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">编辑</router-link>
+          &nbsp;
+          <a href="javascript: void(0);" @click="showDialogConsultants(scope.row)" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">调整归属</a>
+          &nbsp;
+          <router-link :to="{ name:'integralRecord', query: { id: scope.row.customerId } }" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">积分记录</router-link>
+          &nbsp;
+          <a href="javascript: void(0);" @click="showRecommendCustomerList(scope.row)" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">推荐客户</a>
+          &nbsp;
+          <router-link :to="{ name:'editCustomer', query: { id: scope.row.customerId } }">查看详情</router-link>
         </template>
       </el-table-column>
     </el-table>
+    <el-pagination
+            small
+            style="margin-top:10px;"
+            layout="prev, pager, next"
+            :current-page.sync="form.pageNumber"
+            :pageSize="form.pageSize"
+            @current-change="getList"
+    >
+    </el-pagination>
+
+
     <el-dialog title="选择置业顾问" :visible.sync="dialogTableVisible">
-      <el-table :data="gridData">
-        <el-table-column property="date" label="姓名"></el-table-column>
-        <el-table-column property="name" label="电话"></el-table-column>
-        <el-table-column property="name" label="部门"></el-table-column>
-        <el-table-column property="name" label="岗位"></el-table-column>
+      <el-table :data="consultantList">
+        <el-table-column property="name" label="姓名"></el-table-column>
+        <el-table-column property="phone" label="电话"></el-table-column>
+        <el-table-column property="department" label="部门"></el-table-column>
+        <el-table-column property="post" label="岗位"></el-table-column>
         <el-table-column fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleDel(scope.row)" size="small">选择</el-button>
+            <!--            <el-button type="text" @click="handleDel(scope.row)" size="small">选择</el-button>-->
+            <el-radio v-model="dialogConsultantForm.realtyConsultant" :label="scope.row.personId"></el-radio>
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+              @size-change="dialogHandleSizeChange"
+              @current-change="dialogHandleCurrentChange"
+              :current-page.sync="dialogForm.pageNumber"
+              :page-size="dialogForm.pageSize"
+              layout="total, prev, pager, next"
+              :total="dialogTotal">
+      </el-pagination>
+      <el-button type="primary" @click="handleDel" size="small">确定</el-button>
     </el-dialog>
-    <el-dialog title="推荐客户" :visible.sync="dialogRecommendVisible">
-      <el-table :data="gridData">
-        <el-table-column property="date" label="姓名"></el-table-column>
-        <el-table-column property="name" label="电话"></el-table-column>
-        <el-table-column property="name" label="性别"></el-table-column>
-        <el-table-column property="name" label="意向项目"></el-table-column>
-        <el-table-column property="name" label="推荐时间"></el-table-column>
-        <el-table-column property="name" label="状态"></el-table-column>
+
+
+    <el-dialog title="推荐客户" :visible.sync="dialogRecommendedTableVisible">
+      <el-table :data="recommendedConsultantList">
+        <el-table-column property="name" label="姓名"></el-table-column>
+        <el-table-column property="phone" label="电话"></el-table-column>
+        <el-table-column property="sex" label="性别">
+          <template slot-scope="scope"> {{ scope.row.sex === 1 ? '男' : '女' }}</template>
+        </el-table-column>
+        <el-table-column property="intention" label="意向项目"></el-table-column>
+        <el-table-column property="post" label="推荐时间"></el-table-column>
+        <el-table-column fixed="right" label="状态">
+          <template slot-scope="scope">
+            {{ scope.row.status == 1 ? '报备': scope.row.status == 2 ? '到访' : scope.row.status == 3 ? '认购' : scope.row.status == 4 ? '签约' : '无效' }}
+          </template>
+        </el-table-column>
       </el-table>
-       <el-button type="primary" class="close-btn"  @click="dialogRecommendVisible=false" >关闭</el-button>
+      <el-pagination
+              @size-change="recommendedDialogHandleSizeChange"
+              @current-change="recommendedDialogHandleCurrentChange"
+              :current-page.sync="recommendedDialogConsultantForm.pageNumber"
+              :page-size="recommendedDialogConsultantForm.pageSize"
+              layout="total, prev, pager, next"
+              :total="recommendedDialogTotal">
+      </el-pagination>
     </el-dialog>
-    <el-pagination
-      small
-      style="margin-top:10px;"
-      layout="prev, pager, next"
-      :current-page.sync="currentPage"
-      :pageSize="pageSize"
-      @current-change="getList"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
-import { createNamespacedHelpers } from "vuex";
-const {
-  mapState: mapDynamicState,
-  mapActions: mapDynamicActions
-} = createNamespacedHelpers("dynamic");
-const {
-  mapState: mapCustomerState,
-  mapActions: mapCustomerActions
-} = createNamespacedHelpers("customer");
-export default {
-  data() {
-    return {
-      pageSize: 20,
-      currentPage: 1,
-      name: "",
-      sex: "",
-      phone: "",
-      picture: "",
-      describe: "",
-      appointmentTime: "",
-      visiteNum: "",
-      intention: "",
-      buildingId: "",
-      realtyManageType: "",
-      demandType: "",
-      priceRange: "",
-      reportDate: "",
-      status: "",
-      personId: "",
-      dialogTableVisible: false, //调整归属弹框
-      dialogRecommendVisible: false, //推荐客户弹框
-      gridData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎"
+  import { createNamespacedHelpers } from "vuex";
+  import dayjs from 'dayjs'
+  const {
+    mapState: mapDynamicState,
+    mapActions: mapDynamicActions
+  } = createNamespacedHelpers("dynamic");
+  const {
+    mapState: mapCustomerState,
+    mapActions: mapCustomerActions
+  } = createNamespacedHelpers("customer");
+  export default {
+    data() {
+      return {
+        form: {
+          pageSize: 10,
+          pageNumber: 1,
+          name: "",
+          consultName: '',
+          consultTel: '',
+          verifyStatus: '1' // 0未通过 1已通过 2已驳
         },
-        {
-          date: "2016-05-04",
-          name: "王小虎"
+        list: [],
+        total: 0,
+        sex: "",
+        phone: "",
+        picture: "",
+        describe: "",
+        appointmentTime: "",
+        visiteNum: "",
+        intention: "",
+        buildingId: "",
+        realtyManageType: "",
+        demandType: "",
+        priceRange: "",
+        reportDate: "",
+        status: "",
+        personId: "",
+        gridData: [
+          {
+            name: "报备",
+            value: 1
+          },
+          {
+            name: "到访",
+            value: 2
+          },
+          {
+            name: "认购",
+            value: 3
+          },
+          {
+            name: "签约",
+            value: 4
+          }
+        ],
+        dialogTableVisible: false, //选择置业顾问弹框
+        consultantList: [],
+        dialogForm: {
+          pageNumber: 1,
+          pageSize: 10
         },
-        {
-          date: "2016-05-01",
-          name: "王小虎"
+        dialogTotal: 0,
+        dialogConsultantForm: {
+          customerId: '', // 客户Id
+          realtyConsultant: '' // 置业顾问
         },
-        {
-          date: "2016-05-03",
-          name: "王小虎"
-        }
-      ]
-    };
-  },
-  computed: {
-    ...mapCustomerState({
-      customers: x => x.customers
-    }),
-    ...mapDynamicState({
-      dynamics: x => x.dynamics
-    })
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    ...mapCustomerActions(["getCustomers", "getDetail"]),
-    ...mapDynamicActions([
-      "getDynamics",
-      "setDetailNull",
-      "deleteDynamics",
-      "publicDynamic",
-      "cancelDynamic"
-    ]),
-    GetIndex(inx) {
-      return (this.currentPage - 1) * this.pageSize + inx + 1;
-    },
-    getList() {
-      this.getDynamics({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        name: this.name,
-        buildingId: this.buildingId
-      });
-    },
-    // 进入编辑页
-    toEditCustomer(row) {
-      this.$router.push({
-        name: "editCustomer",
-        params: { id: row.personId }
-      });
-    },
-    // 进入积分记录页
-    toIntegralRecord(row) {
-      this.$router.push({
-        name: "integralRecord",
-        params: { id: row.personId }
-      });
-    },
-    // 调整归属
-    adjustment(row) {
-      this.dialogTableVisible = true;
-    },
-    // 推荐客户
-    recommend(row) {
-      this.dialogRecommendVisible = true;
+        // 推荐客户
+        dialogRecommendedTableVisible: false,
+        recommendedConsultantList: [],
+        recommendedDialogTotal: 0,
+        recommendedDialogConsultantForm: {
+          customerId: '', // 客户Id
+          pageNumber: 1,
+          pageSize: 10
+        },
+      };
     },
-    handleDel(row) {
-      this.$confirm("确定选择此置业顾问?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    computed: {
+      ...mapCustomerState({
+        customers: x => x.customers
+      }),
+      ...mapDynamicState({
+        dynamics: x => x.dynamics
       })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "选择成功!"
-          });
-          this.dialogTableVisible = false;
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消选择"
-          });
-        });
     },
-    // getList() {
-    // this.getCustomers({
-    // pageNum: this.currentPage,
-    // pageSize: this.pageSize,
-    // name: this.name,
-    // sex: this.sex,
-    // phone: this.phone,
-    // picture: this.picture,
-    // describe: this.describe,
-    // appointmentTime: this.appointmentTime,
-    // visiteNum: this.visiteNum,
-    // intention: this.intention,
-    // buildingId: this.buildingId,
-    // realtyManageType: this.realtyManageType,
-    // demandType: this.demandType,
-    // priceRange: this.priceRange,
-    // reportDate: this.reportDate,
-    // status: this.status,
-    // personId: this.personId
-    // });
-    // },
-    search() {
-      this.currentPage = 1;
+    created() {
       this.getList();
     },
-    toDetail(row) {
-      this.$router.push({
-        name: "consultant.edit",
-        params: { id: row.personId }
-      });
+    methods: {
+      ...mapCustomerActions(["getCustomers", "getDetail", "getRecommendCustomers"]),
+      ...mapDynamicActions([
+        "getDynamics",
+        "setDetailNull",
+        "deleteDynamics",
+        "publicDynamic",
+        "cancelDynamic"
+      ]),
+      GetIndex(inx) {
+        return (this.currentPage - 1) * this.pageSize + inx + 1;
+      },
+      formateDate(dt) {
+        return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+      },
+      getList() {
+        this.getRecommendCustomers(this.form).then((res) => {
+          this.list = res.records
+          this.form.pageSize = res.size
+          this.form.pageNumber = res.current
+          this.total = res.total
+        }).catch(() => {
+          console.log('getRecommendCustomers err')
+        });
+      },
+
+      // 进入积分记录页
+      toEditRecommend(row) {
+        this.$router.push({
+          name: "editRecommend",
+          params: { id: row.personId }
+        });
+      },
+
+      // getList() {
+      // this.getCustomers({
+      // pageNum: this.currentPage,
+      // pageSize: this.pageSize,
+      // name: this.name,
+      // sex: this.sex,
+      // phone: this.phone,
+      // picture: this.picture,
+      // describe: this.describe,
+      // appointmentTime: this.appointmentTime,
+      // visiteNum: this.visiteNum,
+      // intention: this.intention,
+      // buildingId: this.buildingId,
+      // realtyManageType: this.realtyManageType,
+      // demandType: this.demandType,
+      // priceRange: this.priceRange,
+      // reportDate: this.reportDate,
+      // status: this.status,
+      // personId: this.personId
+      // });
+      // },
+      search() {
+        this.currentPage = 1;
+        this.getList();
+      },
+      handleDel() {
+        this.dialogSubmitForm(this.dialogConsultantForm.customerId, this.dialogConsultantForm.realtyConsultant)
+        this.dialogTableVisible = false
+      },
+      dialogHandleSizeChange(value) {
+        this.dialogForm.pageSize = value
+        this.getConsultantsList()
+      },
+      dialogHandleCurrentChange(value) {
+        this.dialogForm.pageNumber = 1
+        this.dialogForm.pageSize = value
+        this.getConsultantsList()
+      },
+      getConsultantsList() {
+        this.$store.dispatch('persons/getConsultants', this.dialogForm).then((res) => {
+          this.consultantList = res.records
+          this.dialogForm.pageNumber = res.current
+          this.dialogForm.pageSize = res.size
+          this.dialogTotal = res.total
+        }).catch(()=> {
+          console.log('persons/getConsultants err')
+        })
+      },
+      dialogSubmitForm(customerId, realtyConsultant) {
+        console.log('提交', this.dialogConsultantForm)
+        this.$store.dispatch('customer/getRecommendCustomersUpdate',{customerId:  customerId, realtyConsultant:  realtyConsultant})
+                .then(res => {
+                  if (res.personId) {
+                    this.detail = res;
+                  }
+
+                  this.$notify.info("保存成功");
+                })
+                .catch(err => {
+                  this.$notify.error(err.message);
+                });
+      },
+      showDialogConsultants(row) {
+        this.dialogTableVisible = true
+        this.dialogConsultantForm.customerId = row.customerId
+        this.dialogConsultantForm.realtyConsultant = row.realtyConsultant
+        this.getConsultantsList()
+      },
+      getRecommendCustomerList() {
+        this.$store.dispatch('customer/recommendCustomerList', this.recommendedDialogConsultantForm).then((res) => {
+          this.recommendedConsultantList = res.records
+          this.recommendedDialogConsultantForm.pageNumber = res.current
+          this.recommendedDialogConsultantForm.pageSize = res.size
+          this.recommendedDialogTotal = res.total
+        }).catch(()=> {
+          console.log('persons/getConsultants err')
+        })
+      },
+      showRecommendCustomerList(row) {
+        this.dialogRecommendedTableVisible = true
+        this.recommendedDialogConsultantForm.customerId = row.customerId
+        this.getRecommendCustomerList()
+      },
+      recommendedDialogHandleSizeChange(value) {
+        this.recommendedDialogConsultantForm.pageSize = value
+        this.getRecommendCustomerList()
+      },
+      recommendedDialogHandleCurrentChange(value) {
+        this.recommendedDialogConsultantForm.pageNumber = 1
+        this.recommendedDialogConsultantForm.pageSize = value
+        this.getConsultantsList()
+      },
     }
-  }
-};
+  };
 </script>
 <style lang="scss" scoped>
-.list {
-  .header {
-    width: 50px;
-    height: 50px;
-    img {
-      width: 100%;
-      height: 100%;
+  .list {
+    .header {
+      width: 50px;
+      height: 50px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
     }
   }
-}
 
-.system-table-search {
-  width: calc(100% - 40px);
-  margin: 16px auto 0;
-}
+  .system-table-search {
+    width: calc(100% - 40px);
+    margin: 16px auto 0;
+  }
 
-.system-table-search ul > li {
-  margin-right: 20px;
-  display: flex;
-  float: left;
-  align-items: center;
-  span {
-    margin-right: 10px;
+  .system-table-search ul > li {
+    margin-right: 20px;
+    display: flex;
+    float: left;
+    align-items: center;
+    margin-bottom: 10px;
+    span {
+      margin-right: 10px;
+    }
   }
-}
 
-.system-table-search ul {
-  font-size: 15px;
-  white-space: nowrap;
-  padding: 0;
-}
+  .system-table-search ul {
+    font-size: 15px;
+    white-space: nowrap;
+    padding: 0;
+  }
 
-.flex-h {
-  display: flex;
-  align-items: center;
-}
-.el-dialog__body{
-  text-align: center;
-  .close-btn{
-  margin:  20px auto 0 auto;
-}
-}
+  .flex-h {
+    display: flex;
+    align-items: center;
+  }
+  .el-dialog__body {
+    text-align: center;
+    .close-btn {
+      margin: 20px auto 0 auto;
+    }
+  }
 
-.flex-item {
-  flex: 1;
-  -webkit-flex: 1;
-  position: relative;
-  overflow: hidden;
-}
+  .flex-item {
+    flex: 1;
+    -webkit-flex: 1;
+    position: relative;
+    overflow: hidden;
+  }
 </style>
 
 

src/views/customer/recommendCustomer.vue

@@ -19,12 +19,12 @@
             <span>推荐人电话</span>
             <el-input v-model="form.consultTel" ></el-input>
           </li>
-<!--          <li>-->
-<!--            <span>状态</span>-->
-<!--            <el-select v-model="form.status" placeholder="请选择">-->
-<!--              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>-->
-<!--            </el-select>-->
-<!--          </li>-->
+          <li>
+            <span>状态</span>
+            <el-select v-model="form.verifyStatus" placeholder="请选择">
+              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>
+            </el-select>
+          </li>
         </ul>
         <el-button
           size="mini"
@@ -77,20 +77,12 @@
       </el-table-column>
       <el-table-column  label="状态">
         <template slot-scope="scope">
-          <span>{{scope.row.status == 1 ? '报备': scope.row.status == 2 ? '到访' : scope.row.status == 3 ? '认购' : '签约' }}</span>
+          <span>{{scope.row.verifyStatus == '0' ? '未通过': scope.row.verifyStatus == '1' ? '已通过' : scope.row.verifyStatus == '2' ? '已驳回' : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column fixed="right" width="200" label="操作">
         <template slot-scope="scope">
-          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">编辑</router-link>
-          &nbsp;
-          <a href="javascript: void(0);" @click="showDialogConsultants(scope.row)">调整归属</a>
-          &nbsp;
-          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">积分记录</router-link>
-          &nbsp;
-          <a href="javascript: void(0);" @click="showRecommendCustomerList(scope.row)">推荐客户</a>
-          &nbsp;
-          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">查看详情</router-link>
+          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">审核</router-link>
         </template>
       </el-table-column>
     </el-table>
@@ -176,7 +168,8 @@ export default {
         name: "",
         consultName: '',
         consultTel: '',
-        status: ''
+        verifyStatus: '', // 0未通过 1已通过 2已驳
+        entryType: 'input'
       },
       list: [],
       total: 0,
@@ -196,20 +189,16 @@ export default {
       personId: "",
       gridData: [
         {
-          name: "报备",
-          value: 1
-        },
-        {
-          name: "到访",
-          value: 2
+          name: "未通过",
+          value: '0'
         },
         {
-          name: "认购",
-          value: 3
+          name: "已通过",
+          value: '1'
         },
         {
-          name: "签约",
-          value: 4
+          name: "已驳回",
+          value: '2'
         }
       ],
       dialogTableVisible: false, //选择置业顾问弹框

src/views/index.js

@@ -173,7 +173,7 @@ const pages = [
       {
         path: 'customerlist',
         name: 'customerlist',
-        component: () => import('./customer/recommendCustomer.vue'),
+        component: () => import('./customer/list.vue'),
         meta: {
           menuShow: true,
           title: '客户列表',
@@ -194,7 +194,7 @@ const pages = [
         component: () => import('./customer/editRecommend.vue'),
         meta: {
           menuShow: false,
-          title: '编辑',
+          title: '审核',
         },
       },
       {
@@ -212,7 +212,7 @@ const pages = [
         component: () => import('./customer/editCustomer.vue'),
         meta: {
           menuShow: false,
-          title: '编辑',
+          title: '编辑客户',
         },
       },
     ]