fix：企业入驻更新

src/api/firm/enter/index.js

@@ -12,3 +12,16 @@ export function findEnterpriseList(data) {
     data:data
   })
 }
+
+/**
+ * 添加企业入驻
+ * @param data
+ * @returns {*}
+ */
+export function enterpriseAdd(data) {
+  return request({
+    url: '/vehicleManagement/firm/enterpriseAdd',
+    method: 'post',
+    data:data
+  })
+}

src/api/login.js

@@ -13,7 +13,7 @@ export function login(username, password, code, uuid) {
   })
 }
 
-// 方法
+// 注册方法
 export function register(data) {
   return request({
     url: '/auth/register',
@@ -60,3 +60,15 @@ export function getCodeImg() {
     timeout: 20000
   })
 }
+
+/**
+ * 企业下拉框
+ * @param data
+ * @returns {*}
+ */
+export function firmList() {
+  return request({
+    url: '/system/user/firmList',
+    method: 'get'
+  })
+}

src/views/firm/enter/index.vue

@@ -1,5 +1,16 @@
 <template>
   <div>
+    <el-row :gutter="10" class="mb8">
+      <el-button
+        type="primary"
+        plain
+        icon="el-icon-plus"
+        size="mini"
+        @click="dialogFormVisible=true"
+      >新增企业
+      </el-button>
+    </el-row>
+
     <el-table
       :data="tableData"
       style="width: 100%">
@@ -27,13 +38,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="经营执照凭证号码"
-        width="180">
-        <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.row.businessLicenseNumber }}</span>
-        </template>
-      </el-table-column>
 
       <el-table-column
         label="企业成立日期"
@@ -44,7 +48,7 @@
       </el-table-column>
 
       <el-table-column
-        label="注册地址"
+        label="地址"
         width="180">
         <template slot-scope="scope">
           <span style="margin-left: 10px">{{ scope.row.address }}</span>
@@ -76,18 +80,72 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作">
+<!--      <el-table-column label="操作">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <el-button
+<!--          <el-button-->
-            size="mini"
+<!--            size="mini"-->
-            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+<!--            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
-          <el-button
+<!--          <el-button-->
-            size="mini"
+<!--            size="mini"-->
-            type="danger"
+<!--            type="danger"-->
-            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+<!--            @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
     </el-table>
+
+<!--    新增企业按钮-->
+    <el-dialog title="新增企业" :visible.sync="dialogFormVisible" append-to-body width="600px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="企业名称" prop="deptName">
+              <el-input v-model="form.enterpriseName" placeholder="请输入企业名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表" prop="deptName">
+              <el-input v-model="form.legalPerson" placeholder="请输入法定代表人"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="成立日期" prop="deptName">
+              <el-input v-model="form.estabinessDate" placeholder="请输入企业成立日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册地址" prop="deptName">
+              <el-input v-model="form.address" placeholder="请输入注册地址"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="deptName">
+              <el-input v-model="form.contactPhone" placeholder="请输入联系电话"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业邮箱" prop="deptName">
+              <el-input v-model="form.email" placeholder="请输入企业邮箱"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="数据库名" prop="deptName">
+              <el-input v-model="form.databaseName" placeholder="请输入数据库名"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="enterpriseAdd()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -95,6 +153,7 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 import {findEnterpriseList} from "@/api/firm/enter";
+import {enterpriseAdd} from "@/api/firm/enter";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -103,8 +162,12 @@ export default {
     //这里存放数据"
 
     return {
+      //企业入驻列表
       tableData:[],
       enterpriseForm:{},
+      //新增对话框
+      dialogFormVisible:false,
+      form:{},
     };
   },
   //计算属性 类似于data概念",
@@ -113,6 +176,16 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    enterpriseAdd(){
+      enterpriseAdd(this.form).then((res)=>{
+        alert(res.msg);
+        if (200==res.code){
+          this.findEnterpriseList();
+          this.dialogFormVisible=false;
+        }
+      })
+    },
+    //企业列表
     findEnterpriseList(){
       findEnterpriseList(this.enterpriseForm).then((res)=>{
         this.tableData=res.data;

src/views/register.vue

@@ -2,16 +2,10 @@
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
       <h3 class="title">若依后台管理系统</h3>
-      <el-form-item prop="deptName">
+      <el-form-item prop="deptId">
-        <el-input
+        <el-select v-model="registerForm.deptId" placeholder="企业" type="deptId">
-          v-model="registerForm.deptName"
+          <el-option v-for="i in firm" :label="i.deptName" :value="i.deptId" :key="i.deptId"></el-option>
-          auto-complete="off"
+        </el-select>
-          placeholder="企业"
-          type="deptName"
-          @keyup.enter.native="handleRegister"
-        >
-<!--          <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="password"/>-->
-        </el-input>
       </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" auto-complete="off" placeholder="账号" type="text">
@@ -40,20 +34,6 @@
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="password"/>
         </el-input>
       </el-form-item>
-<!--      <el-form-item v-if="captchaEnabled" prop="code">-->
-<!--        <el-input-->
-<!--          v-model="registerForm.code"-->
-<!--          auto-complete="off"-->
-<!--          placeholder="验证码"-->
-<!--          style="width: 63%"-->
-<!--          @keyup.enter.native="handleRegister"-->
-<!--        >-->
-<!--          <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="validCode"/>-->
-<!--        </el-input>-->
-<!--        <div class="register-code">-->
-<!--          <img :src="codeUrl" class="register-code-img" @click="getCode"/>-->
-<!--        </div>-->
-<!--      </el-form-item>-->
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -79,6 +59,7 @@
 
 <script>
 import {getCodeImg, register} from "@/api/login";
+import {firmList} from "@/api/login";
 
 export default {
   name: "Register",
@@ -91,6 +72,7 @@ export default {
       }
     };
     return {
+      firm:[],
       codeUrl: "",
       registerForm: {
         username: "",
@@ -123,8 +105,19 @@ export default {
   },
   created() {
     this.getCode();
+    this.firmList();
   },
   methods: {
+    firmList(){
+      firmList().then((res)=>{
+        this.firm = res.data;
+      })
+    },
+
+    man(a){
+      alert("aaaa"+a)
+    },
+
     getCode() {
       getCodeImg().then(res => {
         this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
@@ -138,6 +131,7 @@ export default {
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           this.loading = true;
+          console.log(this.registerForm)
           register(this.registerForm).then(res => {
             const username = this.registerForm.username;
             this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {