档案管理

.env.development

@@ -3,16 +3,16 @@ ENV = 'development'
 # 接口地址
 
 #内网服务地址
-VUE_APP_BASE_API  = 'http://192.168.99.207:7070'
-VUE_APP_WS_API = 'ws://192.168.99.207:7071'
+#VUE_APP_BASE_API  = 'http://192.168.99.207:7070'
+#VUE_APP_WS_API = 'ws://192.168.99.207:7071'
 
 # 刘力-本地服地址
 #VUE_APP_BASE_API  = 'http://192.168.99.65:7070'
 #VUE_APP_WS_API = 'ws://192.168.99.65:7071'
 
 # 许镇-本地服地址
-#VUE_APP_BASE_API  = 'http://192.168.99.84:7070'
-#VUE_APP_WS_API = 'ws://192.168.99.84:7070'
+VUE_APP_BASE_API  = 'http://192.168.99.84:7070'
+VUE_APP_WS_API = 'ws://192.168.99.84:7070'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

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

@@ -13,7 +13,7 @@
           <p><span class="color-blue">电话号码:</span><span class="color-white">{{ borrowerInfo.phone }}</span></p>
           <p><span class="color-blue">借阅目的:</span><span class="color-white">{{ otherInfo.purpose }}</span></p>
           <p><span class="color-blue">借阅日期:</span><span class="color-white">{{ lendDatesInfo }}</span></p>
-          <p><span class="color-blue">借阅状态:</span><span class="cell-lend no-lend">{{ otherInfo.borrow_type | borrowStatus }}</span></p>
+          <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">
@@ -42,7 +42,7 @@
           <el-table-column prop="borrowType" label="借阅状态" align="center" min-width="100">
             <template slot-scope="scope">
               <!-- 待借阅 / 逾期 have-lend / 待归还 / 已归还 has-return -->
-              <span class="cell-lend no-lend" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>
+              <span :class="borrowStyle(scope.row.borrowType)" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>
             </template>
           </el-table-column>
         </el-table>

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

@@ -39,7 +39,7 @@
         <el-table-column prop="borrowType" align="center" label="借阅状态" min-width="70">
           <template slot-scope="scope">
             <!-- 待借阅 -->
-            <span class="cell-lend no-lend" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>
+            <span :class="borrowStyle(scope.row.borrowType)" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" align="center" label="操作时间" min-width="120">
@@ -49,6 +49,7 @@
         </el-table-column>
       </el-table>
     </div>
+    <!-- 异常处理 -->
     <el-dialog title="异常处理" :visible.sync="exceptionVisible" :close-on-click-modal="false" :before-close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
@@ -101,17 +102,22 @@ export default {
   methods: {
     // 档案异常处理
     handleBorrowException() {
-      this.exceptionVisible = true
+      const index = this.selections.findIndex(item => item.borrowType === -1)
+      if (index === -1) {
+        this.exceptionVisible = true
+      } else {
+        this.$message.error('当前档案为异常状态，请勿重复操作!')
+        return
+      }
     },
     // 确认加入异常
     handleExceptionConfirm() {
-      this.tableLoading = true
-      const params = this.selections.map(item => item.archivesId)
+      const params = this.selections.map(item => item.id)
       FetchBorrowException(params).then(data => {
         if (data === this.selections.length) {
           this.$message.success('已成功加入异常!')
           this.exceptionVisible = false
-          this.tableLoading = false
+          this.getArchivesTable()
         }
       })
     },

src/views/archivesManage/lendManage/mixins/lending.js

@@ -78,6 +78,12 @@ export const lendingCrud = {
           return 'cell-lend have-lend'
         case '已归还':
           return 'cell-lend has-return'
+        case -1:
+          return 'cell-lend have-lend'
+        case 5:
+          return 'cell-lend have-lend'
+        case 4:
+          return 'cell-lend has-return'
         default:
           return 'cell-lend no-lend '
       }

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

@@ -50,10 +50,10 @@
         </template>
       </el-table-column>
       <el-table-column prop="depositNum" label="已装" align="center" width="100" />
-      <el-table-column prop="caseName" label="盒名称" align="center" min-width="200" />
+      <el-table-column prop="caseName" label="盒名称" align="center" min-width="100" />
       <el-table-column prop="tid" label="TID" align="center" min-width="200" />
-      <el-table-column prop="barcode" label="条形码" align="center" width="100" />
-      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="130">
+      <el-table-column prop="barcode" label="条形码" align="center" min-width="100" />
+      <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="260">
         <template slot-scope="scope">
           <div v-if="scope.row.folderLocationDetails.includes(',')">
             <el-tag

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

@@ -195,6 +195,7 @@ export default {
             this.crud.refresh()
           } else {
             this.$message.error('出库失败！')
+            this.outVisible = false
           }
         })
       } else {
@@ -216,6 +217,7 @@ export default {
         } else {
           this.$message.error('出库失败！')
           this.crud.downloadLoading = false
+          this.outVisible = false
         }
       })
     },