ソースを参照

纯正堂bug修复

yuhongqi 2 日 前
コミット
43db8fbbfd
30 ファイル変更130 行追加85 行削除
  1. 10 6
      src/views/company/components/userSelect.vue
  2. 1 0
      src/views/components/course/userCourseCatalogDetails.vue
  3. 3 3
      src/views/course/courseRedPacketLog/index.vue
  4. 3 3
      src/views/course/courseRedPacketLog/myCourseRedPacketLog.vue
  5. 1 1
      src/views/course/courseWatchLog/deptWatchLog.vue
  6. 2 1
      src/views/course/courseWatchLog/index.vue
  7. 1 1
      src/views/course/courseWatchLog/qw/watchLog.vue
  8. 1 1
      src/views/course/courseWatchLog/watchLog.vue
  9. 16 11
      src/views/crm/customer/full.vue
  10. 5 0
      src/views/crm/customer/index.vue
  11. 2 0
      src/views/crm/customer/line.vue
  12. 21 15
      src/views/crm/customer/my.vue
  13. 9 7
      src/views/crm/customerVisit/index.vue
  14. 3 0
      src/views/hisStore/storeOrder/allList.vue
  15. 3 0
      src/views/hisStore/storeOrder/list.vue
  16. 3 0
      src/views/hisStore/storeOrder/myList.vue
  17. 1 0
      src/views/qw/externalContact/deptIndex.vue
  18. 2 1
      src/views/qw/externalContact/index.vue
  19. 3 1
      src/views/qw/externalContact/myExternalContact.vue
  20. 1 0
      src/views/qw/externalContactTransfer/companyTransfer.vue
  21. 1 0
      src/views/qw/externalContactTransfer/deptTransferIndex.vue
  22. 1 0
      src/views/qw/externalContactUnassigned/companyUnassigned.vue
  23. 1 0
      src/views/qw/externalContactUnassigned/deptUnassignedIndex.vue
  24. 1 0
      src/views/qw/externalContactUnassigned/index.vue
  25. 2 2
      src/views/qw/friendWelcome/indexNew.vue
  26. 4 4
      src/views/qw/friendWelcome/myIndexNew.vue
  27. 16 16
      src/views/qw/friendWelcome/myWelcome.vue
  28. 1 0
      src/views/qw/sopLogs/sopLogsList.vue
  29. 1 1
      src/views/qw/sopTemp/index.vue
  30. 11 11
      src/views/qw/sopUserLogs/sopUserLogsSchedule.vue

+ 10 - 6
src/views/company/components/userSelect.vue

@@ -51,7 +51,7 @@
           </el-table-column>
         </el-table>
         <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-        
+
         <div class="btns">
           <el-button type="primary" @click="submit"  >确 定</el-button>
         </div>
