出库/出入库记录 bug修正/档案盒详情

src/views/archivesManage/caseManage/caseList/module/detailDialog.vue

@@ -9,7 +9,7 @@
           <p class="right"><span class="color-blue">盒条码：</span><span class="color-white">{{ rowData.barcode }}</span></p>
         </div>
         <div class="dpflex">
-          <p class="left"><span class="color-blue">存放位置：</span><span class="color-white">{{ rowData.folderLocation }}</span></p>
+          <p class="left"><span class="color-blue">存放位置：</span><span class="color-white">{{ rowData.folderLocationDetails }}</span></p>
           <p class="right"><span class="color-blue">TID：</span><span class="color-white">{{ rowData.tid }}</span></p>
         </div>
         <p class="left"><span class="color-blue">创建时间：</span><span class="color-white">{{ rowData.create_time | parseTime }}</span></p>
@@ -25,7 +25,7 @@
           <el-table-column prop="securityClass" label="保密程度" align="center" width="150" />
           <el-table-column prop="department" label="部门名称" align="center" width="150" />
           <el-table-column prop="caseName" label="盒名称" align="center" width="150" />
-          <el-table-column prop="folderLocation" align="center" label="所在位置" width="180" />
+          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="180" />
           <el-table-column prop="create_time" align="center" label="创建时间" width="150">
             <template slot-scope="scope">
               <div>{{ scope.row.create_time | parseTime }}</div>

src/views/archivesManage/outInStorage/module/detailDialog.vue

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-dialog title="档案盒详情" :visible.sync="detailVisible">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <div class="dpflex">
+          <p class="left"><span class="color-blue">盒名称：</span><span class="color-white">{{ rowData.caseName }}</span></p>
+          <p class="right"><span class="color-blue">盒条码：</span><span class="color-white">{{ rowData.barcode }}</span></p>
+        </div>
+        <div class="dpflex">
+          <p class="left"><span class="color-blue">存放位置：</span><span class="color-white">{{ rowData.folderLocationDetails }}</span></p>
+          <p class="right"><span class="color-blue">TID：</span><span class="color-white">{{ rowData.tid }}</span></p>
+        </div>
+        <p class="left"><span class="color-blue">创建时间：</span><span class="color-white">{{ rowData.create_time | parseTime }}</span></p>
+        <el-table :data="tableData" style="margin-top:15px;height:373px">
+          <el-table-column type="index" label="序号" align="center" width="55" />
+          <el-table-column prop="child" label="子条数目" align="center" width="100" />
+          <el-table-column prop="categoryType" label="门类级别" align="center" width="100" />
+          <el-table-column prop="categoryName" label="门类名称" align="center" width="100" />
+          <el-table-column prop="fondsNo" label="全宗号" align="center" width="180" />
+          <el-table-column prop="archivesId" label="档号" align="center" width="220" />
+          <el-table-column prop="archiveYear" label="归档年度" align="center" width="150" />
+          <el-table-column prop="maintitle" :show-overflow-tooltip="true" align="center" label="题名" width="180" />
+          <el-table-column prop="securityClass" label="保密程度" align="center" width="150" />
+          <el-table-column prop="department" label="部门名称" align="center" width="150" />
+          <el-table-column prop="caseName" label="盒名称" align="center" width="150" />
+          <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="180" />
+          <el-table-column prop="create_time" align="center" label="创建时间" width="150">
+            <template slot-scope="scope">
+              <div>{{ scope.row.create_time | parseTime }}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      detailVisible: false,
+      rowData: {},
+      tableData: []
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-dialog{
+  width: 950px;
+  height: 520px;
+}
+::v-deep .el-dialog__body{
+  padding: 20px 0;
+}
+.dpflex{
+  display: flex;
+  p{
+    margin-bottom: 20px;
+  }
+  .left{
+    width: 400px;
+  }
+}
+.color-blue{
+    width: 86px;
+    display: inline-block;
+    text-align: right;
+    color: #339CFF;
+}
+.color-white{
+  color: #fff;
+}
+::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
+    position: absolute;
+    right: -160px;
+    bottom: -10px;
+}
+</style>

src/views/archivesManage/outInStorage/outInHistory/index.vue

@@ -36,6 +36,7 @@
       :loading="crud.downloadLoading"
       :cell-class-name="cell"
       @row-click="clickRowHandler"
+      @row-dblclick="handleDbClick"
       @selection-change="selectionChangeHandler"
     >
       <el-table-column type="selection" width="55" />
@@ -62,6 +63,8 @@
     </el-table>
     <!-- 分页 -->
     <pagination />
+    <!-- 档案盒详情 -->
+    <detailDialog ref="detailDom" />
   </div>
 </template>
 
@@ -71,11 +74,12 @@ import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
 // import crudOperation from '@crud/CRUD.operation'
 import { exportFile } from '@/utils/index'
+import detailDialog from '../module/detailDialog.vue'
 
 // exportFile内容
 export default {
   name: 'OutInHistory',
-  components: { rrOperation, pagination },
+  components: { rrOperation, pagination, detailDialog },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
@@ -92,6 +96,9 @@ export default {
   },
   data() {
     return {
+      permission: {
+        download: ['admin', 'permission:download']
+      },
       msgVisible: false,
       selections: [],
       keyWord: '',
@@ -157,7 +164,23 @@ export default {
       this.crud.downloadLoading = true
       exportFile(this.baseApi + '/api/storage/exportStorageLogList')
       this.crud.downloadLoading = false
+    },
+    // 双击 详情
+    handleDbClick(row) {
+      // console.log(row, 'row')
+      this.$refs.detailDom.rowData = row
+      // const params = {
+      //   caseId: row.id
+      //   // caseId: '1716F6C668C83A929C738B'
+      // }
+      // this.crud.crudMethod.findInCase(params).then(res => {
+      //   if (res) {
+      //     this.$refs.detailDom.tableData = res.archives
+      //   }
+      // })
+      this.$refs.detailDom.detailVisible = true
     }
+
   }
 }
 </script>

src/views/archivesManage/outInStorage/outStorage/index.vue

@@ -33,6 +33,7 @@
       :data="crud.data"
       :cell-class-name="cell"
       @row-click="clickRowHandler"
+      @row-dblclick="handleDbClick"
       @selection-change="selectionChangeHandler"
     >
       <el-table-column type="selection" width="55" />
@@ -68,6 +69,8 @@
         </div>
       </div>
     </el-dialog>
+    <!-- 档案盒详情 -->
+    <detailDialog ref="detailDom" />
   </div>
 </template>
 
@@ -77,10 +80,11 @@ import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
 // import { grant } from '@/api/archivesManage/outInStorage'
+import detailDialog from '../module/detailDialog.vue'
 
 export default {
   name: 'OutInStorage',
-  components: { rrOperation, pagination },
+  components: { rrOperation, pagination, detailDialog },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
@@ -127,6 +131,21 @@ export default {
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row) // 单击选中
     },
+    // 双击 详情
+    handleDbClick(row) {
+      // console.log(row, 'row')
+      this.$refs.detailDom.rowData = row
+      // const params = {
+      //   caseId: row.id
+      //   // caseId: '1716F6C668C83A929C738B'
+      // }
+      // this.crud.crudMethod.findInCase(params).then(res => {
+      //   if (res) {
+      //     this.$refs.detailDom.tableData = res.archives
+      //   }
+      // })
+      this.$refs.detailDom.detailVisible = true
+    },
     selectionChangeHandler(val) {
       this.selections = val
       // console.log(val, '-----')