Merge branch 'jsxswms-app' of http://47.97.1.152:5880/r/wms_app into jsxswm...

skyouc

16 小时以前 ad1e4e950a4e961a41344e5847d47f91dabd0c29

 pages/AGV/CollectionInCall.vue

@@ -9,6 +9,10 @@
            <view class="code-decs">托盘码:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="barcode">
         </view>
         <view class="item">
            <view class="code-decs">目标区:</view>
            <uni-combox :candidates="staList" placeholder="请选择站点" v-model="tarSite"></uni-combox>
         </view>
      </view>
      <view class="mat-list-title">
      </view>
@@ -79,13 +83,13 @@
            locNo: "",
            orgSite: '',
            tarSite: '',
            staList: [],
            staList: ["EO", "SO"],
         }
      },
      onLoad() {
         let that = this
         const eventChannel = this.getOpenerEventChannel();
         that.getSites()
         // that.getSites()
      },
      onShow() {
         this.baseUrl = uni.getStorageSync('baseUrl');
@@ -260,11 +264,21 @@
            this.$refs.combConfirm.close()
         },
         comb() {
            uni.setStorageSync('tarSite', this.tarSite);
            // uni.setStorageSync('tarSite', this.tarSite);
            uni.vibrateShort();
            let that = this;
            if (that.orgSite === '') {
               this.messageText = "产线站为空"
               this.messageText = "起始站为空"
               this.messageToggle('error')
               return;
            }
            if (that.barcode === '') {
               this.messageText = "托盘码为空"
               this.messageToggle('error')
               return;
            }
            if (that.tarSite === '') {
               this.messageText = "目标区为空"
               this.messageToggle('error')
               return;
            }
@@ -272,7 +286,8 @@
               url: that.baseUrl + '/mobile/collection/agv/call',
               data: JSON.stringify({
                  orgSite: that.orgSite,
                  barcode: that.barcode
                  barcode: that.barcode,
                  tarSite: that.tarSite
               }),
               method: 'POST',
               header: {
@@ -319,7 +334,8 @@
         resst() {
            this.orgSite = ''
            this.dataList = []

            this.tarSite = ''
            this.barcode = ''

         },
      }