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

src/views/Customer/AgentManagement.vue

@@ -411,7 +411,7 @@ export default {
                 }else{
                   this.addagentobj.managerPassword=''
                 }
-              this.resetFlag=false
+              this.resetFlag=true
               this.passFlag=false
               callback();
 

src/views/Customer/CompanyRecord.vue

@@ -347,7 +347,7 @@ export default {
                 }else{
                   this.addagentobj.managerPassword=''
                 }
-              this.resetFlag=false
+              this.resetFlag=true
               this.passFlag=false
               callback();
 

src/views/Customer/SalesStage.vue

@@ -136,6 +136,7 @@ computed: {
         sort: "", // 联系人
         remarks: "", // 联系人手机号
       };
+      this.$refs.ruleForm.resetFields()
     },
     zkhousePage() {
       this.$api.api

src/views/Equipment/index.vue

@@ -956,6 +956,7 @@ export default {
         batchId: "",
         remark: "",
       };
+     this.$refs.addForm.resetFields()
     },
     resetBind() {
       this.bindForm = {

src/views/ReceivingRecords/index.vue

@@ -152,6 +152,47 @@
           </el-select>
         </div>
 
+
+        <div class="div-lab">
+          <!-- 默认全部 -->
+          <div class="label">是否违禁：</div>
+          <el-select
+            v-model="searchForm.taboo"
+            placeholder="请选择"
+            class="div-inp"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in options11"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <div class="div-lab">
+          <!-- 默认全部 -->
+          <div class="label">是否加精：</div>
+          <el-select
+            v-model="searchForm.zfal"
+            placeholder="请选择"
+            class="div-inp"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in options12"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
         <div class="div-lab">
           <div class="label">接待时长：</div>
           <el-select
@@ -234,7 +275,7 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="markAdvisor" label="标记客户" align="center">
+        <el-table-column prop="markAdvisor" label="标记顾问" align="center">
           <template slot-scope="{ row }">
             {{ row.markAdvisor == 0 ? "未标记" : "已标记" }}
           </template>
@@ -248,6 +289,12 @@
         <!-- <el-table-column prop="address" label="禁忌执行率" align="center">
         </el-table-column> -->
         <!--  scope -->
+        <el-table-column prop="taboo" label="是否违禁" align="center">
+           <template slot-scope="{ row }"> {{ row.taboo==0?'否':'是' }} </template>
+        </el-table-column>
+        <el-table-column prop="zfal" label="是否加精" align="center">
+           <template slot-scope="{ row }"> {{ row.zfal==0?'已加精':'未加精' }} </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="{ row }">
             <el-button type="text" v-if="rec_index_look" @click="Receivedetailsabout(row)">查看</el-button>
@@ -348,6 +395,26 @@ export default {
           label: "未标记",
         },
       ],
+      options11: [
+        {
+          value: "0",
+          label: "否",
+        },
+        {
+          value: "1",
+          label: "是",
+        },
+      ],
+      options12: [
+        {
+          value: "0",
+          label: "已加精",
+        },
+        {
+          value: "1",
+          label: "未加精",
+        },
+      ],
       currentPage: 1,
       size: 10,
       total: 10,
@@ -368,6 +435,8 @@ export default {
         houseType: "",
         dateType: "0",
         projectId: "",
+        taboo:'',
+        zfal:''
       },
     };
   },
