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

src/views/Customer/label.vue

@@ -325,9 +325,9 @@ export default {
     addclick(){
       var orgCode='';
        if(localStorage.getItem("orgType") == 3){
-          orgCode=this.orgCodes
+          orgCode=localStorage.getItem("orgCode")
       }else{
-        orgCode=localStorage.getItem("orgCode")
+        orgCode= this.orgCodes
       }
        if (this.addForm2.name != "") {
          axios({

src/views/Statistics/ReceptionOverview.vue

@@ -136,7 +136,7 @@
           <div class="hejisan">
                 <div  class="sanbox1" style="width: 30%;">
                   <div class="text1-1">合计</div>
-                  <div class="text1-2">{{ceratelist.sum || ''}}个</div>
+                  <div class="text1-2">{{ceratelist.sum || ''}}次</div>
                 </div>
                 <div  class="sanbox1" style="width: 40%;">
                   <div class="text1-1">顾问</div>
@@ -144,7 +144,7 @@
                 </div>
                 <div  class="sanbox1" style="width: 30%;">
                   <div class="text1-1">人均接待</div>
-                  <div class="text1-2">{{ceratelist.avg || ''}}%</div>
+                  <div class="text1-2">{{ceratelist.avg || ''}}次</div>
                 </div>
             </div>
             <div style="overflow-y:auto;height: 290px;width: 94%;margin: 0 auto;margin-top: 15px;margin-bottom: 16px;">

src/views/Statistics/ReceptionStatistical.vue

@@ -75,7 +75,7 @@
     </div>
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table max-height="300" :data="tableData" stripe style="width: 100%">
+      <el-table  :data="tableData"  style="width: 100%">
         <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             {{
@@ -144,7 +144,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="current"
-          :page-sizes="[ 10, 30, 50]"
+          :page-sizes="[10, 30, 50]"
           :page-size="size"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/views/Statistics/TrendAnalysis.vue

@@ -220,7 +220,7 @@
                             <span v-if="item.name=='变化'">{{item.name}}</span>
                             <span v-else-if="item.name==0">{{item.name}}%</span>
                             <span v-else-if="item.name>0" style="color: red;">{{item.name}}%</span>
-                            <span v-else-if="item.name<0" style="color: 25CEBA;">{{item.name}}%</span>
+                            <span v-else-if="item.name<0" style="color: #25CEBA;">{{item.name}}%</span>
                           </td>
                     </tr>
                 </tbody>

src/views/Template/PinspeakwordsList.vue

@@ -8,9 +8,10 @@
         <div v-if="orgType!=3">
           <el-select
             v-model="projectId"
+            filterable
             @change="houseChange"
             placeholder="请选择"
-            filterable
+
           >
             <el-option
               v-for="item in houseList"
@@ -25,6 +26,8 @@
         <div>
           <el-select
             v-model="statetest"
+             clearable
+            filterable
             placeholder="请选择"
           >
             <el-option
@@ -119,7 +122,6 @@ export default {
       projectId:"",
       orgType:localStorage.getItem('orgType'),
       stateList:[
-        {label:'请选择',value:''},
         {label:'停用',value:'1'},
         {label:'启用',value:'0'},
       ],

src/views/building/Count.vue

@@ -184,8 +184,10 @@
         </el-table-column>
         <el-table-column prop="agentName" label="代理商" align="center">
         </el-table-column>
+
         <el-table-column prop="area" label="地区" align="center">
         </el-table-column>
+
         <!-- <el-table-column prop="userName" label="运营人" align="center">
         </el-table-column> -->
         <el-table-column prop="linkman" label="负责人" align="center">
@@ -236,7 +238,7 @@
         </el-table-column>
         <!-- <el-table-column prop="agentName" label="代理商" align="center">
         </el-table-column> -->
-        <el-table-column prop="area" label="服务期内楼盘" align="center">
+        <el-table-column prop="houseQuantityOfEnough" label="服务期内楼盘" align="center">
         </el-table-column>
         <el-table-column prop="onlineQuantity" label="在线设备" align="center">
         </el-table-column>

src/views/building/index.vue

@@ -164,8 +164,10 @@
     <!-- 表格 -->
     <div class="cen-tab">
       <el-table :data="tableData" stripe style="width: 100%" >
+
         <el-table-column prop="propertyName" label="楼盘名称" align="center">
         </el-table-column>
+
         <el-table-column
           prop="agentName"
           label="代理商"
@@ -176,6 +178,7 @@
             {{ row.agentName || "-" }}
           </template>
         </el-table-column>
+
         <el-table-column
           prop="corporateName"
           label="公司"
@@ -183,62 +186,60 @@
           v-if="orgType != 2"
         >
         </el-table-column>
+
         <el-table-column prop="address" label="楼盘地址" align="center">
         </el-table-column>
-        <el-table-column prop="linkman" label="联系人信息" align="center">
-          <template slot-scope="{ row }">
-            {{ row.linkman || "-" }}-{{ row.linkmanPhone || "-" }}
-          </template>
+
+        <el-table-column prop='linkman' label="联系人姓名" align="center">
         </el-table-column>
+          <el-table-column prop='linkmanPhone' label="联系人手机号" align="center">
+        </el-table-column>
+
         <el-table-column prop="managerPhone" label="管理员账号" align="center">
           <template slot-scope="{ row }">
             {{ row.managerPhone || "-" }}
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="添加日期" align="center">
-          <template  slot-scope="{ row }">
-            {{row.createTime.substring(0,10)}}
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="houseType"
-          label="楼盘类型"
-          align="center"
-          v-if="orgType != 2"
-        >
+
+
+
+        <el-table-column prop="houseType" label="楼盘类型" align="center" v-if="orgType != 2">
           <template slot-scope="{ row }">
             {{
               row.houseType == 0 ? "正式" : row.houseType == 1 ? "试用" :row.houseType == 2? "演示":'测试'
             }}
           </template>
         </el-table-column>
+
         <el-table-column
           prop="startWorking"
           label="合同开始日期"
-          align="center"
-        >
+          align="center" >
         </el-table-column>
 
         <el-table-column prop="endWorking" label="合同结束日期" align="center">
         </el-table-column>
-        <!-- <el-table-column prop="residueTime" label="剩余天数" align="center">
-        </el-table-column> -->
+
+
+  <el-table-column label="添加日期" align="center">
+          <template  slot-scope="{ row }">
+            {{row.createTime.substring(0,10)}}
+          </template>
+        </el-table-column>
+
         <el-table-column prop="residueTime" label="服务状态" align="center">
           <template slot-scope="scope">
-            <!-- {{ row.serviceStatus == 0 ? "在服务期内" : "已过期" }} -->
-              <!-- <div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
-              <div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
-              <div v-if="scope.row.lockFlag==1">禁用</div> -->
                <div v-if="scope.row.residueTime >0">服务中({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
               <div v-if="scope.row.residueTime <=0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div>
           </template>
         </el-table-column>
+
           <el-table-column prop="lockFlag" label="状态" align="center">
           <template slot-scope="{ row }">
             {{row.lockFlag==1?'禁用':'启用'}}
           </template>
         </el-table-column>
-        <!--  scope -->
+
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template slot-scope="{ row }">
             <el-button type="text" v-if="cus_build_index_edit" @click="edit(row)">编辑</el-button>
@@ -248,15 +249,15 @@
               @click="changeAccount(row)"
               >更换账号</el-button
             >
-            <!-- <el-button type="text" v-if="orgType == 2">添加员工</el-button> -->
             <el-button type="text" size="small" v-if="cus_build_index_sys"  @click="editOpera(row,0)">系统运营</el-button>
             <el-button  type="text" size="small" v-if="cus_build_index_agent" @click="editOpera(row,1)">售后运营</el-button>
-            <!-- <el-button type="text">添加员工</el-button> -->
             <el-button  type="text" size="small" v-if="cus_build_index_bindAgent" @click="bindAgent(row)">绑定代理商</el-button>
             <el-button type="text" v-if="cus_build_index_del" @click="del(row)">删除</el-button>
             <el-button  type="text" v-if="cus_build_index_open" size="small"  @click="toDisable(row)">{{row.lockFlag==0?'禁用':'启用'}}</el-button>
           </template>
         </el-table-column>
+
+
       </el-table>
       <div style="display: flex; justify-content: flex-end; margin-top: 10px">
         <el-pagination