From 539b7c497d7ec0d439745a924d2b5f47673f7947 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Thu, 6 Nov 2025 13:33:19 +0800
Subject: [PATCH] jsk

---
 .../certificateRecord/index.vue               | 107 ------------------
 .../certificateAtake/index.vue                |  45 ++++++--
 .../certificateSave/index.vue                 |  32 +++---
 .../certificateTask/index.vue                 |  22 ++--
 src/views/certificate/device/index.vue        |   4 +-
 5 files changed, 67 insertions(+), 143 deletions(-)

diff --git a/src/views/certificate/certificateManage/certificateRecord/index.vue b/src/views/certificate/certificateManage/certificateRecord/index.vue
index 4488f76..cff8ad1 100644
--- a/src/views/certificate/certificateManage/certificateRecord/index.vue
+++ b/src/views/certificate/certificateManage/certificateRecord/index.vue
@@ -85,113 +85,6 @@
         @pagination="getList"
       />
 
-      <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body>
-        <el-tabs v-model="activeName" @tab-click="handleTabClick">
-            <!-- 基础设置 -->
-            <el-tab-pane label="添加证件" name="baseSetting" style="height: 400px;">
-                <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
-                  <el-row>
-                    <el-col :span="24" v-if="baseForm.deptId !== 0">
-                        <el-form-item label="单位" prop="deptId">
-                            <treeselect
-                                v-model="baseForm.deptId"
-                                :options="deptOptions"
-                                :normalizer="normalizer"
-                                placeholder="选择单位"
-                            />
-                        </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="姓名" prop="name">
-                        <el-input  v-model="baseForm.name" placeholder="请输入" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="身份证号" prop="idNumber">
-                            <el-input  v-model="baseForm.idNumber" placeholder="请输入" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="出生日期" prop="birthday">
-                            <el-date-picker
-                                v-model="baseForm.birthday"
-                                type="date"
-                                placeholder="选择日期"
-                                format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="出生地点" prop="birthAddr">
-                            <el-input  v-model="baseForm.birthAddr" placeholder="请输入" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="证件类型" prop="certificateType">
-                            <el-select v-model="baseForm.certificateType" placeholder="证件类型" clearable>
-                              <el-option
-                                v-for="dict in dict.type.sys_certificate_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="证件编号" prop="certificateNo">
-                            <el-input  v-model="baseForm.certificateNo" placeholder="请输入" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="签发地" prop="issueAddr">
-                            <el-input  v-model="baseForm.issueAddr" placeholder="请输入" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="签发日期" prop="issueDay">
-                            <el-date-picker
-                              v-model="baseForm.issueDay"
-                              type="date"
-                              placeholder="选择日期"
-                              format="yyyy-MM-dd"
-                              :picker-options="startPickerOptions"
-                              value-format="yyyy-MM-dd"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="有效期至" prop="issueLifespan">
-                            <el-date-picker
-                              v-model="baseForm.issueLifespan"
-                              type="date"
-                              placeholder="选择日期"
-                              format="yyyy-MM-dd"
-                              :picker-options="endPickerOptions"
-                              value-format="yyyy-MM-dd"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    </el-row>
-                    <el-row>
-                      <el-col :span="12">
-                          <el-form-item label-width="120px" label="是否电子标签"  prop="isEle">
-                            <el-radio-group v-model="baseForm.isEle" size="small">
-                              <el-radio label="1">是</el-radio>
-                              <el-radio label="0">否</el-radio>
-                            </el-radio-group>
-                          </el-form-item>
-                      </el-col>
-                    </el-row>
-                </el-form>
-            </el-tab-pane>
-        </el-tabs>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
     </div>
   </template>
 
diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
index e5c330a..b9987de 100644
--- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
@@ -144,6 +144,22 @@
                         <el-form-item label="身份证号" prop="idNumber">
                             <el-input style="width: 240px;background-color:#DAE1EE;" v-model="baseForm.idNumber" readonly="true" maxlength="30" clearable/>
                         </el-form-item>
+                        <el-form-item label="出境日期" prop="exitTime">
+                            <el-date-picker
+                                v-model="baseForm.exitTime"
+                                type="date"
+                                placeholder="选择日期"
+                                format="yyyy-MM-dd" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+                        </el-form-item>
+                        <el-form-item label="入境日期" prop="entryTime">
+                            <el-date-picker
+                                v-model="baseForm.entryTime"
+                                type="date"
+                                placeholder="选择日期"
+                                format="yyyy-MM-dd" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
+                        </el-form-item>
                     </el-col>
                   </el-row>
                 </el-form>
@@ -439,10 +455,15 @@
                 const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
                 console.log("param",param);
                 getCertificateTakeAddPageApi(param).then(response => {
-                this.getList();
-                this.open2 = false;
-                this.reset();
-                this.$modal.msgSuccess("操作成功");
+                  console.log("response",response);
+                if(response.code==200){
+                  this.getList();
+                  this.open2 = false;
+                  this.reset();
+                  this.$modal.msgSuccess("操作成功");
+                }else{
+                  this.$modal.msgError(response.msg);
+                }
                 });
             },
             // 取消按钮
@@ -451,13 +472,19 @@
                 this.reset();
             },
             submitForm: function() {
-                const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"idNumber":this.selectIdNumber,"name":this.selectName};
+                const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"idNumber":this.selectIdNumber,"name":this.selectName,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
                 console.log("param",param);
                 getCertificateTakeAddPageApi(param).then(response => {
-                this.getList();
-                this.open = false;
-                this.reset();
-                this.$modal.msgSuccess("操作成功");
+                  console.log("response",response);
+                  if(response.code==200){
+                    this.getList();
+                    this.open = false;
+                    this.reset();
+                    this.$modal.msgSuccess("操作成功");
+                  }else{
+                    this.$modal.msgError(response.msg);
+                  }
+
                 });
             },
             // 取消按钮
