Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda

whycq

2024-11-19 fe8fb74ce94e7bee23ed47b7175236248ac93b98

 pages/order/orderComb.vue

@@ -33,7 +33,7 @@
      <scroll-view>
         <checkbox-group class="list" v-for="(item,i) in dataList" :key="i" @change="checkboxChange">
            <view class="aside">
               <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/>
               <!-- <checkbox :value="item.matnr" :checked="item.checked" @click="set(i)"/> -->
            </view>
            <view class="list-left" style="margin: 0;">
               <view class="list-left-item">
@@ -243,7 +243,7 @@
         getOrderNoList() {
            let that = this
            uni.request({
               url: this.baseUrl + '/order/list/all',
               url: this.baseUrl + '/order/comb/list/all',
               header: {
                  'token': uni.getStorageSync('token')
               },