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

skyouc

5 小时以前 9382f2c611581996c9b015abeb079891acbddde4

 pages/AGV/CollectionInCall.vue

@@ -3,19 +3,14 @@
      <view class="code">
         <view class="item">
            <view class="code-decs">入库站:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="orgSite" :focus="barcodeFocus">
         </view>
         <view class="item">
            <view class="code-decs">托盘码:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="barcode">
            <input type="text" placeholder=" 扫码 / 输入" v-model="orgSite" :focus="barcodeFocus" />
         </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>
      <view class="mat-list-title"></view>

      <!-- 底部操作按钮 -->
      <view class="buttom">
@@ -29,8 +24,7 @@
      <view>
         <!-- 提示窗示例 -->
         <uni-popup ref="alertDialog" type="dialog">
            <uni-popup-dialog :type="msgType" confirmText="移除" :title="title" :content="content"
               @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
            <uni-popup-dialog :type="msgType" confirmText="移除" :title="title" :content="content" @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
         </uni-popup>
      </view>
      <view>
@@ -42,15 +36,21 @@
      <!-- 确认组托 -->
      <view>
         <uni-popup ref="combConfirm" type="dialog">
            <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
               @confirm="comb" @close="combClose"></uni-popup-dialog>
            <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content" @confirm="comb" @close="combClose"></uni-popup-dialog>
         </uni-popup>
      </view>
      <!-- 确认重置 -->
      <view>
         <uni-popup ref="resetConfirm" type="dialog">
            <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
               @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
            <uni-popup-dialog
               :type="msgType"
               cancelText="取消"
               confirmText="确认"
               :title="title"
               :content="content"
               @confirm="resetConfirm"
               @close="resetClose"
            ></uni-popup-dialog>
         </uni-popup>
      </view>
   </view>
@@ -80,14 +80,14 @@
            matFocus: false,
            matData: '',
            removeNum: 0,
            locNo: "",
         locNo: '',
            orgSite: '',
            tarSite: '',
            staList: ["EO", "SO"],
         }
         staList: ['EO', 'SO']
      };
      },
      onLoad() {
         let that = this
      let that = this;
         const eventChannel = this.getOpenerEventChannel();
         // that.getSites()
      },
