init

src/views/Customer/SalesStage.vue

@@ -4,15 +4,17 @@
     <div class="app-top">
       <div class="app-titel">
         <div
+          v-if="orgType != 3"
           class="label"
           style="color: #32363d; font-weight: 400; font-size: 16px"
         >
           楼盘选择：
         </div>
-        <div>
+        <div v-if="orgType != 3">
           <el-select
             v-model="houseId"
             @change="houseChange"
+            filterable 
             placeholder="请选择"
           >
             <el-option
@@ -67,7 +69,10 @@
           <el-input v-model="ruleForm.stageName"></el-input>
         </el-form-item>
         <el-form-item label="顺序：" prop="sort">
-          <el-input v-model="ruleForm.sort" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"></el-input>
+          <el-input
+            v-model="ruleForm.sort"
+            onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"
+          ></el-input>
         </el-form-item>
         <el-form-item label="备注：">
           <el-input v-model="ruleForm.remarks"></el-input>
@@ -87,6 +92,7 @@ export default {
     return {
       houseId: "",
       houseList: [],
+      orgType: localStorage.getItem("orgType"),
       ruleForm: {
         stageName: "", // 公司名称
         sort: "", // 联系人
@@ -128,7 +134,12 @@ export default {
         .then((res) => {
           // console.log(res)
           this.houseList = res.data;
-          this.houseId = res.data[0].id;
+          if (localStorage.getItem("orgType") == 3) {
+            this.houseId = localStorage.getItem("houseId");
+          } else {
+            this.houseId = res.data[0].id;
+          }
+          // this.houseId = res.data[0].id;
           // 获取列表
           this.findbypage();
         });
@@ -206,18 +217,20 @@ export default {
                 this.$message.success("编辑成功");
                 this.findbypage();
               }
-            })
+            });
           } else {
             // 添加
             console.log("添加");
-            this.$api.api.lifeTrackDefineAdd({houseId:this.houseId,...this.ruleForm,}).then((res) => {
-              console.log(res);
-              if (res.code == 0) {
-                this.dialogVisible = false;
-                this.$message.success("新增成功");
-                this.findbypage();
-              }
-            });
+            this.$api.api
+              .lifeTrackDefineAdd({ houseId: this.houseId, ...this.ruleForm })
+              .then((res) => {
+                console.log(res);
+                if (res.code == 0) {
+                  this.dialogVisible = false;
+                  this.$message.success("新增成功");
+                  this.findbypage();
+                }
+              });
           }
         }
       });

src/views/Customer/index.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
-      <div class="app-titel">
+      <div class="app-titel" v-if="orgType!=3">
         <div
           class="label"
           style="color: #32363d; font-weight: 400; font-size: 16px"
@@ -14,6 +14,7 @@
             v-model="searchForm.projectId"
             @change="houseChange"
             placeholder="请选择"
+            filterable
           >
             <el-option
               v-for="item in houseList"
@@ -182,7 +183,7 @@
       <div class="app-titel" style="margin-top: 15px"></div>
 
       <div class="app-titel" style="margin-top: 15px">
-        <div class="label" style="color: #ffffff">筛选相关：</div>
+        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
         <div style="margin-left: 20px">
           <el-button style="background: #2671e2; color: #ffffff" @click="screen"
             >筛选</el-button
@@ -208,7 +209,7 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column prop="agentName" label="销售顾问" align="center">
+        <el-table-column prop="agentName" label="销售顾问" width="110" align="center">
         </el-table-column>
         <el-table-column prop="level" label="客户等级" align="center">
           <template slot-scope="{ row }">
@@ -264,11 +265,11 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="250" fixed="right">
-          <template>
+          <template slot-scope="{row}">
             <el-button type="text">客户详情</el-button>
             <el-button type="text">接待详情</el-button>
             <!-- <el-button type="text">更多</el-button> -->
-            <el-button type="text">转交</el-button>
+            <el-button type="text" @click="tranfser(row)">转交</el-button>
             <el-button type="text">删除</el-button>
           </template>
         </el-table-column>
