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

src/components/Page.vue

@@ -16,7 +16,7 @@
     @current-change="getData"
     background :page-size='20'
     @size-change="handleSizeChange"
-    :page-sizes="[20, 30, 40, 50,60,70,80,90,100]"
+    :page-sizes="[1,20, 30, 40, 50,60,70,80,90,100]"
     layout="sizes,total,prev, pager, next"
     :total="total">
     </el-pagination>

src/main.js

@@ -24,3 +24,5 @@ new Vue({
   store,
   render: h => h(App)
 }).$mount('#app')
+
+

src/router.js

@@ -8,7 +8,7 @@ export default new Router({
       path: '/login',
       name: 'login',
       component: () => import('./views/Login.vue'),
-      show: 0
+      show: 0,
     },
     {
       path: '/',
@@ -74,7 +74,11 @@ export default new Router({
       children: [{
         path: '/company',
         component: () => import('./views/company/Company.vue'),
-        name: '公司管理'
+        name: '公司管理',
+        meta: {
+          keepAlive: true, 
+          isBack: false
+        }
       },{
         path: '/company/add',
         hide:1,

src/views/Home.vue

@@ -50,7 +50,10 @@
 			<!-- 右侧内容 -->
 			<el-container>
 				<el-main>			
-					<transition name="fade" mode="out-in"><router-view :info='info' :community='community'></router-view></transition>
+					
+						<transition name="fade" mode="out-in">
+						<router-view  :info='info' :community='community'></router-view>
+						</transition>
 				</el-main>
 				<!-- <el-footer>Footer</el-footer> -->
 			</el-container>

src/views/company/Add.vue

@@ -56,8 +56,16 @@
                     <el-form-item label="密码" class="req">
                         <el-input clearable placeholder="请输入密码" type="password" v-model="form.password"></el-input>
                     </el-form-item>
+                    <el-form-item label="账号状态" class="">
+                        <el-switch
+                        v-model="form.is_active"
+                        active-text="启用"
+                        inactive-text="禁用">
+                        </el-switch>
+                    </el-form-item>
+                    
                     <el-form-item label="公司类型" class="req">
-                            <el-select clearable v-model="form.category" placeholder="请选择">
+                            <el-select clearable v-model="form.category" filterable allow-create placeholder="请选择">
                                 <el-option v-for="(item,index) in category" :key="index" :label="item" :value="item"></el-option>
                             </el-select>
                     </el-form-item>
@@ -67,7 +75,7 @@
                             </el-select>
                     </el-form-item>
                     <el-form-item label="企业区域" class="req">
-                        <el-select v-model="form.area" clearable placeholder="请选择">
+                        <el-select v-model="form.area" clearable filterable allow-create placeholder="请选择">
                             <el-option v-for="(item,index) in area" :key="index" :label="item" :value="item"></el-option>
                         </el-select>
                     </el-form-item>
@@ -77,19 +85,19 @@
                                 <el-option label="区域二" value="beijing"></el-option>
                             </el-select>
                     </el-form-item> -->
-                    <el-form-item label="企业法人" class="req">
+                    <el-form-item label="企业法人" class="">
                         <el-input clearable placeholder="请输入企业法人" v-model="form.legalperson"></el-input>
                     </el-form-item>
-                    <el-form-item label="法人手机号" class="req">
+                    <el-form-item label="法人手机号" class="">
                         <el-input clearable placeholder="请输入法人手机号" v-model="form.legalperson_phone"></el-input>
                     </el-form-item>
-                    <el-form-item label="企业负责人" class="req">
+                    <el-form-item label="企业负责人" class="">
                         <el-input clearable placeholder="请输入企业负责人" v-model="form.principal"></el-input>
                     </el-form-item>
-                    <el-form-item label="负责人手机号" class="req">
+                    <el-form-item label="负责人手机号" class="">
                         <el-input clearable placeholder="请输入负责人手机号" v-model="form.principal_phone"></el-input>
                     </el-form-item>
-                    <el-form-item label="经营范围" class="req">
+                    <el-form-item label="经营范围" class="">
                         <el-input type="textarea" v-model="form.busscope"></el-input>
                     </el-form-item>
                     

src/views/company/Company.vue

@@ -75,7 +75,7 @@
                 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:'/company/detail',query:{id:scope.row.id}})"  type="success">查看</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>
                 </template>
@@ -109,6 +109,10 @@ export default {
             this.form.page=this.$refs.pageButton.page
             this.getData()
         },
+        detail(id){
+            let routeData = this.$router.resolve({ path: '/company/detail', query: {  id: id } });
+            window.open(routeData.href, '_blank');
+        },
         getData(){
             var parm=this.form;
             this.loading=true

src/views/company/Detail.vue

@@ -45,6 +45,7 @@
     <section>
         <p>公司管理  >  {{form.name}}</p>
         <div class="content">
+            <!-- <el-button style="float:right" size="small" @click="$router.go(-1)" type="success">返回</el-button> -->
             <el-form class="add_form detail" label-width="100px"  size="small" label-position="right">
                 <div class="div_left">
                     <el-form-item label="企业名称" class="">