wjx 1 year ago
parent
commit
9f75ce09d3

+ 1 - 0
src/assets/icons/svg/createRole.svg

@@ -0,0 +1 @@
+<svg t="1691564641286" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5393" width="48" height="48"><path d="M224 277.3504a181.3504 181.3504 0 1 1 362.6496 0 181.3504 181.3504 0 0 1-362.6496 0z m181.3504-117.3504a117.3504 117.3504 0 1 0 0 234.6496 117.3504 117.3504 0 0 0 0-234.6496zM357.0176 565.2992H453.632c46.592 0 83.5072 0 113.2544 2.4576 30.464 2.5088 56.2176 7.68 79.7184 19.6608a202.752 202.752 0 0 1 88.576 88.576c9.1136 17.92 13.9776 39.8336 16.896 62.8224 2.9696 23.3472 4.1984 50.3808 4.7616 79.7696 1.1264 60.8256-48.5888 109.4144-108.3392 109.4144h-486.4c-59.8016 0-109.568-48.5888-108.3904-109.4144 0.5632-29.3888 1.8432-56.4224 4.8128-79.7696 2.9184-22.9888 7.7312-44.9536 16.896-62.8224 19.4048-38.144 50.3808-69.12 88.5248-88.576 23.552-11.9808 49.2544-17.152 79.7184-19.6608 29.7472-2.4576 66.6624-2.4576 113.3056-2.4576zM193.024 644.4544c-26.112 13.312-47.2576 34.5088-60.5696 60.5696-4.096 8.0896-7.8336 21.504-10.3936 41.8304-2.56 19.968-3.7376 44.2368-4.3008 72.96a43.9296 43.9296 0 0 0 44.3904 44.1856h486.4c25.0368 0 44.8-20.2752 44.3392-44.1856-0.512-28.672-1.7408-53.0432-4.2496-72.96-2.56-20.3776-6.2976-33.7408-10.4448-41.8304a138.6496 138.6496 0 0 0-60.5696-60.5696c-13.0048-6.656-29.3888-10.752-55.8592-12.9024-26.88-2.2016-61.184-2.2528-109.5168-2.2528H358.4c-48.3328 0-82.6368 0.0512-109.4656 2.2528-26.5216 2.1504-42.9056 6.2464-55.9104 12.9024zM842.6496 277.3504a32 32 0 1 0-64 0v96h-96a32 32 0 0 0 0 64h96v95.9488a32 32 0 0 0 64 0V437.2992h96a32 32 0 1 0 0-64h-96V277.3504z" fill="#86909C" p-id="5394"></path></svg>

+ 1 - 0
src/assets/icons/svg/gameServer.svg

@@ -0,0 +1 @@
+<svg t="1691406231914" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3608" id="mx_n_1691406231915" width="1em" height="1em"><path d="M326.8096 480.8704c0 9.3184 6.2464 15.5648 15.5648 15.5648h133.8368c9.3184 0 15.5648-6.2464 15.5648-15.5648v-34.2528H326.8096v34.2528z" p-id="3609"></path><path d="M917.0432 106.9568C834.816 22.016 686.8992 2.7648 512 0 337.1008 2.7648 189.184 22.016 106.9568 106.9568 22.016 189.184 2.7648 337.1008 0 512c2.7648 174.8992 22.016 322.816 106.9568 405.0432C189.184 1001.984 337.1008 1021.2352 512 1024c174.8992-2.7648 322.816-22.016 405.0432-106.9568 84.992-82.176 104.2432-230.0928 106.9568-405.0432-2.7648-174.8992-22.016-322.816-106.9568-405.0432z m-353.6896 654.0288H295.68c-18.688 0-34.2528-15.5648-34.2528-34.2528V297.216c0-18.688 15.5648-34.2528 34.2528-34.2528h233.4208c18.688 0 34.2528 15.5648 34.2528 34.2528v463.7696z m199.2192-31.1296c-3.1232 15.5648-18.688 31.1296-37.3248 31.1296h-130.7136V396.8512h133.8368c18.688 0 34.2528 15.5648 34.2528 34.2528v298.752z" p-id="3610"></path><path d="M644.3008 577.3824c0 9.3184 6.2464 15.5648 15.5648 15.5648h34.2528c9.3184 0 15.5648-6.2464 15.5648-15.5648v-31.1296l-65.3824-3.1232v34.2528zM342.3744 396.8512h133.8368c9.3184 0 15.5648-6.2464 15.5648-15.5648v-34.2528H326.8096v34.2528c0 9.3184 6.2464 15.5648 15.5648 15.5648zM644.3008 496.4352c0 9.3184 6.2464 15.5648 15.5648 15.5648h34.2528c9.3184 0 15.5648-6.2464 15.5648-15.5648v-31.1296l-65.3824-3.1232v34.2528z" p-id="3611"></path></svg>

