1.调整界面

src/views/calendar/myCalendar/index.vue

@@ -5,18 +5,18 @@
       <el-col :span="6">
          <div class="mydate">
            <div><span>我的日程</span></div>
-            <div class="mycate"> 
+            <div class="mycate">
               <el-checkbox-group v-model="checkedEvent" @change="handleCheckedChange">
                 <el-checkbox v-for="item in eventOptions" :label="item.dictValue" :key="item.dictValue">{{item.dictLabel}}</el-checkbox>
               </el-checkbox-group>
             </div>
-         
+
         </div>
       </el-col>
        <el-col :span="18">
          <div class="mycalendar">
             <full-calendar
-              @changeMonth="changeMonth"   
+              @changeMonth="changeMonth"
               :config="config"
               :events="events"
               ref="calendar"
@@ -45,7 +45,7 @@
               v-model="form.startTime"
               type="datetime"
               placeholder="选择开始时间">
-              
+
             </el-date-picker>
           </el-form-item>
           <el-form-item label="结束时间" prop="finishTime" >
@@ -89,21 +89,21 @@
             </el-select>
           </el-form-item>
           <el-form-item label="开始时间"  prop="startTime" >
-              <el-date-picker :disabled="true"  
+              <el-date-picker :disabled="true"
               v-model="event.startTime"
               type="datetime"
               placeholder="选择开始时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="结束时间" prop="finishTime" >
-              <el-date-picker :disabled="true"  
+              <el-date-picker :disabled="true"
               v-model="event.finishTime"
               type="datetime"
               placeholder="选择结束时间">
             </el-date-picker>
           </el-form-item>
             <el-form-item label="提醒时间" prop="eventTime" >
-              <el-date-picker :disabled="true"  
+              <el-date-picker :disabled="true"
               v-model="event.eventTime"
               type="datetime"
               placeholder="选择提醒时间">
@@ -125,6 +125,7 @@
 //https://blog.csdn.net/weixin_44254243/article/details/105238681
 //https://blog.csdn.net/qq_41460077/article/details/121158394
 import { getMyCrmEventList,addCrmEvent,delCrmEvent,doEvent } from "@/api/crm/event";
+import moment from 'moment'
 import icon from '@/assets/icon/menu.png'
 import { FullCalendar } from 'vue-full-calendar' //单页
 import 'fullcalendar/dist/fullcalendar.css'
@@ -216,7 +217,7 @@ data() {
   }
 },
 created() {
-    this.searchMonth = this.$moment().format('YYYY-MM')
+    this.searchMonth = moment().format('YYYY-MM')
     this.getDicts("crm_event_type").then((response) => {
         this.eventOptions = response.data;
     });
@@ -304,7 +305,7 @@ methods: {
           //   title:'春游4',
           //   start: '2021-03-17 15:00:00',
           //   end: '2021-03-17 16:00:00',
-          //   color: '#ff0000' 
+          //   color: '#ff0000'
           // }
           for(var i=0;i<this.myEvents.length;i++){
               var item={};
@@ -322,7 +323,7 @@ methods: {
               this.events.push(item)
           }
         }
-        
+
         this.users = response.data;
       });
     },
