From c2988bf26f95d52a9be19d7457df07ffa3992e5f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 12 Jul 2023 09:42:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=AF=E5=BA=9F=E7=BB=84=E6=A1=B6?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=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                        |  2 +
 .../storage/settings/SoftWasteBarrelPrint.vue | 48 +++++++++++++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index ff834de..173a1fc 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -70,6 +70,8 @@ export const confirmGroupBucket = (mst, dtl) => post('api/pda/set/bucket/confirm
 export const bucketPrint = (code) => post('api/pda/set/bucket/print', {
   bucketunique: code
 })
+// 1.5等级下拉框
+export const bucketGetLevel = () => post('api/pda/set/bucket/getLevel', {})
 
 /** 返工料桶标签打印 */
 // 1.1返工料根据桶查询（扫描桶码触发后台的查询按钮）
diff --git a/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue b/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue
index 2939636..9c5e81d 100644
--- a/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue
+++ b/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue
@@ -35,6 +35,18 @@
             </dropdown-menu>
           </div>
         </div>
+        <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>
         <search-box
         label="袋码"
         v-model="val4"
@@ -116,7 +128,7 @@
 import NavBar from '@components/NavBar.vue'
 import SearchBox from '@components/SearchBox.vue'
 import DropdownMenu from '@components/DropdownMenu.vue'
-import { queryInfoBybucket, queryInfoByBag, confirmGroupBucket, bucketPrint, bucketDelete, getpcsn } from '@config/getData2.js'
+import { queryInfoBybucket, queryInfoByBag, confirmGroupBucket, bucketPrint, bucketDelete, getpcsn, bucketGetLevel } from '@config/getData2.js'
 import {accAdd, submitPackUp} from '@config/mUtils.js'
 import {toPrint} from '@config/print.js'
 export default {
@@ -145,7 +157,10 @@ export default {
       printWeight: true,
       option: [{value: '0', label: '不可用'}, {value: '1', label: '可用'}],
       active: '0',
-      open: false
+      open: false,
+      option1: [],
+      active1: '',
+      open1: false
     }
   },
   computed: {
@@ -183,6 +198,7 @@ export default {
     // let date = cd.getDate() < 10 ? '0' + cd.getDate() : cd.getDate()
     // this.val3 = year + month + date
     this._getpcsn()
+    this._bucketGetLevel()
   },
   methods: {
     handleChange1 (e, type) {
@@ -221,6 +237,16 @@ export default {
         this.Dialog(res.desc)
       }
     },
+    /** 等级 */
+    async _bucketGetLevel () {
+      let res = await bucketGetLevel()
+      if (res.code === '1') {
+        this.option1 = [...res.result]
+        this.active1 = '0'
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
     /** 桶码查询信息 */
     async _queryInfoBybucket (e) {
       let res = await queryInfoBybucket(e)
@@ -354,7 +380,7 @@ export default {
       try {
         let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : ''
         let user = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).user_name : ''
-        let newObj = Object.assign({}, this.result, this.$store.getters.materObj, {pcsn: this.val3, storage_qty: this.val5, accountId: accountId, user: user, is_active: this.option[this.active].value})
+        let newObj = Object.assign({}, this.result, this.$store.getters.materObj, {pcsn: this.val3, storage_qty: this.val5, accountId: accountId, user: user, is_active: this.option[this.active].value, ivt_level: this.option1[this.active1].value})
         let res = await confirmGroupBucket(newObj, this.dataList)
         if (res.code === '1') {
           this.toast(res.desc)
@@ -367,6 +393,7 @@ export default {
           this.pkObj = {}
           this.disabled5 = false
           this.active = '0'
+          this.active1 = '0'
         } else {
           this.Dialog(res.desc)
           this.disabled5 = false
@@ -398,7 +425,7 @@ export default {
       try {
         let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : ''
         let user = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).user_name : ''
-        let newObj = Object.assign({}, this.result, this.$store.getters.materObj, {pcsn: this.val3, storage_qty: this.val5, accountId: accountId, user: user, is_active: this.option[this.active].value})
+        let newObj = Object.assign({}, this.result, this.$store.getters.materObj, {pcsn: this.val3, storage_qty: this.val5, accountId: accountId, user: user, is_active: this.option[this.active].value, ivt_level: this.option1[this.active1].value})
         let res = await confirmGroupBucket(newObj, this.dataList)
         if (res.code === '1') {
           this.toast(res.desc)
@@ -419,6 +446,7 @@ export default {
           this.pkObj = {}
           this.disabled1 = false
           this.active = '0'
+          this.active1 = '0'
         } else {
           this.Dialog(res.desc)
           this.disabled1 = false
@@ -467,6 +495,7 @@ export default {
       this.disabled4 = false
       this.disabled5 = false
       this.active = '0'
+      this.active1 = '0'
       this.$store.dispatch('materObj', '')
       this._getpcsn()
     },
@@ -483,6 +512,17 @@ export default {
     dropdownMenu (i) {
       this.active = i + ''
       this.open = false
+    },
+    toggleItem1 () {
+      if (!this.open1) {
+        this.open1 = true
+      } else {
+        this.open1 = false
+      }
+    },
+    dropdownMenu1 (i) {
+      this.active1 = i + ''
+      this.open1 = false
     }
   }
 }

From 413e5b869070122ef470d5e6f18283fe1cc80e5e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 24 Jul 2023 17:33:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AF=E5=BA=9F=E7=BB=84=E6=A1=B6?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xinrui/storage/settings/SoftWasteBarrelPrint.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue b/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue
index 9c5e81d..8d790ec 100644
--- a/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue
+++ b/src/pages/xinrui/storage/settings/SoftWasteBarrelPrint.vue
@@ -156,7 +156,7 @@ export default {
       disabled5: false,
       printWeight: true,
       option: [{value: '0', label: '不可用'}, {value: '1', label: '可用'}],
-      active: '0',
+      active: '1',
       open: false,
       option1: [],
       active1: '',
@@ -392,7 +392,7 @@ export default {
           this.pkId = ''
           this.pkObj = {}
           this.disabled5 = false
-          this.active = '0'
+          this.active = '1'
           this.active1 = '0'
         } else {
           this.Dialog(res.desc)
@@ -445,7 +445,7 @@ export default {
           this.pkId = ''
           this.pkObj = {}
           this.disabled1 = false
-          this.active = '0'
+          this.active = '1'
           this.active1 = '0'
         } else {
           this.Dialog(res.desc)
@@ -494,7 +494,7 @@ export default {
       this.disabled3 = false
       this.disabled4 = false
       this.disabled5 = false
-      this.active = '0'
+      this.active = '1'
       this.active1 = '0'
       this.$store.dispatch('materObj', '')
       this._getpcsn()