+ 1 - 0
src/assets/icons/svg/remitLog.svg

@@ -0,0 +1 @@
+<svg t="1691560606663" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4264" width="48" height="48"><path d="M762.304 64c60.288 0 109.76 46.08 112.256 104.234667l0.106667 4.629333v437.589333h-42.666667V172.864c0-35.114667-28.906667-64.128-65.706667-66.090667L762.304 106.666667H261.696C224.362667 106.666667 194.133333 134.464 192.106667 169.109333L192 172.864v678.272c0 35.114667 28.906667 64.128 65.706667 66.090667l3.989333 0.106666 357.397333 0.021334a181.333333 181.333333 0 1 1 6.677334 7.424V960H261.696c-60.288 0-109.76-46.08-112.256-104.234667L149.333333 851.136V172.864c0-58.773333 47.936-106.368 107.626667-108.778667L261.696 64h500.608zM757.333333 661.333333a138.666667 138.666667 0 1 0 0 277.333334 138.666667 138.666667 0 0 0 0-277.333334z m26.816 8.192l33.642667 26.282667-25.450667 32.554667h43.52v42.666666H778.666667v24.384h69.845333v42.666667H778.666667V917.333333h-42.666667v-79.253333H661.333333v-42.666667h74.666667v-24.384h-57.216v-42.666666h43.52l-25.429333-32.554667 33.642666-26.282667 26.816 34.346667 26.816-34.346667zM426.666667 554.666667v42.666666h-192v-42.666666h192z m128-128v42.666666H234.666667v-42.666666h320z m170.666666-128v42.666666H234.666667v-42.666666h490.666666z" fill="#333333" p-id="4265"></path></svg>

+ 11 - 2
src/views/accounts/corpWechat/index.vue

@@ -40,7 +40,8 @@
         </el-row>
         </el-row>
 
 
         <el-table :data="corpList" v-loading="loading" size="mini">
         <el-table :data="corpList" v-loading="loading" size="mini">
-            <el-table-column label="企微名称" prop="corpName" width="150" align="center" fixed="left" :show-overflow-tooltip="true"/>
+            <el-table-column label="企微名称" prop="corpName" width="150" align="center" fixed="left"
+                :show-overflow-tooltip="true" />
             <el-table-column label="企微头像" prop="corpSquareLogoUrl" align="center" width="150">
             <el-table-column label="企微头像" prop="corpSquareLogoUrl" align="center" width="150">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <el-image style="height: 23px" :src="scope.row.corpSquareLogoUrl" fit="fit" />
                     <el-image style="height: 23px" :src="scope.row.corpSquareLogoUrl" fit="fit" />
@@ -84,6 +85,13 @@
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
             <el-table-column label="授权时间" prop="createTime" width="130" :show-overflow-tooltip="true" />
             <el-table-column label="授权时间" prop="createTime" width="130" :show-overflow-tooltip="true" />
+            <el-table-column label="用户分组" prop="sysUserGroupList" width="150" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.sysUserGroupList"><span v-for="(item, index) in scope.row.sysUserGroupList"
+                            :key="item.id"><i v-if="index > 0">,</i>{{ item.groupName }}</span></div>
+                    <div v-else>--</div>
+                </template>
+            </el-table-column>
             <el-table-column label="备注" prop="remark" width="250" :show-overflow-tooltip="true" />
             <el-table-column label="备注" prop="remark" width="250" :show-overflow-tooltip="true" />
             <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
