Merge branch 'zl' into dev

src/views/client/index.vue

@@ -16,8 +16,8 @@
       <el-table-column prop="address" label="联系人地址" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="type" label="类型" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span v-if="dictionaries">
-            {{(dictionaries.filter(item=>item.dictChildValue==scope.row.type))[0].dictChildLabel}}
+          <span v-if="dictionaries.TENANT_TYPE">
+            {{(dictionaries.TENANT_TYPE.filter(item=>item.dictChildValue==scope.row.type))[0].dictChildLabel}}
           </span>
         </template>
       </el-table-column>
@@ -199,7 +199,9 @@
           </el-form-item>
 
           <el-form-item label="租户类型 :" class="marginB">
-            <span>{{ruleForm.apply.type}}</span>
+            <span v-if="dictionaries.TENANT_TYPE">
+               {{((dictionaries.TENANT_TYPE).filter(item=>item.dictChildValue==ruleForm.apply.type))[0].dictChildLabel}}
+            </span>
           </el-form-item>
           <!-- <el-form-item label="备注 :" class="marginB">
             <span>{{ruleForm.apply.describe}}</span>
@@ -218,6 +220,7 @@ export default {
     return {
       trans: [],
       authority: [],
+      select:'',
       pswdshow: false,
       showvisible: false,
       visible: false,
@@ -236,7 +239,7 @@ export default {
      rules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' },],
         contacts:[{ required: true, message: '请输入联系人', trigger: 'blur' },],
-        email:[{ required: true, message: '请输入联系人邮箱', trigger: 'blur' },],
+        // email:[{ required: true, message: '请输入联系人邮箱', trigger: 'blur' },],
         address: [{ required: true, message: '请输入联系地址', trigger: 'blur' },],
         number: [{ required: true, message: '请输入用户账号配额', trigger: 'blur' },],
         username:[{ required: true, message: '请输入管理员账号', trigger: 'blur' },],
@@ -251,12 +254,16 @@ export default {
   mounted() {
     this.getList()
     this.getFunction()
+    // this.translate()
     // console.log(this.select)
   },
+  created(){
+    // this.select = this.$store.state.admin.dictionaries
+  },
     computed: {
     dictionaries() {
       // console.log(this.$store.state.admin.dictionaries)
-      return this.$store.state.admin.dictionaries.TENANT_TYPE
+      return this.$store.state.admin.dictionaries
     },
    
   },
@@ -287,6 +294,11 @@ export default {
       this.showvisible = false
       this.pswdshow = false
     },
+    // translate() {
+    //   for (let i = 0; i < this.select.length; i++) {
+    //     this.trans.push(this.select[i].dictChildLabel)
+    //   }
+    // },
     getList() {
       this.loading = true
       this.$api.getTenantList(this.queryParams).then(response => {

src/views/dataPermission/index.vue

@@ -53,7 +53,7 @@
             <el-input v-model="ruleForm.function" size="small" :readonly="true" placeholder="请输入所属功能"></el-input>
         </el-form-item>
         <el-form-item label="数据权限名称" prop="function">
-            <el-input v-model="ruleForm.name" size="small" :readonly="true" placeholder="请输入数据权限名称"></el-input>
+            <el-input v-model="ruleForm.name" size="small" placeholder="请输入数据权限名称"></el-input>
         </el-form-item>
         <el-form-item label="数据权限">
              <template>

src/views/position/index.vue

@@ -75,7 +75,6 @@
             multiple
             collapse-tags
             placeholder="请选择角色"
-            :disabled="disabled"
             style="display:block">
             <el-option
               v-for="item in roleList"