Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_companyUI

src/views/company/companyVoiceRobotic/index.vue

@@ -648,8 +648,8 @@ export default {
       },
       // 表单参数
       form: {},
-      taskFlowList: [{key: "cellPhone", value: "外呼"}, {key: "sendMsg", value: "发短信"}, {key: "addWx", value: "加微"}],
-      taskFlowMap: {cellPhone: "外呼", sendMsg: "发短信", addWx: "加微", qwAddWx: "企微加个微"},
+      taskFlowList: [{key: "cellPhone", value: "外呼"}, {key: "qwAddWx", value: "企微加微"}, {key: "sendMsg", value: "发短信"}, {key: "addWx", value: "加微"}],
+      taskFlowMap: {cellPhone: "外呼", sendMsg: "发短信", addWx: "加微", qwAddWx: "企微加微"},
       statusObj: {},
       levelList: {},
       robotList: [],

src/views/company/companyWorkflow/design.vue

@@ -389,7 +389,7 @@
             </div>
 
             <!-- 条件判断 -->
-            <div v-if="edgeSourceNode.nodeType == 'AI_CALL_TASK' || edgeSourceNode.nodeType == 'AI_SEND_MSG_TASK' || edgeSourceNode.nodeType == 'AI_ADD_WX_TASK'" class="property-section">
+            <div v-if="edgeSourceNode.nodeType == 'AI_CALL_TASK' || edgeSourceNode.nodeType == 'AI_SEND_MSG_TASK' || edgeSourceNode.nodeType == 'AI_ADD_WX_TASK' || edgeSourceNode.nodeType == 'AI_QW_ADD_WX_TASK'"  class="property-section">
               <div class="section-title">
                 <i class="el-icon-set-up"></i>条件判断
                 <el-button type="success" size="mini" icon="el-icon-plus" @click="addCondition" class="add-condition-btn">新增条件</el-button>
@@ -428,7 +428,7 @@
               </div>
 
               <!-- 加微信任务条件 -->
-              <div v-if="edgeSourceNode.nodeType == 'AI_ADD_WX_TASK'" class="conditions-container">
+              <div v-if="edgeSourceNode.nodeType == 'AI_ADD_WX_TASK' || edgeSourceNode.nodeType == 'AI_QW_ADD_WX_TASK'" class="conditions-container">
                 <div v-for="(item, index) in selectedEdge.conditionExprObj" :key="index" class="condition-item">
                   <div class="condition-header">
                     <span class="condition-number">条件 {{ index + 1 }}</span>

src/views/company/companyWorkflow/index.vue

@@ -44,7 +44,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['company:companyWorkflow:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -55,7 +54,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['company:companyWorkflow:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -66,7 +64,6 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['company:companyWorkflow:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -105,7 +102,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleEdit(scope.row)"
-            v-hasPermi="['company:companyWorkflow:edit']"
           >设计</el-button>
           <el-button
             size="mini"
@@ -118,14 +114,12 @@
             type="text"
             icon="el-icon-document-copy"
             @click="handleCopy(scope.row)"
-            v-hasPermi="['company:companyWorkflow:add']"
           >复制</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['company:companyWorkflow:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -145,9 +139,9 @@
       <div class="current-sales">
         <div class="section-title">当前绑定销售</div>
         <div v-if="currentBindUserList && currentBindUserList.length > 0" class="bind-info">
-          <el-tag 
-            v-for="(user, index) in currentBindUserList" 
-            :key="index" 
+          <el-tag
+            v-for="(user, index) in currentBindUserList"
+            :key="index"
             type="success"
             style="margin-right: 8px; margin-bottom: 8px;"
           >
@@ -429,7 +423,7 @@ export default {
 
       const workflowId = this.currentWorkflow.workflowId
       const companyUserIds = this.selectedSalesList.map(item => item.userId || item.companyUserId)
-      
+
       this.doBindSales(workflowId, companyUserIds)
     },
     /** 执行绑定销售 */
@@ -491,7 +485,7 @@ export default {
 .el-table .disabled-row {
   background-color: #f5f5f5;
   color: #999;
-  
+
   &:hover > td {
     background-color: #f5f5f5 !important;
   }

src/views/components/QwUserSelectTwo.vue

@@ -48,7 +48,7 @@
           <el-table-column label="企微用户名" align="center" prop="qwUserName"/>
           <el-table-column label="企微用户id" align="center" prop="qwUserId"/>
           <el-table-column label="uid" align="center" prop="uid"/>
-          <el-table-column label="ipad服务器id" align="center" prop="server_id"/>
+          <el-table-column label="ipad服务器id" align="center" prop="serverId"/>
         </el-table>
 
         <!-- 分页组件 -->

src/views/qw/externalContact/deptIndex.vue

@@ -422,7 +422,7 @@
           <el-tag v-else type="info"> 未绑定</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="是否下载APP" width="100px" align="center">
+      <el-table-column label="是否下载APP" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isDownloadApp === 1 ? 'success' : 'info'">
             {{ scope.row.isDownloadApp === 1 ? '已下载' : '未下载' }}

src/views/qw/externalContact/index.vue

@@ -470,7 +470,7 @@
           <el-tag v-else type="info"> 未绑定</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="是否下载APP" width="100px" align="center">
+      <el-table-column label="是否下载APP" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isDownloadApp === 1 ? 'success' : 'info'">
             {{ scope.row.isDownloadApp === 1 ? '已下载' : '未下载' }}

src/views/qw/externalContact/myExternalContact.vue

@@ -454,7 +454,7 @@
           <el-tag v-else type="info"> 未绑定</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="是否下载APP" width="100px" align="center">
+      <el-table-column label="是否下载APP" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-tag :type="scope.row.isDownloadApp === 1 ? 'success' : 'info'">
             {{ scope.row.isDownloadApp === 1 ? '已下载' : '未下载' }}