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

whycq

2023-02-04 b75ab103d8763245432c773d32c1f38239ec162f

 pages/basics/pakin.vue

@@ -8,10 +8,26 @@
            </view>
            <view class="square-content">
               <view class="content-input">
                  <input v-model="barcode" type="text" placeholder="扫码 / 输入" maxlength="8"
                  :focus="barcodeFocus" @focus="nextInput">
                  <input v-model="barcode" type="text" placeholder="扫码 / 输入" 
                  :focus="barcodeFocus" @confirm="barcodeInput()" placeholder-style="line-height:  85rpx;">
                  <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
               </view>
            </view>
         </view>
         <view class="square-1">
            <view class="square-title">
               <view class="title-sign"><view class="sign"></view></view>
               <view class="title-text"><text>是否冻结</text></view>
               <radio-group @change="isFrozen">
                  <label>
                     <radio :checked="ck1" style="margin-left: 100rpx;"/><text>是</text>
                  </label>
                  <label>
                     <radio :checked="ck2" style="margin-left: 50rpx;"/><text>否</text>
                  </label>
               </radio-group>
               <!-- <radio :value="yes" style="margin-left: 100rpx;">是</radio>
               <radio :value="no" style="margin-left: 50rpx;">否</radio> -->
            </view>
         </view>
         
@@ -24,7 +40,7 @@
            <view class="square-content">
               <view class="content-input-btn">
                  <input v-model="matnr" type="text" placeholder="扫码 / 输入" @input="findMat()"
                  :focus="focus">
                  :focus="focus" placeholder-style="line-height:  85rpx;">
                  <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
               </view>
               <view class="content-btn">
@@ -38,8 +54,10 @@
            <view class="square-title">
               <view class="title-sign"><view class="sign"></view></view>
               <view class="title-text"><text>商品列表</text></view>
               <!-- <label v-show="matList.length != 0" style="float: right;margin-right: 20px;margin-top: 13px;"><uni-icons type="trash" size="25" color="#a5a5a5" @click="remove()"></uni-icons></label> -->
            </view>
         </view>
			
         <view class="square-none"  v-show="matList.length === 0">
            <view class="v-show">暂无更多数据...</view>
         </view>
@@ -47,12 +65,21 @@
         <checkbox-group @change="checkbox">
            <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
               <view class="data-list-left">
                  <!-- <view>
                     <checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
                  </view> -->
                  <view class="matnr"><text style="width: 400rpx;">编码：{{item.matnr}}</text></view>
                  <view><text style="width: 400rpx;">品名：{{item.maktx}}</text></view>
                  <view><text style="width: 400rpx;">规格：{{item.specs}}</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>
                     <text style="width: 400rpx;">数量：{{item.anfme}}</text>
                  </view> -->
               </view>
               <view class="data-list-right">
                  <label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
@@ -61,27 +88,48 @@
            </view>
         </checkbox-group>
      </scroll-view>
		
		
      <!-- 底部按钮 -->
      <view class="footer flex justify-around">
         <view>
            <button class="cu-btn lg" @click="resst()">重置</button>
         </view>
         <view>
            <button class="cu-btn lg pakin-btn bg-blue" @click="comb()">组托</button>
         </view>
         <!-- <label class="label-btn" style="width: 170rpx;">
            <checkbox :checked="check" @click="allChecked()">{{checkText}}</checkbox>
         </label>
         <label class="label-btn" style="width: 100rpx;">
            <text  @click="reChecked()">反选</text>
         </label> -->
			
         <label class="label-btn" style="width: 150rpx;">
            <button class="cu-btn" @click="resst()">重置</button>
         </label>
         <label class="label-btn">
            <button class="cu-btn bg-blue " @click="comb()">组托</button>
         </label>
      </view>
      <!-- 弹窗 -->
      <!-- 修改数量 -->
      <uni-popup ref="revise" background-color="#fff" @change="change">
         <view class="revise-box">
      <uni-popup ref="revise" >
         <view class="revise-box ">
            <view class="revise-box-top">
               <view class="color-block-blue"></view>
               <text class="title">组托数量</text>
               <text class="title">修改</text>
            </view>
            <view class="text-box">
               <text>可组数量：{{enableQty}}</text>
            <view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
               <text style="display: inline-block;float: left;width: 50px;">批号：</text>
               <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch">
            </view>
            <view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
               <text style="display: inline-block;float: left;width: 50px;">备注：</text>
               <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="memo">
            </view>
            <view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
               <text style="display: inline-block;float: left;width: 50px;">客户：</text>
               <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="cstmr">
            </view>
            <view class="changeBox">
               <view class="num-box">
                  <uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474"  @change="changeValue"/>
                  <text style="display: inline-block;float: left;width: 50px;">数量：</text>
                  <uni-number-box :value="count" :max="9999999" color="#747474"  @change="changeValue"/>
               </view> 
            </view>
            <view class="revise-box-buttom">
