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

skyouc

昨天 9382f2c611581996c9b015abeb079891acbddde4

 pages/AGV/CallEmptyCar.vue

@@ -3,45 +3,100 @@
      <view class="code">
         <view class="item">
            <view class="code-decs">起始区:</view>
            <uni-combox :candidates="staList" placeholder="请选择站点" v-model="orgSite"></uni-combox>
            <uni-combox
               :candidates="staList"
               placeholder="请选择站点"
               v-model="orgSite"
            ></uni-combox>
         </view>
         <view class="item">
            <view class="code-decs">终点站:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="tarSite" :focus="barcodeFocus">
            <input
               type="text"
               placeholder=" 扫码 / 输入"
               v-model="tarSite"
               :focus="barcodeFocus"
            />
         </view>

      </view>
      <!-- 底部操作按钮 -->
      <view class="buttom">
         <button size="mini" @click="reset('warn')">重置</button>
         <button size="mini" type="primary" @click="combConfirm('warn')">呼叫</button>
         <button
            size="mini"
            @click="reset('warn')"
         >
            重置
         </button>
         <button
            size="mini"
            type="primary"
            @click="combConfirm('warn')"
         >
            呼叫
         </button>
      </view>
      <!-- 移除确认 -->
      <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
            ref="alertDialog"
            type="dialog"
         >
            <uni-popup-dialog
               :type="msgType"
               confirmText="移除"
               :title="title"
               :content="content"
               @confirm="removeConfirm()"
               @close="removeClose"
            ></uni-popup-dialog>
         </uni-popup>
      </view>
      <view>
         <!-- 提示信息弹窗 -->
         <uni-popup ref="message" type="message">
            <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
         <uni-popup
            ref="message"
            type="message"
         >
            <uni-popup-message
               :type="msgType1"
               :message="messageText"
               :duration="2000"
            ></uni-popup-message>
         </uni-popup>
      </view>
      <!-- 确认组托 -->
      <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
            ref="combConfirm"
            type="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
            ref="resetConfirm"
            type="dialog"
         >
            <uni-popup-dialog
               :type="msgType"
               cancelText="取消"
               confirmText="确认"
               :title="title"
               :content="content"
               @confirm="resetConfirm"
               @close="resetClose"
            ></uni-popup-dialog>
         </uni-popup>
      </view>
   </view>
@@ -71,25 +126,25 @@
            matFocus: false,
            matData: '',
            removeNum: 0,
            locNo: "",
         locNo: '',
            orgSite: '',
            tarSite: '',
            staList: ["SO", "EO"],
         staList: ['SO', 'EO']
         }
      },
      onLoad() {
         let that = this
         const eventChannel = this.getOpenerEventChannel();
      const eventChannel = this.getOpenerEventChannel()

         eventChannel.on('data', function(data) {
            console.log(data.data)
            that.orgSite = data.data.agvSite.name
            that.checkMat(data.data.wrkDetls)
         });
      })
      },
      onShow() {
         this.baseUrl = uni.getStorageSync('baseUrl');
         this.token = uni.getStorageSync('token');
      this.baseUrl = uni.getStorageSync('baseUrl')
      this.token = uni.getStorageSync('token')
      },
      mounted() {
         // this.tarSite = uni.getStorageSync('tarSite')
@@ -101,12 +156,12 @@
         },
         clearOrderNo() {
            this.orderNo = ''
            let that = this;
            that.orderNoFocus = false;
         let that = this
         that.orderNoFocus = false
            setTimeout(() => {
               that.orderNo = '';
               that.orderNoFocus = true;
            }, 100);
            that.orderNo = ''
            that.orderNoFocus = true
         }, 100)
         },
         orderNoInput() {
            // 不设置定时器 会出现扫入的字符串不全
@@ -125,35 +180,34 @@
         },
         // 托盘码有误重置
         barcodeFocuss() {
            let that = this;
            that.barcodeFocus = false;
         let that = this
         that.barcodeFocus = false
            setTimeout(() => {
               that.barcode = '';
               that.barcodeFocus = true;
            }, 100);
            that.barcode = ''
            that.barcodeFocus = true
         }, 100)
         },
         // 商品光标清空重置
         focuss() {
            this.focus = false;
         this.focus = false
            setTimeout(() => {
               this.matnr = '';
               this.matFocus = true;
            }, 100);
            this.matnr = ''
            this.matFocus = true
         }, 100)
         },
         // 搜索物料
         findMat() {
            let that = this
            let m = that.matnr.split(";")
         let m = that.matnr.split(';')
            let matnr1 = m[0].slice(3)
            for (var i = 0; i < that.dataList.length; i++) {
               if (that.dataList[i].matnr === matnr1) {
                  that.dataList[i].review = "已复核"
               that.dataList[i].review = '已复核'
               }

            }
            setTimeout(() => {
               this.matnr = '';
            }, 100);
            this.matnr = ''
         }, 100)
            // uni.request({
            //    url: that.baseUrl + '/mat/auth',
            //    data: {
