up

src/api.js

@@ -158,6 +158,11 @@ export default {
 	uploadPaper: params => {
 		return axios.post(`${baseURL}/api/admin/paper/upload`, params);
 	},
+	getPerList: params => {
+		return axios.get(`${baseURL}/api/admin/permission/list`, {
+			params: params
+		})
+	},
 	//视频
 	getVideoList: params => {
 		return axios.get(`${baseURL}/api/admin/video/list`, {

src/views/apply/Change.vue

@@ -461,7 +461,10 @@ export default {
   },
   watch:{
     $route(to){
-        console.log(to)
+        this.subject_id=false;
+        this.$nextTick(()=>{
+            this.subject_id=to.path.split('/')[2];
+        })
         this.subject_id=to.path.split('/')[2]
         this.$api.getSubList().then(res=>{
           let data=res.data.data;

src/views/apply/New.vue

@@ -51,7 +51,7 @@
             <el-form label-width="75px" :inline="true" size="small">
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="培训项目">
-                    <Subject v-if='subject_id' @subChange='subChange' :subject_id='subject_id' />
+                    <Subject v-if='subject_id' @subChange='subChange' :key="key" :subject_id='subject_id' />
                 </el-form-item>
                 <el-form-item label="姓名" label-width="40px">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
@@ -216,6 +216,7 @@ export default {
     },
   data(){
     return{
+      key:1,
       checkList:[],
       itemList:[
           {name:'姓名', value:'name',checked:true},
@@ -460,9 +461,11 @@ export default {
       }
   },
   watch:{
-    $route(to){
-        console.log(to)
-        this.subject_id=to.path.split('/')[2]
+    $route(to){      
+        this.subject_id=false;
+        this.$nextTick(()=>{
+            this.subject_id=to.path.split('/')[2];
+        })
         this.$api.getSubList().then(res=>{
           let data=res.data.data;
             for(let i=0;i<data.length;i++){
@@ -472,7 +475,7 @@ export default {
                 }
             }
             this.getData()
-      })
+        })
     },
   },
   created(){

src/views/apply/Update.vue

@@ -461,7 +461,10 @@ export default {
   },
   watch:{
     $route(to){
-        console.log(to)
+        this.subject_id=false;
+        this.$nextTick(()=>{
+            this.subject_id=to.path.split('/')[2];
+        })
         this.subject_id=to.path.split('/')[2]
         this.$api.getSubList().then(res=>{
           let data=res.data.data;

src/views/system/AddAccount.vue

@@ -26,16 +26,16 @@
         <el-form-item label="手机">
           <el-input placeholder="手机" v-model="form.phone"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="角色">
-          <el-select v-model="form.permissions" placeholder="请选择">
+        <el-form-item label="权限">
+          <el-select v-model="form.permissions" multiple placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="(item,index) in permissions"
+              :key="index"
+              :label="item"
+              :value="item"
             ></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
 
         <el-form-item label="状态">
           <el-radio v-model="form.status" :label="1">激活</el-radio>
@@ -54,28 +54,7 @@ export default {
     return {
       test: "",
       form: { name: "", realname: "", password:"",repassword:"",permissions:[],status: 1 },
-      options: [
-        {
-          value: "选项1",
-          label: "超级管理员"
-        },
-        {
-          value: "选项2",
-          label: "一级管理员"
-        },
-        {
-          value: "选项3",
-          label: "二级管理员"
-        },
-        {
-          value: "选项4",
-          label: "三级管理员"
-        },
-        {
-          value: "选项5",
-          label: "四级管理员"
-        }
-      ]
+      permissions:[]
     };
   },
   methods: {
@@ -83,6 +62,7 @@ export default {
       this.$api.getAccountById({ id: this.form.id }).then(res => {
         this.form = res.data.data;
       });
+
     },
     save() {
       var parm = this.form;
@@ -109,6 +89,9 @@ export default {
     }
   },
   created() {
+    this.$api.getPerList().then(res=>{
+      this.permissions=res.data.data;
+    })
     if (this.$route.query.id) {
       this.form.id = this.$route.query.id;
       this.id = this.$route.query.id;