slowslo 4 лет назад
Родитель
Сommit
d8626eeb7c

+ 16 - 3
src/components/person-tags/adolescent-form.vue

@@ -4,12 +4,17 @@
       <el-tab-pane label="基础信息" name="first"></el-tab-pane>
       <el-tab-pane label="重点青少年" name="second"></el-tab-pane>
     </el-tabs>
-        <avue-form v-show="activeName=='first'" :option="optionBasic" v-model="formBasic"></avue-form>
+        <avue-form v-show="activeName=='first'" @validate="" :option="optionBasic" v-model="formBasic">
+          <template slot-scope="scope" slot="menuForm">
+            <el-button type="primary" @click="nextStep">下一步</el-button>
+          </template>
+        </avue-form>
         <avue-form v-show="activeName=='second'" :option="optionAdolescent" v-model="formAdolescent" @submit="addEntity"></avue-form>
   </basic-container>
 </template>
 
 <script>
+  import {validatenull} from "@/util/validate";
   import {DIC} from "@/api/util/nation"
   import {add,update,getDetail,getList} from "@/api/person/basicinfo";
   import {update as adolescentUpdate,addAdolescent} from "@/api/person/adolescent";
@@ -29,7 +34,8 @@
         loading:false,
         query: {},
         optionBasic:{
-          tip: false,
+          // submitText:'下一步',
+          disabled:false,
           submitBtn:false,
           emptyBtn:false,
           column:[
@@ -580,6 +586,9 @@
       }
     },
     methods:{
+      nextStep(){
+        this.activeName='second';
+      },
       addEntity(){
         //新增
         if (this.tag==1){
@@ -615,7 +624,11 @@
         }
       },
       handleClick(tab, event){
-        console.log(tab,event)
+        if (tab.name == "first"){
+          console.log(this.optionBasic,'进入first');
+          this.optionBasic.disabled=false;
+        }
+        console.log(this.optionBasic.disabled,'kkkk');
       },
       // onLoad(){
       //   console.log(this.tag,'tag')

+ 1 - 0
src/mock/menu.js

@@ -3,6 +3,7 @@ import Mock from 'mockjs'
 const top = [{
   label: "首页",
   path: "/wel/index",
+  // path:"/grid/dataPage",
   icon: 'el-icon-menu',
   meta: {
     i18n: 'dashboard',

+ 2 - 1
src/page/login/userlogin.vue

@@ -148,7 +148,8 @@
 
                   if(r.data.data.tenantType == 1){
                     let routeUrl = this.$router.resolve({
-                      path: "/wel/door",
+                      // path: "/wel/door",
+                      path: "/wel/index",
                       params: {
                         tenantId:  this.loginForm.tenantId
                       }

+ 1 - 0
src/router/views/index.js

@@ -59,6 +59,7 @@ export default [
     // },
     component: () =>
       import( /* webpackChunkName: "views" */ '@/views/wel/door')
+      // import( /* webpackChunkName: "views" */ '@/views/wel/index')
   },
     {
     path: 'smartCommunity',

+ 6 - 0
src/views/person/adolescent.vue

@@ -38,6 +38,11 @@
         <el-button type="text" size="small" icon="el-icon-view"  @click.native="showDetail(scope.row)">查 看</el-button>
         <el-button type="text" size="small" icon="el-icon-edit"  @click.native="handleEdit(scope.row)">编 辑</el-button>
       </template>
+
+      <template slot-scope="scope" slot="search" >
+          <el-button>自定义</el-button>
+      </template>
+
     </avue-crud>
     <el-dialog v-if="detailVisible===true" :append-to-body="true" :close-on-click-modal="false" :modal-append-to-body="false" :visible.sync="detailVisible"
                title="详 情" width="70%">
@@ -120,6 +125,7 @@
               label: "人员类型",
               prop: "type",
               type: "select",
+              search:true,
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=adolescent_type",
               props: {
                 label: "dictValue",

+ 2 - 2
vue.config.js

@@ -27,8 +27,8 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        target: 'http://localhost',
-        // target: 'http://36.103.227.152:1777/api',
+        // target: 'http://localhost',
+        target: 'http://36.103.227.152:1777/api',
         ws: true,
         pathRewrite: {
           '^/api': '/'