Merge remote-tracking branch 'origin/master'

src/views/archivesManage/archivesList/index.vue

@@ -351,15 +351,15 @@ export default {
           const selectedKey = this.$refs.smartTree.getCurrentNode()
           const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.data.dicCode
           this.treeCurrentNode = ele.$el
+          this.smartQuery = {
+            'archiveYear': null,
+            'department': null,
+            'retention': null,
+            'securityClass': null,
+            'organizationMatter': null
+          }
           if (ele.$el.classList.contains('is-current')) {
             this.treeCurrentNode.classList.remove('is-current')
-            this.smartQuery = {
-              'archiveYear': null,
-              'department': null,
-              'retention': null,
-              'securityClass': null,
-              'organizationMatter': null
-            }
           } else {
             this.treeCurrentNode.classList.add('is-current')
             switch (selectedParentVal) {

src/views/archivesManage/lendManage/components/archiveDetail.vue

@@ -16,13 +16,13 @@
           <p><span class="color-blue">借阅状态:</span><span :class="borrowStyle(otherInfo.borrow_type)">{{ otherInfo.borrow_type | borrowStatus }}</span></p>
           <p><span class="color-blue">操作时间:</span><span class="color-white">{{ otherInfo.create_time | parseTime }}</span></p>
         </div>
-        <el-table :data="tableData" style="margin-top:15px">
+        <el-table :data="tableData" max-height="400px" style="margin-top:15px;">
           <el-table-column type="index" label="序号" align="center" width="55" />
-          <el-table-column prop="categoryName" label="门类名称" align="center" min-width="100" />
-          <el-table-column prop="maintitle" label="题名" align="center" min-width="140" />
-          <el-table-column prop="archiveNo" label="档号" align="center" min-width="130" />
-          <el-table-column prop="caseName" label="盒名称" align="center" min-width="80" />
-          <el-table-column prop="folderLocationDetails" label="存放位置" align="center" min-width="200">
+          <el-table-column prop="categoryName" label="门类名称" align="center" min-width="120" />
+          <el-table-column prop="archiveNo" label="档号" align="center" width="160" show-overflow-tooltip />
+          <el-table-column prop="maintitle" label="题名" align="center" width="180" show-overflow-tooltip />
+          <el-table-column prop="caseName" label="盒名称" align="center" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="folderLocationDetails" label="存放位置" align="center" min-width="260">
             <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
               <div v-if="scope.row.folderLocationDetails.includes(',')">
                 <el-tag

src/views/archivesManage/lendManage/components/lendArchivesList.vue

@@ -15,11 +15,11 @@
       >
         <el-table-column type="selection" align="center" width="55" />
         <el-table-column type="index" label="序号" align="center" width="55" />
-        <el-table-column prop="categoryName" align="center" label="门类名称" min-width="85" />
-        <el-table-column prop="archiveNo" align="center" label="档号" min-width="85" />
-        <el-table-column prop="maintitle" align="center" label="题名" min-width="60" />
-        <el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
-        <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="130">
+        <el-table-column prop="categoryName" align="center" label="门类名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="archiveNo" align="center" label="档号" min-width="160" show-overflow-tooltip />
+        <el-table-column prop="maintitle" align="center" label="题名" min-width="180" show-overflow-tooltip />
+        <el-table-column prop="caseName" align="center" label="盒名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="300">
           <template slot-scope="scope">
             <div v-if="scope.row.folderLocationDetails.includes(',')">
               <el-tag
@@ -36,7 +36,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="borrowType" align="center" label="借阅状态" min-width="70">
+        <el-table-column prop="borrowType" align="center" label="借阅状态" min-width="100">
           <template slot-scope="scope">
             <!-- 待借阅 -->
             <span :class="borrowStyle(scope.row.borrowType)" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>

src/views/archivesManage/lendManage/lendQuery/index.vue

@@ -51,10 +51,10 @@
         </template>
       </el-table-column>
       <el-table-column prop="orderNo" align="center" label="单据号" width="140" />
-      <el-table-column prop="categoryName" align="center" label="门类名称" width="120" />
-      <el-table-column prop="archiveNo" align="center" label="档号" width="100" />
-      <el-table-column prop="maintitle" align="center" label="题名" width="140" />
-      <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
+      <el-table-column prop="categoryName" align="center" label="门类名称" width="120" show-overflow-tooltip />
+      <el-table-column prop="archiveNo" align="center" label="档号" width="160" show-overflow-tooltip />
+      <el-table-column prop="maintitle" align="center" label="题名" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="caseName" align="center" label="盒名称" width="120" show-overflow-tooltip />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="300">
         <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
           <div v-if="scope.row.folderLocationDetails.includes(',')">

src/views/archivesManage/lendManage/returnArchives/index.vue

@@ -33,10 +33,10 @@
       <el-table-column type="selection" :reserve-selection="true" align="center" width="55" />
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="orderNo" align="center" label="单据号" width="140" />
-      <el-table-column prop="categoryName" align="center" label="门类名称" width="120" />
-      <el-table-column prop="archiveNo" align="center" label="档号" width="100" />
-      <el-table-column prop="maintitle" align="center" label="题名" width="140" />
-      <el-table-column prop="caseName" align="center" label="盒名称" width="140" />
+      <el-table-column prop="categoryName" align="center" label="门类名称" width="120" show-overflow-tooltip />
+      <el-table-column prop="archiveNo" align="center" label="档号" min-width="160" show-overflow-tooltip />
+      <el-table-column prop="maintitle" align="center" label="题名" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="caseName" align="center" label="盒名称" width="120" show-overflow-tooltip />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="300">
         <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
           <div v-if="scope.row.folderLocationDetails.includes(',')">