diff --git a/src/views/certificate/certificateReturnManage/certificateSave/index.vue b/src/views/certificate/certificateReturnManage/certificateSave/index.vue
index a64a8d2..0aff7e9 100644
--- a/src/views/certificate/certificateReturnManage/certificateSave/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateSave/index.vue
@@ -60,7 +60,7 @@
             <template slot-scope="scope">
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="出生日期" align="center" prop="birthday" :show-overflow-tooltip="true"/>
@@ -82,7 +82,7 @@
       />
 
       <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body> 
+      <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body>
         <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
           <el-row>
             <el-col :span="24">
@@ -92,13 +92,13 @@
                       placeholder="请选择"
                       filterable
                       clearable
-                      style="width: 100%" 
+                      style="width: 100%"
                     >
                       <el-option
                         v-for="item in allDevice"
                         :key="item.deviceId"
                         :label="item.deviceName"
-                        :value="item.deviceId" 
+                        :value="item.deviceId"
                       />
                     </el-select>
                 </el-form-item>
@@ -116,7 +116,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form> 
+        </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -165,7 +165,7 @@
                 open: false,
                 allDevice:[],
                 selectCertificateNos:"",
-                selectType:"",  
+                selectType:"",
                 checked: false,
                 // 部门树选项
                 deptOptions: [],
@@ -181,7 +181,7 @@
                 deviceData:{},
                 // 表单参数
                 baseForm: {
-                    deviceId:null, 
+                    deviceId:null,
                     processDate:""
                 },
                 // 表单校验
@@ -252,8 +252,8 @@
             // 表单重置
             reset() {
               this.baseForm = {
-                  deviceId:null, 
-                  processDate:""  
+                  deviceId:null,
+                  processDate:""
               };
               this.resetForm("baseForm");
             },
@@ -310,13 +310,17 @@
                   "processDate":this.baseForm.processDate
                 }
                 getCertificateSaveAddPageApi(params).then(response => {
-                this.getList();
-                this.open = false;
-                this.reset();
-                this.$modal.msgSuccess("操作成功");
+                  if(response.code==200){
+                    this.getList();
+                    this.open = false;
+                    this.reset();
+                    this.$modal.msgSuccess("操作成功");
+                  }else{
+                    this.$modal.msgError(response.msg);
+                  }
                 });
             },
-            
+
             formatDate(date) {
                 // 格式化为 YYYY-MM-DD
                 const year = date.getFullYear();
diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
index 3bb532c..72b1787 100644
--- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
@@ -61,12 +61,12 @@
           <div style="font-weight: bold;">取证任务数/已完成数：235/230</div>
       </div>
       <el-table v-loading="loading" :data="tableListData" @selection-change="handleSelectionChange" height="800">
-        <el-table-column type="selection" width="55" align="center" :selectable="selectablerow"/> 
+        <el-table-column type="selection" width="55" align="center" :selectable="selectablerow"/>
         <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
                 <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column label="任务编号" align="center" prop="taskNo" :show-overflow-tooltip="true" width="180" />
         <el-table-column label="姓名" align="center" prop="name" :show-overflow-tooltip="true" width="120" />
         <el-table-column label="身份证号" align="center" prop="idNumber" :show-overflow-tooltip="true" width="180" />
@@ -83,11 +83,11 @@
         <el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
         <el-table-column label="槽位编号" align="center" prop="soltNo" :show-overflow-tooltip="true"/>
         <el-table-column label="验证码" align="center" prop="verificationCode" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <span @click="checkCode(scope.row)">查看</span>
-            </template>
-          
-
+        </el-table-column>
+        <el-table-column label="二维码" align="center" prop="verificationCode" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span @click="checkCode(scope.row)" style="color:blue">查看</span>
+          </template>
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
 
@@ -115,15 +115,15 @@
           <div style="display: flex;width: 100%;justify-content: center;align-items: center;" ref="codeBox">
             <div style="width: 300px;height: 300px;">
               <div id="qrcode" class="qrcode" ref="codeItem"></div>
-            </div> 
+            </div>
           </div>
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="openCode=false">确 定</el-button>
             <el-button @click="openCode=false">取 消</el-button>
           </div>
-      </el-dialog> 
+      </el-dialog>
+
 
-      
     </div>
   </template>
 
@@ -250,7 +250,7 @@
                     ]
                 },
                 openCode:false,
-                qrCode: '', 
+                qrCode: '',
                 qrCodeStr:""
             };
         },
diff --git a/src/views/certificate/device/index.vue b/src/views/certificate/device/index.vue
index d9614d0..b68df15 100644
--- a/src/views/certificate/device/index.vue
+++ b/src/views/certificate/device/index.vue
@@ -159,12 +159,12 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="设备Mac" prop="deviceMac">
-                            <el-input  v-model="baseForm.deviceMac" placeholder="请输入设备key" maxlength="30" clearable/>
+                            <el-input  v-model="baseForm.deviceMac" placeholder="请输入设备Mac" maxlength="30" clearable/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="网关" prop="deviceGateway">
-                            <el-input  v-model="baseForm.deviceGateway" placeholder="请输入安装地址" maxlength="30" clearable/>
+                            <el-input  v-model="baseForm.deviceGateway" placeholder="请输入网关" maxlength="30" clearable/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">