Merge remote-tracking branch 'remotes/origin/test'

src/api/management/user.js

@@ -178,3 +178,12 @@ export function getBindWxQrCodeUrl() {
         method: 'get'
     });
 }
+
+// 绑定单位
+export function bindCompany(data) {
+    return request({
+        url: `/api/company/bind/company?${data}`,
+        method: 'put'
+    });
+}
+

src/views/system/companyManage/index.vue

@@ -121,7 +121,7 @@ export default {
         handleGenerateQrCode(index, row) {
             let state = 2;
             if (process.env.NODE_ENV === 'production') {
-                state = 1;
+                state = 3;
             }
             const param = {
                 url: `https://joylink.club/oss/joylink/company?state=${state}_${row.id}`,

src/views/system/userControl/index.vue

@@ -3,6 +3,7 @@
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <dictionary-edit ref="edit" :company-list="companyList" @reloadTable="reloadTable" />
     <create-user ref="createUser" />
+    <bind-company ref="bindCompany" :company-list="companyList" @create="create" />
   </div>
 </template>
 
@@ -11,12 +12,14 @@ import { getUserList } from '@/api/management/user';
 import { getCompanyList } from '@/api/company';
 import DictionaryEdit from './edit';
 import CreateUser from './createUser';
+import BindCompany from './bindCompany';
 
 export default {
     name: 'UserControl',
     components: {
         DictionaryEdit,
-        CreateUser
+        CreateUser,
+        BindCompany
     },
     data() {
         return {
@@ -87,6 +90,10 @@ export default {
                             {
                                 name: this.$t('global.edit'),
                                 handleClick: this.handleUserEdit
+                            },
+                            {
+                                name: '绑定单位',
+                                handleClick: this.handleBind
                             }
                         ]
                     }
@@ -129,6 +136,12 @@ export default {
         },
         companyManage() {
             this.$router.push({ path: `/system/companyManage`});
+        },
+        handleBind(index, row) {
+            this.$refs.bindCompany.doShow(row);
+        },
+        create() {
+            this.reloadTable();
         }
     }
 };