@@ -75,7 +75,7 @@ import {
 import { treeselect } from "@/api/company/companyDept";
 export default {
   name: "User",
-  
+
   data() {
     return {
       selectUser:[],
@@ -180,8 +180,8 @@ export default {
       this.queryParams.deptId = data.id;
       this.getList();
     },
-     
-     
+
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;
@@ -199,6 +199,10 @@ export default {
       this.ids = selection.map((item) => item.userId);
     },
     addUser(){
+      if(this.selectUser.length < 1) {
+        this.$message.warning("请选择员工")
+        return
+      }
       var that=this;
       this.selectUser.forEach(element => {
         var flag= that.users.some(item => item.userId === element.userId)
@@ -215,11 +219,11 @@ export default {
 };
 </script>
 <style >
- 
+
 .btns{
   padding-top: 15px;
   display: flex;
   align-content: center;
   justify-content: flex-end;
 }
-</style>
+</style>

+ 1 - 0
src/views/components/course/userCourseCatalogDetails.vue

@@ -385,6 +385,7 @@ import request from '@/utils/request'
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
+        this.queryParams.title = null;
         this.handleQuery();
       },
       // 多选框选中数据

+ 3 - 3
src/views/course/courseRedPacketLog/index.vue

@@ -136,7 +136,7 @@
       <el-table-column label="所属销售" align="center" prop="companyUserName" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="企微员工名称" align="center" prop="qwUserName" />
-      <el-table-column label="转金额" align="center" prop="amount" />
+      <el-table-column label="转金额" align="center" prop="amount" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
           <el-tag>{{ scope.row.status === 0 ? "发送中" : scope.row.status === 1 ? "已完成" : "待补发" }}</el-tag>
@@ -181,8 +181,8 @@
         <el-form-item label="公司id" prop="companyId">
           <el-input v-model="form.companyId" placeholder="请输入公司id" />
         </el-form-item>
-        <el-form-item label="转金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入转金额" />
+        <el-form-item label="转金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入转金额" />
         </el-form-item>
         <el-form-item label="企微userid" prop="qwUserId">
           <el-input v-model="form.qwUserId" placeholder="请输入分享企微userid" />

+ 3 - 3
src/views/course/courseRedPacketLog/myCourseRedPacketLog.vue

@@ -126,7 +126,7 @@
       <el-table-column label="会员电话" align="center" prop="phone" />
       <el-table-column label="所属销售" align="center" prop="companyUserName" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
-      <el-table-column label="转金额" align="center" prop="amount" />
+      <el-table-column label="转金额" align="center" prop="amount" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
           <el-tag>{{ scope.row.status === 0 ? "发送中" : scope.row.status === 1 ? "已完成" : "待补发" }}</el-tag>
@@ -171,8 +171,8 @@
         <el-form-item label="公司id" prop="companyId">
           <el-input v-model="form.companyId" placeholder="请输入公司id" />
         </el-form-item>
-        <el-form-item label="转金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入转金额" />
+        <el-form-item label="转金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入转金额" />
         </el-form-item>
         <el-form-item label="企微userid" prop="qwUserId">
           <el-input v-model="form.qwUserId" placeholder="请输入分享企微userid" />

+ 1 - 1
src/views/course/courseWatchLog/deptWatchLog.vue

@@ -434,7 +434,7 @@
 <!--        <el-table-column label="会员电话" align="center" prop="phone" />-->
 <!--        <el-table-column label="所属销售" align="center" prop="companyUserName" />-->
 <!--        <el-table-column label="所属公司" align="center" prop="companyName" />-->
-        <el-table-column label="转金额" align="center" prop="amount" />
+        <el-table-column label="转金额" align="center" prop="amount" />
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>

+ 2 - 1
src/views/course/courseWatchLog/index.vue

@@ -472,7 +472,7 @@
 <!--        <el-table-column label="会员电话" align="center" prop="phone" />-->
 <!--        <el-table-column label="所属销售" align="center" prop="companyUserName" />-->
 <!--        <el-table-column label="所属公司" align="center" prop="companyName" />-->
-        <el-table-column label="转金额" align="center" prop="amount" />
+        <el-table-column label="转金额" align="center" prop="amount" />
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>
@@ -1418,6 +1418,7 @@ export default {
     },
 
     resetSearchQueryTag(){
+      this.tagChange.tagName=null;
 
       this.queryTagParams= {
         pageNum: 1,

+ 1 - 1
src/views/course/courseWatchLog/qw/watchLog.vue

@@ -247,7 +247,7 @@
         <el-table-column label="会员电话" align="center" prop="phone" />
         <el-table-column label="所属销售" align="center" prop="companyUserName" />
         <el-table-column label="所属公司" align="center" prop="companyName" />
-        <el-table-column label="转金额" align="center" prop="amount" />
+        <el-table-column label="转金额" align="center" prop="amount" />
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>{{ scope.row.status === 0 ? "发送中" : "已完成" }}</el-tag>

+ 1 - 1
src/views/course/courseWatchLog/watchLog.vue

@@ -472,7 +472,7 @@
 <!--        <el-table-column label="会员电话" align="center" prop="phone" />-->
 <!--        <el-table-column label="所属销售" align="center" prop="companyUserName" />-->
 <!--        <el-table-column label="所属公司" align="center" prop="companyName" />-->
-        <el-table-column label="转金额" align="center" prop="amount" />
+        <el-table-column label="转金额" align="center" prop="amount" />
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <el-tag>

+ 16 - 11
src/views/crm/customer/full.vue

@@ -54,7 +54,7 @@
                   />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item label="客户类型" prop="customerType">
             <el-select multiple filterable v-model="ctsTypeArr" placeholder="请选择客户类型" clearable size="small">
               <el-option
@@ -65,7 +65,7 @@
                   />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item label="客户标签" prop="tags">
             <el-select multiple  filterable v-model="tagIds" placeholder="请选择客户标签" clearable size="small">
               <el-option
@@ -76,7 +76,7 @@
                   />
             </el-select>
           </el-form-item>
-          
+
           <!-- <el-form-item label="是否认领" prop="isReceive">
             <el-select v-model="queryParams.isReceive" placeholder="请选择是否认领" clearable size="small">
               <el-option
@@ -87,7 +87,7 @@
                   />
             </el-select>
           </el-form-item> -->
-          
+
           <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               style="width:205.4px"
@@ -215,7 +215,7 @@
             </template>
           </el-table-column>
         </el-table>
-        
+
         <pagination
           v-show="total>0"
           :total="total"
@@ -224,8 +224,8 @@
           @pagination="getList"
         />
 
-    
- 
+
+
     <el-drawer
       size="75%"
       :title="show.title" :visible.sync="show.open"
@@ -238,13 +238,13 @@
     <el-dialog :title="assign.title" :visible.sync="assign.open" width="800px" append-to-body>
         <assign-user  ref="assignUser" @close="closeAssign"   />
     </el-dialog>
-   
- 
+
+
   </div>
 </template>
 
 <script>
- 
+
 import { assignToUser,receive,getFullCustomerList,addCustomer,updateCustomer,getCustomerDetails,exportCustomer  } from "@/api/crm/customer";
 import customerDetails from '../components/customerDetails.vue';
 import {getCitys} from "@/api/store/city";
@@ -434,7 +434,7 @@ export default {
           else if(that.queryParams.isReceive=="1"){
             that.$refs.assignUser.init(ids,3);
           }
-          
+
       }, 200);
     },
     closeAssign(){
@@ -582,6 +582,11 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.visitStatusArr =  [];
+      this.tagIds =  [];
+      this.dateRange = [];
+      this.sourceArr  =  [];
+      this.ctsTypeArr =  [];
       this.handleQuery();
     },
     // 多选框选中数据

+ 5 - 0
src/views/crm/customer/index.vue

@@ -752,6 +752,11 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.sourceArr =  [];
+      this.visitStatusArr =  [];
+      this.tagIds =  [];
+      this.ctsTypeArr =  [];
+      this.dateRange = [];
       this.handleQuery();
     },
     // 多选框选中数据

+ 2 - 0
src/views/crm/customer/line.vue

@@ -583,6 +583,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.tagIds = [];
+      this.dateRange = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 21 - 15
src/views/crm/customer/my.vue

@@ -154,7 +154,7 @@
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    
+
     <el-table  height="500" border v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户编码" align="center" prop="customerCode" />
@@ -220,7 +220,7 @@
             v-hasPermi="['crm:customer:recover']"
           >回收公海</el-button>
           <!-- <el-button
-         
+
             size="mini"
             type="text"
             @click="handleAssign(scope.row)"
@@ -242,13 +242,13 @@
     <el-dialog :title="addSms.title" :visible.sync="addSms.open" width="1000px" append-to-body>
        <add-batch-sms ref="sms" @close="closeSms()"></add-batch-sms>
     </el-dialog>
- 
- 
+
+
     <el-dialog :title="source.title" :visible.sync="source.open" width="1000px" append-to-body>
        <edit-source ref="editSource" @close="closeSource()"></edit-source>
     </el-dialog>
- 
-    <el-dialog :title="visit.title" :visible.sync="visit.open" width="600px" append-to-body> 
+
+    <el-dialog :title="visit.title" :visible.sync="visit.open" width="600px" append-to-body>
       <add-visit @closeVisit="closeVisit"   ref="addVisit" />
     </el-dialog>
     <el-dialog :title="customer.title" :visible.sync="customer.open" width="1000px" append-to-body>
@@ -462,7 +462,7 @@ export default {
         setTimeout(() => {
             that.$refs.visitStatus.reset(row);
         }, 500);
-        
+
     },
     closeCustomerType(){
         this.addCustomerType.open=false;
@@ -474,7 +474,7 @@ export default {
         setTimeout(() => {
             that.$refs.customerType.reset(row);
         }, 500);
-        
+
     },
     closeRemark(){
         this.addRemark.open=false;
@@ -486,7 +486,7 @@ export default {
         setTimeout(() => {
             that.$refs.remark.reset(row);
         }, 500);
-        
+
     },
     closeTag(){
         this.addTag.open=false;
@@ -498,7 +498,7 @@ export default {
         setTimeout(() => {
             that.$refs.tag.reset(row);
         }, 500);
-        
+
     },
     handleShow(row){
       this.show.open=true;
@@ -549,7 +549,7 @@ export default {
       setTimeout(() => {
         that.$refs.editSource.handleEdit(that.ids);
       }, 200);
-      
+
     },
     closeSource(){
         this.source.open=false;
@@ -593,7 +593,7 @@ export default {
           this.citys=res.data;
         })
     },
-    
+
     /** 查询客户列表 */
     getList() {
       this.loading = true;
@@ -649,6 +649,12 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.statusArr=[];
+      this.ctsTypeArr=[];
+      this.tagIds=[];
+      this.sourceArr=[];
+      this.createTimeRange=null;
+      this.dateRange = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -657,9 +663,9 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    
-    
-     
+
+
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const customerIds = row.customerId || this.ids;

+ 9 - 7
src/views/crm/customerVisit/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
- 
+
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="客户编码" prop="customerCode">
             <el-input
@@ -133,13 +133,13 @@
             <template slot-scope="scope">
               <el-image  v-for="(img) in parsePhoto(scope.row.photos)"
                 style="width: 30px; height: 30px;margin-right:5px"
-                :src="img" 
+                :src="img"
                 :preview-src-list="parsePhoto(scope.row.photos)">
               </el-image>
             </template>
           </el-table-column>
           <el-table-column label="跟进时间" align="center" prop="createTime" />
-          
+
           <el-table-column label="下次联系时间" align="center" prop="nextTime" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.nextTime, '{y}-{m}-{d}') }}</span>
@@ -164,7 +164,7 @@
             </template>
           </el-table-column>
         </el-table>
-        
+
         <pagination
           v-show="total>0"
           :total="total"
@@ -172,7 +172,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
-  
+
       <el-drawer
        size="75%"
         :title="show.title" :visible.sync="show.open"
@@ -181,7 +181,7 @@
       </el-drawer>
     </div>
   </template>
-  
+
   <script>
   import { listCustomerVisit, getCustomerVisit, delCustomerVisit, addCustomerVisit, updateCustomerVisit, exportCustomerVisit } from "@/api/crm/customerVisit";
   import customerDetails from '../components/customerDetails.vue';
@@ -358,6 +358,9 @@
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
+        this.dateRange = [];
+        this.createTimeRange=[];
+        this.receiveTimeRange=[];
         this.handleQuery();
       },
       // 多选框选中数据
@@ -436,4 +439,3 @@
     }
   };
   </script>
-  

+ 3 - 0
src/views/hisStore/storeOrder/allList.vue

@@ -679,6 +679,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.createTimeRange = null;
+      this.payTimeRange = null;
+      this.deliveryImportTimeRange = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 3 - 0
src/views/hisStore/storeOrder/list.vue

@@ -837,6 +837,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.createTimeRange = null;
+      this.payTimeRange = null;
+      this.deliveryImportTimeRange = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 3 - 0
src/views/hisStore/storeOrder/myList.vue

@@ -573,6 +573,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.createTimeRange = null;
+      this.payTimeRange = null;
+      this.deliveryImportTimeRange = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 1 - 0
src/views/qw/externalContact/deptIndex.vue

@@ -1701,6 +1701,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.corpId= this.myQwCompanyList[0].dictValue;
+      this.queryParams.transferStatus = null;
       this.selectTags=[];
       this.createTime=null;
       this.queryParams.sTime=null;

+ 2 - 1
src/views/qw/externalContact/index.vue

@@ -524,7 +524,7 @@
              size="mini"
              type="text"
              @click="handleInfoCollection(scope.row)"
-             v-if="scope.row.fsUserId"
+             v-if="false"
              >
              <span>信息采集</span>
           </el-button>
@@ -1812,6 +1812,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.transferStatus=null;
       this.queryParams.corpId= this.myQwCompanyList[0].dictValue;
       this.selectTags=[];
 	   this.createTime=null;

+ 3 - 1
src/views/qw/externalContact/myExternalContact.vue

@@ -493,10 +493,11 @@
              <span>会员详情</span>
           </el-button>
           <el-button
+
              size="mini"
              type="text"
              @click="handleInfoCollection(scope.row)"
-             v-if="scope.row.fsUserId"
+          v-if="false"
              >
              <span>信息采集</span>
           </el-button>
@@ -1891,6 +1892,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.qwUserId=this.myQwUserList[0].dictValue;
       this.queryParams.corpId=this.myQwUserList[0].corpId;
+      this.queryParams.transferStatus = null;
       this.selectTags=[];
 	   this.createTime=null;
 	  this.queryParams.sTime=null;

+ 1 - 0
src/views/qw/externalContactTransfer/companyTransfer.vue

@@ -349,6 +349,7 @@ export default {
       };
       this.selectTags=[];
       this.resetForm("queryForm");
+      this.queryParams.transferStatus = null;
       this.queryParams.corpId = this.myQwCompanyList?.[0]?.dictValue || null
       this.getList();
     },

+ 1 - 0
src/views/qw/externalContactTransfer/deptTransferIndex.vue

@@ -455,6 +455,7 @@ export default {
     resetQuery() {
       this.selectTags=[];
       this.resetForm("queryForm");
+      this.queryParams.transferStatus = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 1 - 0
src/views/qw/externalContactUnassigned/companyUnassigned.vue

@@ -332,6 +332,7 @@ export default {
       this.qwUserNameList = null
       this.isQwUserISNull = false
       this.resetForm("queryForm")
+      this.queryParams.transferStatus = null;
       this.queryParams.corpId = this.myQwCompanyList?.[0]?.dictValue || null
       this.getList()
     },

+ 1 - 0
src/views/qw/externalContactUnassigned/deptUnassignedIndex.vue

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

+ 1 - 0
src/views/qw/externalContactUnassigned/index.vue

@@ -436,6 +436,7 @@ export default {
        this.isQwUserISNull = false;
       this.resetForm("queryForm");
       this.queryParams.corpId= this.myQwCompanyList[0].dictValue
+      this.queryParams.transferStatus = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 2 - 2
src/views/qw/friendWelcome/indexNew.vue

@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item label="创建时间" prop="createdTime">
         <el-date-picker clearable size="small"
-          v-model="queryParams.createdTime"
+          v-model="queryParams.createTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择创建时间">
@@ -36,7 +36,7 @@
       </el-form-item>
       <el-form-item label="更新时间" prop="updateTieme">
         <el-date-picker clearable size="small"
-          v-model="queryParams.updateTieme"
+          v-model="queryParams.updateTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择更新时间">

+ 4 - 4
src/views/qw/friendWelcome/myIndexNew.vue

@@ -27,17 +27,17 @@
                      :value="dict.dictValue"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker clearable size="small"
-                        v-model="queryParams.createdTime"
+                        v-model="queryParams.createTime"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择创建时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="更新时间" prop="updateTieme">
+      <el-form-item label="更新时间" prop="updateTime">
         <el-date-picker clearable size="small"
-                        v-model="queryParams.updateTieme"
+                        v-model="queryParams.updateTime"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择更新时间">

+ 16 - 16
src/views/qw/friendWelcome/myWelcome.vue

@@ -26,22 +26,22 @@
           <el-option v-for="dict in allowSelectOptions" :key="dict.dictValue" :label="dict.dictLabel"  :value="dict.dictValue"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.createdTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTieme">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.updateTieme"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择更新时间">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.createTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择创建时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="更新时间" prop="updateTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--          v-model="queryParams.updateTime"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          placeholder="选择更新时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item label="是否发送欢迎语" prop="isSendMsg">
         <el-select v-model="queryParams.isSendMsg" placeholder="请选择" clearable size="small" >
           <el-option v-for="dict in allowSelectOptions" :key="dict.dictValue" :label="dict.dictLabel"  :value="dict.dictValue"/>

+ 1 - 0
src/views/qw/sopLogs/sopLogsList.vue

@@ -569,6 +569,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.scheduleStartTime=null;
       this.queryParams.scheduleEndTime=null;
+      this.scheduleTime = null;
       this.handleQuery();
     },
     // 多选框选中数据

+ 1 - 1
src/views/qw/sopTemp/index.vue

@@ -111,7 +111,7 @@
     <el-table v-loading="loading" border :data="sopTempList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="模板编号" align="center" prop="id"/>
-      <el-table-column label="模板编号" align="center">
+      <el-table-column label="公司名称" align="center">
         <template slot-scope="scope">
           <el-tag v-for="item in companys" v-if="scope.row.companyId == item.companyId">{{item.companyName}}</el-tag>
         </template>

+ 11 - 11
src/views/qw/sopUserLogs/sopUserLogsSchedule.vue

@@ -35,16 +35,16 @@
                         placeholder="选择营期时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option
-            v-for="dict in sopUserLogsDelStatus"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="dict in sopUserLogsDelStatus"-->
+<!--            :key="dict.dictValue"-->
+<!--            :label="dict.dictLabel"-->
+<!--            :value="dict.dictValue"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="客户名称" prop="externalUserName">
         <el-input
           v-model="queryParams.externalUserName"
@@ -447,7 +447,7 @@ export default {
       // 仅在选中员工时携带 actualQwUserId 与 actualQwId,否则两字段均不传,后端按清空处理
       if (user && user.qwUserId) {
         data.actualQwUserId = user.qwUserId;
-        data.actualQwId     = user.id;   
+        data.actualQwId     = user.id;
       }
       replaceUser(data).then(res => {
         this.msgSuccess(user && user.qwUserId ? "修改成功" : "已清空实际发送人");