jz.kai 4 роки тому
батько
коміт
f8f64d0834

+ 9 - 1
src/api/base/userAuthenticationApprove.js

@@ -41,6 +41,14 @@ function batchRemove(idList){
   });
 }
 
+function checked(formModel){  
+  return request.post(constant.serverUrl + "/base/userAuthenticationApprove/checked", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,checked
 }

+ 4 - 1
src/api/job/jobUser.js

@@ -54,7 +54,10 @@ function create(){
     });
   }
 
+  function editChecked(id){
+    return request.get(constant.serverUrl + "/job/jobUser/editChecked/" + id);
+  }
 
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,exportXls,batchExportXls
+  pageList,create,edit,add,update,remove,batchRemove,exportXls,batchExportXls,editChecked
 }

+ 9 - 0
src/routers/modules/base.js

@@ -65,6 +65,15 @@ var routers = [
                         title: '通知管理'
                 }
         },
+        {
+                path: '/base/userAuthenticationApprove/list',
+                name: 'userAuthenticationApproveList',
+                component: () => import('@/views/base/userAuthenticationApprove-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '用户实名审核'
+                }
+        },
 ]
 
 export default routers;

+ 47 - 127
src/views/base/userAuthenticationApprove-detail.vue

@@ -17,120 +17,50 @@
       <el-form
         ref="form"
         :model="formModel"
-        :rules="ruleValidate"
         :label-width="'100px'"
       >
