用户管理修改

jero-web/src/views/system/modules/RoleAssignment.vue

@@ -12,7 +12,7 @@
         <a-row :gutter='24'>
           <a-col :span='24'>
             <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">
+              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole" @change='selectChange'>
                 <a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">
                     <span style="display: inline-block;width: 100%">
                       {{ role.roleName }}
@@ -22,6 +22,33 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row :gutter='24' v-if='viewshow'>
+          <a-col :span='24'>
+            <a-form-item :label="$t('NareaOfResponsibility')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-multi-select-tag class="box-input" v-model:value="dutyTerritories"
+                                  :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
+<!--              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')" v-model:value="dutyTerritories">-->
+<!--                <a-select-option v-for="(role,roleindex) in dictOptions" :key="role.id" :value="role.id">-->
+<!--                    <span style="display: inline-block;width: 100%">-->
+<!--                      {{ role.roleName }}-->
+<!--                    </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter='24' v-if='viewshow'>
+          <a-col :span='24'>
+            <a-form-item :label="$t('brand')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-multi-select-tag class="box-input" v-model:value="brands"
+                                  :placeholder="$t('PleaseSelect')+$t('brand')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'brand'"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form-model>
     </a-spin>
     <div class='drawer-bootom-button'>
@@ -33,6 +60,7 @@
 
 <script>
 import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
 import axios from 'axios'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -51,6 +79,8 @@ export default {
       editId: '',
       newVisible: false,
       selectedRole: undefined,
+      dutyTerritories: undefined,
+      brands: undefined,
       labelCol: {
         xs: { span: 24 },
         sm: { span: 7 }
@@ -65,8 +95,10 @@ export default {
       flag: false,  //表单提交标识
       spinLoading: false,
       confirmLoading: false,
+      viewshow: false,
       selectedRowKeys: [],
       roleList: [],
+      dictOptions: [],
       defaultValue: undefined
     }
   },
@@ -79,8 +111,24 @@ export default {
   },
   mounted() {
     this.loadData()
+    this.initDictData()
   },
   methods: {
+    initDictData() {
+      //优先从缓存中读取字典配置
+      if (getDictItemsFromCache(this.dictCode)) {
+        this.dictOptions = getDictItemsFromCache(this.dictCode)
+        return
+      }
+
+      //根据字典Code, 初始化字典数组
+      ajaxGetDictItems(this.dictCode, null).then((res) => {
+        if (res.success) {
+//                console.log(res.result);
+          this.dictOptions = res.result
+        }
+      })
+    },
     loadData() {
       this.loading = true
       getAction(`sys/role/queryall`, {}).then(res => {
@@ -94,9 +142,31 @@ export default {
     handleCancel() {
       this.$emit('rolevisible', false)
     },
+    selectChange(value){
+      value.map((item,index) => {
+          this.roleList.map((val,index) => {
+            if(val.roleCode == 'Viewer' && item == val.id){
+              this.$nextTick(() => {
+                this.viewshow = true
+              })
+              return
+            }else{
+              this.viewshow = false
+            }
+          })
+      })
+      // value.forEach((item,index) => {
+      //   console.log(item)
+      //     if(item == '1590600516943253506'){
+      //       this.viewshow = true
+      //     }else{
+      //       this.viewshow = false
+      //     }
+      // })
+    },
     //保存
     handleSubmit() {
-      let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}` }
+      let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}`, dutyTerritories: `${this.dutyTerritories}`, brands: `${this.brands}` }
       postAction('/sys/user/setRole', param).then((res) => {
         if (res.success) {
           this.$emit('rolevisible', false)