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

zjj

2025-05-06 c5df53716b70b190e22e4016d952f1aec25c9049

 pages/listing/disc.vue

@@ -149,9 +149,15 @@
      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 {

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

            }

         },

         async getList() {

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

            const {

               code,

               data,