t

src/views/report/components/popup/IndexRecord.vue

@@ -12,19 +12,19 @@
     >
       <div class="scoped-info">
         <div class="si-row">
-          <div class="si-col">昵称：{{dtlObj.name}}</div>
+          <div class="si-col">客户：{{dtlObj.name}}-{{sexObj[dtlObj.sex]}}</div>
           <div class="si-col">手机号：{{dtlObj.phone}}</div>
-          <div class="si-col">性别：{{sexObj[dtlObj.sex]}}</div>
+          <div class="si-col">创建日期：{{dtlObj.create_at}}</div>
         </div>
         <div class="si-row">
+          <div class="si-col">报备楼盘：{{dtlObj.estate_name}}</div>
           <div class="si-col">客户状态：{{reportStateStr}}</div>
           <div class="si-col">报备进度：{{reportStepStr}}</div>
-          <div class="si-col">创建日期：{{dtlObj.create_at}}</div>
         </div>
         <div class="si-row">
           <div class="si-col">报备日期：{{dtlObj.report_at}}</div>
           <div class="si-col">保护期止：{{dtlObj.lock_at}}</div>
-          <div class="si-col">报备楼盘：{{dtlObj.estate_name}}</div>
+          <div class="si-col">到访日期：{{dtlObj.visit_at}}</div>
         </div>
       </div>
       <div class="scoped-table">

src/views/report/components/popup/IndexRecordMy.vue

@@ -12,18 +12,19 @@
     >
       <div class="scoped-info">
         <div class="si-row">
-          <div class="si-col">昵称：{{dtlObj.name}}</div>
+          <div class="si-col">客户：{{dtlObj.name}}-{{sexObj[dtlObj.sex]}}</div>
           <div class="si-col">手机号：{{dtlObj.phone}}</div>
-          <div class="si-col">性别：{{sexObj[dtlObj.sex]}}</div>
+          <div class="si-col">创建日期：{{dtlObj.create_at}}</div>
         </div>
         <div class="si-row">
+          <div class="si-col">报备楼盘：{{dtlObj.estate_name}}</div>
           <div class="si-col">客户状态：{{reportStateStr}}</div>
           <div class="si-col">报备进度：{{reportStepStr}}</div>
         </div>
         <div class="si-row">
-          <div class="si-col">报备日期：{{dtlObj.create_at}}</div>
+          <div class="si-col">报备日期：{{dtlObj.report_at}}</div>
           <div class="si-col">保护期止：{{dtlObj.lock_at}}</div>
-          <div class="si-col">报备楼盘：{{dtlObj.estate_name}}</div>
+          <div class="si-col">到访日期：{{dtlObj.visit_at}}</div>
         </div>
       </div>
       <div class="scoped-table">

src/views/report/components/searchForm/Index.vue

@@ -25,6 +25,7 @@ export default {
         { label: '意向楼盘', key: 'estate_id', type: 'selectRemote',
           remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
         },
+        { label: '时间类型', key: 'section', defaultValue: 'create_at', type: 'select', options: [{key: '创建时间', val: 'create_at'}, {key: '报备时间', val: 'report_at'}, {key: '到访时间', val: 'visit_at'}, ]},
         { label: '时间', label2: '开始时间', label3: '结束时间', key: 'startEndTime', type: 'datePicker'},
         { label: '中介渠道', key: 'user_id', type: 'selectRemote',
           remoteParams: { skey: 'search', api: `user.admusersearch`, opKey: 'nickname', opVal: 'id' },
@@ -63,7 +64,7 @@ export default {
         return
       }
       const token = window.sessionStorage.getItem('fp_token')
-      window.open(`https://api.fangpiaovip.com/adm/report/export?token=${encodeURIComponent(token)}&start_at=${newForm.start_at}&end_at=${newForm.end_at}&estate_id=${newForm.estate_id}&report_state=${newForm.report_state}&report_step=${newForm.report_step}`)
+      window.open(`https://api.fangpiaovip.com/adm/report/export?token=${encodeURIComponent(token)}&section=${newForm.section}&start_at=${newForm.start_at}&end_at=${newForm.end_at}&estate_id=${newForm.estate_id}&report_state=${newForm.report_state}&report_step=${newForm.report_step}`)
     }
   }
 }

