转非农业人口批复存根样式调整

dangan-ui/src/views/dangan/ytzm/index.vue

@@ -103,11 +103,11 @@
 
     <el-table v-loading="loading" :data="ytzmList" border>
       <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
-      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
+<!--      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="150" show-overflow-tooltip/>
       <el-table-column label="年份" align="center" prop="year" min-width="100" show-overflow-tooltip/>
       <el-table-column label="序号" align="center" prop="xh" min-width="100" show-overflow-tooltip/>

dangan-ui/src/views/dangan/zfnyhkcg/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="档案目录ID" prop="muId">
+      <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.muId"
+          v-model="queryParams.name"
-          placeholder="请输入档案目录ID"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,174 +17,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请人姓名" prop="name">
+      <el-form-item label="承办人" prop="cbr">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入申请人姓名"
-          clearable
-          @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="与申请人关系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="与申请人关系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="与申请人关系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="与申请人关系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="与申请人关系5" prop="relation5">
-        <el-input
-          v-model="queryParams.relation5"
-          placeholder="请输入与申请人关系5"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="姓名5" prop="name5">
-        <el-input
-          v-model="queryParams.name5"
-          placeholder="请输入姓名5"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="性别5" prop="sex5">
-        <el-input
-          v-model="queryParams.sex5"
-          placeholder="请输入性别5"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="机关1" prop="jg1">
         <el-input
-          v-model="queryParams.jg1"
+          v-model="queryParams.cbr"
-          placeholder="请输入机关1"
+          placeholder="请输入承办人"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机关2" prop="jg2">
+      <el-form-item label="承办日期" prop="cbDate">
-        <el-input
-          v-model="queryParams.jg2"
-          placeholder="请输入机关2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="承办人" prop="cbr">
         <el-input
-          v-model="queryParams.cbr"
+          v-model="queryParams.cbDate"
-          placeholder="请输入承办人"
+          placeholder="请输入承办日期"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="承办日期" prop="cbDate">
-        <el-date-picker clearable
-          v-model="queryParams.cbDate"
-          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"
@@ -247,14 +95,14 @@
 
     <el-table v-loading="loading" :data="zfnyhkcgList" border>
       <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
-      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
+<!--      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
-      <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="150" show-overflow-tooltip/>
+      <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="180" show-overflow-tooltip/>
-      <el-table-column label="编号" align="center" prop="num" fixed min-width="100" show-overflow-tooltip/>
+      <el-table-column label="编号" align="center" prop="num" fixed min-width="120" show-overflow-tooltip/>
-      <el-table-column label="申请人姓名" align="center" prop="name" fixed min-width="100" show-overflow-tooltip/>
+      <el-table-column label="申请人姓名" align="center" prop="name" min-width="120" show-overflow-tooltip/>
       <el-table-column label="住址" align="center" prop="address" min-width="100" show-overflow-tooltip/>
       <el-table-column label="与申请人关系1" align="center" prop="relation1" min-width="110" show-overflow-tooltip/>
       <el-table-column label="姓名1" align="center" prop="name1" min-width="100" show-overflow-tooltip/>
@@ -698,10 +546,10 @@
     <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-item label="物理书架路径" prop="wlsjPath">
+        <el-form-item label="档案室密集柜路径" prop="wlsjPath" label-width="130px">
           <el-input
             v-model="dalsInfo.queryParams.wlsjPath"
-            placeholder="请输入物理书架路径"
+            placeholder="请输入档案室密集柜路径"
             clearable
             @keyup.enter.native="dalsInfoQuery"
           />
@@ -723,32 +571,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-column type="selection" width="50" align="center" />
+        <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="picName" min-width="100" show-overflow-tooltip/>-->
-        <el-table-column label="图片路径" align="center" prop="picUrl">
+        <el-table-column label="图片" align="center" prop="picUrl">
           <template slot-scope="scope">
             <image-preview :src="scope.row.picUrl" :width="40" :height="40"/>
           </template>
@@ -1082,7 +921,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 {

dangan-ui/src/views/dangan/zqz/index.vue

@@ -111,11 +111,11 @@
 
     <el-table v-loading="loading" :data="zqzList" border>
       <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>
-      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
+<!--      <el-table-column label="业务类型" align="center" prop="ywType" min-width="150" fixed show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="档案目录路径" align="center" fixed prop="muPath" min-width="150" show-overflow-tooltip/>
       <el-table-column label="编号" align="center" prop="num" min-width="100" show-overflow-tooltip/>
       <el-table-column label="申请人姓名" align="center" prop="name" min-width="100" show-overflow-tooltip/>