@@ -246,7 +254,8 @@ export default {
                 originCorpId: row.originCorpId,
                 originCorpId: row.originCorpId,
                 externalUserSecret: row.externalUserSecret,
                 externalUserSecret: row.externalUserSecret,
                 bookAgentIdMap: [],
                 bookAgentIdMap: [],
-                remark: row.remark
+                remark: row.remark,
+                sysUserGroupIds: row.sysUserGroupIds
             }
             }
             if (row.bookAgentIdMap && Object.keys(row.bookAgentIdMap).length > 0) {
             if (row.bookAgentIdMap && Object.keys(row.bookAgentIdMap).length > 0) {
                 this.secretData.bookAgentIdMap = Object.keys(row.bookAgentIdMap).map(key => {
                 this.secretData.bookAgentIdMap = Object.keys(row.bookAgentIdMap).map(key => {

+ 13 - 2
src/views/accounts/corpWechat/setSecret.vue

@@ -10,6 +10,11 @@
             <!-- <el-form-item label="书城应用ID" prop="bookAgentId">
             <!-- <el-form-item label="书城应用ID" prop="bookAgentId">
                 <el-input v-model.number="queryForm.bookAgentId" placeholder="请输入书城应用ID" clearable size="small" />
                 <el-input v-model.number="queryForm.bookAgentId" placeholder="请输入书城应用ID" clearable size="small" />
             </el-form-item> -->
             </el-form-item> -->
+            <el-form-item label="用户分组" prop="sysUserGroupIds">
+                <el-select v-model="queryForm.sysUserGroupIds" placeholder="请选择" size="small" multiple filterable clearable>
+                    <el-option v-for="item in groupsOptions" :key="item.id" :label="item.groupName" :value="item.id" />
+                </el-select>
+            </el-form-item>
             <div>
             <div>
                 <el-form :model="item" :rules="rulesBookCityType" ref="bookCityType" label-width="80px" label-position="top"
                 <el-form :model="item" :rules="rulesBookCityType" ref="bookCityType" label-width="80px" label-position="top"
                     v-for="(item, index) in queryPlatformBookCity" :key="index">
                     v-for="(item, index) in queryPlatformBookCity" :key="index">
@@ -17,8 +22,8 @@
                         <el-col :span="8">
                         <el-col :span="8">
                             <el-form-item label="书城" prop="bookCityId">
                             <el-form-item label="书城" prop="bookCityId">
                                 <el-select v-model="item.bookCityId" size="small" placeholder="选择书城" filterable clearable>
                                 <el-select v-model="item.bookCityId" size="small" placeholder="选择书城" filterable clearable>
-                                    <el-option v-for="item in bookCity" :disabled="item.disabled" :key="item.id" :label="item.platformName"
-                                        :value="item.platformKey" />
+                                    <el-option v-for="item in bookCity" :disabled="item.disabled" :key="item.id"
+                                        :label="item.platformName" :value="item.platformKey" />
                                 </el-select>
                                 </el-select>
                             </el-form-item>
                             </el-form-item>
                         </el-col>
                         </el-col>
@@ -52,6 +57,7 @@
 <script>
 <script>
 import { refreshCorp } from "@/api/accounts/corpWeChat";
 import { refreshCorp } from "@/api/accounts/corpWeChat";
 import { getBookPlatInfoAll } from "@/api/accounts/bookCity";
 import { getBookPlatInfoAll } from "@/api/accounts/bookCity";
+import { getGroupAll } from "@/api/system/group";
 export default {
 export default {
     name: 'setSecret',
     name: 'setSecret',
     data() {
     data() {
@@ -79,6 +85,7 @@ export default {
             },
             },
             bookCity: [],
             bookCity: [],
             bookCityCS: [],
             bookCityCS: [],
+            groupsOptions: []
         }
         }
     },
     },
     props: {
     props: {
@@ -148,6 +155,10 @@ export default {
                 this.bookCity = res.data
                 this.bookCity = res.data
                 this.bookCityCS = res.data
                 this.bookCityCS = res.data
             })
             })
+            // 获取用户分组列表
+            getGroupAll().then(res => {
+                this.groupsOptions = res.data;
+            });
         },
         },
         onClose() {
         onClose() {
             this.$emit("close");
             this.$emit("close");