Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2025-05-06 c5df53716b70b190e22e4016d952f1aec25c9049

 pages/listing/disc.vue

@@ -6,12 +6,11 @@
            <input placeholder="请扫描容器号" v-model="container" focus></input>

            <text class='cuIcon-search text-blue' @click="getList"></text>

         </view>

         <view class="cu-form-group ">

         <view class="cu-form-group">

            <view class="title">批次号</view>

            <input placeholder="请输入物料批次" v-model="batch"></input>

            <text class='text-blue'></text>

         </view>

         <view class="cu-form-group ">

         <view class="cu-form-group">

            <view class="title">物料标签</view>

            <input placeholder="请扫描物料标签" v-model="barcode"></input>

            <text class='cuIcon-search text-blue' @click="search"></text>

@@ -114,7 +113,6 @@
         <button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>

         <button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="confirm">组盘</button>

      </view>



   </view>

</template>



@@ -136,8 +134,10 @@
            megreQty: '',

            list: [],

            range: [],

            batch: '',

            repeatClick: false,

            isconfirm: false

            isconfirm: false,

            batch:''

         }

      },

      computed: {

@@ -149,16 +149,25 @@
      mounted() {},

      methods: {

         async search() {

            const find = this.list.find(el => el.trackCode === this.barcode);

            if (this.barcode == undefined || this.barcode == '') {
               uni.showToast({
                  icon: "none",
                  title: '物料标签不能为空！！'
               })
               return
            }
            const find = this.list.find(el => el.trackCode === this.barcode);
            find ? this.scrollTo() : this.getDet();



         },

         async getDet() {

            const {

               code,

               data,

               msg

            } = await request('/asnOrderItem/trackCode/' + this.barcode, {}, "get")

            } = await request('/asnOrderItem/trackCode', {

               code: this.barcode,

               batch: this.batch

            }, "post")

            if (code === 200) {

               data && this.list.push(data);

            } else {

@@ -169,7 +178,14 @@
               })

            }

         },

         async getList() {

         async getList() {
            if (this.container == undefined || this.container == '') {
               uni.showToast({
                  icon: "none",
                  title: '容器号不能为空！！'
               })
               return
            }

            const {

               code,

               data,

@@ -230,7 +246,8 @@
               msg

            } = await request('/waitPakin/merge', {

               items: newArr,

               barcode: this.container

               barcode: this.container,

               batch: this.batch,

            })

            if (code === 200) {

               uni.showToast({