2 Commits c5aad47973 ... f34cd41eec

Auteur SHA1 Bericht Datum
  xgb f34cd41eec Merge remote-tracking branch 'origin/master' 4 dagen geleden
  xgb 8c1d7e71aa 云联bug修复 4 dagen geleden
3 gewijzigde bestanden met toevoegingen van 20 en 17 verwijderingen
  1. 8 0
      src/api/qw/user.js
  2. 6 6
      src/views/course/videoResource/index.vue
  3. 6 11
      src/views/crm/externalContact/index.vue

+ 8 - 0
src/api/qw/user.js

@@ -60,6 +60,14 @@ export function getMyQwCompanyList(query) {
   })
 }
 
+export function getMyQwCompanyListAll() {
+  return request({
+    url: '/qw/user/getMyQwCompanyListAll',
+    method: 'get'
+  })
+}
+
+
 
 export function getQwCompanyList() {
   return request({

+ 6 - 6
src/views/course/videoResource/index.vue

@@ -198,7 +198,7 @@
     />
 
     <!-- 添加或修改视频素材库对话框 -->
-    <minimizable-dialog :title="title" :visible.sync="open" width="700px" append-to-body :before-close="cancel"
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :before-close="cancel"
                         @minimize="hasMinimizableDialog = true" @restore="hasMinimizableDialog = false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="素材名称" prop="resourceName" style="margin-top: 20px">
@@ -343,7 +343,7 @@
           {{ isUploading ? '上传中...' : '保存' }}
         </el-button>
       </div>
-    </minimizable-dialog>
+    </el-dialog>
 
     <el-dialog
       title="视频预览"
@@ -358,7 +358,7 @@
     </el-dialog>
 
     <!--批量修改弹框-->
-    <minimizable-dialog :title="'批量修改'" :visible.sync="batchUpdateVisible" width="700px" append-to-body :before-close="cancel"
+    <el-dialog :title="'批量修改'" :visible.sync="batchUpdateVisible" width="700px" append-to-body :before-close="cancel"
                         @minimize="hasMinimizableDialog = true" @restore="hasMinimizableDialog = false">
       <el-form ref="form" :model="batchUpdateForm" :rules="rules" label-width="80px">
       <el-form-item label="分类" prop="typeId">
@@ -387,9 +387,9 @@
         <el-button @click="cancelBatch">取 消</el-button>
         <el-button type="primary" @click="submitBatchUpdate">保 存</el-button>
       </div>
-    </minimizable-dialog>
+    </el-dialog>
     <!-- 批量选择视频弹窗 -->
-    <minimizable-dialog :title="'选择视频'" :visible.sync="batchAddVisible" width="1200px" append-to-body class="batch-dialog"
+    <el-dialog :title="'选择视频'" :visible.sync="batchAddVisible" width="1200px" append-to-body class="batch-dialog"
       :close-on-click-modal="false" :before-close="cancelBeforeBatch" @minimize="hasMinimizableDialog = true"
       @restore="hasMinimizableDialog = false">
       <div class="filter-container">
@@ -636,7 +636,7 @@
         </div>
       </el-dialog>
 
-    </minimizable-dialog>
+    </el-dialog>
 
     <!-- 项目选择弹窗 -->
     <el-dialog

+ 6 - 11
src/views/crm/externalContact/index.vue

@@ -787,18 +787,13 @@ import {
   setCustomerCourseSopList,
   unBindUserId, updateExternalContactCall
 } from '@/api/qw/externalContact'
-/*import {getMyQwUserList, getMyQwCompanyList, updateUser,getQwUserListLikeName} from "@/api/qw/user";*/
-import {getMyQwUserList, getMyQwCompanyList, updateUser} from "@/api/qw/user";
-import {listTag, getTag, searchTags,} from "@/api/qw/tag";
+
+import { getMyQwCompanyListAll } from '@/api/qw/user'
+import {listTag, searchTags,} from "@/api/qw/tag";
 import { allListTagGroup} from "@/api/qw/tagGroup";
-/*import mycustomer from '@/views/qw/externalContact/mycustomer'
-import customerDetails from '@/views/qw/externalContact/customerDetails'
-import SopDialog from '@/views/course/sop/SopDialog.vue'
-import  selectUser  from "@/views/qw/externalContact/selectUser.vue";
-import info from "@/views/qw/externalContact/info.vue";
-import { editTalk } from "@/api/qw/externalContactInfo";*/
+
 import PaginationMore from "../../../components/PaginationMore/index.vue";
-/*import userDetails from '@/views/store/components/userDetails.vue';*/
+
 export default {
   name: "ExternalContact",
   /*components:{PaginationMore, mycustomer,customerDetails,SopDialog,selectUser,info,userDetails},*/
@@ -1004,7 +999,7 @@ export default {
     });
 
 
-    getMyQwCompanyList().then(response => {
+    getMyQwCompanyListAll().then(response => {
             this.myQwCompanyList = response.data;
             if(this.myQwCompanyList!=null){
               // this.queryParams.corpId=this.myQwCompanyList[0].dictValue