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

野心家

2025-01-06 a374e91194afc8d3c2be316c0e4fdbf55e5cd429

 pages/mat/matSelected.vue

@@ -7,20 +7,20 @@
         </view>
         <view class="form-item">
            <view class="form-item-desc"><text>商品名称</text></view>
            <view class="form-item-content"><text>{{mat.maktx}}</text></view>
            <view class="form-item-content"><text style="word-wrap:break-word">{{mat.maktx}}</text></view>
         </view>
         <view class="form-item">
            <view class="form-item-desc"><text>规格</text></view>
            <view class="form-item-content"><text>{{mat.specs}}</text></view>
         </view>
         <!-- <view class="form-item">
         <view class="form-item">
            <view class="form-item-desc"><text>批号</text></view>
            <view class="form-item-content">
               <view class="form-input">
                  <input type="text" v-model="mat.batch">
               </view>
            </view>
         </view> -->
         </view>
         <view class="form-item">
            <view class="form-item-desc"><text>数量</text></view>
            <view class="form-item-content">
@@ -44,7 +44,7 @@
               maktx: null,
               specs: null,
               batch: null,
               anfme: 0,
               anfme: 1,
            },
            baseIP:'',
            basePORT:'',
@@ -62,7 +62,7 @@
         // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
         eventChannel.on('mat', function(data) {
            that.mat = data.data
            that.mat.anfme = 0
            that.mat.anfme = 1
         })
         
         
@@ -101,12 +101,13 @@
      box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
   }
   .form-item {
      height: 100rpx;
      line-height: 100rpx;
      min-height: 100rpx;
      line-height: 1.3;
      border-bottom: 1px solid #DCDFE6;
      margin-left: 40rpx;
      display: flex;
      align-items: center;
      word-wrap: break-word;
   }
   .form-item-desc {
      width: 30%;