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

whycq

2023-02-04 b75ab103d8763245432c773d32c1f38239ec162f

 pages/basics/stockCheck.vue

@@ -21,7 +21,7 @@
            </view>
            <view class="square-content">
               <view class="content-input">
                  <input v-model="barcode" type="text" placeholder="扫码 / 输入" maxlength="8"placeholder-style="line-height:  85rpx;">
                  <input v-model="barcode" @input="search" type="text" placeholder="扫码 / 输入" maxlength="8"placeholder-style="line-height:  85rpx;">
                  <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode" ></uni-icons>
               </view>
            </view>
@@ -56,10 +56,13 @@
            <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
               <view class="data-list-left">
                  <view class="matnr"><text style="width: 400rpx;">编码：{{item.matnr}}</text></view>
                  <view><text style="width: 400rpx;">规格：{{item.specs}}</text></view>
                  <view><text style="width: 400rpx;">品名：{{item.maktx}}</text></view>
                  <view><text style="width: 400rpx;">批号：{{item.batch}}</text></view>
                  <view><text style="width: 400rpx;">客户信息：{{item.cstmr}}</text></view>
                  <view>
                     <text style="width: 400rpx;">数量：{{item.anfme}}</text>
                     <text style="width: 400rpx;">备注：{{item.memo}}</text>
                     <text style="width: 400rpx;margin-left: 100rpx">数量：{{item.anfme}}</text>
                  </view>
               </view>
               <view class="data-list-right">
@@ -92,7 +95,7 @@
                  </view>
                  <view class="changeBox">
                     <view class="num-box">
                        <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474"  @change="changeValue"/>
                        <uni-number-box v-model="count" :min="minCount" :max="99999999" color="#747474"  @change="changeValue"/>
                     </view> 
                  </view>
               </view>
@@ -142,7 +145,36 @@
         getUrl() {
            this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
         },
			
         // 根据托盘码搜索
         search() {
            let that = this
            uni.request({
               url: that.commonUrl + '/mobile/checkDetl/auth2',
               header: {
                  'token':uni.getStorageSync('token')
               },
               data: {barcode: that.barcode},
               method:'GET',
               success(result) {
                  let res = result.data
                  if(res.code === 200){
                     for(var i = 0; i < res.data.length;i++){
                        that.matList.push(res.data[i])
                     }
                  } else if (res.code == 403) {
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                     }, 1000);
                  } else {
                     uni.showToast({title: res.msg, icon: "none",position: 'top'})
                  }
               }
					
            })
         },
         selectMat() {  // 选择商品
            let that = this
            uni.vibrateShort();
@@ -153,6 +185,7 @@
                   acceptDataFromOpenedPage: function(data) {
                     that.matnr = data.data
                     that.findMat(that.matnr)
                     that.matnr = ''
                   },
               },
               success: function(res) {
@@ -161,7 +194,7 @@
               },
               
            });
            that.matnr = ''
				
         }, // selectMat
         findMat() {
            let that = this
@@ -205,13 +238,14 @@
            });
         },
         revise(item,index) {
            var maxCount = this.matList[index].maxCount
            if (maxCount == undefined ) {
               this.matList[index]["maxCount"] = item.enableQty
            } 
            this.enableQty = item.enableQty
            this.count = this.minCount
            this.maxCount = item.maxCount
            // var maxCount = this.matList[index].maxCount
            // if (maxCount == undefined ) {
            //    this.matList[index]["maxCount"] = item.enableQty
            // } 
            // this.enableQty = item.enableQty
            // this.count = this.minCount
            // this.maxCount = item.maxCount
            this.count = this.matList[index].anfme
            this.rowNum = index
            this.eject()
            // this.show = true
@@ -261,20 +295,23 @@
         },
         adjust() {
            let that = this
            var combMats = []
            var combParam = {}
            combParam['barcode'] = that.barcode
            combParam['wrkDetls'] = that.matList
            uni.request({
               url: that.commonUrl + '/adjust/auth',
               url: that.commonUrl + '/mobile/adjustNew/auth',
               method: 'POST',
               data: {
                  combParam: that.matList
               },
               data: JSON.stringify(combParam),
               header: {
                  'token':uni.getStorageSync('token')
               },
               success(result) {
                  var res = result.data
                     console.log(result)
                  if (res.code === 200) {
					
                     that.matList = []
                     that.barcode = ''
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
                  } else if (res.code == 403) {
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
                     setTimeout(() => {
@@ -391,7 +428,7 @@
   }
   .data-list {
      border-bottom: 1px solid #d8d8d8;
      height: 180rpx;
      height: 240rpx;
      margin: 15rpx;
      border-radius: 20rpx;
   }
@@ -399,7 +436,7 @@
      margin-top: 20rpx;
   }
   .data-list:last-child {
      margin-bottom: 160rpx;
      margin-bottom: 180rpx;
   }
   .data-list-left {
      display: inline-block;
@@ -415,8 +452,8 @@
      display: inline-block;
      float: right;
      width: 200rpx;
      height: 180rpx;
      line-height: 180rpx;
      height: 230rpx;
      line-height: 230rpx;
   }
   .data-list-right label {
      display: inline-block;