src/views/report/components/searchForm/My.vue

@@ -24,6 +24,8 @@ export default {
         { label: '性别', key: 'sex', type: 'select', options: this.$dictData.sex},
         { label: '客户状态', key: 'report_state', type: 'select', options: this.$dictData.report_state},
         { label: '报备进度', key: 'report_step', type: 'select', options: this.$dictData.report_step},
+        { label: '时间类型', key: 'section', defaultValue: 'create_at', type: 'select', options: [{key: '创建时间', val: 'create_at'}, {key: '报备时间', val: 'report_at'}, {key: '到访时间', val: 'visit_at'}, ]},
+        { label: '时间', label2: '开始时间', label3: '结束时间', key: 'startEndTime', type: 'datePicker'},
         { label: '意向楼盘', key: 'estate_id', type: 'selectRemote',
           remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
         },
@@ -39,6 +41,11 @@ export default {
     searchHandle() {
       const oldform = this.$refs.ruleForm.baseForm
       const newForm = { ...oldform }
+      if (newForm.startEndTime) {
+        newForm.start_at = newForm.startEndTime[0]
+        newForm.end_at = newForm.startEndTime[1]
+      }
+      delete newForm.startEndTime
       this.$emit('change', newForm)
     }
   }

src/views/report/index.vue

@@ -102,12 +102,14 @@ export default {
       rows: [
         { label: '报备人', prop: 'createBy' },
         { label: '姓名', prop: 'name' },
+        { label: '性别', prop: 'sex', type: 'tag', tags: arrToObj(this.$dictData.sex), tagTypeObj: {'male': 'primary', 'female': 'danger'} },
         { label: '电话', prop: 'phone' },
         { label: '客户状态', prop: 'report_state', type: 'tag', tags: arrToObj(this.$dictData.report_state	), tagTypeObj: {'1': 'success', '2': 'warning', '3': 'danger'}},
         { label: '报备进度', prop: 'report_step', type: 'tag', tags: arrToObj(this.$dictData.report_step	), tagTypeObj: {'1': 'info', '2': 'success', '3': 'success'} },
         { label: '报备楼盘', prop: 'estate_name'},
-        { label: '报备时间', prop: 'create_at' },
-        { label: '性别', prop: 'sex', type: 'tag', tags: arrToObj(this.$dictData.sex), tagTypeObj: {'male': 'primary', 'female': 'danger'} },
+        { label: '报备时间', prop: 'report_at' },
+        { label: '到访时间', prop: 'visit_at' },
+        { label: '创建时间', prop: 'create_at' },
         { label: '备注', prop: 'remark', fullShow: true },
         { label: '操作', width: 90, type: 'handle2', operations:
           [

src/views/report/my.vue

@@ -100,12 +100,14 @@ export default {
     this.listConfig = {
       rows: [
         { label: '姓名', prop: 'name' },
+        { label: '性别', prop: 'sex', type: 'tag', tags: arrToObj(this.$dictData.sex), tagTypeObj: {'male': 'primary', 'female': 'danger'} },
         { label: '电话', prop: 'phone' },
         { label: '客户状态', prop: 'report_state', type: 'tag', tags: arrToObj(this.$dictData.report_state	), tagTypeObj: {'1': 'success', '2': 'warning', '3': 'danger'}},
         { label: '报备进度', prop: 'report_step', type: 'tag', tags: arrToObj(this.$dictData.report_step	), tagTypeObj: {'1': 'info', '2': 'success', '3': 'success'} },
         { label: '报备楼盘', prop: 'estate_name'},
-        { label: '报备时间', prop: 'create_at' },
-        { label: '性别', prop: 'sex', type: 'tag', tags: arrToObj(this.$dictData.sex), tagTypeObj: {'male': 'primary', 'female': 'danger'} },
+        { label: '报备时间', prop: 'report_at' },
+        { label: '到访时间', prop: 'visit_at' },
+        { label: '创建时间', prop: 'create_at' },
         { label: '备注', prop: 'remark', fullShow: true },
         { label: '操作', width: 90, type: 'handle2', operations:
           [