From f037c313fe3ecfe4cc9b136a4124161dd991d6ab Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 11 Dec 2023 17:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E5=BA=9F=E5=85=A5=E5=BA=93=E7=BB=84?=
 =?UTF-8?q?=E7=9B=98=20=E8=BD=AF=E5=BA=9F=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                        | 14 ++++-
 .../instorage/SoftWasteInStoreGroup.vue       | 54 +++++++++++++++++--
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 173a1fc..0fb7b5e 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -120,13 +120,14 @@ export const getBillDtl = (page, size) => post('api/pda/st/in/getBillDtl', {
   size: size
 })
 // 1.4 确认组盘
-export const confirmVehicle = (option, vehicle, rows, point, bill) => post('api/pda/st/in/confirmVehicle', {
+export const confirmVehicle = (option, vehicle, rows, point, bill, level) => post('api/pda/st/in/confirmVehicle', {
   accountId: accountId,
   option: option,
   vehicle: vehicle,
   bucket_rows: rows,
   point: point,
-  bill: bill
+  bill: bill,
+  ivt_level: level
 })
 /** 工序返工入库 */
 // 1.1查询站点
@@ -182,6 +183,15 @@ export const getRecBillDtl = (page, size, mater, code) => post('api/pda/st/in/ge
   material_search: mater,
   bill_code: code
 })
+// 1.9 获取软废等级下拉框（进页面查询)
+export const inIetIvtLevel = () => post('api/pda/st/in/getIvtLevel', {})
+// export const inIetIvtLevel = () => {
+//   let res = {
+//     code: '1',
+//     ivtLevel: [{value: 'r0', label: 'a'}, {value: 'b1', label: 'b'}]
+//   }
+//   return res
+// }
 
 /** 设备查询 */
 // 1.2查询工序下拉框
diff --git a/src/pages/xinrui/storage/instorage/SoftWasteInStoreGroup.vue b/src/pages/xinrui/storage/instorage/SoftWasteInStoreGroup.vue
index 0c96fcc..e9315f2 100644
--- a/src/pages/xinrui/storage/instorage/SoftWasteInStoreGroup.vue
+++ b/src/pages/xinrui/storage/instorage/SoftWasteInStoreGroup.vue
@@ -31,6 +31,18 @@
         v-model="val3"
         @handleChange="handleChange3"
         ></search-box>
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">软废等级</div>
+          <div class="fxcol mgl20 visible" >
+            <dropdown-menu
+            :option="option1"
+            :active="active1"
+            :open="open1"
+            @toggleItem="toggleItem1"
+            @dropdownMenu="dropdownMenu1">
+            </dropdown-menu>
+          </div>
+        </div>
       </div>
       <div class="grid-wraper">
         <div class="left_fixed">
@@ -82,13 +94,15 @@
 <script>
 import NavBar from '@components/NavBar.vue'
 import SearchBox from '@components/SearchBox.vue'
-import {checkVehicle, checkBucket, confirmVehicle} from '@config/getData2.js'
+import DropdownMenu from '@components/DropdownMenu.vue'
+import {checkVehicle, checkBucket, confirmVehicle, inIetIvtLevel} from '@config/getData2.js'
 import {accAdd} from '@config/mUtils.js'
 export default {
   name: 'SoftWasteInStoreGroup',
   components: {
     NavBar,
-    SearchBox
+    SearchBox,
+    DropdownMenu
   },
   data () {
     return {
@@ -100,7 +114,10 @@ export default {
       dataList: [],
       pkId: '',
       disabled1: false,
-      disabled2: false
+      disabled2: false,
+      option1: [],
+      active1: '',
+      open1: false
     }
   },
   computed: {
@@ -122,6 +139,9 @@ export default {
   activated () {
     if (this.$store.getters.materObj !== '') this.val2 = this.$store.getters.materObj.source_bill_code
   },
+  created () {
+    this._inIetIvtLevel()
+  },
   methods: {
     handleChange1 (e, type) {
       if (type) {
@@ -177,6 +197,11 @@ export default {
         this.disabled1 = false
         return
       }
+      if (this.active1 === '') {
+        this.toast('请选择软废等级')
+        this.disabled1 = false
+        return
+      }
       this._confirmVehicle()
     },
     /** 查询载具码 */
@@ -225,10 +250,11 @@ export default {
     },
     async _confirmVehicle () {
       try {
-        let res = await confirmVehicle('5', this.vehicle, this.dataList)
+        let res = await confirmVehicle('5', this.vehicle, this.dataList, null, null, this.option1[this.active1].value)
         if (res.code === '1') {
           this.toast(res.desc)
           Object.assign(this.$data, this.$options.data())
+          this._inIetIvtLevel()
         } else {
           this.Dialog(res.desc)
         }
@@ -236,6 +262,26 @@ export default {
       } catch (e) {
         this.disabled1 = false
       }
+    },
+    /** 获取软废等级下拉框 */
+    async _inIetIvtLevel () {
+      let res = await inIetIvtLevel()
+      if (res.code === '1') {
+        this.option1 = [...res.ivtLevel]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    toggleItem1 () {
+      if (!this.open1) {
+        this.open1 = true
+      } else {
+        this.open1 = false
+      }
+    },
+    dropdownMenu1 (i) {
+      this.active1 = i + ''
+      this.open1 = false
     }
   }
 }