档案导入修改

src/views/archivesManage/fileImport/importLog/index.vue

@@ -56,7 +56,9 @@ export default {
       reset: true,
       download: false,
       group: false
-    }})
+    },
+    sort: ['create_time,desc']
+    })
   },
   mixins: [presenter(), header(), crud()],
   data() {
@@ -79,7 +81,7 @@ export default {
     handleDbClick(row) {
       this.zipSelect = row
       this.detailVisible = true
-      crudFileImport.FetchInitImportLogDetail({ zipid: row.id, type: 1 }).then(res => {
+      crudFileImport.FetchInitImportLogDetail({ page: 0, size: 10, zipid: row.id, type: 1 }).then(res => {
         this.$refs.importTableList.tableData = res.content
         this.$refs.importTableList.page.total = res.totalElements
       })

src/views/archivesManage/fileImport/module/detail.vue

@@ -2,8 +2,8 @@
   <div class="import-detail-container">
     <div v-if="isLogOrPreview === 'log'" class="import-data-number">
       <p>导入方式：<span style="color: #339cff;">{{ importType }}</span></p>
-      <p>成功读取数据：<span style="color:rgb(246,81,99)">{{ importData }}</span> 条</p>
-      <p>成功导入数据：<span style="color: #1AAE93;">{{ readData }}</span> 条</p>
+      <p>成功读取数据：<span style="color:rgb(246,81,99)">{{ readData }}</span> 条</p>
+      <p>成功导入数据：<span style="color: #1AAE93;">{{ importData }}</span> 条</p>
     </div>
     <ul class="import-tab">
       <li :class="{'active': archivesTabIndex == 0}" @click="changeActiveTab(0)">案卷</li>
@@ -14,25 +14,83 @@
       ref="table"
       :data="tableData"
       style="width: 100%"
-      height="calc(100vh - 504px)"
+      height="calc(100vh - 500px)"
       @row-click="clickRowHandler"
       @selection-change="selectionChangeHandler"
     >
+      <el-table-column v-if="isLogOrPreview === 'log'" prop="status" label="状态" align="center" width="80px">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status===1" type="success">导入</el-tag>
+          <el-tag v-if="scope.row.status===2">跳过</el-tag>
+          <el-tag v-if="scope.row.status===3" type="warning">覆盖</el-tag>
+          <el-tag v-if="scope.row.status===4" type="danger">失败</el-tag>
+        </template>
+      </el-table-column>
+      <!-- 资料 -->
+      <el-table-column v-if=" archivesTabIndex == 2" prop="serialNo" label="序号" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveDate" label="收发日期" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveClass" label="收发类别" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveNo" label="类别编号" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveMark" label="收发标识" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="sourcePartNo" label="源份号" align="center" width="80px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="docNo" label="发文字号" align="center" width="120px" />
+      <!-- 案卷 / 文件 / 资料 -->
       <el-table-column prop="securityClass" label="密级" align="center" width="80px" />
-      <el-table-column prop="mediumType" label="载体类型" align="center" width="100px" />
-      <el-table-column prop="microfilm" label="缩微号" align="center" width="80px" />
-      <el-table-column prop="archiveNo" label="档号" align="center" width="240px" />
-      <el-table-column prop="pieceQty" label="文件件数" align="center" width="100px" />
-      <el-table-column prop="maintitle" label="案卷题名" align="center" show-overflow-tooltip width="240px" />
-      <el-table-column prop="beginDate" label="起始时间" align="center" width="140px" />
-      <el-table-column prop="endDate" label="终止时间" align="center" width="140px" />
+      <!-- 案卷 / 文件 -->
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="mediumType" label="载体类型" align="center" width="100px" />
+      <!-- 资料 -->
+      <el-table-column v-if="archivesTabIndex == 2" prop="recordType" label="公文种类" align="center" width="100px" />
+      <!-- 文件 -->
+      <el-table-column v-if=" archivesTabIndex == 1" prop="recordType" label="文种" align="center" width="80px" />
+      <el-table-column v-if=" archivesTabIndex == 1" prop="documentNo" label="文件编号" align="center" width="100px" />
+      <!-- 案卷 / 文件 -->
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="microfilm" label="缩微号" align="center" width="80px" />
+      <!-- 文件 -->
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="fileNo" label="电子文件号" align="center" width="120px" />
+      <!-- 案卷 / 文件 -->
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="archiveNo" label="档号" align="center" width="240px" />
+      <!-- 文件 -->
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="maintitle" label="题名" align="center" width="80px" />
+
+      <!-- 资料 -->
+      <el-table-column v-if="archivesTabIndex == 2" prop="createdDate" label="成文日期" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="organizer" label="承办单位" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="undertaker" label="承办人" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="endorsementLeader" label="签批领导" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="readingLeader" label="阅文领导" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="arriveOrgan" label="发文机关" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="sendOrgan" label="主送机关" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="copyOrgan" label="抄送机关" align="center" width="100px" />
+
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="version" label="文本" align="center" width="80px" />
+      <el-table-column v-if="archivesTabIndex == 1" prop="responsibleby" label="责任者" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1" prop="created_date" label="时间" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumQty" label="载体数量" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumUnit" label="载体单位" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumSpecs" label="载体规格" align="center" width="100px" />
+      <!-- 案卷 -->
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 2" prop="pieceQty" label="文件件数" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="tempNo" label="临时卷号" align="center" width="100px" />
+
+      <el-table-column v-if="archivesTabIndex == 0" prop="maintitle" label="案卷题名" align="center" show-overflow-tooltip width="240px" />
+      <el-table-column v-if="archivesTabIndex == 0" prop="beginDate" label="起始时间" align="center" width="140px" />
+      <el-table-column v-if="archivesTabIndex == 0" prop="endDate" label="终止时间" align="center" width="140px" />
+      <!-- 案卷 / 文件 -->
       <el-table-column prop="archiveCtgNo" label="分类号" align="center" width="140px" />
       <el-table-column prop="keyword" label="主题词" align="center" width="140px" />
       <el-table-column prop="remarks" label="附注" align="center" width="120px" />
-      <el-table-column prop="retention" label="保管期限" align="center" width="120px" />
+      <!-- 资料 -->
+      <el-table-column v-if=" archivesTabIndex ==2" prop="dividedQty" label="已分份数" align="center" width="120px" />
+
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="retention" label="保管期限" align="center" width="120px" />
       <el-table-column prop="archiveYear" label="年度" align="center" width="100px" />
-      <el-table-column prop="fondsNo" label="全宗" align="center" width="100px" />
-      <el-table-column prop="recordNo" label="卷号" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="fondsNo" label="全宗" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="recordNo" label="卷号" align="center" width="100px" />
+      <!-- 文件 -->
+      <el-table-column v-if=" archivesTabIndex ==1" prop="pieceNo" label="件号" align="center" width="100px" />
+      <!-- 资料 -->
+      <el-table-column v-if=" archivesTabIndex ==2" prop="fileQty" label="归档份数" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex ==2" prop="classSerialNo" label="类别序号" align="center" width="100px" />
     </el-table>
     <!--分页组件-->
     <el-pagination
@@ -85,6 +143,7 @@ export default {
   },
   methods: {
     changeActiveTab(index) {
+      this.page.page = 1
       this.archivesTabIndex = index
       this.getList()
       this.getTotalInfo()
@@ -97,11 +156,11 @@ export default {
       } else if (this.archivesTabIndex === 1) {
         this.importType = this.zipSelect.archivesImportType === 1 ? '跳过' : '覆盖'
         this.readData = this.zipSelect.daNum
-        this.importData = this.zipSelect.daNum
+        this.importData = this.zipSelect.daOkNum
       } else if (this.archivesTabIndex === 2) {
         this.importType = this.zipSelect.informationInputType === 1 ? '跳过' : '覆盖'
         this.readData = this.zipSelect.djNum
-        this.importData = this.zipSelect.djNum
+        this.importData = this.zipSelect.djOkNum
       }
     },
     getList() {
@@ -115,12 +174,16 @@ export default {
           this.page.total = res.list.totalElements
         })
       } else {
-        crudFileImport.FetchInitImportLogDetail({ page: this.page.page - 1, size: this.page.size, zipid: this.zipSelect.id, type: this.archivesTabIndex + 1 }).then(res => {
-          console.log(res)
+        let page = this.page.page - 1
+        if (page === -1) {
+          page = 0
+        }
+        crudFileImport.FetchInitImportLogDetail({ page: page, size: this.page.size, zipid: this.zipSelect.id, type: this.archivesTabIndex + 1 }).then(res => {
           this.tableData = res.content
           this.page.total = res.totalElements
         })
       }
+      this.doLayout()
     },
     // table
     clickRowHandler(row) {
@@ -136,7 +199,13 @@ export default {
       this.getList()
     },
     handleCurrentPage(val) {
-      this.page.page = val - 1
+      this.page.page = val
+      this.getList()
+    },
+    doLayout() {
+      this.$nextTick(() => {
+        this.$refs.table.doLayout()
+      })
     }
   }
 }
@@ -186,4 +255,9 @@ export default {
     }
   }
 }
+.el-tag.el-tag--success{
+  color: #1aae93;
+  border-color: #1aae93;
+  background-color: transparent !important;
+}
 </style>