文件柜层位

src/views/archivesMIOD/miodLibrary/module/detail.vue

@@ -72,7 +72,7 @@
                 v-loading="archivesFiledataLoading"
                 :data="archivesFiledata"
                 style="min-width: 100%;"
-                height="calc(100vh - 796px)"
+                height="calc(100vh - 786px)"
               >
                 <el-table-column prop="reg_no" label="登记号" show-overflow-tooltip min-width="140" />
                 <el-table-column prop="details_type" label="类型" min-width="85">
@@ -96,7 +96,7 @@
                     <span v-else class="row-state defalut-state">未绑定</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="pass_cell" label="所在层位" min-width="120" />
+                <el-table-column prop="folder_location" label="所在层位" min-width="120" />
                 <el-table-column v-if="!isMidoRecord" prop="update_time" label="操作" min-width="140">
                   <template slot-scope="scope">
                     <div style="display: inline-block;">
@@ -595,9 +595,10 @@ export default {
       }
 
       FetchInitDocumentDetailsList(params).then(data => {
-        // id,parents_id,reg_no,details_type,pass_location,read_type,tid,is_destroy,create_by,create_time,update_by,update_time
-        // id，公文id，登记号，文件类别（1.原文 2.复印件），传阅所在位置，传阅状态，tid，是否销毁，创建人，创建时间，更新人，更新时间
+        // id,parents_id,reg_no,details_type,pass_location,folder_location,read_type,tid,is_destroy,create_by,create_time,update_by,update_time
+        // id，公文id，登记号，文件类别（1.原文 2.复印件），传阅所在位置，所在层位，传阅状态，tid，是否销毁，创建人，创建时间，更新人，更新时间
         const jsonData = this.convertData(data)
+        console.log('jsonData', jsonData)
         this.archivesFiledata = jsonData
         this.archivesFiledataLoading = false
       }).catch(error => {
@@ -608,7 +609,7 @@ export default {
     convertData(data) {
       return data.map(item => {
         const fieldNames = [
-          'id', 'parents_id', 'reg_no', 'details_type', 'pass_location',
+          'id', 'parents_id', 'reg_no', 'details_type', 'pass_location', 'folder_location',
           'read_type', 'tid', 'is_destroy', 'create_by', 'create_time',
           'update_by', 'update_time'
         ]
@@ -893,7 +894,6 @@ export default {
             : this.parentInfo.parents_id
           : this.parentInfo.id
       }
-      console.log('param', param)
       FetchInitBorrowerListOrderNo(param)
         .then(res => {
           if (res && res.length > 0) {

src/views/archivesMIOD/‌filingCabinet/index.vue

@@ -141,7 +141,7 @@
           v-loading="borrowerListLoading"
           :data="borrowerList"
           row-key="id"
-          height="300px"
+          height="440px"
         >
           <el-table-column prop="borrowName" label="借阅者名称" />
           <el-table-column prop="borrowType" label="借阅者类型">
@@ -152,7 +152,11 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="borrowNo" label="借阅证号" />
+          <el-table-column prop="borrowNo" label="借阅证号">
+            <template slot-scope="scope">
+              {{ scope.row.borrowNo || '-' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="cabinetId" label="已绑定位置">
             <template slot-scope="scope">
               {{ scope.row.cabinetId ? String(scope.row.cabinetId).padStart(2, '0') : '-' }}
@@ -165,7 +169,7 @@
           </el-table-column>
         </el-table>
         <el-pagination
-          :current-page="borrowerPage.current"
+          :current-page="borrowerPage.current+1"
           :page-size="borrowerPage.size"
           :total="borrowerPage.total"
           :page-sizes="[10, 20, 50, 100]"
@@ -476,7 +480,7 @@ export default {
       })
     },
     handleBorrowerPageChange(page) {
-      this.borrowerPage.current = page
+      this.borrowerPage.current = page - 1
       this.getBorrowerList()
     },
     handleBorrowerSizeChange(size) {
@@ -721,10 +725,10 @@ export default {
   &::before{
     content: '';
     display: inline-block;
-    width: 6px;
+    width: 4px;
     height: 16px;
     background: #1890ff;
-    margin-right: 4px;
+    margin-right: 6px;
   }
 }
 </style>