@@ -388,6 +389,7 @@ export default {
       input: "",
       tableData: [],
       tophove: "",
+      orgType:localStorage.getItem('orgType'),
       type: "0",
       searchForm: {
         name: "",
@@ -409,6 +411,10 @@ export default {
     this.zkhousePage();
   },
   methods: {
+    // 转交
+    tranfser(row){
+      console.log(row);
+    },
     // 接待记录列表
     findbypage() {
       let obj = {
@@ -438,9 +444,9 @@ export default {
         staDate: "",
         endDate: "",
         dateType: "0",
-        projectId: "",
+        // projectId: "",
         timeType: "0",
-        projectId: this.houseList[0].id,
+        projectId:this.orgType==3? localStorage.getItem('houseId'):this.houseList[0].id,
       };
       this.findbypage();
     },
@@ -451,6 +457,7 @@ export default {
       this.findUserListByHouseId();
     },
     timeChange(e) {
+      this.searchForm.dateType=null
       this.searchForm.staDate = e[0];
       this.searchForm.endDate = e[1];
       this.houseChange();
@@ -481,7 +488,11 @@ export default {
         .then((res) => {
           // console.log(res)
           this.houseList = res.data;
-          this.searchForm.projectId = res.data[0].id;
+          if(localStorage.getItem('orgType')==3){
+            this.searchForm.projectId=localStorage.getItem('houseId')
+          }else{
+            this.searchForm.projectId = res.data[0].id;
+          }
           // 获取接待记录列表
           this.findbypage();
           // 获取客户意向

src/views/Customer/label.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
     <div id="app">
       <div class="biaoti">客户画像关键词配置</div>
-      <div class="app-titel" style="margin-top: 20px">
+      <div class="app-titel" style="margin-top: 20px" v-if="orgType!=3">
         <div
           class="label"
           style="color: #32363d; font-weight: 400; font-size: 16px"
@@ -14,6 +14,7 @@
             v-model="houseId"
             placeholder="请选择"
             @change="houseChange"
+            filterable 
           >
             <el-option
               v-for="item in houseList"
@@ -54,35 +55,76 @@
               {{ data.name }}
             </span>
 
-            <span v-if="data.level == 1" style="display: flex; align-items: center;" >
-              <span class="editorcd"  @click="append(node, data)" style="display: flex; align-items: center;" >
+            <span
+              v-if="data.level == 1"
+              style="display: flex; align-items: center"
+            >
+              <span
+                class="editorcd"
+                @click="append(node, data)"
+                style="display: flex; align-items: center"
+              >
                 <img class="levelimg3" src="/img/add1.png" alt="" />
                 <span>添加二级</span>
               </span>
             </span>
 
-            <span v-if="data.level == 2" style="display: flex; align-items: center">
-              <span v-if="data.isInterval == 1" class="editorcd2"  @click="append(node, data)"  style="display: flex; align-items: center" >
+            <span
+              v-if="data.level == 2"
+              style="display: flex; align-items: center"
+            >
+              <span
+                v-if="data.isInterval == 1"
+                class="editorcd2"
+                @click="append(node, data)"
+                style="display: flex; align-items: center"
+              >
                 <img class="levelimg3" src="/img/add2.png" alt="" />
                 <span>添加三级</span>
               </span>
-              <span style="margin-left: 10px;">
-                <el-button class="editorcd" type="text" size="mini"  @click="ddeditor(node, data)" >编辑</el-button>
+              <span style="margin-left: 10px">
+                <el-button
+                  class="editorcd"
+                  type="text"
+                  size="mini"
+                  @click="ddeditor(node, data)"
+                  >编辑</el-button
+                >
               </span>
-              <span style="margin-left: 10px;">
-                <el-button class="remove" type="text"  size="mini"  @click="remove(node, data)">删除</el-button>
+              <span style="margin-left: 10px">
+                <el-button
+                  class="remove"
+                  type="text"
+                  size="mini"
+                  @click="remove(node, data)"
+                  >删除</el-button
+                >
               </span>
             </span>
 
-            <span v-if="data.level == 3" style="display: flex; align-items: center" >
+            <span
+              v-if="data.level == 3"
+              style="display: flex; align-items: center"
+            >
               <span style="margin-left: 10px">
-                <el-button class="editorcd" type="text" size="mini" @click="ddeditor(node, data)">编辑</el-button>
+                <el-button
+                  class="editorcd"
+                  type="text"
+                  size="mini"
+                  @click="ddeditor(node, data)"
+                  >编辑</el-button
+                >
               </span>
               <span style="margin-left: 10px">
-                <el-button class="remove" type="text" size="mini"  @click="remove(node, data)">删除</el-button>
+                <el-button
+                  class="remove"
+                  type="text"
+                  size="mini"
+                  @click="remove(node, data)"
+                  >删除</el-button
+                >
               </span>
             </span>
-
           </span>
         </el-tree>
       </div>
@@ -252,6 +294,7 @@ export default {
       formLabelWidth: "120px",
       dialogFormVisible: false,
       dialogVisible: false,
+      orgType: localStorage.getItem("orgType"),
       isshowage: false,
       treeList: [], //树形数据
       houseList: [],
@@ -447,7 +490,7 @@ export default {
             });
           });
           this.dialogVisible = false;
-          this.$message.success('删除成功')
+          this.$message.success("删除成功");
         }
       });
     },
@@ -512,7 +555,12 @@ export default {
         .then((res) => {
           // console.log(res)
           this.houseList = res.data;
-          this.houseId = res.data[0].id;
+          if (localStorage.getItem("orgType") == 3) {
+            this.houseId = localStorage.getItem("houseId");
+          } else {
+            this.houseId = res.data[0].id;
+          }
+          // this.houseId = res.data[0].id;
           // 列表获取
           this.getHouse();
         });

src/views/Equipment/equipmentDetailList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box-center">
-    <div class="titlebox">
+    <div class="titlebox" v-if="orgType != 3">
       <div
         style="
           background: #ffffff;
@@ -639,6 +639,7 @@ export default {
     return {
       houseId: "",
       timeType: 0,
+      orgType: localStorage.getItem("orgType"),
       time: "",
       compareFlag: "0",
       selectTime: "",
@@ -956,8 +957,13 @@ export default {
 
           this.houseList = res.data;
           if (!this.flag) {
-            console.log(this.flag, "12");
-            this.houseId = res.data[0].id;
+            // console.log(this.flag, "12");
+            if (localStorage.getItem("orgType") == 3) {
+              this.houseId = localStorage.getItem("houseId");
+            } else {
+              this.houseId = res.data[0].id;
+            }
+            // this.houseId = res.data[0].id;
           }
           // console.log(this.flag,'12')
           this.tabtimetap(this.timeType);

src/views/Equipment/equipmentOnlineRecordList.vue

@@ -37,12 +37,12 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-        <span class="demonstration" style="margin-left: 18px; line-height: 40px"
+        <span class="demonstration" v-if="orgType!=3" style="margin-left: 18px; line-height: 40px"
           >楼盘名称：</span
         >
-        <div style="width: 200px">
+        <div style="width: 200px" v-if="orgType!=3">
           <!--			<el-input  v-model="page.houseName"></el-input>-->
-          <el-select v-model="page.houseName" placeholder="请选择">
+          <el-select v-model="page.houseName" filterable placeholder="请选择">
             <el-option
               v-for="item in houseList"
               :key="item.id"
@@ -144,12 +144,12 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-        <span class="demonstration" style="margin-left: 18px; line-height: 40px"
+        <span class="demonstration" v-if="orgType!=3" style="margin-left: 18px; line-height: 40px"
           >楼盘名称：</span
         >
-        <div style="width: 200px">
+        <div style="width: 200px;" v-if="orgType!=3">
           <!--			<el-input  v-model="page.houseName"></el-input>-->
-          <el-select v-model="page.houseName" placeholder="请选择">
+          <el-select v-model="page.houseName" filterable placeholder="请选择">
             <el-option
               v-for="item in houseList"
               :key="item.id"
@@ -280,6 +280,7 @@ export default {
       customtime: "",
       tableData: [],
       currentPage4: 1,
+      orgType:localStorage.getItem('orgType'),
       houseList: [],
       flag: false,
       page: {
@@ -290,7 +291,7 @@ export default {
         houseName: "",
         accountName: "",
         imei: "",
-        total:10,
+        total: 10,
         recording: "",
       },
       options: [
@@ -311,23 +312,23 @@ export default {
   },
   mounted() {
     // return
-      let theRequest=this.$route.query
-      console.log(theRequest, "123"); //此时的theRequest就是我们需要的参数；
-      if (theRequest.houseId) {
-        this.activeTotal = theRequest.flag;
-        this.flag = true;
-        this.page.openTime = theRequest.startDate;
-        this.page.closeTime = theRequest.endDate;
-        this.customtime = [theRequest.startDate, theRequest.endDate];
-        this.page.houseName = theRequest.houseId;
-      } else {
-        let num = 24 * 3600 * 1000 * 6;
-        let time1 = this.timestampToTime(new Date().getTime() - num);
-        console.log(this.timestampToTime(new Date().getTime()), time1);
-        this.page.openTime = time1.trim();
-        this.page.closeTime = this.timestampToTime(new Date().getTime()).trim();
-        this.customtime = [this.page.openTime, this.page.closeTime];
-      }
+    let theRequest = this.$route.query;
+    console.log(theRequest, "123"); //此时的theRequest就是我们需要的参数；
+    if (theRequest.houseId) {
+      this.activeTotal = theRequest.flag;
+      this.flag = true;
+      this.page.openTime = theRequest.startDate;
+      this.page.closeTime = theRequest.endDate;
+      this.customtime = [theRequest.startDate, theRequest.endDate];
+      this.page.houseName = theRequest.houseId;
+    } else {
+      let num = 24 * 3600 * 1000 * 6;
+      let time1 = this.timestampToTime(new Date().getTime() - num);
+      console.log(this.timestampToTime(new Date().getTime()), time1);
+      this.page.openTime = time1.trim();
+      this.page.closeTime = this.timestampToTime(new Date().getTime()).trim();
+      this.customtime = [this.page.openTime, this.page.closeTime];
+    }
 
     // this.activeTotal=0;
     // this.customtime=[] ;
@@ -378,7 +379,7 @@ export default {
     },
     goinfo(row) {
       console.log(row);
-      return
+      return;
       location.href = "${jypath}/zk/file/receptionDetails";
       localStorage.setItem("AudioListId", row.id);
       localStorage.setItem("AudioIdx", 0);
@@ -389,7 +390,8 @@ export default {
         pageSize: 6,
         openTime: "",
         closeTime: "",
-        houseName: this.houseList[0].id,
+        // houseName: this.houseList[0].id,
+        houseName:this.orgType==3? localStorage.getItem('houseId'):this.houseList[0].id,
         accountName: "",
         imei: "",
         total: "",
@@ -420,22 +422,29 @@ export default {
     //获取楼盘数据
     getHouseList() {
       axios({
-        url: `/autoSR/zkhouse/findHouseByUser?orgType=0`,
+        url: `/autoSR/zkhouse/findHouseByUser`,
         method: "get",
+        params:{
+          orgType:this.orgType,
+        }
       }).then((res) => {
         // console.log(res.data.obj)
 
-          this.houseList = res.data;
-          if (!this.flag) {
+        this.houseList = res.data;
+        if (!this.flag) {
+          if (localStorage.getItem("orgType") == 3) {
+            this.page.houseName = localStorage.getItem("houseId");
+          } else {
             this.page.houseName = res.data[0].id;
           }
-          this.getTableList();
-          // res.data.obj.results.forEach((item,index)=>{
-          // 	item.index=index+1
-          // })
-          // this.tableData=res.data.obj.results;
-          // this.page.total = res.data.obj.totalRecord;
-
+          // this.page.houseName = res.data[0].id;
+        }
+        this.getTableList();
+        // res.data.obj.results.forEach((item,index)=>{
+        // 	item.index=index+1
+        // })
+        // this.tableData=res.data.obj.results;
+        // this.page.total = res.data.obj.totalRecord;
       });
     },
     //获取table数据、
@@ -469,13 +478,12 @@ export default {
       }).then((res) => {
         // console.log(res)
 
-          if (!res.data.records) return;
-          res.data.records.forEach((item, index) => {
-            item.index = index + 1;
-          });
-          this.tableData = res.data.records;
-          this.page.total = res.data.total;
-
+        if (!res.data.records) return;
+        res.data.records.forEach((item, index) => {
+          item.index = index + 1;
+        });
+        this.tableData = res.data.records;
+        this.page.total = res.data.total;
       });
     },
   },

src/views/ReceivingRecords/index.vue

@@ -2,7 +2,7 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
-      <div class="app-titel">
+      <div class="app-titel" v-if="orgType!=3">
         <div
           class="label"
           style="color: #32363d; font-weight: 400; font-size: 16px"
@@ -14,6 +14,7 @@
             v-model="searchForm.projectId"
             @change="houseChange"
             placeholder="请选择"
+            filterable
           >
             <el-option
               v-for="item in houseList"
@@ -268,6 +269,7 @@ export default {
       TimetoAhoose: 2,
       time: [],
       houseList: [],
+      orgType:localStorage.getItem('orgType'),
       options: [],
       keywordsList: [],
       accountList: [],
@@ -363,7 +365,7 @@ export default {
     };
   },
   mounted() {
-    this.tabtimetap(0)
+    this.tabtimetap(0);
     // 获取楼盘列表
     this.zkhousePage();
   },
@@ -399,7 +401,11 @@ export default {
         endDate: "",
         houseType: "",
         dateType: "0",
-        projectId: this.houseList[0].id,
+        // projectId: this.houseList[0].id,
+        projectId:
+          this.orgType == 3
+            ? localStorage.getItem("houseId")
+            : this.houseList[0].id,
       };
       this.findbypage();
     },
@@ -441,7 +447,12 @@ export default {
         .then((res) => {
           // console.log(res)
           this.houseList = res.data;
-          this.searchForm.projectId = res.data[0].id;
+          if (localStorage.getItem("orgType") == 3) {
+            this.searchForm.projectId = localStorage.getItem("houseId");
+          } else {
+            this.searchForm.projectId = res.data[0].id;
+          }
+          // this.searchForm.projectId = res.data[0].id;
           // 获取接待记录列表
           this.findbypage();
           // 获取客户意向
@@ -486,11 +497,10 @@ export default {
         num = 24 * 3600 * 1000 * 7;
       }
 
-        this.time = [
-          this.timestampToTime(new Date().getTime() - num),
-          this.timestampToTime(new Date().getTime()),
-        ];
-
+      this.time = [
+        this.timestampToTime(new Date().getTime() - num),
+        this.timestampToTime(new Date().getTime()),
+      ];
     },
     timestampToTime(timestamp) {
       var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000

src/views/Template/PinspeakwordsList.vue

@@ -4,12 +4,13 @@
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
-        <div class="label">楼盘：</div>
-        <div>
+        <div class="label" v-if="orgType!=3">楼盘：</div>
+        <div v-if="orgType!=3">
           <el-select
             v-model="projectId"
             @change="houseChange"
             placeholder="请选择"
+            filterable
           >
             <el-option
               v-for="item in houseList"
@@ -116,6 +117,7 @@ export default {
       pageSize:8,
       houseList:[],
       projectId:"",
+      orgType:localStorage.getItem('orgType'),
       stateList:[
         {label:'请选择',value:''},
         {label:'停用',value:'1'},
@@ -199,9 +201,16 @@ export default {
     },
      //获取楼盘
      zkhousePage() {
-      this.$api.api.findHouseByUser().then((res) => {
+      this.$api.api.findHouseByUser({
+        orgType: localStorage.getItem("orgType"),
+      }).then((res) => {
           this.houseList = res.data;
-          this.projectId = res.data[0].id;
+          if(localStorage.getItem('orgType')==3){
+            this.projectId=localStorage.getItem('houseId')
+          }else{
+            this.projectId = res.data[0].id;
+          }
+          // this.projectId = res.data[0].id;
           this.getcompanyList()
         });
     },

src/views/Template/taboo.vue

@@ -1,17 +1,18 @@
 <template>
-
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
-          <div
-          class="label"
-          style="color: #32363d; font-weight: 400; font-size: 16px"
-        >
+        <div class="label" style="color: #32363d; font-weight: 400" v-if="orgType!=3">
           楼盘选择：
         </div>
-        <div>
-          <el-select v-model="houseId" @change="houseChange" placeholder="请选择">
+        <div v-if="orgType!=3">
+          <el-select
+            v-model="houseId"
+            @change="houseChange"
+            placeholder="请选择"
+            filterable
+          >
             <el-option
               v-for="item in houseList"
               :key="item.id"
@@ -23,16 +24,19 @@
         </div>
         <div class="label">销讲词：</div>
         <div>
-             <el-input v-model="words"></el-input>
+          <el-input v-model="words"></el-input>
         </div>
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff"
+          <el-button
+            style="background: #2671e2; color: #ffffff"
             @click="screening()"
             >筛选</el-button
           >
         </div>
-         <div style="margin-left: 20px">
-          <el-button @click="editorinfo()" style="background: #2671e2; color: #ffffff"
+        <div style="margin-left: 20px">
+          <el-button
+            @click="editorinfo()"
+            style="background: #2671e2; color: #ffffff"
             >新增</el-button
           >
         </div>
@@ -41,67 +45,63 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-        <el-table
-          :data="tableData"
-          stripe
-          height="400"
-          style="width: 100%">
-          <el-table-column
-            prop="words"
-            label="敏感词"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="houseName"
-            label="楼盘名称"
-             align="center"
-           >
-          </el-table-column>
-          <el-table-column
-            prop="createDate"
-            label="创建时间"
-             align="center">
-          </el-table-column>
+      <el-table :data="tableData" stripe height="400" style="width: 100%">
+        <el-table-column prop="words" label="敏感词" align="center">
+        </el-table-column>
+        <el-table-column prop="houseName" label="楼盘名称" align="center">
+        </el-table-column>
+        <el-table-column prop="createDate" label="创建时间" align="center">
+        </el-table-column>
 
-          <el-table-column
-            prop="updateDate"
-            label="修改时间"
-            align="center"
-          >
-          </el-table-column>
-           <!--  scope -->
-         <el-table-column label="操作" align="center">
-            <template slot-scope="scope" style="">
-              <span style="color: #2671E2;" @click="bianji(scope.row)">编辑</span>
-              <span style="color: #2671E2;margin-left: 10px;" @click="del(scope.row)">删除</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="display: flex;justify-content:flex-end;margin-top: 10px;">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="currentPage4"
-              :page-sizes="[6, 12, 18, 24]"
-              :page-size="6"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="total">
-            </el-pagination>
-        </div>
+        <el-table-column prop="updateDate" label="修改时间" align="center">
+        </el-table-column>
+        <!--  scope -->
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope" style="">
+            <span style="color: #2671e2" @click="bianji(scope.row)">编辑</span>
+            <span
+              style="color: #2671e2; margin-left: 10px"
+              @click="del(scope.row)"
+              >删除</span
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="display: flex; justify-content: flex-end; margin-top: 10px">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage4"
+          :page-sizes="[6, 12, 18, 24]"
+          :page-size="6"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
     </div>
 
-       <el-dialog  :title="editFlag ? '编辑' : '新增'" :visible.sync="dialogVisible" >
-      <el-form :model="ruleForm" label-position="labelPosition" :rules="ruleser" ref="ruleForm" label-width="140px" style="width:60%; margin: 0 auto;">
-          <el-form-item label="禁忌词" prop="words">
-              <el-input v-model="ruleForm.words"></el-input>
-          </el-form-item>
+    <el-dialog
+      :title="editFlag ? '编辑' : '新增'"
+      :visible.sync="dialogVisible"
+    >
+      <el-form
+        :model="ruleForm"
+        label-position="labelPosition"
+        :rules="ruleser"
+        ref="ruleForm"
+        label-width="140px"
+        style="width: 60%; margin: 0 auto"
+      >
+        <el-form-item label="禁忌词" prop="words">
+          <el-input v-model="ruleForm.words"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="editor()">保存</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="editor()">保存</el-button>
       </div>
-  </el-dialog>
+    </el-dialog>
   </div>
 </template>
 
@@ -109,38 +109,37 @@
 export default {
   data() {
     return {
-      currentPage4:1,
+      currentPage4: 1,
       value: "",
       input: "",
       tableData: [],
-      multipleSelection:[],
-      dialogVisible:false,
-        ruleForm:{
-          words:'',
-          id:'',
-       },
-       houseId:"",
-       houseList:[],
-       Page:1,
-       size:6,
-       words:"",
-       total:0,
+      multipleSelection: [],
+      dialogVisible: false,
+      orgType:localStorage.getItem('orgType'),
+      ruleForm: {
+        words: "",
+        id: "",
+      },
+      houseId: "",
+      houseList: [],
+      Page: 1,
+      size: 6,
+      words: "",
+      total: 0,
       ruleser: {
-        words: [
-          { required: true, message: '请填写禁忌词', trigger: 'blur' },
-        ]
+        words: [{ required: true, message: "请填写禁忌词", trigger: "blur" }],
       },
-      editFlag:false
+      editFlag: false,
     };
   },
   mounted() {
-    this.zkhousePage()
+    this.zkhousePage();
   },
   methods: {
     houseChange() {
-      this.Page=1;
-      this.words='';
-      this.taboofindbypagelist()
+      this.Page = 1;
+      this.words = "";
+      this.taboofindbypagelist();
     },
     zkhousePage() {
       this.$api.api
@@ -149,16 +148,21 @@ export default {
         })
         .then((res) => {
           this.houseList = res.data;
-          this.houseId = res.data[0].id;
-          this.taboofindbypagelist()
+          if (localStorage.getItem("orgType") == 3) {
+            this.houseId = localStorage.getItem("houseId");
+          } else {
+            this.houseId = res.data[0].id;
+          }
+          // this.houseId = res.data[0].id;
+          this.taboofindbypagelist();
         });
     },
-    taboofindbypagelist(){
+    taboofindbypagelist() {
       let obj = {
         current: this.Page,
         size: this.size,
-        houseId:this.houseId,
-        words:this.words
+        houseId: this.houseId,
+        words: this.words,
       };
       this.$api.http.taboofindbypage(obj).then((res) => {
         console.log(res);
@@ -166,100 +170,105 @@ export default {
         this.total = res.data.total;
       });
     },
-    screening(){
-       this.Page=1;
-      this.taboofindbypagelist()
+    screening() {
+      this.Page = 1;
+      this.taboofindbypagelist();
     },
     //删除
-    del(item){
-        this.$confirm('此操作将永久删除, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          distinguishCancelAndClose: true,
-          type: 'warning'
-        }).then(() => {
-            this.$api.http.taboodelete({id:item.id}).then((res) => {
-                 if(res.code==0){
-                     this.$message({
-                      type: 'success',
-                      message: '删除成功!'
-                    });
-                     this.Page=1;
-                        this.words='';
-                        this.taboofindbypagelist()
-                 }else{
-                    this.$message.error(res.message);
-                 }
-            })
-            }).catch(() => {
+    del(item) {
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        distinguishCancelAndClose: true,
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.http.taboodelete({ id: item.id }).then((res) => {
+            if (res.code == 0) {
               this.$message({
-                type: 'info',
-                message: '已取消删除'
+                type: "success",
+                message: "删除成功!",
               });
+              this.Page = 1;
+              this.words = "";
+              this.taboofindbypagelist();
+            } else {
+              this.$message.error(res.message);
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
         });
     },
     //编辑
-    bianji(row){
-      this.ruleForm.id=row.id;
-      this.dialogVisible=true;
-      this.ruleForm.words=row.words;
-      this.editFlag=true;
+    bianji(row) {
+      this.ruleForm.id = row.id;
+      this.dialogVisible = true;
+      this.ruleForm.words = row.words;
+      this.editFlag = true;
     },
 
-    editorinfo(){
-      this.dialogVisible=true;
-      this.editFlag=false;
+    editorinfo() {
+      this.dialogVisible = true;
+      this.editFlag = false;
     },
-    editor(){
-        this.$refs.ruleForm.validate((valid) => {
-          if (valid) {
-            if(this.editFlag==false){
-                this.$api.http.tabooadd({
-                  houseId:this.houseId,
-                  words:this.ruleForm.words
-                }).then((res) => {
-                  if(res.code==0){
-                        this.dialogVisible=false;
-                        this.$refs.ruleForm.resetFields();
-                        this.Page=1;
-                        this.words='';
-                        this.taboofindbypagelist()
-                    }else{
-                      this.$message.error(res.message);
-                  }
-                });
-            }else{
-               this.$api.http.tabooupdate({
-                  id:this.ruleForm.id,
-                  words:this.ruleForm.words
-                }).then((res) => {
-                  if(res.code==0){
-                        this.dialogVisible=false;
-                        this.$refs.ruleForm.resetFields();
-                        this.Page=1;
-                        this.words='';
-                        this.taboofindbypagelist()
-                    }else{
-                      this.$message.error(res.message);
-                  }
-                });
-            }
-
+    editor() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          if (this.editFlag == false) {
+            this.$api.http
+              .tabooadd({
+                houseId: this.houseId,
+                words: this.ruleForm.words,
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  this.dialogVisible = false;
+                  this.$refs.ruleForm.resetFields();
+                  this.Page = 1;
+                  this.words = "";
+                  this.taboofindbypagelist();
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
           } else {
-            return false;
+            this.$api.http
+              .tabooupdate({
+                id: this.ruleForm.id,
+                words: this.ruleForm.words,
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  this.dialogVisible = false;
+                  this.$refs.ruleForm.resetFields();
+                  this.Page = 1;
+                  this.words = "";
+                  this.taboofindbypagelist();
+                } else {
+                  this.$message.error(res.message);
+                }
+              });
           }
-        });
+        } else {
+          return false;
+        }
+      });
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.size = val;
+      this.taboofindbypagelist();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.Page = val;
+      this.taboofindbypagelist();
     },
-     handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-        this.size = val;
-        this.taboofindbypagelist()
-      },
-      handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
-        this.Page = val;
-        this.taboofindbypagelist()
-      }
   },
 };
 </script>
@@ -271,10 +280,10 @@ export default {
   min-width: 1200px;
   padding-bottom: 100px;
 }
-.cen-tab{
+.cen-tab {
   width: 100%;
   padding: 15px;
-  background: #FFFFFF;
+  background: #ffffff;
   margin-top: 15px;
 }
 .tophove {

src/views/Template/wrongword.vue

@@ -2,15 +2,18 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-top">
-      <div class="app-titel">
-        <div
-          class="label"
-          style="color: #32363d; font-weight: 400; font-size: 16px"
-        >
+      <div class="app-titel" v-if="orgType!=3">
+        <div class="label" style="color: #32363d; font-weight: 400">
           楼盘选择：
         </div>
         <div>
-          <el-select v-model="searchForm.houseId" @change="houseChange" placeholder="请选择">
+          <el-select
+            v-model="searchForm.houseId"
+            style="width: 200px"
+            @change="houseChange"
+            placeholder="请选择"
+            filterable
+          >
             <el-option
               v-for="item in houseList"
               :key="item.id"
@@ -31,8 +34,7 @@
           <el-input v-model="searchForm.wrongWord"></el-input>
         </div>
         <div style="margin-left: 20px">
-          <el-button style="background: #2671e2; color: #ffffff"
-            @click="screen"
+          <el-button style="background: #2671e2; color: #ffffff" @click="screen"
             >筛选</el-button
           >
         </div>
@@ -122,6 +124,7 @@ export default {
   data() {
     return {
       currentPage: 4,
+      orgType:localStorage.getItem('orgType'),
       value: "",
       input: "",
       tableData: [],
@@ -232,13 +235,14 @@ export default {
         }
       });
     },
-    screen(){
-      this.currentPage=1
+    screen() {
+      this.currentPage = 1;
       this.correctFindbypage();
     },
     clascreen() {
       this.searchForm.wrongWord = "";
       this.searchForm.correctWord = "";
+      this.searchForm.houseId=this.orgType==3? localStorage.getItem('houseId'):this.houseList[0].id,
       this.correctFindbypage();
     },
     houseChange() {
@@ -252,7 +256,12 @@ export default {
         .then((res) => {
           // console.log(res)
           this.houseList = res.data;
-          this.searchForm.houseId = res.data[0].id;
+          if (localStorage.getItem("orgType") == 3) {
+            this.searchForm.houseId = localStorage.getItem("houseId");
+          } else {
+            this.searchForm.houseId = res.data[0].id;
+          }
+          // this.searchForm.houseId = res.data[0].id;
           // 列表获取
           this.correctFindbypage();
         });
@@ -327,6 +336,7 @@ export default {
       font-weight: 400;
       color: #32363d;
       line-height: 14px;
+      width: 80px;
       margin-left: 15px;
     }
     .toptimeqhuan {

src/views/building/index.vue

@@ -561,7 +561,7 @@ export default {
         },
       ],
       currentPage: 1,
-      size: "",
+      size: 10,
       total: 10,
       value: "",
       input: "",
@@ -635,7 +635,7 @@ export default {
           // console.log(valid,this.operaForm);
           this.$api.api
             .zkoperationrecordSaveHouse({
-              orgType: 2,
+              orgType: 3,
               accountIds: this.operaForm.operationalPeople.join(","),
               orgId: this.operaForm.orgId,
               orgCode: this.operaForm.orgCode,
@@ -660,7 +660,7 @@ export default {
     zkoperationrecordFindByOrg(orgId) {
       this.$api.api
         .zkoperationrecordFindByOrg({
-          orgType: "2",
+          orgType: "3",
           orgId,
         })
         .then((res) => {
@@ -841,9 +841,9 @@ export default {
         orgType: localStorage.getItem("orgType"),
         ...this.searchForm,
       };
-      // if (this.orgType == 0) {
-      //   obj.residueTime = "";
-      // }
+      if (this.orgType == 0) {
+        obj.residueTime = null;
+      }
       this.$api.api.zkhousePage(obj).then((res) => {
         // console.log(res)
         this.tableData = res.data.records;

vue.config.js

@@ -4,8 +4,8 @@
  */
 // const url = 'http://pigx-gateway'
 // const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.168:9999' //长龙
-const url = 'http://192.168.31.133:9999' //嘉豪
+const url = 'http://192.168.31.168:9999' //长龙
+// const url = 'http://192.168.31.133:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')