入库管理和征集品提用-增加待归还和已归还筛选

src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 // export const baseURL = '666初始地址'
 const service = axios.create({
-  // baseURL: 'http://192.168.0.135:8006',
-  baseURL: '',
+  baseURL: 'http://192.168.0.135:8006',
+  // baseURL: '',
   timeout: 5000
 })
 

src/views/collect/collect1.vue

@@ -112,7 +112,8 @@ export default {
         { txt: '全部', num: 0 },
         { txt: '待审核', num: 0 },
         { txt: '待办理', num: 0 },
-        { txt: '已完成', num: 0 },
+        { txt: '待归还', num: 0 },
+        { txt: '已归还', num: 0 },
         { txt: '审核不通过', num: 0 }
       ],
       type: '',
@@ -180,10 +181,14 @@ export default {
           this.myData.status = 0
           this.getList(this.myData)
         } else if (index === 3) {
-          // 点击已完成
+          // 点击待归还
           this.myData.status = 3
           this.getList(this.myData)
         } else if (index === 4) {
+          // 点击已归还
+          this.myData.status = 4
+          this.getList(this.myData)
+        } else if (index === 5) {
           // 点击审核不通过
           this.myData.status = 2
           this.getList(this.myData)
@@ -312,16 +317,19 @@ export default {
     let num2 = 0
     let num3 = 0
     let num4 = 0
+    let num5 = 0
     res.data.list.forEach(v => {
       if (v.status === 1) num1++
       if (v.status === 0) num2++
       if (v.status === 3) num3++
-      if (v.status === 2) num4++
+      if (v.status === 4) num4++
+      if (v.status === 2) num5++
     })
     this.stateArr[1].num = num1
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
+    this.stateArr[5].num = num5
     // 获取用户角色权限标识
     let temp = localStorage.getItem('daliCK')
     temp = JSON.parse(temp)

src/views/holding/holding2.vue

@@ -112,7 +112,8 @@ export default {
         { txt: '全部', num: 0 },
         { txt: '待审核', num: 0 },
         { txt: '待办理', num: 0 },
-        { txt: '已完成', num: 0 },
+        { txt: '待归还', num: 0 },
+        { txt: '已归还', num: 0 },
         { txt: '审核不通过', num: 0 }
       ],
       type: '',
@@ -180,10 +181,14 @@ export default {
           this.myData.status = 0
           this.getList(this.myData)
         } else if (index === 3) {
-          // 点击已完成
+          // 点击待归还
           this.myData.status = 3
           this.getList(this.myData)
         } else if (index === 4) {
+          // 点击已归还
+          this.myData.status = 4
+          this.getList(this.myData)
+        } else if (index === 5) {
           // 点击审核不通过
           this.myData.status = 2
           this.getList(this.myData)
@@ -312,16 +317,19 @@ export default {
     let num2 = 0
     let num3 = 0
     let num4 = 0
+    let num5 = 0
     res.data.list.forEach(v => {
       if (v.status === 1) num1++
       if (v.status === 0) num2++
       if (v.status === 3) num3++
-      if (v.status === 2) num4++
+      if (v.status === 4) num4++
+      if (v.status === 2) num5++
     })
     this.stateArr[1].num = num1
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
+    this.stateArr[5].num = num5
     // 获取用户角色权限标识
     let temp = localStorage.getItem('daliCK')
     temp = JSON.parse(temp)

src/views/home/index.vue

@@ -160,7 +160,7 @@ export default {
     // 进页面拿数据--出库管理
     const res2 = await getList2({ pageNum: 1, pageSize: 99999 })
     res2.data.list.forEach(v => {
-      if (v.status === 1 || v.status === 0) this.dingdong[2].inoc++
+      if (v.status === 1 || v.status === 0 || v.status === 3) this.dingdong[2].inoc++
     })
     // 进页面拿数据--藏品注销
     const res5 = await getList5({ pageNum: 1, pageSize: 99999 })
@@ -170,7 +170,7 @@ export default {
     // 进页面拿数据--征集品提用
     const col1 = await collect1({ pageNum: 1, pageSize: 99999 })
     col1.data.list.forEach(v => {
-      if (v.status === 1 || v.status === 0) this.dingdong[4].inoc++
+      if (v.status === 1 || v.status === 0 || v.status === 3) this.dingdong[4].inoc++
     })
     // 进页面拿数据--征集品注销
     const col2 = await collect2({ pageNum: 1, pageSize: 99999 })