zyp

.env.prod-myhk

@@ -9,8 +9,8 @@ VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
 VUE_APP_LOG_URL =@/assets/logo/myhk.png
 
-# 开发环境配置
-ENV = 'development'
+# 生产环境配置
+ENV = 'production'
 
 # FS管理系统/开发环境
 VUE_APP_BASE_API = '/prod-api'

src/api/qw/sopUserLogsInfo.js

@@ -68,3 +68,12 @@ export function sendMsgSop(data) {
     data: data
   })
 }
+
+//一键群发新版
+export function sendMsgSopType(data) {
+  return request({
+    url: '/qwSop/sopUserLogsInfo/sendUserLogsInfoMsgType',
+    method: 'post',
+    data: data
+  })
+}

src/views/qw/externalContact/index.vue

@@ -261,11 +261,11 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-tabs type="card" v-model="isBindActiveName" @tab-click="handleClickX">
-      <el-tab-pane label="全部" name="all"></el-tab-pane>
+<!--    <el-tabs type="card" v-model="isBindActiveName" @tab-click="handleClickX">-->
+<!--      <el-tab-pane label="全部" name="all"></el-tab-pane>-->
 <!--      <el-tab-pane label="已绑定CRM" name="isBind"></el-tab-pane>-->
 <!--      <el-tab-pane label="未绑定CRM" name="noBind"></el-tab-pane>-->
-    </el-tabs>
+<!--    </el-tabs>-->
 
     <el-table v-loading="loading" :data="externalContactList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />

src/views/qw/externalContact/myExternalContact.vue

@@ -276,11 +276,11 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-tabs type="card" v-model="isBindActiveName" @tab-click="handleClickX">
-      <el-tab-pane label="全部" name="all"></el-tab-pane>
-      <el-tab-pane label="已绑定CRM" name="isBind"></el-tab-pane>
-      <el-tab-pane label="未绑定CRM" name="noBind"></el-tab-pane>
-    </el-tabs>
+<!--    <el-tabs type="card" v-model="isBindActiveName" @tab-click="handleClickX">-->
+<!--      <el-tab-pane label="全部" name="all"></el-tab-pane>-->
+<!--      <el-tab-pane label="已绑定CRM" name="isBind"></el-tab-pane>-->
+<!--      <el-tab-pane label="未绑定CRM" name="noBind"></el-tab-pane>-->
+<!--    </el-tabs>-->
 
     <el-table v-loading="loading" :data="externalContactList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />

src/views/qw/sop/addSop.vue

@@ -265,7 +265,7 @@
           </el-row>
           <Tip title="任务生成的代发送消息，如果超过此设置的时间还未发送，自动作废" />
         </el-form-item>
-        <el-form-item v-if="(form.sendType==2 || form.sendType==4) && form.type != 3 && form.isFixed == 0" label="自动添加SOP"
+        <el-form-item v-if="(form.sendType==2 || form.sendType==4 || form.sendType==11) && form.type != 3 && form.isFixed == 0" label="自动添加SOP"
                       prop="autoSopTime.autoSopType">
           <el-radio-group v-model="form.autoSopTime.autoSopType">
             <el-radio
@@ -376,7 +376,7 @@
       <el-dialog :title="changeTagDialog.title" :visible.sync="changeTagDialog.open" width="800px" append-to-body>
 
         <div>搜索标签：
-          <el-input v-model="queryTagParams.tagName" placeholder="请输入标签名称" clearable size="small"
+          <el-input v-model="queryTagParams.name" placeholder="请输入标签名称" clearable size="small"
                     style="width: 200px;margin-right: 10px"/>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchTags">搜索</el-button>
           <el-button type="primary" icon="el-icon-plus" size="mini" @click="cancelSearchTags">重置</el-button>
@@ -426,6 +426,7 @@ import { sopListWxUserGroup } from '@/api/wxUser/wxUserGroup'
 import { listAll as chatListAll } from '@/api/qw/groupChat'
 import SopTemp from '@/views/qw/sopTemp/sopTemp.vue'
 import { allListTagGroup } from '@/api/qw/tagGroup'
+import {searchTags} from "../../../api/qw/tag";
 import Tip from '@/components/Tip'
 
 export default {

src/views/qw/sop/sop.vue

@@ -206,7 +206,7 @@
           <span v-if="scope.row.filterMode == 2"
                 style="margin-left: 10px;color: #ff4949">群聊无法设置</span>
           <el-switch
-            v-if="(scope.row.sendType===2 || scope.row.sendType===4 || scope.row.sendType===5) && scope.row.filterMode == 1"
+            v-if="(scope.row.sendType===2 || scope.row.sendType===4 || scope.row.sendType===11) && scope.row.filterMode == 1"
             v-model="scope.row.isAutoSop"
             active-color="#13ce66"
             inactive-color="#ff4949"
@@ -1415,7 +1415,8 @@ export default {
         id: row.id,
         name: row.name,
         tempId: row.tempId,
-        filterMode: row.filterMode
+        filterMode: row.filterMode,
+        corpId: row.corpId
       }
       // 使用 params 传递参数
       this.$router.push({

src/views/qw/sopUserLogs/sopUserLogsSchedule.vue

@@ -238,6 +238,7 @@ export default {
     this.sopName = this.$route.query.name;
     this.tempId = this.$route.query.tempId;
     this.queryParams.corpId= this.$route.query.corpId;
+
     this.getList()
 
   },

src/views/qw/user/qwUserList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-alert v-if="type==2 && (sendType==2||sendType==4)"
+    <el-alert v-if="type==2 && (sendType==2||sendType==4||sendType==11)"
       title="注意事项"
       type="warning"
       description="只显示含有【允许使用插件】的成员"