Merge remote-tracking branch 'origin/master'

src/api/enterprise/enterprise.js

@@ -17,6 +17,12 @@ export function getEnterprise(id) {
   })
 }
 
+export function enterpriseUpdateId(id) {
+  return request({
+    url: '/authentication/enterprise/enterpriseUpdateId?id=' + id,
+    method: 'post'
+  })
+}
 // 新增企业
 export function addEnterprise(data) {
   return request({

src/api/system/user.js

@@ -21,7 +21,7 @@ export function getUser(userId) {
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/system/user',
+    url: '/system/user/add',
     method: 'post',
     data: data
   })

src/views/enterprise/enterprise/index.vue

@@ -73,10 +73,10 @@
           placeholder="请选择企业入驻平台时期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="企业认证id" prop="certificationId">
+      <el-form-item label="审核状态" prop="examineStatus">
         <el-input
-          v-model="queryParams.certificationId"
+          v-model="queryParams.examineStatus"
-          placeholder="请输入企业认证id"
+          placeholder="审核状态"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -170,15 +170,14 @@
           <span>{{ parseTime(scope.row.registrationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="企业认证id" align="center" prop="certificationId" />
+      <el-table-column label="审核状态" align="center" prop="examineStatus" />
       <el-table-column label="认证时间" align="center" prop="authenticationDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.authenticationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="服务级别" align="center" prop="serviceLevel" />
-      <el-table-column label="开通服务id" align="center" prop="openServerId" />
+      <el-table-column label="开通服务级别" align="center" prop="openServerId" />
-      <el-table-column label="增值服务id" align="center" prop="addServerId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -189,6 +188,12 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['authentication:enterprise:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="EnterpriseUpdate(scope.row)"
+          >认证</el-button>
           <el-button
             size="mini"
             type="text"
@@ -253,7 +258,14 @@
 </template>
 
 <script>
-import { listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise } from "@/api/enterprise/enterprise";
+import {
+  listEnterprise,
+  getEnterprise,
+  delEnterprise,
+  addEnterprise,
+  updateEnterprise,
+  enterpriseUpdateId
+} from "@/api/enterprise/enterprise";
 
 export default {
   name: "Enterprise",
@@ -290,12 +302,11 @@ export default {
         contactPhone: null,
         email: null,
         status: null,
+        examineStatus:null,
         registrationDate: null,
-        certificationId: null,
         authenticationDate: null,
         serviceLevel: null,
-        openServerId: null,
+        openServerId: null
-        addServerId: null,
       },
       // 表单参数
       form: {},
@@ -308,6 +319,17 @@ export default {
     this.getList();
   },
   methods: {
+    EnterpriseUpdate(row){
+      enterpriseUpdateId(row.id).then(res=>{
+        if (res.code === 200) {
+          this.$modal.msgSuccess(res.data);
+          this.getList();
+        }else {
+          this.$modal.msgSuccess(res.data);
+          this.getList();
+        }
+      })
+    },
     /** 查询企业列表 */
     getList() {
       this.loading = true;
@@ -336,11 +358,10 @@ export default {
         email: null,
         status: null,
         registrationDate: null,
-        certificationId: null,
+        examineStatus: null,
         authenticationDate: null,
         serviceLevel: null,
         openServerId: null,
-        addServerId: null,
         createBy: null,
         createTime: null,
         updateBy: null,