@@ -354,7 +355,7 @@ methods: {
       this.form.title="";
       this.form.content="";
       if(day._i.length==undefined){
-        this.form.startTime=this.formatDate(d);
+        this.form.startTime=moment(d).format('YYYY-MM-DD HH:mm:ss');
       }
     },
     eventRender:function (event, element) {
@@ -375,7 +376,7 @@ methods: {
  height: 100%;
  background-color:#ffffff;
  padding: 15px;
- 
+
 }
 .fc th{
  font-weight: normal;

src/views/chat/chatUser/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="微信客户 external_userid" prop="externalUserid">
+      <el-form-item label="微信客户id" prop="externalUserid">
         <el-input
           v-model="queryParams.externalUserid"
-          placeholder="请输入微信客户 external_userid"
+          placeholder="请输入微信客户id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -102,7 +102,7 @@
     <el-table v-loading="loading" :data="chatUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="userId" />
-      <el-table-column label="微信客户 external_userid" align="center" prop="externalUserid" />
+      <el-table-column label="微信客户id" align="center" prop="externalUserid" />
       <el-table-column label="头像" align="center" prop="avatar" />
       <el-table-column label="昵称" align="center" prop="nickname" />
       <el-table-column label="性别" align="center" prop="gender" />
@@ -126,7 +126,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -138,8 +138,8 @@
     <!-- 添加或修改客户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="微信客户 external_userid" prop="externalUserid">
-          <el-input v-model="form.externalUserid" placeholder="请输入微信客户 external_userid" />
+        <el-form-item label="微信客户id" prop="externalUserid">
+          <el-input v-model="form.externalUserid" placeholder="请输入微信客户id" />
         </el-form-item>
         <el-form-item label="头像" prop="avatar">
           <el-input v-model="form.avatar" placeholder="请输入头像" />

src/views/crm/msg/index.vue

@@ -24,28 +24,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="对象ID 多个用,分隔" prop="objId">
+      <el-form-item label="对象ID" prop="objId">
         <el-input
           v-model="queryParams.objId"
-          placeholder="请输入对象ID 多个用,分隔"
+          placeholder="请输入对象ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="对象ID 多个用,分隔" prop="isRead">
+      <el-form-item label="对象ID" prop="isRead">
         <el-input
           v-model="queryParams.isRead"
-          placeholder="请输入对象ID 多个用,分隔"
+          placeholder="请输入对象ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="对象ID 多个用,分隔" prop="companyId">
+      <el-form-item label="对象ID" prop="companyId">
         <el-input
           v-model="queryParams.companyId"
-          placeholder="请输入对象ID 多个用,分隔"
+          placeholder="请输入对象ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -106,9 +106,9 @@
       <el-table-column label="消息类型 1客户消息 " align="center" prop="msgType" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="对象ID 多个用,分隔" align="center" prop="objId" />
-      <el-table-column label="对象ID 多个用,分隔" align="center" prop="isRead" />
-      <el-table-column label="对象ID 多个用,分隔" align="center" prop="companyId" />
+      <el-table-column label="对象ID" align="center" prop="objId" />
+      <el-table-column label="对象ID" align="center" prop="isRead" />
+      <el-table-column label="对象ID" align="center" prop="companyId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -128,7 +128,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -154,14 +154,14 @@
         <el-form-item label="内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="对象ID 多个用,分隔" prop="objId">
-          <el-input v-model="form.objId" placeholder="请输入对象ID 多个用,分隔" />
+        <el-form-item label="对象ID" prop="objId">
+          <el-input v-model="form.objId" placeholder="请输入对象ID" />
         </el-form-item>
-        <el-form-item label="对象ID 多个用,分隔" prop="isRead">
-          <el-input v-model="form.isRead" placeholder="请输入对象ID 多个用,分隔" />
+        <el-form-item label="对象ID" prop="isRead">
+          <el-input v-model="form.isRead" placeholder="请输入对象ID" />
         </el-form-item>
-        <el-form-item label="对象ID 多个用,分隔" prop="companyId">
-          <el-input v-model="form.companyId" placeholder="请输入对象ID 多个用,分隔" />
+        <el-form-item label="对象ID" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入对象ID" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/hisStore/storeOrder/index.vue

@@ -1002,7 +1002,7 @@ import {
   addStoreOrder,
   updateStoreOrder,
   exportStoreOrder,
-  getOrderItemsNum,
+  //getOrderItemsNum,
   importDeliveryNoteExpressTemplate, exportStoreOrderDetails, exportStoreOrderItemsDetails,getErpAccount,
   queryErpPhone,
   saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder
@@ -2094,11 +2094,13 @@ export default {
           this.payPriceTotal = response.payPriceTotal;
           this.payMoneyTotal = response.payMoneyTotal;
           this.payRemainTotal = response.payRemainTotal;
+          this.orderItemNum = response.total;
           this.productInfo = response.productInfo;
         } else {
           this.payPriceTotal = "0"
           this.payMoneyTotal = "0"
           this.payRemainTotal = "0"
+          this.orderItemNum = "0"
           this.productInfo = response.productInfo;
         }
         this.loading = false;
@@ -2152,10 +2154,10 @@ export default {
         this.queryParams.deliverySendTimeRange=null;
       }
 
-      getOrderItemsNum(this.queryParams).then(response => {
-        this.orderItemNum = response.orderItemsNum;
-        this.loading = false;
-      });
+      // getOrderItemsNum(this.queryParams).then(response => {
+      //   this.orderItemNum = response.orderItemsNum;
+      //   this.loading = false;
+      // });
     },
     // 取消按钮
     cancel() {

src/views/qw/QwWorkTask/index.vue

@@ -171,6 +171,8 @@ export default {
       statusOptions: [],
       // 类别 1先导 2 课程 3 大小转 4 转人工字典
       typeOptions: [],
+      // 是否为SM模式
+      isSM: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -276,7 +278,7 @@ export default {
 
 	  getMyQwUserList().then(response => {
 	    this.myQwUserList = response.data;
-	    if(this.myQwUserList!=null){
+	    if(this.myQwUserList!=null && this.myQwUserList.length>0){
 	      // this.queryParams.qwUserId=this.myQwUserList[0].dictValue
 	      this.queryParams.corpId=this.myQwUserList[0].corpId
 	      this.getList();

src/views/qw/autoTagsLogs/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="自动添加标签主表id" prop="autoTagId">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="98px">
+      <el-form-item label="标签主表id" prop="autoTagId">
         <el-input
           v-model="queryParams.autoTagId"
-          placeholder="请输入自动添加标签主表id"
+          placeholder="请输入标签主表id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" clearable size="small">
+      <el-form-item label="组别" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择组别" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -33,29 +33,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="添加好友时间/加入群聊时间" prop="addTime">
+      <el-form-item label="添加好友/群聊时间" prop="addTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.addTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择添加好友时间/加入群聊时间">
+          placeholder="选择添加好友/群聊时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="群聊id(2时有值)" prop="chatId">
+      <el-form-item label="群聊id" prop="chatId">
         <el-input
           v-model="queryParams.chatId"
-          placeholder="请输入群聊id(2时有值)"
+          placeholder="请输入群聊id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="入群方式。
-0/1 - 由群成员邀请入群" prop="joinScene">
+      <el-form-item label="入群方式" prop="joinScene">
         <el-input
           v-model="queryParams.joinScene"
-          placeholder="请输入入群方式。
-0/1 - 由群成员邀请入群"
+          placeholder="请输入入群方式"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -126,19 +124,18 @@
     <el-table v-loading="loading" :data="autoTagsLogsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司id" align="center" prop="id" />
-      <el-table-column label="自动添加标签主表id" align="center" prop="autoTagId" />
-      <el-table-column label="组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" align="center" prop="type" />
+      <el-table-column label="标签主表id" align="center" prop="autoTagId" />
+      <el-table-column label="组别" align="center" prop="type" />
       <el-table-column label="所属员工id" align="center" prop="qwUserid" />
       <el-table-column label="客户id" align="center" prop="externalUserId" />
       <el-table-column label="生效规则" align="center" prop="effectiveRules" />
-      <el-table-column label="添加好友时间/加入群聊时间" align="center" prop="addTime" width="180">
+      <el-table-column label="添加好友/群聊时间" align="center" prop="addTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.addTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="群聊id(2时有值)" align="center" prop="chatId" />
-      <el-table-column label="入群方式。
-0/1 - 由群成员邀请入群" align="center" prop="joinScene" />
+      <el-table-column label="群聊id" align="center" prop="chatId" />
+      <el-table-column label="入群方式" align="center" prop="joinScene" />
       <el-table-column label="公司id" align="center" prop="companyId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -171,11 +168,11 @@
     <!-- 添加或修改自动打标签的日志对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="自动添加标签主表id" prop="autoTagId">
+        <el-form-item label="标签主表id" prop="autoTagId">
           <el-input v-model="form.autoTagId" placeholder="请输入自动添加标签主表id" />
         </el-form-item>
-        <el-form-item label="组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" prop="type">
-          <el-select v-model="form.type" placeholder="请选择组别 1关键词打标签 2客户入群行为打标签 3分时段打标签">
+        <el-form-item label="组别" prop="type">
+          <el-select v-model="form.type" placeholder="请选择组别">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
@@ -185,21 +182,19 @@
         <el-form-item label="客户id" prop="externalUserId">
           <el-input v-model="form.externalUserId" placeholder="请输入客户id" />
         </el-form-item>
-        <el-form-item label="添加好友时间/加入群聊时间" prop="addTime">
+        <el-form-item label="添加好友/群聊时间" prop="addTime">
           <el-date-picker clearable size="small"
             v-model="form.addTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择添加好友时间/加入群聊时间">
+            placeholder="选择添加好友/群聊时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="群聊id(2时有值)" prop="chatId">
-          <el-input v-model="form.chatId" placeholder="请输入群聊id(2时有值)" />
+        <el-form-item label="群聊id" prop="chatId">
+          <el-input v-model="form.chatId" placeholder="请输入群聊id" />
         </el-form-item>
-        <el-form-item label="入群方式。
-0/1 - 由群成员邀请入群" prop="joinScene">
-          <el-input v-model="form.joinScene" placeholder="请输入入群方式。
-0/1 - 由群成员邀请入群" />
+        <el-form-item label="入群方式" prop="joinScene">
+          <el-input v-model="form.joinScene" placeholder="请输入入群方式" />
         </el-form-item>
         <el-form-item label="公司id" prop="companyId">
           <el-input v-model="form.companyId" placeholder="请输入公司id" />

src/views/qw/autoTagsRules/index.vue

@@ -1,26 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="自动打标签主表id" prop="autoTagsId">
+      <el-form-item label="标签id" prop="autoTagsId">
         <el-input
           v-model="queryParams.autoTagsId"
-          placeholder="请输入自动打标签主表id"
+          placeholder="请输入标签id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否运用规则状态 1启用 2停用" prop="isApply">
+      <el-form-item label="运用规则" prop="isApply">
         <el-input
           v-model="queryParams.isApply"
-          placeholder="请输入是否运用规则状态 1启用 2停用"
+          placeholder="请输入运用规则"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" clearable size="small">
+      <el-form-item label="组别" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择组别" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -89,11 +89,11 @@
     <el-table v-loading="loading" :data="autoTagsRulesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司id" align="center" prop="id" />
-      <el-table-column label="自动打标签主表id" align="center" prop="autoTagsId" />
+      <el-table-column label="标签id" align="center" prop="autoTagsId" />
       <el-table-column label="群集合" align="center" prop="rules" />
       <el-table-column label="标签集合" align="center" prop="tags" />
-      <el-table-column label="是否运用规则状态 1启用 2停用" align="center" prop="isApply" />
-      <el-table-column label="组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" align="center" prop="type" />
+      <el-table-column label="运用规则" align="center" prop="isApply" />
+      <el-table-column label="组别" align="center" prop="type" />
       <el-table-column label="公司id" align="center" prop="companyId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -123,17 +123,17 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改自动打标签的规则(主要是 群)对话框 -->
+    <!-- 添加或修改标签的规则(主要是 群)对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="自动打标签主表id" prop="autoTagsId">
-          <el-input v-model="form.autoTagsId" placeholder="请输入自动打标签主表id" />
+        <el-form-item label="标签id" prop="autoTagsId">
+          <el-input v-model="form.autoTagsId" placeholder="请输入标签id" />
         </el-form-item>
-        <el-form-item label="是否运用规则状态 1启用 2停用" prop="isApply">
-          <el-input v-model="form.isApply" placeholder="请输入是否运用规则状态 1启用 2停用" />
+        <el-form-item label="运用规则" prop="isApply">
+          <el-input v-model="form.isApply" placeholder="请输入运用规则" />
         </el-form-item>
-        <el-form-item label="组别 1关键词打标签 2客户入群行为打标签 3分时段打标签" prop="type">
-          <el-select v-model="form.type" placeholder="请选择组别 1关键词打标签 2客户入群行为打标签 3分时段打标签">
+        <el-form-item label="组别" prop="type">
+          <el-select v-model="form.type" placeholder="请选择组别">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
@@ -170,7 +170,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 自动打标签的规则(主要是 群)表格数据
+      // 标签的规则(主要是 群)表格数据
       autoTagsRulesList: [],
       // 弹出层标题
       title: "",
@@ -246,7 +246,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加自动打标签的规则(主要是 群)";
+      this.title = "添加打标签的规则(主要是 群)";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -255,7 +255,7 @@ export default {
       getAutoTagsRules(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改自动打标签的规则(主要是 群)";
+        this.title = "修改打标签的规则(主要是 群)";
       });
     },
     /** 提交按钮 */
@@ -281,7 +281,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认删除自动打标签的规则(主要是 群)编号为"' + ids + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除标签的规则(主要是 群)编号为"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -295,7 +295,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有自动打标签的规则(主要是 群)数据项?', "警告", {
+      this.$confirm('是否确认导出所有标签的规则(主要是 群)数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

src/views/qw/contactWay/index.vue

@@ -883,7 +883,7 @@ export default {
 	  });
     getMyQwCompanyList().then(response => {
         this.myQwCompanyList = response.data;
-        if(this.myQwCompanyList!=null){
+        if(this.myQwCompanyList != null && this.myQwCompanyList.length > 0){
           this.queryParams.corpId=this.myQwCompanyList[0].dictValue;
           setTimeout(() => {
             this.$refs.contactWayGroup.getDetails(this.queryParams.corpId);
@@ -898,6 +898,8 @@ export default {
               this.tagGroupList = response.rows;
           });
           this.getList();
+        } else {
+          this.loading = false;
         }
     });
 

src/views/qw/drainageLinkLogs/index.vue

@@ -28,8 +28,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态 1 点击 2 加入" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择状态 1 点击 2 加入" clearable size="small">
+      <el-form-item label="状态" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -119,7 +119,7 @@
       <el-table-column label="引流链接id" align="center" prop="linkId" />
       <el-table-column label="企微用户id" align="center" prop="userId" />
       <el-table-column label="公司用户id" align="center" prop="companyUserId" />
-      <el-table-column label="状态 1 点击 2 加入" align="center" prop="type" />
+      <el-table-column label="状态" align="center" prop="type" />
       <el-table-column label="描述" align="center" prop="msg" />
       <el-table-column label="外部联系人id" align="center" prop="externalUserId" />
       <el-table-column label="公司id" align="center" prop="companyId" />
@@ -142,7 +142,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -163,8 +163,8 @@
         <el-form-item label="公司用户id" prop="companyUserId">
           <el-input v-model="form.companyUserId" placeholder="请输入公司用户id" />
         </el-form-item>
-        <el-form-item label="状态 1 点击 2 加入" prop="type">
-          <el-select v-model="form.type" placeholder="请选择状态 1 点击 2 加入">
+        <el-form-item label="状态" prop="type">
+          <el-select v-model="form.type" placeholder="请选择状态">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>

src/views/qw/externalContact/index.vue

@@ -1370,7 +1370,7 @@ export default {
 
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
 
               var listTagFrom={corpId:this.queryParams.corpId}
@@ -2756,4 +2756,4 @@ export default {
   border-radius: 1px;
   margin-bottom: 20px;
 }
-</style>
+</style>

src/views/qw/externalContactLoss/index.vue

@@ -282,9 +282,11 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               this.getList();
+            }else{
+              this.loading = false;
             }
     });
     this.getDicts("sys_qw_externalContact_type").then(response => {

src/views/qw/externalContactStage/index.vue

@@ -220,8 +220,12 @@ export default {
     getList() {
       listExternalContactCrm(this.queryParams).then(response => {
         this.externalContactCrmList = response.rows;
-        this.changeCurrentRow(this.externalContactCrmList[0],null,null);
         this.total = response.total;
+        if(this.externalContactCrmList && this.externalContactCrmList.length > 0){
+          this.changeCurrentRow(this.externalContactCrmList[0],null,null);
+        }else{
+          this.loading = false;
+        }
       });
     },
 

src/views/qw/externalContactTransfer/index.vue

@@ -381,7 +381,7 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue;
               listTag({corpId:this.queryParams.corpId}).then(response => {
                 this.tagList = response.rows;
@@ -391,6 +391,8 @@ export default {
               });
 
               this.getList();
+            }else{
+              this.loading = false;
             }
     });
 

src/views/qw/externalContactTransferLog/index.vue

@@ -195,9 +195,11 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               this.getList();
+            }else{
+              this.loading = false;
             }
     });
     this.getDicts("sys_qw_transfer_status").then(response => {

src/views/qw/externalContactUnassigned/index.vue

@@ -330,12 +330,14 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               listTag({corpId:this.queryParams.corpId}).then(response => {
                 this.tagList = response.rows;
               });
               this.getList();
+            }else{
+              this.loading = false;
             }
     });
     this.getDicts("sys_qw_externalContact_type").then(response => {
@@ -441,7 +443,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      
+
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length

src/views/qw/friendCircle/index.vue

@@ -1,33 +1,33 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="附件，不能与text.content同时为空，最多支持9个图片类型，或者1个视频，或者1个链接。类型只能三选一" prop="attachments">
+      <el-form-item label="附件名称" prop="attachments">
         <el-input
           v-model="queryParams.attachments"
-          placeholder="请输入附件，不能与text.content同时为空，最多支持9个图片类型，或者1个视频，或者1个链接。类型只能三选一"
+          placeholder="请输入附件名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="异步任务id，最大长度为64字节，24小时有效；可使用获取发表朋友圈任务结果查询任务状态" prop="jobid">
+      <el-form-item label="异步任务id" prop="jobid">
         <el-input
           v-model="queryParams.jobid"
-          placeholder="请输入异步任务id，最大长度为64字节，24小时有效；可使用获取发表朋友圈任务结果查询任务状态"
+          placeholder="请输入异步任务id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="任务状态，1表示开始创建任务，2表示正在创建任务中，3表示创建任务已完成" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态，1表示开始创建任务，2表示正在创建任务中，3表示创建任务已完成" clearable size="small">
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="操作类型，字节串，此处固定为add_moment_task" prop="type">
+      <el-form-item label="操作类型" prop="type">
         <el-input
           v-model="queryParams.type"
-          placeholder="请输入操作类型，字节串，此处固定为add_moment_task"
+          placeholder="请输入操作类型"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -42,10 +42,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" prop="resultMomentId">
+      <el-form-item label="朋友圈id" prop="resultMomentId">
         <el-input
           v-model="queryParams.resultMomentId"
-          placeholder="请输入朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表"
+          placeholder="请输入朋友圈id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -117,14 +117,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司id" align="center" prop="id" />
       <el-table-column label="消息文本内容" align="center" prop="content" />
-      <el-table-column label="附件，不能与text.content同时为空，最多支持9个图片类型，或者1个视频，或者1个链接。类型只能三选一" align="center" prop="attachments" />
-      <el-table-column label="异步任务id，最大长度为64字节，24小时有效；可使用获取发表朋友圈任务结果查询任务状态" align="center" prop="jobid" />
-      <el-table-column label="任务状态，1表示开始创建任务，2表示正在创建任务中，3表示创建任务已完成" align="center" prop="status" />
-      <el-table-column label="操作类型，字节串，此处固定为add_moment_task" align="center" prop="type" />
+      <el-table-column label="附件名称" align="center" prop="attachments" />
+      <el-table-column label="异步任务id" align="center" prop="jobid" />
+      <el-table-column label="任务状态" align="center" prop="status" />
+      <el-table-column label="操作类型" align="center" prop="type" />
       <el-table-column label="返回码" align="center" prop="resultErrcode" />
       <el-table-column label="对返回码的文本描述内容" align="center" prop="resultErrmsg" />
-      <el-table-column label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" align="center" prop="resultMomentId" />
-      <el-table-column label="不合法的执行者列表，包括不存在的id以及不在应用可见范围内的部门或者成员" align="center" prop="resultInvalidSenderList" />
+      <el-table-column label="朋友圈id" align="center" prop="resultMomentId" />
+      <el-table-column label="不合法的执行者列表" align="center" prop="resultInvalidSenderList" />
       <el-table-column label="公司id" align="center" prop="companyId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -160,19 +160,19 @@
         <el-form-item label="消息文本内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="附件，不能与text.content同时为空，最多支持9个图片类型，或者1个视频，或者1个链接。类型只能三选一" prop="attachments">
-          <el-input v-model="form.attachments" placeholder="请输入附件，不能与text.content同时为空，最多支持9个图片类型，或者1个视频，或者1个链接。类型只能三选一" />
+        <el-form-item label="附件名称" prop="attachments">
+          <el-input v-model="form.attachments" placeholder="请输入附件名称" />
         </el-form-item>
-        <el-form-item label="异步任务id，最大长度为64字节，24小时有效；可使用获取发表朋友圈任务结果查询任务状态" prop="jobid">
-          <el-input v-model="form.jobid" placeholder="请输入异步任务id，最大长度为64字节，24小时有效；可使用获取发表朋友圈任务结果查询任务状态" />
+        <el-form-item label="异步任务id" prop="jobid">
+          <el-input v-model="form.jobid" placeholder="请输入异步任务id" />
         </el-form-item>
-        <el-form-item label="任务状态，1表示开始创建任务，2表示正在创建任务中，3表示创建任务已完成">
+        <el-form-item label="任务状态">
           <el-radio-group v-model="form.status">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="操作类型，字节串，此处固定为add_moment_task" prop="type">
-          <el-input v-model="form.type" placeholder="请输入操作类型，字节串，此处固定为add_moment_task" />
+        <el-form-item label="操作类型" prop="type">
+          <el-input v-model="form.type" placeholder="请输入操作类型" />
         </el-form-item>
         <el-form-item label="返回码" prop="resultErrcode">
           <el-input v-model="form.resultErrcode" placeholder="请输入返回码" />
@@ -180,10 +180,10 @@
         <el-form-item label="对返回码的文本描述内容" prop="resultErrmsg">
           <el-input v-model="form.resultErrmsg" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" prop="resultMomentId">
-          <el-input v-model="form.resultMomentId" placeholder="请输入朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" />
+        <el-form-item label="朋友圈id" prop="resultMomentId">
+          <el-input v-model="form.resultMomentId" placeholder="请输入朋友圈id" />
         </el-form-item>
-        <el-form-item label="不合法的执行者列表，包括不存在的id以及不在应用可见范围内的部门或者成员" prop="resultInvalidSenderList">
+        <el-form-item label="不合法的执行者列表" prop="resultInvalidSenderList">
           <el-input v-model="form.resultInvalidSenderList" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="公司id" prop="companyId">

src/views/qw/friendCircleTask/index.vue

@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="成员发表状态。0:未发表 1：已发表" prop="publishStatus">
-        <el-select v-model="queryParams.publishStatus" placeholder="请选择成员发表状态。0:未发表 1：已发表" clearable size="small">
+      <el-form-item label="成员发表状态" prop="publishStatus">
+        <el-select v-model="queryParams.publishStatus" placeholder="请选择成员发表状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -33,10 +33,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" prop="resultMomentId">
+      <el-form-item label="朋友圈id" prop="resultMomentId">
         <el-input
           v-model="queryParams.resultMomentId"
-          placeholder="请输入朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表"
+          placeholder="请输入朋友圈id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -97,12 +97,12 @@
 
     <el-table v-loading="loading" :data="friendCircleTaskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" align="center" prop="id" />
+      <el-table-column label="朋友圈id" align="center" prop="id" />
       <el-table-column label="企微用户id" align="center" prop="qwUserId" />
-      <el-table-column label="成员发表状态。0:未发表 1：已发表" align="center" prop="publishStatus" />
+      <el-table-column label="成员发表状态" align="center" prop="publishStatus" />
       <el-table-column label="qw_friend_circle主表" align="center" prop="circleId" />
       <el-table-column label="公司id" align="center" prop="companyId" />
-      <el-table-column label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" align="center" prop="resultMomentId" />
+      <el-table-column label="朋友圈id" align="center" prop="resultMomentId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -137,7 +137,7 @@
         <el-form-item label="企微用户id" prop="qwUserId">
           <el-input v-model="form.qwUserId" placeholder="请输入企微用户id" />
         </el-form-item>
-        <el-form-item label="成员发表状态。0:未发表 1：已发表">
+        <el-form-item label="成员发表状态">
           <el-radio-group v-model="form.publishStatus">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
@@ -148,8 +148,8 @@
         <el-form-item label="公司id" prop="companyId">
           <el-input v-model="form.companyId" placeholder="请输入公司id" />
         </el-form-item>
-        <el-form-item label="朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" prop="resultMomentId">
-          <el-input v-model="form.resultMomentId" placeholder="请输入朋友圈id，可通过获取客户朋友圈企业发表的列表接口获取朋友圈企业发表的列表" />
+        <el-form-item label="朋友圈id" prop="resultMomentId">
+          <el-input v-model="form.resultMomentId" placeholder="请输入朋友圈id" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/qw/friendComments/index.vue

@@ -19,24 +19,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label=" 1 评论 2 点赞" prop="commentsType">
-        <el-select v-model="queryParams.commentsType" placeholder="请选择 1 评论 2 点赞" clearable size="small">
+      <el-form-item label="评论状态" prop="commentsType">
+        <el-select v-model="queryParams.commentsType" placeholder="请选择评论状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="评论或点赞的客户userid，userid与external_userid不会同时出现" prop="externalUserid">
+      <el-form-item label="客户userid" prop="externalUserid">
         <el-input
           v-model="queryParams.externalUserid"
-          placeholder="请输入评论或点赞的客户userid，userid与external_userid不会同时出现"
+          placeholder="请输入客户userid"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="评论的企业成员userid，userid与external_userid不会同时出现" prop="userid">
+      <el-form-item label="企业成员userid" prop="userid">
         <el-input
           v-model="queryParams.userid"
-          placeholder="请输入评论的企业成员userid，userid与external_userid不会同时出现"
+          placeholder="请输入企业成员userid"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -109,9 +109,9 @@
       <el-table-column label="公司id" align="center" prop="id" />
       <el-table-column label="朋友圈id" align="center" prop="momentId" />
       <el-table-column label="发送朋友圈的员工id" align="center" prop="qwUserId" />
-      <el-table-column label=" 1 评论 2 点赞" align="center" prop="commentsType" />
-      <el-table-column label="评论或点赞的客户userid，userid与external_userid不会同时出现" align="center" prop="externalUserid" />
-      <el-table-column label="评论的企业成员userid，userid与external_userid不会同时出现" align="center" prop="userid" />
+      <el-table-column label="评论状态" align="center" prop="commentsType" />
+      <el-table-column label="客户userid" align="center" prop="externalUserid" />
+      <el-table-column label="企业成员userid" align="center" prop="userid" />
       <el-table-column label="公司id" align="center" prop="companyId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -132,7 +132,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -150,16 +150,16 @@
         <el-form-item label="发送朋友圈的员工id" prop="qwUserId">
           <el-input v-model="form.qwUserId" placeholder="请输入发送朋友圈的员工id" />
         </el-form-item>
-        <el-form-item label=" 1 评论 2 点赞">
+        <el-form-item label="评论状态">
           <el-radio-group v-model="form.commentsType">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="评论或点赞的客户userid，userid与external_userid不会同时出现" prop="externalUserid">
-          <el-input v-model="form.externalUserid" placeholder="请输入评论或点赞的客户userid，userid与external_userid不会同时出现" />
+        <el-form-item label="客户userid" prop="externalUserid">
+          <el-input v-model="form.externalUserid" placeholder="请输入客户userid" />
         </el-form-item>
-        <el-form-item label="评论的企业成员userid，userid与external_userid不会同时出现" prop="userid">
-          <el-input v-model="form.userid" placeholder="请输入评论的企业成员userid，userid与external_userid不会同时出现" />
+        <el-form-item label="企业成员userid" prop="userid">
+          <el-input v-model="form.userid" placeholder="请输入企业成员userid" />
         </el-form-item>
         <el-form-item label="公司id" prop="companyId">
           <el-input v-model="form.companyId" placeholder="请输入公司id" />

src/views/qw/friendCustomerList/index.vue

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发送成功的外部联系人userid" prop="externalUserid">
+      <el-form-item label="外部联系人userid" prop="externalUserid">
         <el-input
           v-model="queryParams.externalUserid"
-          placeholder="请输入发送成功的外部联系人userid"
+          placeholder="请输入外部联系人userid"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -94,7 +94,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="公司id" align="center" prop="id" />
       <el-table-column label="朋友圈id" align="center" prop="momentId" />
-      <el-table-column label="发送成功的外部联系人userid" align="center" prop="externalUserid" />
+      <el-table-column label="外部联系人userid" align="center" prop="externalUserid" />
       <el-table-column label="企微用户id" align="center" prop="qwUserId" />
       <el-table-column label="公司id" align="center" prop="companyId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -116,7 +116,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -131,8 +131,8 @@
         <el-form-item label="朋友圈id" prop="momentId">
           <el-input v-model="form.momentId" placeholder="请输入朋友圈id" />
         </el-form-item>
-        <el-form-item label="发送成功的外部联系人userid" prop="externalUserid">
-          <el-input v-model="form.externalUserid" placeholder="请输入发送成功的外部联系人userid" />
+        <el-form-item label="外部联系人userid" prop="externalUserid">
+          <el-input v-model="form.externalUserid" placeholder="请输入外部联系人userid" />
         </el-form-item>
         <el-form-item label="企微用户id" prop="qwUserId">
           <el-input v-model="form.qwUserId" placeholder="请输入企微用户id" />

src/views/qw/groupChat/index.vue

@@ -171,7 +171,7 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               this.getList();
             }

src/views/qw/groupChatTransfer/index.vue

@@ -174,7 +174,7 @@ export default {
     getMyQwCompanyList() {
       getMyQwCompanyList().then(response => {
         this.myQwCompanyList = response.data;
-        if(this.myQwCompanyList!=null){
+        if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
           this.queryParams.corpId=this.myQwCompanyList[0].dictValue
           this.getList();
         }

src/views/qw/groupChatTransferLog/index.vue

@@ -85,7 +85,7 @@ export default {
     getMyQwCompanyList() {
       getMyQwCompanyList().then(response => {
         this.myQwCompanyList = response.data;
-        if(this.myQwCompanyList!=null){
+        if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
           this.queryParams.corpId=this.myQwCompanyList[0].dictValue
           this.getList();
         }

src/views/qw/groupChatTransferOnJob/index.vue

@@ -175,7 +175,7 @@ export default {
     getMyQwCompanyList() {
       getMyQwCompanyList().then(response => {
         this.myQwCompanyList = response.data;
-        if(this.myQwCompanyList!=null){
+        if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
           this.queryParams.corpId=this.myQwCompanyList[0].dictValue
           this.getList();
         }

src/views/qw/groupMsg/index.vue

@@ -790,7 +790,7 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue;
 
               this.getList();
@@ -820,7 +820,7 @@ export default {
 
     //客户性别
     this.getDicts("sys_qw_external_contact_gender").then(response => {
-      this.sysUserSex = response.data;
+      this.sysUserSex = response.data || [];
 
       // 要添加的新对象数据
       let newUserData = {

src/views/qw/groupMsgItem/index.vue

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="企业群发消息的id，可用于获取群发消息发送结果" prop="msgId">
+      <el-form-item label="企业群发消息id" prop="msgId">
         <el-input
           v-model="queryParams.msgId"
-          placeholder="请输入企业群发消息的id，可用于获取群发消息发送结果"
+          placeholder="请输入企业群发消息id"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -207,7 +207,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="群发记录主表id" align="center" prop="groupMsgId" />
-      <el-table-column label="企业群发消息的id，可用于获取群发消息发送结果" align="center" prop="msgId" />
+      <el-table-column label="企业群发消息id" align="center" prop="msgId" />
       <el-table-column label="附件类型" align="center" prop="msgType" />
       <el-table-column label="图片的media_id" align="center" prop="mediaId" />
       <el-table-column label="图片的链接" align="center" prop="picUrl" />
@@ -242,7 +242,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -257,8 +257,8 @@
         <el-form-item label="群发记录主表id" prop="groupMsgId">
           <el-input v-model="form.groupMsgId" placeholder="请输入群发记录主表id" />
         </el-form-item>
-        <el-form-item label="企业群发消息的id，可用于获取群发消息发送结果" prop="msgId">
-          <el-input v-model="form.msgId" placeholder="请输入企业群发消息的id，可用于获取群发消息发送结果" />
+        <el-form-item label="企业群发消息id" prop="msgId">
+          <el-input v-model="form.msgId" placeholder="请输入企业群发消息id" />
         </el-form-item>
         <el-form-item label="附件类型" prop="msgType">
           <el-select v-model="form.msgType" placeholder="请选择附件类型">

src/views/qw/material/index.vue

@@ -615,9 +615,11 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               this.getList();
+            }else{
+              this.loading = false;
             }
     });
     //素材类型字典

src/views/qw/tagGroup/index.vue

@@ -236,9 +236,11 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               this.getList();
+            }else{
+              this.loading = false;
             }
     });
   },

src/views/qw/welcome/index.vue

@@ -457,9 +457,11 @@ export default {
   created() {
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
+            if(this.myQwCompanyList!=null && this.myQwCompanyList.length>0){
               this.queryParams.corpId=this.myQwCompanyList[0].dictValue
               this.getList();
+            }else{
+              this.loading = false;
             }
         });
     //文本类型字典

src/views/statistics/index.vue

@@ -128,7 +128,7 @@
               <span class="sub-value">
                 <count-to :start-val="0" :end-val="todayWatchUserCount" :duration="3600" class="card-panel-num" />/<count-to :start-val="0" :end-val="versionLimit" :duration="3600" class="card-panel-num" /></span>
             </div>
-            <el-progress :percentage="todayWatchUserCount/versionLimit" :show-text="false" color="#409EFF"></el-progress>
+            <el-progress :percentage="versionLimit > 0 ? Math.min(100, Math.round((todayWatchUserCount/versionLimit) * 100)) : 0" :show-text="false" color="#409EFF"></el-progress>
           </div>
         </el-col>
         <el-col :span="3">
@@ -1020,7 +1020,7 @@ export default {
     },
     refresh() {
       rechargeComsumption().then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           this.balance = res.data.balance;
           this.todayComsumption = res.data.todayComsumption;
           this.yesterdayComsumption = res.data.yesterdayComsumption;
@@ -1031,14 +1031,14 @@ export default {
       });
 
       trafficLog().then(res=>{
-        if(res.code === 200) {
+        if(res.code === 200 && res.data) {
           this.todayTraffic = res.data.today;
           this.thisMonthTraffic = res.data.thisMonth;
         }
       })
 
       dealerAggregated().then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           this.dealderCount = res.data.dealderCount??0;
           this.groupMgrCount = res.data.groupMgrCount??0;
           this.memberCount = res.data.memberCount??0;
@@ -1061,7 +1061,7 @@ export default {
       param.startTime = this.formatDate(today);
       param.endTime = this.formatDate(today);
       analysisPreview(param).then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           this.watchUserCount = res.data.watchUserCount;
           this.completedUserCount = res.data.completedUserCount;
           this.completedRate = res.data.completedRate;
@@ -1085,7 +1085,7 @@ export default {
         }
       })
       authorizationInfo().then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           this.todayWatchUserCount = res.data.todayWatchUserCount;
           this.versionLimit = res.data.versionLimit;
         }
@@ -1241,7 +1241,7 @@ export default {
       let param = this.getParam();
       param = {...param,statisticalType:this.viewerType,dataType: this.dataType};
       rewardMoneyTopTen(param).then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let data = res.data;
           let companyNameList = data.map(e=>e.companyName)
           let courseNameList = data.map(e=>e.courseName)
@@ -1261,7 +1261,7 @@ export default {
       let param = this.getParam();
       param = {...param,statisticalType:this.viewerType,dataType: this.dataType};
       rewardMoneyTrend(param).then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let data = res.data;
           let option = data.map(e=>[e.x,e.rewardMoney])
           lineChartOption.series[0].data = option;
@@ -1274,7 +1274,7 @@ export default {
       let param = this.getParam();
       param = {...param,statisticalType:this.viewerType};
       watchCourseTopTen(param).then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let data = res.data;
           let watchUserCountList = data.map(e=>e.watchUserCount);
           let completedUserCountList = data.map(e=>e.completedUserCount);
@@ -1295,7 +1295,7 @@ export default {
 
       // 经销商会员观看TOP10
       deaMemberTopTen({...param,statisticalType: this.viewerType}).then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let data = res.data;
           let companyNameList = data.map(e=>e.companyName);
           let watchUserList = data.map(e=>e.watchUserCount);
@@ -1309,7 +1309,7 @@ export default {
     },
     handleThisMonthOrderCount(){
       thisMonthOrderCount().then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let dates = res.dates;
           let orderCount = res.orderCount;
           let payPrice = res.payPrice;
@@ -1324,7 +1324,7 @@ export default {
     },
     handleThisMonthRecvCount(){
       thisMonthRecvCount().then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let dates = res.dates;
           let orderCount = res.orderCount;
           let payMoney = res.payMoney;
@@ -1340,7 +1340,7 @@ export default {
       let param = this.getParam();
 
       watchEndPlayTrend({...param}).then(res=>{
-        if(res.code === 200){
+        if(res.code === 200 && res.data){
           let data = res.data;
           let watchUserCountList = data.map(e=>e.watchUserCount);
           let completedUserCountList = data.map(e=>e.completedUserCount);

src/views/user/transfer/index.vue

@@ -199,7 +199,7 @@ import { listApproval, getApproval, delApproval, addApproval, updateApproval, ex
 import Editor from '@/components/Editor';
 import {getDicts} from "@/api/system/dict/data";
 import {getCompanyList} from "@/api/company/company";
-import {getAllUserListLimit} from "@/api/store/user";
+import {getAllUserListLimit} from "@/api/hisStore/user";
 
 export default {
   name: "Approval",

src/views/wx/wxSopLogs/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="消息类型0个人1群" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择消息类型0个人1群" clearable size="small">
+      <el-form-item label="消息类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择消息类型" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -29,8 +29,8 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="生成类型(0自动1手动)" prop="generateType">
-        <el-select v-model="queryParams.generateType" placeholder="请选择生成类型(0自动1手动)" clearable size="small">
+      <el-form-item label="生成类型" prop="generateType">
+        <el-select v-model="queryParams.generateType" placeholder="请选择生成类型" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -88,8 +88,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="发送状态0待发送1发送成功2发送失败3消息作废" prop="sendStatus">
-        <el-select v-model="queryParams.sendStatus" placeholder="请选择发送状态0待发送1发送成功2发送失败3消息作废" clearable size="small">
+      <el-form-item label="发送状态" prop="sendStatus">
+        <el-select v-model="queryParams.sendStatus" placeholder="请选择发送状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -175,18 +175,18 @@
     <el-table border v-loading="loading" :data="wxSopLogsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="消息类型0个人1群" align="center" prop="type" />
+      <el-table-column label="消息类型" align="center" prop="type" />
       <el-table-column label="任务ID" align="center" prop="sopId" />
       <el-table-column label="营期ID" align="center" prop="sopUserId" />
       <el-table-column label="发送类型" align="center" prop="sendType" />
-      <el-table-column label="生成类型(0自动1手动)" align="center" prop="generateType" />
+      <el-table-column label="生成类型" align="center" prop="generateType" />
       <el-table-column label="发送账号ID" align="center" prop="accountId" />
       <el-table-column label="发送对象ID" align="center" prop="wxContactId" />
       <el-table-column label="发送对象名称" align="center" prop="wxContactName" />
       <el-table-column label="发送群聊ID" align="center" prop="wxRoomId" />
       <el-table-column label="发送群聊名称" align="center" prop="wxRoomName" />
       <el-table-column label="小程序ID" align="center" prop="fsUserId" />
-      <el-table-column label="发送状态0待发送1发送成功2发送失败3消息作废" align="center" prop="sendStatus" />
+      <el-table-column label="发送状态" align="center" prop="sendStatus" />
       <el-table-column label="发送备注" align="center" prop="sendRemark" />
       <el-table-column label="发送排序" align="center" prop="sendSort" />
       <el-table-column label="消息过期时间" align="center" prop="expirationTime" width="180">
@@ -226,8 +226,8 @@
     <!-- 添加或修改个微发送记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="消息类型0个人1群" prop="type">
-          <el-select v-model="form.type" placeholder="请选择消息类型0个人1群">
+        <el-form-item label="消息类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择消息类型">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
@@ -242,8 +242,8 @@
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
-        <el-form-item label="生成类型(0自动1手动)" prop="generateType">
-          <el-select v-model="form.generateType" placeholder="请选择生成类型(0自动1手动)">
+        <el-form-item label="生成类型" prop="generateType">
+          <el-select v-model="form.generateType" placeholder="请选择生成类型">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
@@ -265,7 +265,7 @@
         <el-form-item label="小程序ID" prop="fsUserId">
           <el-input v-model="form.fsUserId" placeholder="请输入小程序ID" />
         </el-form-item>
-        <el-form-item label="发送状态0待发送1发送成功2发送失败3消息作废">
+        <el-form-item label="发送状态">
           <el-radio-group v-model="form.sendStatus">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>

src/views/wx/wxSopUserInfo/index.vue

@@ -37,10 +37,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否7天都没有看课 0否 1是" prop="isDaysNotStudy">
+      <el-form-item label="是否7天都没有看课" prop="isDaysNotStudy">
         <el-input
           v-model="queryParams.isDaysNotStudy"
-          placeholder="请输入是否7天都没有看课 0否 1是"
+          placeholder="请输入是否7天都没有看课"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -81,8 +81,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="禁用状态 0 正常 1禁用" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择禁用状态 0 正常 1禁用" clearable size="small">
+      <el-form-item label="禁用状态 " prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择禁用状态 " clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -146,7 +146,7 @@
       <el-table-column label="营期ID" align="center" prop="sopUserId" />
       <el-table-column label="联系人ID" align="center" prop="wxContactId" />
       <el-table-column label="小程序ID" align="center" prop="fsUserId" />
-      <el-table-column label="是否7天都没有看课 0否 1是" align="center" prop="isDaysNotStudy" />
+      <el-table-column label="是否7天都没有看课" align="center" prop="isDaysNotStudy" />
       <el-table-column label="总完课天数" align="center" prop="finishCout" />
       <el-table-column label="最近完课时间" align="center" prop="finishTime" width="180">
         <template slot-scope="scope">
@@ -155,7 +155,7 @@
       </el-table-column>
       <el-table-column label="连续完课天数" align="center" prop="finishCourseDays" />
       <el-table-column label="客户评级的等级" align="center" prop="grade" />
-      <el-table-column label="禁用状态 0 正常 1禁用" align="center" prop="status" />
+      <el-table-column label="禁用状态 " align="center" prop="status" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -200,8 +200,8 @@
         <el-form-item label="小程序ID" prop="fsUserId">
           <el-input v-model="form.fsUserId" placeholder="请输入小程序ID" />
         </el-form-item>
-        <el-form-item label="是否7天都没有看课 0否 1是" prop="isDaysNotStudy">
-          <el-input v-model="form.isDaysNotStudy" placeholder="请输入是否7天都没有看课 0否 1是" />
+        <el-form-item label="是否7天都没有看课" prop="isDaysNotStudy">
+          <el-input v-model="form.isDaysNotStudy" placeholder="请输入是否7天都没有看课" />
         </el-form-item>
         <el-form-item label="总完课天数" prop="finishCout">
           <el-input v-model="form.finishCout" placeholder="请输入总完课天数" />
@@ -220,7 +220,7 @@
         <el-form-item label="客户评级的等级" prop="grade">
           <el-input v-model="form.grade" placeholder="请输入客户评级的等级" />
         </el-form-item>
-        <el-form-item label="禁用状态 0 正常 1禁用">
+        <el-form-item label="禁用状态 ">
           <el-radio-group v-model="form.status">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>