核验任务提交

src/api/certificateManage/index.js

@@ -322,8 +322,30 @@ export function getCertificateVerifyUserApi(data) {
     headers: {
         //"merchant-id":"378915229716713472",
     },
-    params:data
+    data:data
   })
 }
 
+// 核验任务-新增
+export function addCertificateVerifyApi(data) {
+  return request({
+    url: '/certificate/certificate_verify/certificateVerify/add',
+    method: 'post',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    data:data
+  })
+}
 
+// 核验任务-详情
+export function getCertificateVerifyDetailApi(data) {
+  return request({
+    url: '/certificate/certificate_verify/certificateVerify/detail',
+    method: 'get',
+    headers: {
+        //"merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}

src/views/certificate/remoteVerification/remoteVerificationTask/index.vue

@@ -21,8 +21,8 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="任务状态" prop="state">
+        <el-form-item label="任务状态" prop="verifyState">
-          <el-select v-model="queryParams.state" placeholder="任务状态" clearable>
+          <el-select v-model="queryParams.verifyState" placeholder="任务状态" clearable>
               <el-option label="未开始" value="1"/>
               <el-option label="进行中" value="2"/>
               <el-option label="已超时" value="3"/>
@@ -31,8 +31,8 @@
               <el-option label="已取消" value="6"/>
           </el-select>
         </el-form-item>
-         <el-form-item label="任务类型" prop="type">
+         <el-form-item label="任务类型" prop="verifyType">
-          <el-select v-model="queryParams.type" placeholder="任务类型" clearable>
+          <el-select v-model="queryParams.verifyType" placeholder="任务类型" clearable>
               <el-option label="有无证件核验" value="1"/>
               <el-option label="一人多证核验" value="2"/>
               <el-option label="出入境时间核验" value="3"/> 
@@ -68,11 +68,11 @@
         <el-table-column label="结束时间" align="center" prop="endTime" :show-overflow-tooltip="true"/>
         <el-table-column label="任务标题" align="center" prop="verifyTitle" :show-overflow-tooltip="true"/>
         <el-table-column label="任务状态" align="center" prop="verifyStateName" :show-overflow-tooltip="true"/> 
-        <el-table-column label="任务类型" align="center" prop="type" :show-overflow-tooltip="true">
+        <el-table-column label="任务类型" align="center" prop="verifyType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              <span v-if="scope.row.type==1">有无证件核验</span>
+              <span v-if="scope.row.verifyType==1">有无证件核验</span>
-              <span v-if="scope.row.type==2">一人多证核验</span>
+              <span v-if="scope.row.verifyType==2">一人多证核验</span>
-              <span v-if="scope.row.type==3">出入境时间核验</span>
+              <span v-if="scope.row.verifyType==3">出入境时间核验</span>
           </template>
         </el-table-column>
         <el-table-column label="完成进度" align="center" prop="taskProcess" :show-overflow-tooltip="true">
@@ -99,14 +99,14 @@
             <el-button 
               size="mini"
               type="text"
-              @click="handleUpdate(scope.row)"
+              @click="handleView(scope.row)"
-            >编辑</el-button>
+            >查看</el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               type="text"
               style="color: red;"
               @click="handleDelete(scope.row)"
-            >删除</el-button>
+            >删除</el-button> -->
           </template>
         </el-table-column>
 
@@ -160,8 +160,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-form-item label-width="120px" label="选择核验类型"  prop="type">
+                <el-form-item label-width="120px" label="选择核验类型"  prop="verifyType">
-                  <el-radio-group v-model="baseForm.type" size="small">
+                  <el-radio-group v-model="baseForm.verifyType" size="small">
                     <el-radio label="1">有无证件核验</el-radio>
                     <el-radio label="2">一人多证核验</el-radio>
                     <el-radio label="3">出入境时间核验</el-radio>
@@ -169,8 +169,8 @@
                 </el-form-item>
             </el-col> 
             <el-col :span="24">
-              <el-form-item label="提醒方式" prop="remindType">
+              <el-form-item label="提醒方式" prop="noticeType">
-                    <el-radio-group v-model="baseForm.remindType" size="small">
+                    <el-radio-group v-model="baseForm.noticeType" size="small">
                     <el-radio label="1">邮件通知</el-radio>
                     <el-radio label="2">短信通知</el-radio> 
                   </el-radio-group>
@@ -184,7 +184,75 @@
         </div>
       </el-dialog>
 
+      <el-dialog title="核验任务详情" :visible.sync="openDetail" width="900px" append-to-body>
+        <el-form :model="detailParams" ref="detailForm" size="small" :inline="true" label-width="100px">
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="detailParams.name"
+              placeholder="请输入姓名"
+              clearable maxlength="20"
+              style="width: 240px" 
+            />
+          </el-form-item>  
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
+          </el-form-item>
+        </el-form> 
+        <el-table v-loading="loading" :data="detailList" height="600"> 
+          <el-table-column label="序号" align="center" width="80" type="index">
+              <template slot-scope="scope">
+                  <span>{{(detailParams.pageNum - 1) * detailParams.pageSize + scope.$index + 1}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true" width="120"/>
+          <!-- <el-table-column label="证件编号" align="center" prop="" :show-overflow-tooltip="true"/>-->
+          <el-table-column label="申请出境时间" align="center" prop="startTime" :show-overflow-tooltip="true"/>
+          <el-table-column label="申请入境时间" align="center" prop="endTime" :show-overflow-tooltip="true"/>
+          <el-table-column label="任务标题" align="center" prop="verifyTitle" :show-overflow-tooltip="true"/>
+          <el-table-column label="核验类型" align="center" prop="verifyType" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span v-if="scope.row.verifyType==1">有无证件核验</span>
+                <span v-if="scope.row.verifyType==2">一人多证核验</span>
+                <span v-if="scope.row.verifyType==3">出入境时间核验</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="核验状态" align="center" prop="checkState" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span v-if="scope.row.checkState==0" >验证中</span>
+                <span v-if="scope.row.checkState==1" >已验证</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="核验结果" align="center" prop="checkResult" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span v-if="scope.row.checkResult==null" >/</span>
+                  <span v-if="scope.row.checkResult==0" >不通过</span>
+                  <span v-if="scope.row.checkResult==1" >已通过</span>
+              </template>
+          </el-table-column> -->
+          <!-- <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button 
+                size="mini"
+                type="text"
+                @click="handleView(scope.row)"
+              >查看</el-button>
+            </template>
+          </el-table-column> -->
 
+        </el-table> 
+        <pagination
+          v-show="total2>0"
+          :total="total2"
+          :page.sync="detailParams.pageNum"
+          :limit.sync="detailParams.pageSize"
+          @pagination="getDetailList"
+        /> 
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="openDetail=false">确 定</el-button>
+          <el-button @click="openDetail=false">取 消</el-button>
+        </div>
+      </el-dialog>
     </div>
   </template>
 
@@ -192,8 +260,7 @@
     import {
         listDept
     } from '@/api/system/dept'
-    import { getCertificateVerifyListPageApi,addCertificateCheckApi, updateCertificateInfoApi,
+    import { getCertificateVerifyListPageApi,addCertificateVerifyApi,getCertificateVerifyUserApi,getCertificateVerifyDetailApi } from "@/api/certificateManage/index";
-     deleteCertificateInfoApi,getCertificateVerifyUserApi } from "@/api/certificateManage/index";
     import base64 from 'base-64';
     import { getToken } from '@/utils/auth'
     import { downloadFileByUrl } from '@/utils/download'
@@ -232,13 +299,12 @@
                     pageNum: 1,
                     pageSize: 10,
                     keyWord:null,
-                    state:null,
+                    verifyState:null,
-                    type:null,
+                    verifyType:null,
                 },
                 // 表单参数
                 baseForm: {
-                    checkType:1,
+
-                    processDate:"",
                 },
                 // 表单校验
                 baseFormRules: {
@@ -249,6 +315,15 @@
                         { required: true, message: "核验截至日期不能为空", trigger: "blur" }
                     ]
                 },
+                openDetail:false,
+                rowData:{},
+                detailParams:{
+                  pageNum: 1,
+                  pageSize: 10,
+                  name:null,
+                },
+                total2:0,
+                detailList:[]
             };
         },
         mounted(){
@@ -292,8 +367,8 @@
                   "pageNum":this.queryParams.pageNum,
                   "pageSize":this.queryParams.pageSize,
                   "keyWord":this.queryParams.keyWord,
-                  "state":this.queryParams.state,
+                  "verifyState":this.queryParams.verifyState,
-                  "type":this.queryParams.type,
+                  "verifyType":this.queryParams.verifyType,
                   "startTime":this.dateRange[0]||"",
                   "endTime":this.dateRange[1]||"",
                 }
@@ -311,20 +386,7 @@
             },
             // 表单重置
             reset() {
-                this.baseForm = {
+                this.baseForm = {};
-                    deptId:null,
-                    name:"",
-                    idNumber:"",
-                    birthday:"",
-                    birthAddr:"",
-                    certificateType:"",
-                    certificateTypeName:"",
-                    certificateNo:"",
-                    issueAddr:"",
-                    issueDay:"",
-                    issueLifespan:"",
-                    isEle:"0",isCreate:"0"
-                };
                 this.resetForm("baseForm");
             },
             /** 新增按钮操作 */