@@ -432,6 +501,8 @@ export default {
         endDate: "",
         houseType: "",
         dateType: "0",
+        taboo:'',
+        zfal:'',
         // projectId: this.houseList[0].id,
         projectId:
           this.orgType == 3

src/views/Scheduling/index.vue

@@ -83,14 +83,16 @@
       <el-table
         :data="tableData"
         stripe
-        height="400"
+        
         @selection-change="handleSelectionChange"
         style="width: 100%"
+        :header-cell-style="{ textAlign: 'center' }"
+        :cell-style="{ textAlign: 'center' }"
       >
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="name" label="顾问名" align="center">
+        <el-table-column prop="name" label="顾问名" >
         </el-table-column>
-        <el-table-column prop="name" label="状态" align="center">
+        <el-table-column prop="name" label="状态" >
           <template slot-scope="scope">
             <span v-if="scope.row.status == 0">空闲</span>
             <span v-if="scope.row.status == 1">接待中</span>
@@ -100,17 +102,17 @@
         <el-table-column
           prop="createTime"
           label="上次接待结束时间"
-          align="center"
+
         >
         </el-table-column>
 
-        <el-table-column prop="date" label="有无排班" align="center">
+        <el-table-column prop="date" label="有无排班" >
           <template slot-scope="scope">
             <span v-if="scope.row.hasSchedule == 1">有排班</span>
             <span v-if="scope.row.hasSchedule == 0">无排班</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" >
           <template slot-scope="scope">
             <el-button  type="text" @click="switchstatus(scope.row,2)" v-if="scope.row.status == 0&&sch_index_pause">暂停接待</el-button>
             <el-button  type="text" @click="switchstatus(scope.row,0)" v-if="scope.row.status == 2&&sch_index_pause">空闲</el-button>

src/views/Statistics/dataScreeAge.vue

@@ -427,7 +427,7 @@ export default {
       let arr1 = [];
       let arr2 = [];
       // console.log(timeDate);
-      if (idx == 1 || idx == 3) {
+      if (idx == 1 ) {
         // 接待量
         this.secondTab.yesterdayReceptionList.map((item) => {
           timeDate.push(item.time.substring(11, 16));
@@ -447,9 +447,16 @@ export default {
           arr2.push(item.data);
         });
       }
-      // if (idx == 3) {
-      //   // 活跃设备
-      // }
+      if (idx == 3) {
+        // 活跃设备
+        this.secondTab.todayActiveEquipmentList.map((item) => {
+          timeDate.push(item.time.substring(11, 16));
+          arr2.push(item.data);
+        });
+        this.secondTab.yesterdayActiveEquipmentList.map((item) => {
+          arr1.push(item.data);
+        });
+      }
       let arr = [
         {
           name: Strname[0],

src/views/Statistics/dataScreeOrg.vue

@@ -400,7 +400,7 @@ export default {
       let arr1 = [];
       let arr2 = [];
       // console.log(timeDate);
-      if (idx == 1 || idx == 3) {
+      if (idx == 1 ) {
         // 接待量
         this.secondTab.yesterdayReceptionList.map((item) => {
           timeDate.push(item.time.substring(11, 16));
@@ -420,9 +420,16 @@ export default {
           arr2.push(item.data);
         });
       }
-      // if (idx == 3) {
-      //   // 活跃设备
-      // }
+      if (idx == 3) {
+        // 活跃设备
+        this.secondTab.todayActiveEquipmentList.map((item) => {
+          timeDate.push(item.time.substring(11, 16));
+          arr2.push(item.data);
+        });
+        this.secondTab.yesterdayActiveEquipmentList.map((item) => {
+          arr1.push(item.data);
+        });
+      }
       let arr = [
         {
           name: Strname[0],

src/views/Statistics/dataScreeSys.vue

@@ -425,7 +425,7 @@ export default {
       let arr1 = [];
       let arr2 = [];
       // console.log(timeDate);
-      if (idx == 1 || idx == 3) {
+      if (idx == 1 ) {
         // 接待量
         this.secondTab.yesterdayReceptionList.map((item) => {
           timeDate.push(item.time.substring(11, 16));
@@ -445,9 +445,16 @@ export default {
           arr2.push(item.data);
         });
       }
-      // if (idx == 3) {
-      //   // 活跃设备
-      // }
+      if (idx == 3) {
+        // 活跃设备
+        this.secondTab.todayActiveEquipmentList.map((item) => {
+          timeDate.push(item.time.substring(11, 16));
+          arr2.push(item.data);
+        });
+        this.secondTab.yesterdayActiveEquipmentList.map((item) => {
+          arr1.push(item.data);
+        });
+      }
       let arr = [
         {
           name: Strname[0],

src/views/Template/taboo.vue

@@ -86,6 +86,7 @@
     <el-dialog
       :title="editFlag ? '编辑' : '新增'"
       :visible.sync="dialogVisible"
+      @close='$refs.ruleForm.resetFields();'
     >
       <el-form
         :model="ruleForm"

src/views/building/index.vue

@@ -572,7 +572,7 @@ export default {
             // alert("手机号码不合法，请重新输入");
             callback(new Error("手机号格式错误，请重新输入"));
           }else{
-                      // 验证电话号码
+          // 验证电话号码
           this.$api.api.verPhone(value).then((res) => {
             // console.log(res);
             // 判断数据是否已经有了
@@ -611,7 +611,7 @@ export default {
                 }else{
                   this.ruleForm.managerPassword=''
                 }
-              this.resetFlag=false
+              this.resetFlag=true
               this.passFlag=false
               callback();