From 76ef736f418d56b34e270785bcb6858ba87a3a45 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 6 Nov 2025 17:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificateInfo/index.vue                 |  6 +-
 .../certificateAtake/index.vue                | 93 +++++++++----------
 .../certificateTask/index.vue                 | 22 ++---
 3 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/src/views/certificate/certificateManage/certificateInfo/index.vue b/src/views/certificate/certificateManage/certificateInfo/index.vue
index b4b417d..fb27652 100644
--- a/src/views/certificate/certificateManage/certificateInfo/index.vue
+++ b/src/views/certificate/certificateManage/certificateInfo/index.vue
@@ -648,11 +648,11 @@
             handleUpdate(row) {
                 this.reset();
                 this.open = true;
-                 this.isReadOnly=true;
+                this.isReadOnly=true;
                 this.baseForm = Object.assign({}, row)
                 listDept().then((response) => {
-                                    this.deptOptions = this.handleTree(response.data, 'deptId')
-                                })
+                    this.deptOptions = this.handleTree(response.data, 'deptId')
+                })
                 this.title = "修改";
             },
             handleTabClick(tab, event) {
diff --git a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
index b9987de..5050433 100644
--- a/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateAtake/index.vue
@@ -116,55 +116,50 @@
       />
 
       <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title+''" :visible.sync="open" width="700px" append-to-body>
-        <el-tabs v-model="activeName">
-            <!-- 基础设置 -->
-            <el-tab-pane label="" name="baseSetting" style="height: 100px;">
-                <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
-                  <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="姓名" prop="name">
-                            <el-select
-                              v-model="baseForm.name"
-                              placeholder="请选择"
-                              filterable
-                              clearable
-                              style="width: 240px"
-                              @change="handleSelectChange"
-                            >
-                              <el-option
-                                v-for="item in allreplace"
-                                :key="item.idNumber"
-                                :label="item.name"
-                                :value="item.idNumber"
-                                @click.native="getCorpAndDept(item)"
-                              />
-                            </el-select>
-                        </el-form-item>
-                        <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>
-            </el-tab-pane>
-        </el-tabs>
+      <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="12">
+                <el-form-item label="姓名" prop="name">
+                    <el-select
+                      v-model="baseForm.name"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                      style="width: 240px"
+                      @change="handleSelectChange"
+                    >
+                      <el-option
+                        v-for="item in allreplace"
+                        :key="item.idNumber"
+                        :label="item.name"
+                        :value="item.idNumber"
+                        @click.native="getCorpAndDept(item)"
+                      />
+                    </el-select>
+                </el-form-item>
+                <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> 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
diff --git a/src/views/certificate/certificateReturnManage/certificateTask/index.vue b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
index 72b1787..da325af 100644
--- a/src/views/certificate/certificateReturnManage/certificateTask/index.vue
+++ b/src/views/certificate/certificateReturnManage/certificateTask/index.vue
@@ -70,16 +70,16 @@
         <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" />
-        <el-table-column label="出生日期" align="center" prop="birthday" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="出生地点" align="center" prop="birthAddr" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column label="出生日期" align="center" prop="birthday" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="出生地点" align="center" prop="birthAddr" :show-overflow-tooltip="true"/> -->
         <el-table-column label="证件类型" align="center" prop="certificateTypeName" :show-overflow-tooltip="true"/>
-        <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="签发地" align="center" prop="issueAddr" :show-overflow-tooltip="true"/>
-        <el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true" width="180"/>
-        <el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true" width="180"/>
-        <el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/>
+        <el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true" width="120"/>
+        <!-- <el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/> -->
         <el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true"/>
-        <el-table-column label="设备地址" align="center" prop="deviceAddr" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备地址" align="center" prop="deviceAddr" :show-overflow-tooltip="true" width="150"/>
         <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">
@@ -89,10 +89,10 @@
             <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"/>
-
-        <el-table-column label="类型" align="center" prop="typeName" width="120" :show-overflow-tooltip="true" fixed="right"/>
-        <el-table-column label="处理结果" align="center" prop="processStateName" :show-overflow-tooltip="true" fixed="right">
+        <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/> 
+        <el-table-column label="操作类型" align="center" prop="typeName" width="120" :show-overflow-tooltip="true"/>
+        <el-table-column label="操作截至日期" align="center" prop="processDate" width="120" :show-overflow-tooltip="true"/>
+        <el-table-column label="处理结果" align="center" prop="processStateName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
               <span v-if="scope.row.processState==0" style="color: orange;">未执行 </span>