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

zjj

5 天以前 9884e489c1ba7abbf412e99d4901a223ad2fbb53

 pages/rece/other.vue

@@ -60,9 +60,6 @@
                     <text class="text-black">实时库存: <text class="text-grey ">{{item.stockQty}}</text></text>

                  </view>

               </view>







               <view class="cu-item">

                  <view class="content">

                     <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>

@@ -71,7 +68,6 @@
                     <text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>

                  </view>

               </view>



               <view class="cu-item">

                  <view class="content">

                     <text class="text-black">采购单位:<text class="text-grey ">{{item.purUnit}}</text></text>

@@ -80,7 +76,6 @@
                     <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>

                  </view>

               </view>



               <view class="cu-item">

                  <view class="content">

                     <text class="black">计划收货数量:<text class="text-grey ">{{item.anfme}}</text></text>

@@ -90,9 +85,7 @@
                     <text class="black">已收货数量:<text class="text-grey ">{{item.qty}}</text></text>

                  </view>

               </view>



               <view class="cu-item">



                  <view class="content" v-if="!isconfirm">

                     <view class="cu-form-group padding-lr-0">

                        <view class="title text-blue"><text

@@ -104,7 +97,6 @@
                     <text class="text-black">收货数量:<text class="text-grey ">{{item.receiptQty}}</text></text>

                  </view>

               </view>



               <view class="cu-item">

                  <view class="content" v-if="!isconfirm">

                     <view class="cu-form-group padding-lr-0">

@@ -133,7 +125,6 @@
                     <text class="text-black">生产日期:<text class="text-grey ">{{item.prodTime}}</text></text>

                  </view>

               </view>



               <view class="cu-item grid  col-1" v-if="!isconfirm">

                  <view v-for="el in dynamicFields" :key="el.id">

                     <view class="cu-form-group padding-lr-0">

@@ -142,16 +133,12 @@
                     </view>

                  </view>

               </view>



               <view class="cu-item grid  col-2" v-if="isconfirm">

                  <view class="item" v-for="el in dynamicFields" :key="el.id">

                     <text class="text-black">{{el.fieldsAlise}}:

                        <text class="text-grey ">{{item[el.fields]}}</text></text>

                  </view>



               </view>





            </view>

         </block>

      </view>

@@ -165,7 +152,6 @@
         <uni-data-select v-model="whAreaId" :localdata="range" placement="top"

            @change="selChange"></uni-data-select>

      </view>





      <view class="cu-bar btn-group foot" v-show="!isconfirm">

         <button class="cu-btn text-blue line-blue shadow" @click="clear">清空</button>

@@ -263,7 +249,9 @@
         prev() {

            this.isconfirm = false

         },

         selChange(val) {

         selChange(val) {
            console.log('-------->')
            console.log(val)

            uni.setStorageSync('whAreaId', val)

         },

         async complete(id) {

@@ -322,7 +310,6 @@
                     icon: "none",

                  })

               }



            }

         },

         async getRece() {

@@ -334,7 +321,7 @@
            if (code === 200) {

               this.range = data.map(item => ({

                  value: item.id,

                  text: item.name

                  text: item.warehouseId$ + "-- " + item.name

               }));

            }

         },