-        <el-form-item label="" prop="id">
-          <el-input
-            v-model="formModel.id"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="createBy">
-          <el-input
-            v-model="formModel.createBy"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="createTime">
-          <el-input
-            v-model="formModel.createTime"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="updateBy">
-          <el-input
-            v-model="formModel.updateBy"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="" prop="updateTime">
-          <el-input
-            v-model="formModel.updateTime"
-            placeholder="请输入"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="删除标示" prop="delFlag">
-          <el-input
-            v-model="formModel.delFlag"
-            placeholder="请输入删除标示"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="用户ID" prop="jobUserId">
-          <el-input
-            v-model="formModel.jobUserId"
-            placeholder="请输入用户ID"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="审批人" prop="approvePersonId">
-          <el-input
-            v-model="formModel.approvePersonId"
-            placeholder="请输入审批人"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="审批时间" prop="approveTime">
-          <el-input
-            v-model="formModel.approveTime"
-            placeholder="请输入审批时间"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="审批状态" prop="approvalStatus">
-          <el-input
-            v-model="formModel.approvalStatus"
-            placeholder="请输入审批状态"
-            style="width: 300px"
-          ></el-input>
-        </el-form-item>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="姓名:" prop="realName">
+              {{formModel.realName}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="身份证号:" prop="idCard">
+              {{formModel.idCard}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="电话:" prop="tel">
+              {{formModel.tel}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-image style="width: 100%;" :src="formModel.idCardUrl" fit="contain">
+              <div slot="error" class="image-slot">
+                <i class="el-icon-picture-outline"></i>
+              </div>
+            </el-image>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting"
-        >确 定</el-button
-      >
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">通 过</el-button>
     </span>
   </el-dialog>
 </template>
 <script>
 import Constant from "@/constant";
 import userAuthenticationApproveApi from "@/api/base/userAuthenticationApprove";
+import jobUserApi from "@/api/job/jobUser";
 
 export default {
-  props: ["businessKey", "title"],
+  props: ["businessKey", "jobUserKey", "title"],
   data() {
     return {
       formModel: {},
-      ruleValidate: {
-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标示不能为空", trigger: "blur" },
-        ],
-        jobUserId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" },
-        ],
-        approvePersonId: [
-          { required: true, message: "审批人不能为空", trigger: "blur" },
-        ],
-        approveTime: [
-          { required: true, message: "审批时间不能为空", trigger: "blur" },
-        ],
-        approvalStatus: [
-          { required: true, message: "审批状态不能为空", trigger: "blur" },
-        ],
-      },
       showDialog: true,
       loading: false,
       submitting: false,
@@ -143,35 +73,28 @@ export default {
     handleSubmit() {
       var self = this;
 
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          (function () {
-            var id = self.formModel.id;
-
-            if (id == null || id.length == 0) {
-              return userAuthenticationApproveApi.add(self.formModel);
-            } else {
-              return userAuthenticationApproveApi.update(self.formModel);
-            }
-          })().then(function (response) {
-            var jsonData = response.data;
+      (function () {
+        var formData = new FormData();
+        formData.append("id", self.businessKey);
 
-            if (jsonData.result) {
-              self.$message({
-                message: "保存成功!",
-                type: "success",
-              });
+        return userAuthenticationApproveApi.checked(formData);
+      })().then(function (response) {
+        var jsonData = response.data;
 
-              self.$emit("close", true);
-            } else {
-              self.$message({
-                message: jsonData.message + "",
-                type: "warning",
-              });
+        if (jsonData.result) {
+          self.$message({
+            message: "保存成功!",
+            type: "success",
+          });
 
-              self.$emit("close", false);
-            }
+          self.$emit("close", true);
+        } else {
+          self.$message({
+            message: jsonData.message + "",
+            type: "warning",
           });
+
+          self.$emit("close", false);
         }
       });
     },
@@ -180,11 +103,7 @@ export default {
     var self = this;
 
     (function () {
-      if (self.businessKey.length == 0) {
-        return userAuthenticationApproveApi.create();
-      } else {
-        return userAuthenticationApproveApi.edit(self.businessKey);
-      }
+        return jobUserApi.editChecked(self.jobUserKey);
     })()
       .then((response) => {
         var jsonData = response.data;
@@ -192,6 +111,7 @@ export default {
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+          console.log(self.formModel);
         } else {
           self.$message.error(jsonData.message + "");
         }

+ 35 - 120
src/views/base/userAuthenticationApprove-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/userAuthenticationApprove">userAuthenticationApprove管理</a>
+        <a href="/base/userAuthenticationApprove">用户实名审核</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -19,71 +19,20 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="" prop="id">
-        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="createBy">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.createBy"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="createTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.createTime"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="updateBy">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.updateBy"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="" prop="updateTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.updateTime"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="删除标示" prop="delFlag">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.delFlag"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="用户ID" prop="jobUserId">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.jobUserId"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="审批人" prop="approvePersonId">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.approvePersonId"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="审批时间" prop="approveTime">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.approveTime"
-        ></el-input>
-      </el-form-item>
       <el-form-item label="审批状态" prop="approvalStatus">
-        <el-input
-          type="text"
-          size="mini"
+        <el-select
           v-model="queryModel.approvalStatus"
-        ></el-input>
+          filterable
+          placeholder="请选择审批状态"
+          size="mini"
+        >
+          <el-option
+            v-for="approvalStatus in approvalStatusResult"
+            :key="approvalStatus.value"
+            :label="approvalStatus.name"
+            :value="approvalStatus.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -104,25 +53,6 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        @click="handleAdd"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
-    </el-row>
     <el-table
       :data="tableData"
       style="min-height: 400px"
@@ -132,44 +62,15 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" label="" width="180"></el-table-column>
-      <el-table-column prop="createBy" label="" width="180"></el-table-column>
-      <el-table-column prop="createTime" label="" width="180"></el-table-column>
-      <el-table-column prop="updateBy" label="" width="180"></el-table-column>
-      <el-table-column prop="updateTime" label="" width="180"></el-table-column>
-      <el-table-column
-        prop="delFlag"
-        label="删除标示"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="jobUserId"
-        label="用户ID"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="approvePersonId"
-        label="审批人"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="approveTime"
-        label="审批时间"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="approvalStatus"
-        label="审批状态"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="approvalStatusName" label="审核状态" width="180"></el-table-column>
+      <el-table-column prop="jobUserName" label="提交人" width="180"></el-table-column>
+      <!-- <el-table-column prop="jobUserId" label="所属单位" width="180"></el-table-column> -->
+      <el-table-column prop="createTime" label="申请时间" width="180"></el-table-column>
+      <el-table-column prop="approvePersonName" label="审核人" width="180"></el-table-column>
+      <el-table-column prop="approveTime" label="审核时间" width="180"></el-table-column>
       <el-table-column label="操作">
-        <template slot-scope="{ row }">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
+        <template slot-scope="{row}">
+          <el-button v-if="row.approvalStatus==1" size="mini" type="warning" @click="handleEdit(row)">处理</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -183,6 +84,7 @@
     ></el-pagination>
     <userAuthenticationApprove-detail
       v-if="showModal"
+      :jobUserKey="jobUserKey"
       :businessKey="businessKey"
       :title="modalTitle"
       @close="onDetailModalClose"
@@ -193,6 +95,7 @@
 import Constant from "@/constant";
 import UserAuthenticationApproveDetail from "./userAuthenticationApprove-detail";
 import userAuthenticationApproveApi from "@/api/base/userAuthenticationApprove";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -226,8 +129,19 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      approvalStatusResult: [],
     };
   },
+  created() {
+    dataDictionaryApi
+    .findByCatalogName({
+      catalogName: "实名制状态",
+    })
+    .then((response) => {
+      var jsonData = response.data;
+      this.approvalStatusResult = jsonData.data;
+    });
+  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -302,6 +216,7 @@ export default {
     handleEdit(record) {
       this.modalTitle = "编辑";
       this.businessKey = record.id;
+      this.jobUserKey = record.jobUserId;
       this.showModal = true;
     },
     handleDelete(record) {