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

src/api/course/courseWatchLog.js

@@ -113,6 +113,15 @@ export function exportCourseWatchLog(query) {
   })
 }
 
+// 导出我的短链课程看课记录
+export function myExportCourseWatchLog(query) {
+  return request({
+    url: '/course/courseWatchLog/myExport',
+    method: 'get',
+    params: query
+  })
+}
+
 export function watchLogStatisticsExport(query) {
   return request({
     url: '/course/courseWatchLog/watchLogStatisticsExport',

src/api/qw/sop.js

@@ -118,6 +118,14 @@ export function exportSop(query) {
     params: query
   })
 }
+// 导出我的企微sop
+export function myExportSop(query) {
+  return request({
+    url: '/qw/sop/myExport',
+    method: 'get',
+    params: query
+  })
+}
 
 // 导出企微sop
 export function getSopVoiceList(params) {

src/views/course/courseWatchLog/watchLog.vue

@@ -407,7 +407,7 @@ import {
   addCourseWatchLog,
   delCourseWatchLog,
   exportCourseWatchLog,
-  getCourseWatchLog,
+  getCourseWatchLog, myExportCourseWatchLog,
   myListCourseWatchLog,
   updateCourseWatchLog
 } from "@/api/course/courseWatchLog";
@@ -736,7 +736,7 @@ export default {
         type: "warning"
       }).then(() => {
         this.exportLoading = true;
-        return exportCourseWatchLog(queryParams);
+        return myExportCourseWatchLog(queryParams);
       }).then(response => {
         this.download(response.msg);
         this.exportLoading = false;

src/views/qw/externalContact/deptIndex.vue

@@ -231,7 +231,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleBatchUpdateNotes"
-          v-hasPermi="['qw:externalContact:edit']"
+          v-hasPermi="['qw:externalContact:deptEdit']"
         >批量修改备注</el-button>
       </el-col>
 
@@ -252,7 +252,7 @@
           plain
           size="mini"
           @click="addUserTag"
-          v-hasPermi="['qw:externalContact:addTag']"
+          v-hasPermi="['qw:externalContact:deptAddTag']"
         >批量添加标签</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -261,7 +261,7 @@
           plain
           size="mini"
           @click="delUserTag"
-          v-hasPermi="['qw:externalContact:delTag']"
+          v-hasPermi="['qw:externalContact:deptDelTag']"
         >批量移除标签</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -270,6 +270,7 @@
           plain
           size="mini"
           @click="updateTalk"
+          v-hasPermi="['qw:externalContactInfo:deptUpdateTalk']"
         >批量更改交流状态</el-button>
       </el-col>
       <!--       <el-col :span="1.5">-->

src/views/qw/externalContact/index.vue

@@ -271,6 +271,7 @@
 	      plain
 	      size="mini"
 	      @click="updateTalk"
+        v-hasPermi="['qw:externalContactInfo:updateTalk']"
 	    >批量更改交流状态</el-button>
 	  </el-col>
 <!--       <el-col :span="1.5">-->

src/views/qw/externalContact/myExternalContact.vue

@@ -196,7 +196,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['qw:externalContact:edit']"
+          v-hasPermi="['qw:externalContact:myEdit']"
         >修改备注</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -207,7 +207,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleSyncMyExternalContact"
-          v-hasPermi="['qw:externalContact:myExport']"
+          v-hasPermi="['qw:externalContact:syncMyClient']"
         >同步我的客户</el-button>
 		<el-button
 		  type="warning"
@@ -216,7 +216,7 @@
 		  size="mini"
 		  :loading="exportLoading"
 		  @click="handleSyncAddMyExternalContact"
-		  v-hasPermi="['qw:externalContact:myExport']"
+		  v-hasPermi="['qw:externalContact:syncNewClient']"
 		>新客同步</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -236,7 +236,7 @@
           plain
           size="mini"
           @click="addUserTag"
-          v-hasPermi="['qw:externalContact:addTag']"
+          v-hasPermi="['qw:externalContact:myAddTag']"
         >批量添加标签</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -245,7 +245,7 @@
           plain
           size="mini"
           @click="delUserTag"
-          v-hasPermi="['qw:externalContact:delTag']"
+          v-hasPermi="['qw:externalContact:myDelTag']"
         >批量移除标签</el-button>
       </el-col>
 	  <el-col :span="1.5">
@@ -254,6 +254,7 @@
 	      plain
 	      size="mini"
 	      @click="updateTalk"
+        v-hasPermi="['qw:externalContactInfo:myUpdateTalk']"
 	    >批量更改交流状态</el-button>
 	  </el-col>
 	  <el-col :span="1.5">
@@ -262,6 +263,7 @@
 	      plain
 	      size="mini"
 	      @click="updateAllTalk"
+        v-hasPermi="['qw:externalContactInfo:myUpdateAllTalk']"
 	    >更改全部交流状态</el-button>
 	  </el-col>
 <!--     <el-col :span="1.5">-->

src/views/qw/sop/mySop.vue

@@ -109,7 +109,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['qw:sop:export']"
+          v-hasPermi="['qw:sop:myExport']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -877,7 +877,7 @@ import {
   updateAutoSopTime,
   updateSop,
   updateSopStatus,
-  updateStatus
+  updateStatus, myExportSop
 } from "@/api/qw/sop";
 import {listSopTemp} from "@/api/qw/sopTemp";
 import {getQwAllUserList, listUser} from '@/api/company/companyUser'
@@ -1610,7 +1610,7 @@ export default {
           type: "warning"
         }).then(() => {
           this.exportLoading = true;
-          return exportSop(queryParams);
+          return myExportSop(queryParams);
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;