From 77a8711bc54e408aa1dab21e95af307c373c5901 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Tue, 19 Jul 2022 16:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=85=A5=E5=BA=93/=E5=87=BA=E5=BA=93/bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archivesManage/outInStorage.js        | 10 +++--
 .../outInStorage/inStorage/index.vue          |  4 +-
 .../inStorage/module/inDialog.vue             | 41 ++++++++++++++-----
 .../outInStorage/outInHistory/index.vue       | 13 +++---
 .../outInStorage/outStorage/index.vue         | 26 ++++++------
 5 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/api/archivesManage/outInStorage.js b/src/api/archivesManage/outInStorage.js
index e2d0775..15686e7 100644
--- a/src/api/archivesManage/outInStorage.js
+++ b/src/api/archivesManage/outInStorage.js
@@ -20,16 +20,18 @@ export function isOccupy(params) {
 // 入库
 export function collect(params) {
   return request({
-    url: 'api/storage/collect' + '?' + qs.stringify(params, { indices: false }),
-    method: 'post'
+    url: 'api/storage/collect',
+    method: 'post',
+    data: params
   })
 }
 
 // 出库
 export function grant(params) {
   return request({
-    url: 'api/storage/grant' + '?' + qs.stringify(params, { indices: false }),
-    method: 'post'
+    url: 'api/storage/grant',
+    method: 'post',
+    data: params
   })
 }
 // 出入库记录 导出
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index 1cb8d29..22e9ca9 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -45,7 +45,7 @@
         <template slot-scope="scope">
           <!-- 未入 / 待入 -->
           <span v-if="scope.row.storageType===0" class="clear" style="width:56px">未入</span>
-          <span v-if="scope.row.storageType===1" class="clear" style="width:56px">未入</span>
+          <span v-if="scope.row.storageType===1" class="clear" style="width:56px">待入</span>
         </template>
       </el-table-column>
       <el-table-column prop="depositNum" align="center" label="已装" min-width="80" />
@@ -180,7 +180,7 @@ export default {
     // 人工确认
     handleManual() {
       if (this.selections.length > 0) {
-        const bool = this.selections.every(item => item.inState === '待入')
+        const bool = this.selections.every(item => item.storageType === 1)
         if (bool) { // 全是'待入'状态弹出成功提示
           this.msgSuccessVisible = true
         } else { // 否则提示
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
index 5a27b0f..74a57fd 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 入库状态下 -->
-    <el-dialog title="入库" :visible.sync="dialogVisible">
+    <el-dialog title="入库" :visible.sync="dialogVisible" @close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
@@ -12,7 +12,14 @@
           <!-- 左侧 -->
           <div class="content-left">
             <!-- <el-tree ref="archivesTree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" /> -->
-            <el-tree ref="archivesTree" :data="treeData" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
+            <el-tree
+              ref="tree"
+              :data="treeData"
+              :props="defaultProps"
+              node-key="id"
+              highlight-current
+              @node-click="handleNodeClick"
+            />
           </div>
           <!-- 右侧 -->
           <div class="content-right">
@@ -120,8 +127,11 @@
 
 <script>
 import { isOccupy, collect } from '@/api/archivesManage/outInStorage'
+import { crud } from '@crud/crud'
+// import qs from 'qs'
 
 export default {
+  mixins: [crud()],
   data() {
     return {
       dialogVisible: false,
@@ -146,8 +156,8 @@ export default {
         { value: '1', label: '左边' },
         { value: '2', label: '右边' }
       ],
-      isOccupy: [] //
-      // 回转柜
+      isOccupy: [],
+      deviceType: null // 1密集架 2回转柜
     }
   },
   computed: {
@@ -165,9 +175,11 @@ export default {
       if (data.cnName === '密集架') {
         const obj = { colNum: '', sectionNum: '', levelNum: '', direction: '' }
         this.numArr = this.childArr(obj)
+        this.deviceType = 1
       } else if (data.cnName === '回转柜') {
         const obj = { cabCol: '', cabLevel: '' }
         this.numArr = this.childArr(obj)
+        this.deviceType = 2
       }
     },
     // 计算
@@ -192,14 +204,14 @@ export default {
       }
       if (bool === 0) {
         const params = {
-          deviceId: 'FA0B05E2728EA8129A9F15',
-          position: '1-1-3-4-1',
-          // deviceId: 'DE1517EF06F7511FFF19C0',
+          // deviceId: 'FA0B05E2728EA8129A9F15', //状态改为已入
           // position: '1-1-3-4-1',
-          deviceType: '1'
+          deviceId: '3734A977C269ABEF6E284C', // 待入
+          position: '1-5-6-2-1',
+          deviceType: this.deviceType
         }
         const res = await isOccupy(params).then(res => {
-          console.log(res, '--res')
+          console.log(res, 'isOccupy--res')
           return res
         })
         // 按钮变化
@@ -230,8 +242,17 @@ export default {
       console.log(params, '==========')
       collect(params).then(data => {
         console.log(data, 'data')
+        this.dialogVisible = false
+        this.$message({
+          message: '入库成功！',
+          type: 'success'
+        })
+        this.crud.refresh()
+        this.cnName = null
       })
-      this.dialogVisible = false
+    },
+    handleClose() {
+      this.cnName = null
     }
   }
 
diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue
index 9adaf5a..9d52772 100644
--- a/src/views/archivesManage/outInStorage/outInHistory/index.vue
+++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue
@@ -44,11 +44,10 @@
       <el-table-column type="index" label="序号" align="center" width="80" />
       <el-table-column prop="storageType" label="状态" align="center" width="90">
         <template slot-scope="scope">
-          <!-- 未入 / 待入 -->
-          <span v-if="scope.row.storageType===0" class="clear" style="width:56px">未入</span>
           <span v-if="scope.row.storageType===1" class="clear" style="width:56px">待入</span>
           <span v-if="scope.row.storageType===2" class="clear" style="width:56px">已入</span>
           <span v-if="scope.row.storageType===3" class="clear" style="width:56px">待出</span>
+          <span v-if="scope.row.storageType===4" class="clear" style="width:56px">已出</span>
         </template>
       </el-table-column>
       <el-table-column prop="depositNum" label="已装" align="center" width="100" />
@@ -161,13 +160,13 @@ export default {
     },
     // 单元格样式
     cell({ row, columnIndex }) {
-      if (row.storageType === 0 && columnIndex === 2) { // 未入
+      if (row.storageType === 1 && columnIndex === 2) { // 待入
         return 'fail-clear'
-      } else if (row.storageType === 1 && columnIndex === 2) { // 待入
-        return 'no-clear'
-      } else if (row.storageType === 2 && columnIndex === 2) { // 已入
+      } else if (row.storageType === 2 && columnIndex === 2) { // 待出
         return 'have-clear'
-      } else if (row.storageType === 3 && columnIndex === 2) { // 待出
+      } else if (row.storageType === 3 && columnIndex === 2) { // 已入
+        return 'no-clear'
+      } else if (row.storageType === 4 && columnIndex === 2) { // 已出
         return 'other-clear'
       }
     },
diff --git a/src/views/archivesManage/outInStorage/outStorage/index.vue b/src/views/archivesManage/outInStorage/outStorage/index.vue
index bc2daf6..348de3a 100644
--- a/src/views/archivesManage/outInStorage/outStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/outStorage/index.vue
@@ -83,7 +83,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 } from '@/api/archivesManage/outInStorage'
 import detailDialog from '../module/detailDialog.vue'
 
 export default {
@@ -156,27 +156,25 @@ export default {
     },
     // 出库
     handleOut() {
-      if (this.selections.length > 0) {
-        this.msgVisible = true
-      } else {
-        this.$message({
-          message: '请选择档案',
-          type: 'warning'
-        })
-      }
+      this.msgVisible = true
     },
     // 人工确认
     handleManual() {
 
     },
     handleConfirm() {
-      this.msgVisible = false
       // console.log(this.selections, 'sel')
-      const params = this.selections.map(item => { return item.archivesId })
+      const params = this.selections.map(item => { return item.id })
       console.log(params, 'params')
-      // grant(params).then(res=>{
-      //   console.log(res,'--res');
-      // })
+      grant(params).then(res => {
+        // console.log(res, '--res')
+        this.msgVisible = false
+        this.$message({
+          message: `成功出库${res}盒！`,
+          type: 'success'
+        })
+        this.crud.refresh()
+      })
     },
     // 单元格样式
     cell({ row, columnIndex }) {