合并冲突GARDEBVASEDATA

src/views/GARDENBASEDATA/index.vue

@@ -8,17 +8,17 @@
       v-show="showSearch"
       label-width="88px"
     >
-      <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="deptId">
+      <el-select filterable 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>
@@ -202,14 +202,8 @@
     />
 
     <!-- 添加或修改园区内企业基础数据对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      :close-on-click-modal="false"
-      width="35%"
-      append-to-body
-    >
-      <el-tabs v-model="tabMsg" type="border-card">
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="65%" append-to-body>
+      <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-row>
@@ -318,85 +312,17 @@
               </el-col>
             </el-row>
 
-            <el-form-item label="部门" prop="deptName">
-              <el-select
-                filterable
-                v-model="form.deptName"
-                @change="deptSelect"
-                placeholder="请选择部门"
-              >
-                <el-option
-                  v-for="(item, index) in detpList"
-                  :key="index"
-                  :label="item.deptName"
-                  :value="index"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="企业代表联系方式 " prop="qydblxfs">
-              <el-input
-                v-model="form.qydblxfs"
-                placeholder="请输入企业代表联系方式 "
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="注册资金" prop="zczj">
-              <el-input
-                v-model="form.zczj"
-                placeholder="请输入注册资金"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="企业类型 " prop="qylx">
-              <el-input
-                v-model="form.qylx"
-                placeholder="请输入企业类型 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="经营状态 " prop="jyzt">
-              <el-input
-                v-model="form.jyzt"
-                placeholder="请输入经营状态 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="统一社会信用代码 " prop="shtyxydm">
-              <el-input
-                v-model="form.shtyxydm"
-                placeholder="请输入统一社会信用代码 "
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="人员规模" prop="rygm">
-              <el-input
-                v-model="form.rygm"
-                placeholder="请输入人员规模"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="成立日期 " prop="clrq">
-              <!-- <el-input  v-model="form.clrq" placeholder="请输入成立日期 "></el-input> -->
-              <el-date-picker
-                value-format="yyyy-MM-dd"
-                @change="setUpTimeSelect"
-                v-model="form.clrq"
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="注册地址 " prop="zcdz">
-              <el-input
-                v-model="form.zcdz"
-                placeholder="请输入注册地址 "
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="经营范围  " prop="jyfw">
-              <el-input
-                v-model="form.jyfw"
-                placeholder="请输入经营范围  "
-              ></el-input>
-            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="经营范围  " prop="jyfw">
+                  <el-input
+                    v-model="form.jyfw"
+                    placeholder="请输入经营范围  "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12"></el-col>
+            </el-row>
           </el-form>
         </el-tab-pane>
 
@@ -856,9 +782,11 @@ export default {
     /** 提交按钮 */
     submitForm() {
       let is;
-      this.$refs["forms"].validate((valid) => {
-        if (!valid) {
-          this.$message.error("请补齐企业基本信息");
+      this.$refs["forms"].validate((valid)=>{
+        if (valid) {
+
+        }else{
+          this.$message.error("请补齐企业基本信息")
           is = true;
           return;
         }