Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/layout/character/characterForm.vue

@@ -6,9 +6,9 @@
           <el-form-item label="角色名称" prop="name">
             <el-input v-model="ruleForm.name" placeholder="请输入角色名称"></el-input>
           </el-form-item>
-          <el-form-item label="用户权限" prop="roles">
+          <el-form-item label="用户权限">
             <el-checkbox-group v-model="ruleForm.roles">
-              <el-checkbox label="复选框 A" v-for="(item, index) in meunroles" :key="index">{{ item.name }}</el-checkbox>
+              <el-checkbox v-for="(item, index) in rolesList" :key="index" :label="item.name"></el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <el-form-item>
@@ -26,7 +26,7 @@ export default {
   name: 'characterForm',
   props: {
     ruleForm: null,
-    meunroles: null,
+    rolesList: null,
   },
   components: {},
   data: () => ({

src/layout/character/characterList.vue

@@ -7,7 +7,7 @@
           <el-table-column property="name" label="角色名称" align="center"> </el-table-column>
           <el-table-column fixed="right" label="操作" align="center">
             <template slot-scope="scope">
-              <el-button @click="$router.push({ path: '/chatacter/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
+              <el-button @click="$router.push({ path: '/character/detail', query: { id: scope.row.id } })" type="text"><i class="el-icon-edit"></i></el-button>
               <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
             </template>
           </el-table-column>

src/views/character/detail.vue

@@ -10,7 +10,7 @@
             <detailTop @goBack="goBack"></detailTop>
           </el-col>
           <el-col :span="24" class="info">
-            <characterForm :ruleForm="ruleForm" :meunroles="meunroles" @submitForm="submitForm" @resetForm="resetForm"></characterForm>
+            <characterForm :ruleForm="ruleForm" :rolesList="rolesList" @submitForm="submitForm" @resetForm="resetForm"></characterForm>
           </el-col>
         </el-col>
       </el-col>
@@ -38,8 +38,13 @@ export default {
     topTitle: '用户信息管理',
     ruleForm: {
       passwd: '123456',
+      roles: [],
     },
-    meunroles: [],
+    rolesList: [
+      {
+        name: '10',
+      },
+    ],
   }),
   created() {
     this.searchInfo();
@@ -52,17 +57,24 @@ export default {
   },
   methods: {
     ...character(['query', 'fetch', 'update', 'create']),
-    ...menurole({ rolequery: 'query' }),
+    ...menurole({ rolequery: 'query', rolesFetch: 'fetch' }),
     async searchInfo() {
       if (this.id) {
         const res = await this.fetch(this.id);
-        this.$set(this, `ruleForm`, res.data);
+        if (`${res.errcode}` === '0') {
+          this.$set(this, `ruleForm`, res.data);
+        } else {
+          this.$message.error(result.errmsg ? result.errmsg : 'error');
+        }
       }
     },
     async searchRole() {
       const res = await this.rolequery();
-      this.$set(this, `meunroles`, res.data);
-      console.log(res.data);
+      if (`${res.errcode}` === '0') {
+        this.$set(this, `rolesList`, res.data);
+      } else {
+        this.$message.error(result.errmsg ? result.errmsg : 'error');
+      }
     },
     // 提交
     async submitForm({ data }) {