Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/qw/user.js

src/api/qw/user.js

@@ -12,7 +12,7 @@ export function staffListUser(query) {
 export function staffListPost(query) {
   return request({
     url: '/qw/user/staffListPost',
-    method: 'post',
+    method: 'get',
     data: query
   })
 }
@@ -67,6 +67,16 @@ export function getMyQwCompanyListAll() {
   })
 }
 
+
+
+export function getQwCompanyList() {
+  return request({
+    url: '/qw/user/getQwCompanyList',
+    method: 'get'
+  })
+}
+
+
 // 查询企微用户详细
 export function getQwUser(id) {
   return request({

src/views/company/companyUser/indexAll.vue

@@ -304,7 +304,7 @@
         <el-form-item label="企微公司" prop="corpId">
           <el-select v-model="synform.corpId" placeholder="企微公司"  >
             <el-option
-              v-for="dict in myQwCompanyList"
+              v-for="dict in qwCompanyList"
               :key="dict.dictValue"
               :label="dict.dictLabel"
               :value="dict.dictValue"
@@ -323,7 +323,7 @@
         <el-form-item label="企微公司" prop="corpId">
           <el-select v-model="synNameform.corpId" placeholder="企微公司"  >
             <el-option
-              v-for="dict in myQwCompanyList"
+              v-for="dict in qwCompanyList"
               :key="dict.dictValue"
               :label="dict.dictLabel"
               :value="dict.dictValue"
@@ -476,7 +476,7 @@
             <el-form-item label="企微主体" prop="corpId">
               <el-select v-model="formBindCompany.corpId" placeholder="企微主体" size="small">
                 <el-option
-                  v-for="dict in myQwCompanyList"
+                  v-for="dict in qwCompanyList"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -678,12 +678,12 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {bindQwUser, addQwUser, getQwUserByIds,addQwUserName} from '@/api/qw/user';
 import { syncDept } from '@/api/qw/qwDept';
-import {getMyQwCompanyList } from "@/api/qw/user";
 import  selectUser  from "@/views/company/components/selectQwUser.vue";
 import { getConfigByKey } from "@/api/company/companyConfig";
 import axios from "axios";
 import selectDoctor from "@/views/qw/user/selectDoctor.vue";
 import { getCompanyList } from '@/api/company/company'
+import { getQwCompanyList } from '../../../api/qw/user'
 export default {
   name: "User",
   components: {selectDoctor, Treeselect ,selectUser},
@@ -707,7 +707,7 @@ export default {
       loading: false,
       qwUserList:[],
       qwUserId:[],
-      myQwCompanyList:[],
+      qwCompanyList:[],
       qwUser:[],
       user:{
         open:false,
@@ -921,8 +921,8 @@ export default {
     getCitysAreaList().then(res=>{
       this.citysAreaList=res.data;
     })
-    getMyQwCompanyList().then(response => {
-      this.myQwCompanyList = response.data;
+    getQwCompanyList().then(response => {
+      this.qwCompanyList = response.data;
     });
   },
   methods: {
@@ -1168,6 +1168,7 @@ export default {
         this.open = true;
         this.title = "添加员工";
         this.form.password = this.form1.loginPassword;
+        this.form.companyId = this.companyIdOpen.companyId;
       });
     },
 
@@ -1276,6 +1277,7 @@ export default {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
+                this.companyIdOpen.open=false;
                 this.getList();
               }
             });
@@ -1284,6 +1286,7 @@ export default {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
+                this.companyIdOpen.open=false;
                 this.getList();
               }
             });

src/views/qw/externalContact/index.vue

@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="销售账号" prop="companyUserName">
-        <el-select v-model="queryParams.companyUserName" placeholder="销售账号"  size="small" clearable>
+        <el-select v-model="queryParams.companyUserName" placeholder="销售账号"  size="small" filterable clearable  >
           <el-option
               v-for="dict in companyUserNameList"
               :key="dict.userId"

src/views/qw/user/index.vue

@@ -176,11 +176,11 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
 
-      <el-table-column label="自动发课" align="center" prop="isAuto">
-        <template slot-scope="scope">
-          <dict-tag :options="isAutoOptions" :value="scope.row.isAuto"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="自动发课" align="center" prop="isAuto">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="isAutoOptions" :value="scope.row.isAuto"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -234,50 +234,50 @@
             v-hasPermi="['qw:user:login']">
             二次验证
           </el-button>
-          <el-button
-            v-if="scope.row.serverStatus!=1"
-            size="mini"
-            type="text"
-            icon="el-icon-moon"
-            plain
-            @click="handleGetQwIpad(scope.row)"
-            v-hasPermi="['qw:user:login']"
-          >
-            获取Ai主机
-          </el-button>
-          <el-button
-            v-if="scope.row.serverStatus==1 && scope.row.ipadStatus!=1"
-            size="mini"
-            type="text"
-            icon="el-icon-moon"
-            plain
-            @click="handleDelQwIpad(scope.row)"
-            v-hasPermi="['qw:user:login']"
-          >
-            解绑Ai主机
-          </el-button>
-          <el-button
-            v-if="scope.row.isAuto=='00'"
-            size="mini"
-            type="text"
-            icon="el-icon-moon"
-            plain
-            @click="handleUpdateIsAuto(scope.row,'01')"
-            v-hasPermi="['qw:user:isauto']"
-          >
-            启用插件
-          </el-button>
-          <el-button
-            v-if="scope.row.isAuto=='01'"
-            size="mini"
-            type="text"
-            icon="el-icon-moon"
-            plain
-            @click="handleUpdateIsAuto(scope.row,'00')"
-            v-hasPermi="['qw:user:isauto']"
-          >
-            禁用插件
-          </el-button>
+<!--          <el-button-->
+<!--            v-if="scope.row.serverStatus!=1"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-moon"-->
+<!--            plain-->
+<!--            @click="handleGetQwIpad(scope.row)"-->
+<!--            v-hasPermi="['qw:user:login']"-->
+<!--          >-->
+<!--            获取Ai主机-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            v-if="scope.row.serverStatus==1 && scope.row.ipadStatus!=1"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-moon"-->
+<!--            plain-->
+<!--            @click="handleDelQwIpad(scope.row)"-->
+<!--            v-hasPermi="['qw:user:login']"-->
+<!--          >-->
+<!--            解绑Ai主机-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            v-if="scope.row.isAuto=='00'"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-moon"-->
+<!--            plain-->
+<!--            @click="handleUpdateIsAuto(scope.row,'01')"-->
+<!--            v-hasPermi="['qw:user:isauto']"-->
+<!--          >-->
+<!--            启用插件-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            v-if="scope.row.isAuto=='01'"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-moon"-->
+<!--            plain-->
+<!--            @click="handleUpdateIsAuto(scope.row,'00')"-->
+<!--            v-hasPermi="['qw:user:isauto']"-->
+<!--          >-->
+<!--            禁用插件-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
       <el-table-column label="主机" align="center" class-name="small-padding fixed-width" width="110px" fixed="right">
@@ -316,17 +316,17 @@
           <!--          >-->
           <!--            获取主机帐密-->
           <!--          </el-button>-->
-          <el-button
-            v-if="scope.row.loginCodeUrl!=null"
-            size="mini"
-            type="text"
-            icon="el-icon-moon"
-            plain
-            @click="handleUnbindCloudHost(scope.row)"
-            v-hasPermi="['qw:user:loginIpOut']"
-          >
-            解除主机
-          </el-button>
+<!--          <el-button-->
+<!--            v-if="scope.row.loginCodeUrl!=null"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-moon"-->
+<!--            plain-->
+<!--            @click="handleUnbindCloudHost(scope.row)"-->
+<!--            v-hasPermi="['qw:user:loginIpOut']"-->
+<!--          >-->
+<!--            解除主机-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -903,7 +903,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      staffListPost(this.queryParams).then(response => {
+      staffListUser(this.queryParams).then(response => {
         this.userList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/system/config/config.vue

@@ -2451,6 +2451,19 @@
           </div>
         </el-form>
       </el-tab-pane>
+      <el-tab-pane label="声纹复刻配置" name="vc.config">
+        <el-form :model="form31" label-width="200px">
+          <el-form-item label="类型" prop="type">
+            <el-radio-group v-model="form31.type">
+              <el-radio :label="1">本地服务器</el-radio>
+              <el-radio :label="2">豆包</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <div class="footer">
+            <el-button type="primary" @click="submitForm31">提 交</el-button>
+          </div>
+        </el-form>
+      </el-tab-pane>
 
     </el-tabs>
 
@@ -2643,6 +2656,7 @@ export default {
         ],
 
       },
+      form31:{},
       storeProductScrmColumns:[],
       storeScrmColumns: [],
       photoArr: [],
@@ -3044,6 +3058,13 @@ export default {
           this.form30 = {...this.form30, ...JSON.parse(response.data.configValue)}
           }
         }
+        if(key == 'vc.config'){
+           if(!!response.data){
+          this.configId = response.data.configId
+          this.configKey = response.data.configKey
+          this.form31 = {...this.form31, ...JSON.parse(response.data.configValue)}
+          }
+        }
       })
     },
     /** 提交按钮 */
@@ -3328,6 +3349,16 @@ export default {
         }
       })
     },
+    submitForm31(){
+      const param = { configId: this.configId, configName : "声纹复刻配置", configKey: this.configKey, configValue: JSON.stringify(this.form31) }
+      console.log(param)
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess('修改成功')
+        }
+      })
+    },
+    
     formatColumns(){
       console.log(this.form27.pass_columns)