@@ -100,11 +100,11 @@
      },
      methods: {
         messageToggle(type) {
            this.msgType1 = type
            this.$refs.message.open()
         this.msgType1 = type;
         this.$refs.message.open();
         },
         clearOrderNo() {
            this.orderNo = ''
         this.orderNo = '';
            let that = this;
            that.orderNoFocus = false;
            setTimeout(() => {
@@ -115,17 +115,17 @@
         orderNoInput() {
            // 不设置定时器 会出现扫入的字符串不全
            setTimeout(() => {
               var len = this.orderNo.length
               this.barcodeFocuss()
            }, 200)
            var len = this.orderNo.length;
            this.barcodeFocuss();
         }, 200);
         },
         // barcode input 事件
         barcodeInput() {
            // 不设置定时器 会出现扫入的字符串不全
            setTimeout(() => {
               var len = this.barcode.length
               this.focuss()
            }, 200)
            var len = this.barcode.length;
            this.focuss();
         }, 200);
         },
         // 托盘码有误重置
         barcodeFocuss() {
@@ -146,27 +146,27 @@
         },
         // 搜索物料
         getSites() {
            let that = this
         let that = this;
            let staResults = [];
            uni.request({
               url: that.baseUrl + '/mobile/cache/locs',
               header: {
                  'token': uni.getStorageSync('token')
               token: uni.getStorageSync('token')
               },
               method: 'GET',
               success(result) {
                  result = result.data
               result = result.data;
                  if (result.code === 200 && result.data) {
                     staResults.push(...result.data);
                     staResults.forEach(item => {
                        that.staList.push(item?.locNo)
                     })
                  staResults.forEach((item) => {
                     that.staList.push(item?.locNo);
                  });
                  } else if (result.code == 403) {
                     uni.showToast({
                        title: result.msg,
                        icon: "none",
                     icon: 'none',
                        position: 'top'
                     })
                  });
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
@@ -175,171 +175,159 @@
                  } else {
                     uni.showToast({
                        title: result.msg,
                        icon: "none",
                     icon: 'none',
                        position: 'top'
                     })
                  });
                  }
               }
            });

         },
         selectMat() {
            let that = this
         let that = this;
            uni.navigateTo({
               url: "../mat/matQuery",
            url: '../mat/matQuery',
               success: function(res) {
                  // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                  res.eventChannel.emit('commonUrl', {
                     commonUrl: ''
                  })
               });
               },
               events: {
                  // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                  acceptDataFromOpenedPage: function(data) {
                     that.matnr = data.data
                     that.findMat(that.matnr)
                  },
               },


                  that.matnr = data.data;
                  that.findMat(that.matnr);
               }
            }
            });
            that.matnr = ''
         that.matnr = '';
         },
         checkMat(mat) {
            this.dataList = mat
         this.dataList = mat;
         },
         // 修改批号
         revise(item, i) {
            this.matnr = this.dataList[i].matnr
            this.count = this.dataList[i].anfme
            this.batch = this.dataList[i].batch
            this.weight = this.dataList[i].weight
            this.rowNum = i
            this.eject()
         this.matnr = this.dataList[i].matnr;
         this.count = this.dataList[i].anfme;
         this.batch = this.dataList[i].batch;
         this.weight = this.dataList[i].weight;
         this.rowNum = i;
         this.eject();
         },
         eject(type) {
            this.type = type
            this.$refs.revise.open(type)
         this.type = type;
         this.$refs.revise.open(type);
         },
         // 列表移除按钮
         remove(item, i, type) {
            this.removeNum = i
            this.msgType = type
            this.title = '警告'
            this.content = '是否移除当前商品!'
            this.$refs.alertDialog.open(i)
         this.removeNum = i;
         this.msgType = type;
         this.title = '警告';
         this.content = '是否移除当前商品!';
         this.$refs.alertDialog.open(i);
         },
         // 确认移除
         removeConfirm() {
            this.messageText = "移除成功"
            this.messageToggle('success')
            this.dataList.splice(this.removeNum, 1)
         this.messageText = '移除成功';
         this.messageToggle('success');
         this.dataList.splice(this.removeNum, 1);
         },
         // 取消移除
         removeClose() {
            this.$refs.alertDialog.close()
         this.$refs.alertDialog.close();
         },
         reviseConfirm() {
            this.dataList[this.rowNum].anfme = this.count
            this.dataList[this.rowNum].batch = this.batch
            this.dataList[this.rowNum].weight = this.weight
            this.matnr = ''
            this.messageText = "修改成功"
            this.messageToggle('success')
            this.$refs.revise.close()
         this.dataList[this.rowNum].anfme = this.count;
         this.dataList[this.rowNum].batch = this.batch;
         this.dataList[this.rowNum].weight = this.weight;
         this.matnr = '';
         this.messageText = '修改成功';
         this.messageToggle('success');
         this.$refs.revise.close();
         },
         reviseClose() {
            this.$refs.revise.close()
         this.$refs.revise.close();
         },
         changeValue(value) {
            this.count = value
         this.count = value;
         },
         combConfirm(type) {
            this.msgType = type
            this.title = '警告'
            this.content = '是否现在呼叫!'
            this.$refs.combConfirm.open()
         this.msgType = type;
         this.title = '警告';
         this.content = '是否现在呼叫!';
         this.$refs.combConfirm.open();
         },
         combClose() {
            this.$refs.combConfirm.close()
         this.$refs.combConfirm.close();
         },
         comb() {
            // uni.setStorageSync('tarSite', this.tarSite);
            uni.vibrateShort();
            let that = this;
            if (that.orgSite === '') {
               this.messageText = "起始站为空"
               this.messageToggle('error')
               return;
            }
            if (that.barcode === '') {
               this.messageText = "托盘码为空"
               this.messageToggle('error')
            this.messageText = '起始站为空';
            this.messageToggle('error');
               return;
            }
            if (that.tarSite === '') {
               this.messageText = "目标区为空"
               this.messageToggle('error')
            this.messageText = '目标区为空';
            this.messageToggle('error');
               return;
            }
            uni.request({
               url: that.baseUrl + '/mobile/collection/agv/call',
               data: JSON.stringify({
                  orgSite: that.orgSite,
                  barcode: that.barcode,
                  tarSite: that.tarSite
               }),
               method: 'POST',
               header: {
                  'token': uni.getStorageSync('token')
               token: uni.getStorageSync('token')
               },
               success(result) {
                  var res = result.data
               var res = result.data;
                  if (res.code === 200) {
                     that.resst();
                     that.messageText = "呼叫成功"
                     that.messageToggle('success')
                  that.messageText = '呼叫成功';
                  that.messageToggle('success');
                  } else if (res.code == 403) {
                     that.messageText = res.msg
                     that.messageToggle('error')
                  that.messageText = res.msg;
                  that.messageToggle('error');
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                     }, 1000);
                  } else {
                     that.messageText = res.msg
                     that.messageToggle('error')
                  that.messageText = res.msg;
                  that.messageToggle('error');
                  }
               }
            });
         },
         reset(type) {
            this.msgType = type
            this.title = '警告'
            this.content = '是否重置!'
            this.$refs.resetConfirm.open()
         this.msgType = type;
         this.title = '警告';
         this.content = '是否重置!';
         this.$refs.resetConfirm.open();
         },
         // 确认重置
         resetConfirm() {
            this.dataList = []
            this.messageText = "重置完成"
            this.messageToggle('success')
         this.dataList = [];
         this.messageText = '重置完成';
         this.messageToggle('success');
         },
         // 取消重置
         resetClose() {

         },
      resetClose() {},
         // 清空
         resst() {
            this.orgSite = ''
            this.dataList = []
            this.tarSite = ''
            this.barcode = ''

         },
         this.orgSite = '';
         this.dataList = [];
         this.tarSite = '';
         this.barcode = '';
      }
   }
};
</script>

<style>
@@ -349,7 +337,7 @@
      width: 100%;
      position: fixed;
      min-height: 100rpx;
      background-color: #FFF;
   background-color: #fff;
      z-index: 10;
   }

@@ -358,7 +346,7 @@
      align-items: center;
      height: 100rpx;
      margin-left: 20rpx;
      border-bottom: 1px solid #DCDFE6;
   border-bottom: 1px solid #dcdfe6;
   }

   .item input {
@@ -368,7 +356,6 @@
      font-size: 36upx;
      font-family: PingFang SC;
      width: 55vw;

   }

   .code-decs {