搜索完成

src/views/GARDENBASEDATA/index.vue

@@ -8,27 +8,21 @@
       v-show="showSearch"
       label-width="88px"
     >
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入"
-        ></el-input>
-      </el-form-item>
+    <el-form-item label="部门名称" prop="deptId">
+      <el-select v-model="queryParams.deptId" placeholder="请选择">
+        <el-option
+          v-for="item in detpList"
+          :key="item.value"
+          :label="item.deptName"
+          :value="item.deptId"
+        >
+        </el-option>
+      </el-select>
+    </el-form-item>
       <el-form-item label="法定代表人" prop="fddbr">
         <el-input v-model="queryParams.fddbr" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="queryParams.deptId" placeholder="请选择">
-          <el-option
-            v-for="item in detpList"
-            :key="item.value"
-            :label="item.deptName"
-            :value="item.deptId"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
         <el-button
           type="primary"
           icon="el-icon-search"
@@ -209,8 +203,8 @@
 
     <!-- 添加或修改园区内企业基础数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="35%" append-to-body>
-      <el-tabs @tab-click="handleTabClick" type="border-card">
-        <el-tab-pane label="企业基本信息">
+      <el-tabs v-model="tabMsg"  type="border-card">
+        <el-tab-pane name="basicMsg" label="企业基本信息">
           <el-form ref="forms" :model="form" :rules="rules" label-width="180px">
             <el-form-item label="法定代表人" prop="fddbr">
               <el-input
@@ -219,9 +213,9 @@
               ></el-input>
             </el-form-item>
 
-            <el-form-item label="部门" prop="fddbr">
+            <el-form-item label="部门" prop="deptName">
               <el-select
-                v-model="detpValue"
+                v-model="form.deptName"
                 @change="deptSelect"
                 placeholder="请选择部门"
               >
@@ -301,7 +295,7 @@
         </el-tab-pane>
 
         <!-- 额外信息 -->
-        <el-tab-pane label="额外信息">
+        <el-tab-pane name="extraMsg" label="额外信息">
           <el-form ref="form" :model="form" :rules="rules" label-width="180px">
             <el-form-item label="控股企业 " prop="kgqy">
               <el-input
@@ -436,10 +430,10 @@ export default {
   name: "GARDENBASEDATA",
   data() {
     return {
-      isShowStatus: 1,
+      // 新增标签索引
+      tabMsg:"basicMsg",
       // 部门列表
       detpList: [],
-      detpValue: null,
 
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
@@ -500,7 +494,6 @@ export default {
       // 表单参数
       form: {},
 
-      tabValue: 0,
       // 表单校验
       rules: {
         id: [
@@ -510,8 +503,8 @@ export default {
             trigger: "blur",
           },
         ],
-        deptId: [
-          { required: true, message: "部门主键不能为空", trigger: "blur" },
+        deptName: [
+          { required: true, message: "部门不能为空", trigger: "blur" },
         ],
         fddbr: [
           { required: true, message: "法定代表人 不能为空", trigger: "blur" },
@@ -618,10 +611,6 @@ export default {
     });
   },
   methods: {
-    handleTabClick(val) {
-      this.tabValue = val.index;
-      console.log(this.tabValue);
-    },
     changeIsShowStatus(val) {
       this.isShowStatus = val;
     },
@@ -651,6 +640,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.tabMsg = "basicMsg";
       this.form = {
         id: null,
         deptId: null,
@@ -681,7 +671,7 @@ export default {
         jcfwwbwhfwcx: null,
       };
       this.resetForm("form");
-      console.log(this.form);
+      this.resetForm("forms");
     },
     /** 搜索按钮操作 */
     handleQuery() {