合并master

src/views/Customer/index.vue

@@ -661,6 +661,7 @@ export default {
 
     downLoad() {
       // this.searchForm
+      // /customer/customerManagementExport
       exportMethodPost(
         "autoSR/customer/customerManagementExport",
         "客户管理",

src/views/Customer/invalidAuditList.vue

@@ -15,7 +15,7 @@
         </el-radio-group>
         <div style="margin-left: 26px">
           <el-date-picker
-            style="width: 250px; height: 32px; line-height: 32px"
+            style="width: 260px; height: 32px; line-height: 32px"
             @change="confirmtime()"
             v-model="customtime"
             type="daterange"
@@ -27,24 +27,27 @@
           </el-date-picker>
         </div>
 
-        <div class="screeningboxlebl" style="margin-left: 20px">项目：</div>
-        <div style="height: 32px">
-          <el-select
-            v-model="params.projectId"
-            collapse-tags
-            filterable
-            clearable
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in projectList"
-              :key="item.id"
-              :label="item.propertyName"
-              :value="item.id"
+        <template v-if="orgType == 2">
+          <div class="screeningboxlebl" style="margin-left: 20px">项目：</div>
+          <div style="height: 32px">
+            <el-select
+              v-model="params.projectId"
+              collapse-tags
+              filterable
+              clearable
+              placeholder="请选择"
             >
-            </el-option>
-          </el-select>
-        </div>
+              <el-option
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.propertyName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </template>
+
         <div class="screeningboxlebl">关键词：</div>
         <el-input
           class="inputbox"
@@ -213,7 +216,7 @@
           </p>
         </div>
         <div class="bottom">
-          <div style="display: flex;width: 100%;">
+          <div style="display: flex; width: 100%">
             <div id="aplayer" style="flex: 1"></div>
             <div style="margin: 25px 0 0 -5px" @click="download()">
               <img
@@ -382,17 +385,25 @@
           //审核状态auditStatus; //审核状态
           0:待审核，1:通过审核，2:审核驳回，3:已撤销--%> -->
           <!-- 审核权限 -->
-          <template v-if="scopeInfo.auditStatus == 0 && checkPermitBtn('invalid_watch_examine')">
+          <template
+            v-if="
+              scopeInfo.auditStatus == 0 &&
+              checkPermitBtn('invalid_watch_examine')
+            "
+          >
             <div class="btns pass" @click="changeAuditStatus(1)">通过</div>
           </template>
-          <template v-if="scopeInfo.auditStatus == 0 && checkPermitBtn('invalid_watch_examine')">
+          <template
+            v-if="
+              scopeInfo.auditStatus == 0 &&
+              checkPermitBtn('invalid_watch_examine')
+            "
+          >
             <div class="btns rejued" @click="rejectReasonTips(2)">驳回</div>
           </template>
           <!-- 标记有效无效接待 -->
           <template
-            v-if="
-              scopeInfo.auditStatus == 0 && checkPermitBtns('bjyx')
-            "
+            v-if="scopeInfo.auditStatus == 0 && checkPermitBtns('bjyx')"
           >
             <div class="btns rejued" @click="changeAuditStatus(3)">撤销</div>
           </template>
@@ -439,6 +450,7 @@ import { exportMethodPost } from "@/util/util";
 export default {
   data() {
     return {
+      orgType: localStorage.getItem("orgType"), // 当前登录项目的类型
       projectList: [], // 项目列表
       tableData: [], // table数据
       customtime: [], // 时间picker
@@ -454,6 +466,7 @@ export default {
         pageSize: 10, // 页数
         projectId: "", // 项目id
         auditStatus: -1, // 审核状态 -1全部  0:待审核，1:通过审核，2:审核驳回，3:已撤销
+        orgCode: '', // 公司id
       },
       auditStatusListIndex: -1, // 默认选中全部
       auditStatusList: [
@@ -504,14 +517,16 @@ export default {
     // 是否有审核权限
     checkPermitBtn() {
       return (name) => {
-        return this.permissions[name] ? true : false
+        return this.permissions[name] ? true : false;
       };
     },
 
     // 是否有审核权限(小程序)
     checkPermitBtns() {
       return (name) => {
-        let index = this.littPermitBtn.findIndex((item) => item.permission == name);
+        let index = this.littPermitBtn.findIndex(
+          (item) => item.permission == name
+        );
         return index != -1;
       };
     },
@@ -535,10 +550,15 @@ export default {
     },
   },
 
-  mounted() {
-    this.getPageList();
+  created() {
     this.getFindHouseListByAccount();
   },
+  mounted() {
+    if (this.orgType != 2) {
+      this.params.projectId = localStorage.getItem("houseId");
+    }
+    this.params.orgCode = localStorage.getItem("orgCode");
+  },
 
   methods: {
     handleSelect(e) {
@@ -586,18 +606,20 @@ export default {
         this.$message.error("请输入无效原因");
         return;
       }
-        this.$api.http.updateReception({
-            id: this.scopeInfo.id,
-            auditStatus: status,
-            rejectReason: this.rejectReason, // 驳回原因
-          }).then((res) => {
+      this.$api.http
+        .updateReception({
+          id: this.scopeInfo.id,
+          auditStatus: status,
+          rejectReason: this.rejectReason, // 驳回原因
+        })
+        .then((res) => {
           if (res.code == 10000) {
-            this.$message.success(res.message)
+            this.$message.success(res.message);
             if (status == 2) this.dialogReason = false;
             this.resetAuditParams();
             this.getPageList();
           } else {
-            this.$message.error(res.message)
+            this.$message.error(res.message);
           }
         });
     },
@@ -609,11 +631,20 @@ export default {
     },
     // 获取项目列表
     getFindHouseListByAccount() {
-      this.$api.http.InvalidFindHouseListByAccount().then((res) => {
-        if (res.code == 10000) {
+      this.$api.api
+        .findHouseByUser({
+          orgType: localStorage.getItem("orgType"),
+        })
+        .then((res) => {
           this.projectList = res.data;
-        }
-      });
+          if (this.orgType == 2) {
+            this.params.projectId = res.data[0].id;
+          }
+
+          this.getPageList();
+        }).catch(() => {
+          this.getPageList();
+        });
     },
     // 获取待审核列表
     getPageList() {
@@ -846,7 +877,11 @@ export default {
     },
     //下载
     download() {
-      exportMethodPost(`/zk/file/filedownload?videoSrc=${this.Broadcastaddress}`,'接待录音', {})
+      exportMethodPost(
+        `/zk/file/filedownload?videoSrc=${this.Broadcastaddress}`,
+        "接待录音",
+        {}
+      );
       // window.location.href =
       //   "${jypath}/zk/file/filedownload?videoSrc=" + this.Broadcastaddress;
     },
@@ -1133,7 +1168,6 @@ export default {
   top: 50px;
 }
 
-
 /deep/.aplayer-info {
   padding: 22px 7px 0px 10px;
 }
@@ -1147,7 +1181,6 @@ export default {
   display: none !important;
 }
 
-
 .aplayer-controller {
   margin-top: 15px;
 }
@@ -1794,4 +1827,8 @@ export default {
 .elmenus .el-menu-demo {
   border-bottom: none;
 }
+
+/deep/ .el-range-separator {
+  width: 10%;
+}
 </style>

src/views/Customer/table.js

@@ -217,7 +217,7 @@ export default {
         indexLabel: "序号",
         stripe: true,
         menuAlign: "center",
-        menuWidth: 146,
+        menuWidth: 200,
         menu: true,
         align: "left",
         refreshBtn: false,

src/views/ReceivingRecords/index.vue

@@ -359,7 +359,8 @@
         @current-change="handleCurrentChange"
       >
         <template slot-scope="{ row }" slot="menu">
-          <el-button
+          <div style="display: flex;">
+            <el-button
             type="text"
             v-if="rec_index_show"
             @click="Receivedetailsabout(row)"
@@ -378,6 +379,7 @@
           >
             删除接待
           </el-button>
+          </div>
         </template>
       </avue-crud>
     </div>
@@ -741,13 +743,19 @@ export default {
     },
     // 无效接待原因列表
     getMarketingInvalidList() {
-      this.$api.api.invalidList({ houseId: this.houseId }).then((res) => {
-        if (res.data && res.data.obj) {
-          this.marketingInvalidList = res.data.obj;
-        } else {
-          this.marketingInvalidList = [];
-        }
-      });
+      
+      this.$api.http
+        .InvalidReceptionReasonList({
+          houseId: this.searchForm.projectId,
+        })
+        .then((res) => {
+          if (res.code == 10000) {
+            this.marketingInvalidList = res.data
+            // .filter(
+            //   (item) => item.id != 6 && item.id != 7 && item.id != 5
+            // );
+          }
+        })
     },
     // 转写方式切换
     changeFun(value) {
@@ -984,6 +992,8 @@ export default {
           this.findTransferMethod();
           // 获取销讲业务
           this.getMarketingBusiness();
+          // 无效接待原因
+          this.getMarketingInvalidList()
         });
     },
     // 置业顾问列表

src/views/ReceivingRecords/table.js

@@ -6,7 +6,7 @@ export default {
         indexLabel: "序号",
         stripe: true,
         menuAlign: "center",
-        menuWidth: 90,
+        menuWidth: 200,
         menu: true,
         align: "left",
         refreshBtn: false,
@@ -67,35 +67,9 @@ export default {
             },
             {
                 label: "无效接待原因",
-                prop: "invalidReason",
+                prop: "invalidNote",
                 formatter: data => {
-                    let str = ''
-                    switch (data.invalidReason) {
-                        case 1 :
-                            str = '没电指派无录音'
-                            break;
-                        case 2 :
-                            str = '离线指派无录音'
-                            break;
-                        case 3 :
-                            str = '系统测试误操作'
-                            break;
-                        case 4 :
-                            str = '非接访场景录音'
-                            break;
-                        case 5 :
-                            str = '其它'
-                            break;
-                        case 6 :
-                            str = '离线'
-                            break;
-                        case 7 :
-                            str = '无设备'
-                            break;
-                        default :
-                            break;
-                    }
-                    return str
+                    return data.invalidNote ? data.invalidNote : '-'
                 }
             },
 

src/views/Statistics/ConsultantBrand.vue

@@ -1077,6 +1077,7 @@ export default {
         current: 1,
         size: 1,
         marketingBusiness: this.marketingBusiness.join(","),
+        exportType: this.tabFlag
       };
       // exportMethodPost()
       exportMethodPost(

src/views/Statistics/ReceptionStatistical.vue

@@ -106,8 +106,8 @@
           </el-select>
         </div>
       </div>
-      <div class="app-titel" style="margin: 15px 0 0 110px">
-        <div>
+      <div class="app-titel" style="padding: 15px 0 0 110px;">
+        <div style="flex-grow: 1;">
           <el-button type="primary" size="small" @click="screen()"
             >筛选</el-button
           >
@@ -127,7 +127,7 @@
         </div>
 
         <div
-          style="margin-left: auto; margin-right: 10px"
+          style=" margin-right: 10px;flex-shrink: 0;"
           v-if="sta_rec_downLoad"
         >
           <el-button @click="downLoad" icon="el-icon-download">导出</el-button>

src/views/houseData/analyse.vue

@@ -136,18 +136,21 @@
               margin-right: 20px;
               cursor: pointer;
             ">
+            
             <div :class="{ colostyle: tabFlag2 == 0 }" style="display: flex;align-items: center;margin-right: 10px" @click="tabClick2(0)">
-              不变
-              <el-tooltip effect="light" content="项目选择月份平均执行率=项目的上月的平均执行率;" placement="bottom-end">
-                <i class="pop"></i>
-              </el-tooltip>
-            </div>
-            <div :class="{ colostyle: tabFlag2 == 1 }" style="display: flex;align-items: center;margin-right: 10px" @click="tabClick2(1)">
               上升
               <el-tooltip effect="light" content="项目选择月份平均执行率>项目的上月的平均执行率;" placement="bottom-end">
                <i class="pop"></i>
               </el-tooltip>
             </div>
+
+            <div :class="{ colostyle: tabFlag2 == 1 }" style="display: flex;align-items: center;margin-right: 10px" @click="tabClick2(1)">
+              不变
+              <el-tooltip effect="light" content="项目选择月份平均执行率=项目的上月的平均执行率;" placement="bottom-end">
+                <i class="pop"></i>
+              </el-tooltip>
+            </div>
+
             <div :class="{ colostyle: tabFlag2 == 2 }" style="display: flex;align-items: center;" @click="tabClick2(2)">
               下降
               <el-tooltip effect="light" content="项目选择月份平均执行率<项目的上月的平均执行率;" placement="bottom-end">
@@ -173,7 +176,7 @@
             </div>
             <div class="jinbox-box">
               <div class="boxbaifenbi"
-                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': item.zxl1 + '%' }">
+                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': (item.zxl1 || 0) + '%' }">
               </div>
             </div>
             <div class="jinboxbott">{{ item.zxl }}</div>
@@ -600,6 +603,7 @@ export default {
           arr.push(obj);
         });
       }
+      console.log(this.objList1)
       this.objList1 = arr;
     },
     tabClick2(idx) {