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

zwl

2025-10-21 5472dae39d4604828772493595ee2e8b41f4e145

 pages/order/orderPutDown.vue

@@ -50,12 +50,12 @@
                     <uni-tag :text="item.batch" type="warning"></uni-tag>
                  </view>
               </view>
               <view class="list-left-item">
               <!-- <view class="list-left-item">
                  <view class="desc">重量：</view>
                  <view class="left-item">
                     <uni-tag :text="item.weight" type="warning"></uni-tag>
                  </view>
               </view>
               </view> -->
               <view class="list-left-item">
                  <view class="desc">数量：</view>
                  <view class="left-item">{{item.anfme}}</view>
@@ -90,10 +90,10 @@
                  <view class="popup-item-left">批号:</view>
                  <view class="popup-item-right"><input type="text" v-model="batch"></view>
               </view> -->
               <view class="popup-item">
               <!-- <view class="popup-item">
                  <view class="popup-item-left">重量:</view>
                  <view class="popup-item-right"><input type="text" v-model="weight"></view>
               </view>
               </view> -->
               <view class="popup-item">
                  <view class="popup-item-left">数量:</view>
                  <view class="popup-item-right" style="border: none;justify-content: center;">
@@ -206,8 +206,15 @@
         findMat() {
            let that = this
            var matnr =  that.matnr.split(";")
            that.order = matnr[0]
            that.matnr = matnr[1]
            if (matnr[1]) {
               that.order = matnr[0]
               that.matnr = matnr[1]
               if (matnr[2] === null) {
                  that.batch = ''
                  matnr[2] = ''
               }
               that.anfme = matnr[3]
            } 
            uni.request({
               url: that.baseUrl + '/mat/auth',
               data: {
@@ -222,7 +229,11 @@
                     that.matData = result.data
                     that.matnr = ''
                     that.matData['batch'] = ''
                     result.data.batch = matnr[2]
                     that.matData['anfme'] = ''
                     if (matnr[2] === null) {
                        result.data.batch = ''
                     }
                     result.data.anfme = matnr[3]
                     uni.navigateTo({
                        url: "../mat/matSelected",
                        // 通过eventChannel向被打开页面传送数据
@@ -440,12 +451,12 @@
      display: flex;
      min-height: 80rpx;
      background-color: #FFF;
      margin: auto 20rpx;
      margin: 30rpx 20rpx;
      border-radius: 20rpx;
      box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
   }
   .list:first-child {
      margin-top: 410rpx;
      margin-top: 340rpx;
   }
   .list:last-child {
      margin-bottom: 120rpx;