From 152d51c736b66092ed4a62c69cce1b73276d4c82 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Sat, 22 Jun 2024 11:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E8=BF=81=E8=AF=81=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/czrkdj/index.vue |   6 +-
 dangan-ui/src/views/dangan/zqz/index.vue    | 201 +-------------------
 2 files changed, 11 insertions(+), 196 deletions(-)

diff --git a/dangan-ui/src/views/dangan/czrkdj/index.vue b/dangan-ui/src/views/dangan/czrkdj/index.vue
index 3f3166e..bbb491e 100644
--- a/dangan-ui/src/views/dangan/czrkdj/index.vue
+++ b/dangan-ui/src/views/dangan/czrkdj/index.vue
@@ -712,7 +712,7 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="dalsInfoQuery">搜索</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border @selection-change="dalsInfoDblclick">
+      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500px" @selection-change="dalsInfoDblclick">
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="档案目录ID" align="center" prop="muId"  min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath"  min-width="100" show-overflow-tooltip/>
@@ -1084,7 +1084,7 @@ export default {
     dalsSubmit(){
       // 是否是常住人口登记表1 :   常住人口登记表1 双面识别
       if(this.form.ywType==='option1'){
-        if(this.dalsInfo.selectRow.length===2){
+        if(this.dalsInfo.selectRow && this.dalsInfo.selectRow.length===2){
           this.dalsInfo.visible = false;
           this.shiBieList = this.dalsInfo.selectRow
         }else {
@@ -1093,7 +1093,7 @@ export default {
           });
         }
       }else {
-        if(this.dalsInfo.selectRow.length===1){
+        if(this.dalsInfo.selectRow && this.dalsInfo.selectRow.length===1){
           this.dalsInfo.visible = false;
           this.shiBieList = this.dalsInfo.selectRow
         }else {
diff --git a/dangan-ui/src/views/dangan/zqz/index.vue b/dangan-ui/src/views/dangan/zqz/index.vue
index ddbcb86..72fc211 100644
--- a/dangan-ui/src/views/dangan/zqz/index.vue
+++ b/dangan-ui/src/views/dangan/zqz/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
-      <el-form-item label="档案目录ID" prop="muId">
-        <el-input
-          v-model="queryParams.muId"
-          placeholder="请输入档案目录ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="编号" prop="num">
         <el-input
           v-model="queryParams.num"
@@ -33,14 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="住址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入住址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item label="登记机关" prop="djJg">
         <el-input
           v-model="queryParams.djJg"
@@ -49,134 +33,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="与申请人关系1" prop="relation1">
-        <el-input
-          v-model="queryParams.relation1"
-          placeholder="请输入与申请人关系1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名1" prop="name1">
-        <el-input
-          v-model="queryParams.name1"
-          placeholder="请输入姓名1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别1" prop="sex1">
-        <el-input
-          v-model="queryParams.sex1"
-          placeholder="请输入性别1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号1" prop="cardId1">
-        <el-input
-          v-model="queryParams.cardId1"
-          placeholder="请输入身份证号1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="与申请人关系2" prop="relation2">
-        <el-input
-          v-model="queryParams.relation2"
-          placeholder="请输入与申请人关系2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名2" prop="name2">
-        <el-input
-          v-model="queryParams.name2"
-          placeholder="请输入姓名2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别2" prop="sex2">
-        <el-input
-          v-model="queryParams.sex2"
-          placeholder="请输入性别2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号2" prop="cardId2">
-        <el-input
-          v-model="queryParams.cardId2"
-          placeholder="请输入身份证号2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="与申请人关系3" prop="relation3">
-        <el-input
-          v-model="queryParams.relation3"
-          placeholder="请输入与申请人关系3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名3" prop="name3">
-        <el-input
-          v-model="queryParams.name3"
-          placeholder="请输入姓名3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别3" prop="sex3">
-        <el-input
-          v-model="queryParams.sex3"
-          placeholder="请输入性别3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号3" prop="cardId3">
-        <el-input
-          v-model="queryParams.cardId3"
-          placeholder="请输入身份证号3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="与申请人关系4" prop="relation4">
-        <el-input
-          v-model="queryParams.relation4"
-          placeholder="请输入与申请人关系4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名4" prop="name4">
-        <el-input
-          v-model="queryParams.name4"
-          placeholder="请输入姓名4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别4" prop="sex4">
-        <el-input
-          v-model="queryParams.sex4"
-          placeholder="请输入性别4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号4" prop="cardId4">
-        <el-input
-          v-model="queryParams.cardId4"
-          placeholder="请输入身份证号4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item label="发往单位" prop="fwdw">
         <el-input
           v-model="queryParams.fwdw"
@@ -185,22 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="迁入地址" prop="qrAddress">
-        <el-input
-          v-model="queryParams.qrAddress"
-          placeholder="请输入迁入地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="准迁原因" prop="zqReason">
-        <el-input
-          v-model="queryParams.zqReason"
-          placeholder="请输入准迁原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item label="批准机关" prop="pzjg">
         <el-input
           v-model="queryParams.pzjg"
@@ -209,22 +49,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="承办人" prop="cbr">
-        <el-input
-          v-model="queryParams.cbr"
-          placeholder="请输入承办人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="签发日期" prop="qfDate">
-        <el-date-picker clearable
-          v-model="queryParams.qfDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择签发日期">
-        </el-date-picker>
-      </el-form-item>-->
       <el-form-item label="是否纠错" prop="errorCorrect">
         <el-select
           v-model="queryParams.errorCorrect"
@@ -801,12 +625,12 @@
 
     <!--选择档案历史记录-->
     <el-dialog title="选择档案历史记录" :visible.sync="dalsInfo.visible" width="1200px" append-to-body>
-      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <el-form :model="dalsInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
 
-        <el-form-item label="物理书架路径" prop="wlsjPath">
+        <el-form-item label="档案室密集柜路径" prop="wlsjPath">
           <el-input
             v-model="dalsInfo.queryParams.wlsjPath"
-            placeholder="请输入物理书架路径"
+            placeholder="请输入档案室密集柜路径"
             clearable
             @keyup.enter.native="dalsInfoQuery"
           />
@@ -828,32 +652,23 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="图片名称" prop="picName">
-          <el-input
-            v-model="dalsInfo.queryParams.picName"
-            placeholder="请输入图片名称"
-            clearable
-            @keyup.enter.native="dalsInfoQuery"
-          />
-        </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="dalsInfoQuery">搜索</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" border height="500" @selection-change="dalsInfoDblclick">
+      <el-table v-loading="dalsInfo.loading" :data="dalsInfo.list" height="500px" border @selection-change="dalsInfoDblclick">
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="档案目录ID" align="center" prop="muId" min-width="50"/>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
+        <el-table-column label="档案室密集柜路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
         <el-table-column label="是否已经识别" align="center" prop="recognize" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
         </el-table-column>
         <el-table-column label="上传时间" align="center" prop="createTime" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="图片路径" align="center" prop="picUrl">
+<!--        <el-table-column label="图片名称" align="center" prop="picName" min-width="100" show-overflow-tooltip/>-->
+        <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
           </template>
@@ -1201,7 +1016,7 @@ export default {
     },
     // 档案历史确认选中
     dalsSubmit(){
-      if(this.dalsInfo.selectRow.length===1){
+      if(this.dalsInfo.selectRow && this.dalsInfo.selectRow.length===1){
         this.dalsInfo.visible = false;
         this.shiBieList = this.dalsInfo.selectRow
       }else {