@@ -89,7 +137,6 @@
                  <button class="cu-btn bg-blue" @click="confirm()">确认</button>
               </view>
            </view>
				
         </view>
      </uni-popup>
   </view>
@@ -97,9 +144,11 @@

<script>
   import permision from "@/common/permission.js"
import loginVue from "../login/login.vue";
   export default {
      data() {
         return {
            commonUrl:null,
            barcode: '',
            barcodeFocus:true,
            focus:false,
@@ -114,33 +163,78 @@
            minCount:0,
            maxCount:'',
            rowNum:'',
            check:false,
            checkText:'全选',
            checkedData:[],
            batch:'',
            memo: '',
            cstmr: '',
            ck1: false,
            ck2: true,
            frozen: 0,
         }
      },
      // onLoad() {
      //    // #ifdef APP
      //    setInterval(()=>{
      //       uni.hideKeyboard()
      //    },20)
      //    // #endif
      // },
      onShow() {
         setTimeout(()=>{
            // this.focuss()
         }, 100);
			
      },
      mounted(){
         const UIP = uni.getStorageSync('UIP');
         this.baseIP = UIP;
         const UPORT = uni.getStorageSync('UPORT');
         this.basePORT = UPORT
         const PROJ = uni.getStorageSync('UPROJ');
         this.baseUrl = PROJ
         this.getUrl()
      },
      methods: {
         nextInput() {
            if (this.barcode.length == 8) {
               this.focuss()
         // 获取url
         getUrl() {
            this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
         },
         // 冻结
         isFrozen() {
            var temp = this.ck1
            this.ck1 = this.ck2
            this.ck2 = temp
            this.frozen = this.ck1
            if (this.frozen == true) {
               this.frozen = 1
            } else {
               this.frozen = 0
            }
         },
         // barcode input 事件
         barcodeInput() {
            // 不设置定时器 会出现扫入的字符串不全
            setTimeout(()=>{
               var len = this.barcode.length
               if (len != 8) {
                  uni.showToast({title: '托盘码有误请重试', icon: "none", position: 'top'});
                  this.barcodeFocuss()
                  return;
               }
               this.focuss()
            },200)
         },
         // 托盘码有误重置
         barcodeFocuss() {
            let that = this;
            that.barcodeFocus = false;
            setTimeout(()=>{
               that.barcode = '';
               that.barcodeFocus = true;
            }, 100);
         },
         // 商品光标清空重置
         focuss() {
            // #ifdef APP
            let that = this;
            that.focus = false;
            setTimeout(()=>{
               that.matnrId = '';
               that.matnr = '';
               that.focus = true;
            }, 100);
            // #endif
@@ -149,6 +243,7 @@
            this.matList = []
            this.barcode = ''
            this.matnr = ''
            this.barcodeFocuss()
            uni.vibrateShort();
         },
         removeBarcode() {
@@ -167,6 +262,7 @@
               this.focus = true;
            });
         },
         // 列表删除按钮
         remove(item,index) {
            this.matList.splice(index,1)
            uni.vibrateShort();
@@ -182,10 +278,17 @@
               uni.showToast({title: '请添加商品列表', icon: "none", position: 'top'});
               return;
            }
            for (var i = 0; i < that.matList.length; i++) {
               if (that.matList[i].anfme == 0 || that.matList[i].anfme == '') {
                  uni.showToast({title: that.matList[i].matnr + '组托数量不能为0', icon: "none", position: 'top'});
                  return;
               }
            }
            uni.showLoading();
            uni.request({
                url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
                url: that.commonUrl + '/mobile/comb/auth',
                data: JSON.stringify({
                  frozen: that.frozen,
                  barcode: that.barcode,
                  combMats: that.matList
               }),
@@ -197,6 +300,9 @@
                  uni.hideLoading();
                  var res = result.data
                  if (res.code === 200) {
                     const innerAudioContext = uni.createInnerAudioContext();
                     innerAudioContext.src = '/static/music/pakinOk.mp3';
                     innerAudioContext.play()
                     that.resst();
                     uni.showToast({
                        title: res.msg,
@@ -227,18 +333,19 @@
                     that.matnr = data.data
                     that.findMat(that.matnr)
                   },
                 },
                 success: function(res) {
               },
               success: function(res) {
                   // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                   res.eventChannel.emit('acceptDataFromOpenerPage', {baseIP:that.baseIP, basePORT:that.basePORT })
                 }
                   res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
               },
					
            });
            that.matnr = ''
         },
         findMat() {
            let that = this
            uni.request({
                url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
                url: that.commonUrl + '/mat/auth',
                data: {
                  matnr:that.matnr
                },
@@ -250,28 +357,62 @@
                  let res = result.data
                  if (res.code === 200 && res.data) {
                     that.matData = res.data
                     that.matnr = ''
                     that.matData['batch'] = ''
                     uni.navigateTo({
                        url: "matQuery",
                        events: {
                            // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
                            matList: function(data) {
                              that.matList.push(data.data)
                              console.log(that.matList)
                            },
                          },
                          success: function(res) {
                            // 通过eventChannel向被打开页面传送数据
                            res.eventChannel.emit('matData', { data: that.matData })
                          }
                              that.checkMat(data.data)
                              // that.matList.push(data.data)
                           },
                        },
                        success: function(res) {
                           // 通过eventChannel向被打开页面传送数据
                           res.eventChannel.emit('matData', { data: that.matData })
                        },
                     });
                  } 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'})
                  }
                  
               }
            });
				
         },
      
         // 添加商品
         addMat(mat) {
            this.matList.unshift(mat)
         },
         checkMat(mat) {
            var len = this.matList.length
            var add = true
            var date = new Date()
            var today = date.getFullYear() + '/' + (date.getMonth()+1) + '/' + date.getDate()
            for (var i = 0; i < len; i++) {
               if (mat.matnr == this.matList[i].matnr) {
                  this.matList[i].anfme += mat.anfme 
                  this.$forceUpdate() // 强制刷新
                  add = false
               }
            }
            if (add) {
               if(mat.batch === '' || mat.batch === null) {
                  mat.batch = today
               }
               this.matList.unshift(mat)
            }
         },
         change(e) {
            console.log('当前模式：' + e.type + ',状态：' + e.show);
         },
         toggle(type) {
            this.type = type
@@ -279,7 +420,7 @@
            this.$refs.goodsSearch.open(type)
         },
         checkbox: function (e) {
            var items = this.data,
            var items = this.matList,
               values = e.detail.value;
            for (var i = 0, lenI = items.length; i < lenI; ++i) {
               const item = items[i]
@@ -300,13 +441,10 @@
            uni.vibrateShort();
         },
         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
            this.count = this.matList[index].anfme
            this.batch = this.matList[index].batch
            this.memo = this.matList[index].memo
            this.cstmr = this.matList[index].cstmr
            this.rowNum = index
            this.eject()
         },
