site描述

src/views/modules/sys/user.vue

@@ -551,8 +551,8 @@
     <el-dialog title="角色" :close-on-click-modal="false" v-drag :visible.sync="businessRoleAddModal" width="900px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="businessRoleData">
-          <el-form-item :label="'工厂编码'">
-            <el-input v-model="businessRoleData.site" clearable style="width: 80px"></el-input>
+          <el-form-item :label="'工厂描述'">
+            <el-input v-model="businessRoleData.sitename" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="'角色编码'">
             <el-input v-model="businessRoleData.roleNo" clearable style="width: 80px"></el-input>
@@ -585,11 +585,11 @@
               width="50">
             </el-table-column>
             <el-table-column
-              prop="site"
+              prop="sitename"
               header-align="center"
               align="center"
-              min-width="50"
-              label="工厂编码">
+              min-width="120"
+              label="工厂描述">
             </el-table-column>
             <el-table-column
               prop="roleNo"
@@ -633,6 +633,13 @@
               :selectable="selectFlag"
               width="50">
             </el-table-column>
+            <el-table-column
+              prop="sitename"
+              header-align="center"
+              align="center"
+              min-width="120"
+              label="工厂描述">
+            </el-table-column>
             <el-table-column
               prop="roleNo"
               header-align="center"
@@ -830,6 +837,7 @@ export default {
       businessRoleAddModal: false,
       businessRoleData: {
         site: '',
+        sitename: '',
         buNo: '',
         roleNo: '',
         roleDesc: '',
@@ -1260,6 +1268,7 @@ export default {
     businessRoleAuthorize () {
       this.businessRoleData = {
         site: '',
+        sitename: '',
         roleNo: '',
         roleDesc: '',
         active: '',
@@ -1267,11 +1276,15 @@ export default {
       }
       this.businessRoleSelections1 = null
       this.businessRoleSelections2 = null
+      this.refreshBusinessRoleList()
+      this.businessRoleAddModal = true
+    },
+    refreshBusinessRoleList () {
+      this.businessRoleData.username = this.selectUser.username
       getBusinessRoleList(this.businessRoleData).then(({data}) => {
-        this.businessRoleList1 = data.row1
-        this.businessRoleList2 = data.row2
+        this.businessRoleList1 = data.row1 || []
+        this.businessRoleList2 = data.row2 || []
       })
-      this.businessRoleAddModal = true
     },
     /**
      * 查询可用角色
@@ -1310,10 +1323,7 @@ export default {
       }
       addUserBusinessRole(inData).then(({data}) => {
         if (data && data.code === 0) {
-          getBusinessRoleList(this.selectUser).then(({data}) => {
-            this.businessRoleList1 = data.row1
-            this.businessRoleList2 = data.row2
-          })
+          this.refreshBusinessRoleList()
           this.businessRoleSelections1 = []
         } else {
           this.$alert(data.msg, '错误', {
@@ -1334,10 +1344,7 @@ export default {
       }
       delUserBusinessRole(inData).then(({data}) => {
         if (data && data.code === 0) {
-          getBusinessRoleList(this.selectUser).then(({data}) => {
-            this.businessRoleList1 = data.row1
-            this.businessRoleList2 = data.row2
-          })
+          this.refreshBusinessRoleList()
           this.businessRoleSelections2 = []
         } else {
           this.$alert(data.msg, '错误', {