Commit c03825d0 by LJM

aok

parent 0fc87d78
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<view class="row verCenter"> <view class="row verCenter">
<text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text> <text class="iconfont icon-jinggao2" @click="clearInput(1)" v-if="box_sn"></text>
<template v-if="box_sn"> <template v-if="box_sn">
<view class="btn1 row rowCenter verCenter" @click="print()" style="margin-right: 8rpx;">打印箱号</view>
<view class="btn row rowCenter verCenter" @click="canel()">取消装箱</view> <view class="btn row rowCenter verCenter" @click="canel()">取消装箱</view>
</template> </template>
<template v-else> <template v-else>
...@@ -297,6 +296,12 @@ ...@@ -297,6 +296,12 @@
if (res.err_code === 0) { if (res.err_code === 0) {
this.box_sn = res.data.box_sn; this.box_sn = res.data.box_sn;
this.wsty_id = res.data.wsty_id; this.wsty_id = res.data.wsty_id;
//取箱号才自动打印,输入箱号不需要自动打印
if (!box_sn) {
this.print(); //取箱号成功则自动调用打印箱号
}
} else { } else {
uni.showModal({ uni.showModal({
title: '', title: '',
......
...@@ -657,7 +657,10 @@ ...@@ -657,7 +657,10 @@
this.box_sn = res.data.box_sn; this.box_sn = res.data.box_sn;
this.wsty_id = res.data.wsty_id; this.wsty_id = res.data.wsty_id;
this.print(); //取箱号成功则自动调用打印箱号 //取箱号才自动打印,输入箱号不需要自动打印
if (!box_sn) {
this.print(); //取箱号成功则自动调用打印箱号
}
if (this.form.length > 0) { if (this.form.length > 0) {
// 筛选出 tally_status 等于 1 或 2 的数据 // 筛选出 tally_status 等于 1 或 2 的数据
......
// const API_BASE = 'https://api.ichunt.com'; const API_BASE = 'https://api.ichunt.com';
// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统 const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
// const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
// const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统 const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
const API_BASE = 'http://api.liexin.com'; // const API_BASE = 'http://api.liexin.com';
const API_BASE_OSS = 'http://image.liexindev.net'; // const API_BASE_OSS = 'http://image.liexindev.net';
const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK // const API_BASE_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统 // const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
const API = { const API = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment