Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/baianxi_admin

src/views/company/Add.vue

@@ -60,7 +60,7 @@
                         <el-switch
                         v-model="form.is_active"
                         active-text="启用"
-                        inactive-text="禁用">
+                        inactive-text="停用">
                         </el-switch>
                     </el-form-item>
                     
@@ -218,6 +218,7 @@ export default {
         if(this.id){
             this.$api.getEnterprise({id:this.id}).then(res=>{
                 this.form=res.data.data
+                this.form.is_active=Boolean(this.form.is_active)
             })
         }
         
@@ -228,7 +229,8 @@ export default {
         })
     },
     save(){
-          var parm=this.form;
+          var parm={...this.form};
+          parm.is_active=String(Number(parm.is_active))
           if(parm.id){
               this.$api.updateEnterprise(parm).then(res=>{
                   if(res.data.code==0){

src/views/company/Company.vue

@@ -74,7 +74,7 @@
                 prop="zip"  width="320"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button icon="el-icon-view" size="mini" @click="$router.push({path:'/monitjob',query:{id:scope.row.id}})"  type="success">查看巡检记录</el-button>
+                    <el-button icon="el-icon-view" size="mini" @click="$router.push({path:'/monitjob',query:{id:scope.row.id}})"  type="success" v-if='permission("巡检记录")'>查看巡检记录</el-button>
                     <el-button icon="el-icon-view" size="mini" @click="detail(scope.row.id)"  type="success">查看</el-button>
                     <el-button icon="el-icon-edit" @click="$router.push({path:'/company/add',query:{id:scope.row.id}})" size="mini" type="warning">编辑</el-button>
                     <el-button icon="el-icon-delete" @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
@@ -99,6 +99,7 @@ export default {
       loading:false,
       category:[],
       area:[],
+      info:{}
     }
   },
   methods:{
@@ -144,9 +145,24 @@ export default {
                     })
                 })
         },
+        permission(name){
+			let permissions=this.info.permissions||[];
+			let list=[];
+			for(let i=0;i<permissions.length;i++){
+				list.push(permissions[i].name)
+			}
+			if(list.indexOf(name)<0){
+				return false;
+			}else{
+				return true;
+			}	
+		},
   },
   created(){
       this.getData()
+      this.$api.getInfo().then(res=>{
+		this.info=res.data.data
+	  })
   }
 }
 </script>