出入库管理出库 人工确认

src/api/archivesManage/outInStorage.js

@@ -53,6 +53,30 @@ export function grant(params) {
   })
 }
 
+// 出库 人工确认
+export function grantConfirm(params) {
+  return request({
+    url: 'api/storage/grantConfirm',
+    method: 'post',
+    data: params
+  })
+}
+
+// 出入库详情
+export function initStorageLogDetailes(params) {
+  return request({
+    url: 'api/storage/initStorageLogDetailes' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
+  })
+}
+// 出入库记录列表
+export function initStorageLogList(data) {
+  return request({
+    url: 'api/storage/initStorageLogList',
+    method: 'get',
+    data
+  })
+}
 // 出入库记录 导出
 export function exportStorageLogList(params) {
   return request({
@@ -60,6 +84,7 @@ export function exportStorageLogList(params) {
     method: 'get'
   })
 }
+
 export default {
   initCaseByArchives,
   isOccupy,
@@ -67,5 +92,8 @@ export default {
   grant,
   exportStorageLogList,
   readyCollectConfirm,
-  collectConfirm
+  collectConfirm,
+  initStorageLogDetailes,
+  initStorageLogList,
+  grantConfirm
 }

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

@@ -186,7 +186,7 @@ export default {
     },
     // 双击 详情
     handleDbClick(row) {
-      // console.log(row, 'row')
+      console.log(row, 'row')
       this.$refs.detailDom.rowData = row
       // const params = {
       //   caseId: row.id

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

@@ -63,16 +63,32 @@
     <!-- 分页 -->
     <pagination />
     <!-- 出库弹框 -->
-    <el-dialog title="出库" :visible.sync="msgVisible">
+    <el-dialog title="出库" :visible.sync="outVisible" :close-on-click-modal="false">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <p>确定将当前选中的档案全部出库?</p>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="handleConfirm">确认</el-button>
+          <el-button type="primary" :loading="crud.downloadLoading" @click="handleConfirm">确认</el-button>
         </div>
       </div>
     </el-dialog>
+    <!-- 出库 有待入存在 弹框 -->
+    <el-dialog title="提示" :visible.sync="msgVisible" :close-on-click-modal="false">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <p>当前档案盒正在出库，请勿重复操作</p>
+      </div>
+    </el-dialog>
+    <!-- 人工确认弹窗 弹框 -->
+    <el-dialog title="提示" :visible.sync="handVisible" :close-on-click-modal="false">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <p>当前档案盒状态不为“待出”，不可人工确认</p>
+      </div>
+    </el-dialog>
     <!-- 档案盒详情 -->
     <detailDialog ref="detailDom" />
   </div>
@@ -83,7 +99,7 @@
 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 { grant, grantConfirm } from '@/api/archivesManage/outInStorage'
 import detailDialog from '../module/detailDialog.vue'
 
 export default {
@@ -100,7 +116,9 @@ export default {
   },
   data() {
     return {
+      outVisible: false,
       msgVisible: false,
+      handVisible: false,
       keyWord: '',
       // keyWord: {
       //   caseName: '',
@@ -137,7 +155,7 @@ export default {
     },
     // 双击 详情
     handleDbClick(row) {
-      // console.log(row, 'row')
+      console.log(row, 'row')
       this.$refs.detailDom.rowData = row
       // const params = {
       //   caseId: row.id
@@ -156,24 +174,53 @@ export default {
     },
     // 出库
     handleOut() {
-      this.msgVisible = true
+      const bool = this.selections.every(item => item.storageType === 2)
+      if (bool) {
+        this.outVisible = true
+      } else {
+        this.msgVisible = true
+      }
     },
     // 人工确认
     handleManual() {
-
+      const bool = this.selections.every(item => item.storageType === 3)
+      if (bool) {
+        const params = this.selections.map(item => { return item.id })
+        grantConfirm(params).then(res => {
+          console.log(res, '--人工出库')
+          if (res) {
+            this.$message({
+              message: '出库成功！',
+              type: 'success'
+            })
+            this.crud.refresh()
+          } else {
+            this.$message.error('出库失败！')
+          }
+        })
+      } else {
+        this.handVisible = true
+      }
     },
     handleConfirm() {
       // console.log(this.selections, 'sel')
+      this.crud.downloadLoading = true
       const params = this.selections.map(item => { return item.id })
       console.log(params, 'params')
       grant(params).then(res => {
         // console.log(res, '--res')
-        this.msgVisible = false
-        this.$message({
-          message: `成功出库${res}盒！`,
-          type: 'success'
-        })
-        this.crud.refresh()
+        if (res) {
+          this.crud.downloadLoading = false
+          this.$message({
+            message: '出库成功！',
+            type: 'success'
+          })
+          this.outVisible = false
+          this.crud.refresh()
+        } else {
+          this.$message.error('出库失败！')
+          this.crud.downloadLoading = false
+        }
       })
     },
     // 单元格样式
@@ -197,6 +244,7 @@ export default {
 @import '~@/assets/styles/lend-manage.scss';
 .setting-dialog{
   color: #fff;
+  font-size: 16px;
 }
 .dpflex{
   justify-content: space-between;