@@ -205,12 +259,11 @@

            //    }
            // });

         },
         selectMat() {
            let that = this
            uni.navigateTo({
               url: "../mat/matQuery",
            url: '../mat/matQuery',
               success: function(res) {
                  // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                  res.eventChannel.emit('commonUrl', {
@@ -222,11 +275,9 @@
                  acceptDataFromOpenedPage: function(data) {
                     that.matnr = data.data
                     that.findMat(that.matnr)
                  },
               },


            });
               }
            }
         })
            that.matnr = ''
         },
         checkMat(mat) {
@@ -255,7 +306,7 @@
         },
         // 确认移除
         removeConfirm() {
            this.messageText = "移除成功"
         this.messageText = '移除成功'
            this.messageToggle('success')
            this.dataList.splice(this.removeNum, 1)
         },
@@ -268,7 +319,7 @@
            this.dataList[this.rowNum].batch = this.batch
            this.dataList[this.rowNum].weight = this.weight
            this.matnr = ''
            this.messageText = "修改成功"
         this.messageText = '修改成功'
            this.messageToggle('success')
            this.$refs.revise.close()
         },
@@ -289,17 +340,17 @@
         },
         comb() {
            // uni.setStorageSync('tarSite', this.tarSite);
            uni.vibrateShort();
            let that = this;
         uni.vibrateShort()
         let that = this
            if (that.orgSite === '') {
               this.messageText = "起始区为空"
            this.messageText = '起始区为空'
               this.messageToggle('error')
               return;
            return
            }
            if (that.tarSite === '') {
               this.messageText = "终点站为空"
            this.messageText = '终点站为空'
               this.messageToggle('error')
               return;
            return
            }
            uni.request({
               url: that.baseUrl + '/mobile/agv/callEmptyCar',
@@ -309,13 +360,13 @@
               }),
               method: 'POST',
               header: {
                  'token': uni.getStorageSync('token')
               token: uni.getStorageSync('token')
               },
               success(result) {
                  var res = result.data
                  if (res.code === 200) {
                     that.resst();
                     that.messageText = "呼叫成功"
                  that.resst()
                  that.messageText = '呼叫成功'
                     that.messageToggle('success')
                  } else if (res.code == 403) {
                     that.messageText = res.msg
@@ -323,14 +374,14 @@
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                     }, 1000);
                     })
                  }, 1000)
                  } else {
                     that.messageText = res.msg
                     that.messageToggle('error')
                  }
               }
            });
         })
         },
         reset(type) {
            this.msgType = type
@@ -341,20 +392,17 @@
         // 确认重置
         resetConfirm() {
            this.dataList = []
            this.messageText = "重置完成"
         this.messageText = '重置完成'
            this.messageToggle('success')
         },
         // 取消重置
         resetClose() {

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

         },
      }
      }
   }
</script>
@@ -366,7 +414,7 @@
      width: 100%;
      position: fixed;
      min-height: 100rpx;
      background-color: #FFF;
   background-color: #fff;
      z-index: 10;
   }

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

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

   }

   .code-decs {