@@ -315,12 +453,59 @@
            // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
            this.$refs.revise.open(type)
         },
         changeValue() {
				
         changeValue(value) {
            this.count = value
         },
         confirm() {
            this.matList[this.rowNum].anfme = this.count
            this.matList[this.rowNum].batch = this.batch
            this.matList[this.rowNum].memo = this.memo
            this.matList[this.rowNum].cstmr = this.cstmr
            this.$refs.revise.close()
            this.$forceUpdate() // 强制刷新
         },
         // 列表反选
         reChecked() { 
            if (this.matList.length == 0) {
               return;
            }
            var checkArr = []
            for (var i = 0; i < this.matList.length;i++) {
               if (this.matList[i].checked == true) {
                  this.$set(this.matList[i],'checked',false)
               }else{
                  this.$set(this.matList[i],'checked',true)
               }
               if (this.matList[i].checked == true) {
                  checkArr.push(this.matList[i].checked) 
               }
            }
            if (checkArr.length == this.matList.length) {
               this.check = true
               this.checkText = "取消全选"
            } else {
               this.check = false
               this.checkText = "全选"
            }
            uni.vibrateShort();
         },
         // 列表全选
         allChecked(e){ 
				
            if (this.check == true) {
               for (var i = 0; i < this.matList.length;i++) {
                  this.$set(this.matList[i],'checked',false)
               }
               this.check = false
               this.checkText = "全选"
            } else {
               for (var i = 0; i < this.matList.length;i++) {
                  this.$set(this.matList[i],'checked',true)
               }
               this.check = true
               this.checkText = "取消全选"
            }
            uni.vibrateShort();
         },
      }
   }
@@ -329,7 +514,29 @@
<style>
   /* @import "../../colorui/main.css";
   @import "../../colorui/icon.css"; */
	
   .revise-box {
      position: relative;
      width: 500rpx;
      height: 570rpx;
      border-radius: 25px;
      background-color: #fff;
      border-radius: 20rpx;
   }
   .revise-box-top {
      width: 400rpx;
      height: 120rpx;
      border-radius: 25px;
   }
   .changeBox {
      width: 400rpx;
      height: 100rpx;
   }
   .num-box {
      margin-left: 100rpx;
   }
   .revise-box-buttom{
      margin-left: 190rpx;
   }
   .pak-seach-box {
      background-color: #FFFFFF;
      margin: 15rpx 15rpx 0rpx 15rpx;
@@ -426,7 +633,7 @@
   }
   .data-list {
      border-bottom: 1px solid #d8d8d8;
      height: 180rpx;
      height: 250rpx;
      margin: 15rpx;
      border-radius: 20rpx;
   }
@@ -434,7 +641,7 @@
      margin-top: 20rpx;
   }
   .data-list:last-child {
      margin-bottom: 120rpx;
      margin-bottom: 180rpx;
   }
   /* .data-list-left {
      display: inline-block;
@@ -457,8 +664,8 @@
   .data-list-right {
      display: inline-block;
      float: right;
      height: 180rpx;
      line-height: 180rpx;
      height: 250rpx;
      line-height: 250rpx;
   }
   /* display: inline-block;
   float: right;