@@ -338,8 +400,8 @@
                 console.log("this.baseForm",this.baseForm);
                 this.$refs["baseForm"].validate(valid => {
                 if (valid) {
-                     this.baseForm.taskNos=this.taskNos;
+                    // this.baseForm.taskNos=this.taskNos;
-                    addCertificateCheckApi(this.baseForm).then(response => {
+                    addCertificateVerifyApi(this.baseForm).then(response => {
                       if(response.code=200){
                         this.$modal.msgSuccess("验证下发成功");
                         this.open = false;
@@ -351,6 +413,31 @@
                 }
                 });
             },
+            handleView(row){
+              console.log(row)
+              this.rowData = row;
+              this.handleQuery2()
+              this.openDetail = true
+            },
+             /** 搜索按钮操作 */
+            handleQuery2() {
+                this.detailParams.pageNum = 1;
+                this.getDetailList();
+            },
+            /** 重置按钮操作 */
+            resetQuery2() { 
+                this.resetForm("detailForm");
+                this.handleQuery2();
+            }, 
+            getDetailList(){
+              let param = {
+                bathId:this.rowData.bathId
+              }
+              getCertificateVerifyDetailApi(param).then(response => {
+                  this.detailList = response.rows;
+                  this.total2 = Number(response.total); 
+              });
+            },
             formatDate(date) {
                 // 格式化为 YYYY-MM-DD
                 const year = date.getFullYear();