Merge branch 'master' into 企微聊天

src/views/course/courseWatchLog/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="看课方式" prop="sendType">
-        <el-select v-model="queryParams.sendType" placeholder="选择看课方式"  clearable size="small" @change="handleSendTypeChange">
+        <el-select v-model="queryParams.sendType" placeholder="选择看课方式" size="small" @change="handleSendTypeChange">
           <el-option
             v-for="dict in sendTypeOptions"
             :key="dict.dictValue"
@@ -99,7 +99,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属企微" prop="qwUserName" v-if="queryParams.companyUserId">
+      <el-form-item label="所属企微" prop="qwUserName" v-if="queryParams.companyUserId && (queryParams.sendType == 2)">
         <el-select v-model="queryParams.qwUserName"
                    clearable filterable
                    placeholder="请输入关键词"
@@ -1332,6 +1332,11 @@ export default {
     },
 
     handleSendTypeChange() {
+
+      // 如果是会员，清除一下选中的企微
+      if(this.queryParams.sendType == 1) {
+        this.queryParams.qwUserName = null;
+      }
       this.handleQuery(); // 重新查询列表
     },
 

src/views/crm/components/customerAssignList.vue

@@ -19,7 +19,7 @@
            >
         </el-date-picker>
       </el-form-item>
-        
+
         <el-form-item>
           <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -41,7 +41,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-           
+
             size="mini"
             type="text"
             @click="handleShow(scope.row)"
@@ -72,9 +72,9 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
-  
+
   import { listCustomerAssign,   cancelCustomerAssign } from "@/api/crm/customerAssign";
   import { getCustomerListByIds } from "@/api/crm/customer";
   export default {
@@ -115,7 +115,7 @@
           sysUserId: null,
           assignType: null,
         },
-        
+
       };
     },
     created() {
@@ -143,7 +143,7 @@
             this.loading = false;
             });
         },
-         
+
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
@@ -151,8 +151,9 @@
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
+          this.dateRange = [];
+          this.resetForm("queryForm");
+          this.handleQuery();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
@@ -173,8 +174,7 @@
                 this.msgSuccess("操作成功");
             }).catch(function() {});
         },
-         
+
     }
   };
   </script>
-  

src/views/qw/friendWelcome/indexNew.vue

@@ -1132,6 +1132,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTime = null;
       this.resetForm("queryForm");
       this.queryParams.corpId= this.myQwCompanyList[0].dictValue
       getQwAllUserList(this.queryParams.corpId).then(response => {

src/views/qw/qwUserVoiceLog/index.vue

@@ -573,8 +573,8 @@ export default {
       }
       this.selectTags=[];
       this.createTime=null;
-      this.queryParams.sTime=null;
-      this.queryParams.eTime=null;
+      this.queryParams.beginTime=null;
+      this.queryParams.endTime=null;
       this.queryParams.tagIds=null;
       this.$forceUpdate();
       this.handleQuery();