Compare commits
No commits in common. "e785a99b7da565cd92dc3ace3a3c4766a8689058" and "9fffe228d5eec080c0f6382f161e21e3a69b9651" have entirely different histories.
e785a99b7d
...
9fffe228d5
10
.env
10
.env
@ -1,5 +1,5 @@
|
|||||||
NODE_ENV = production
|
NODE_ENV = development
|
||||||
VUE_APP_ENV_NAME = zhoushang环境
|
VUE_APP_ENV_NAME = 默认环境
|
||||||
VUE_APP_UPGRADE_NAME = erp_pda_zhoushang
|
VUE_APP_UPGRADE_NAME = erp_pda
|
||||||
VUE_APP_PRODUCTION_API_URL = https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1
|
VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
|
||||||
VUE_APP_DEV_API_URL = https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1
|
VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
|
||||||
|
|||||||
@ -132,16 +132,6 @@ export default {
|
|||||||
this.warehouseBinName = '';
|
this.warehouseBinName = '';
|
||||||
this.phoneContinuousScan = false;
|
this.phoneContinuousScan = false;
|
||||||
},
|
},
|
||||||
/** 重扫仓位:先清空输入框再填入,避免残留旧码拼接 */
|
|
||||||
applyWarehouseBinScan(scanResult) {
|
|
||||||
const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
|
|
||||||
if (!code) return;
|
|
||||||
this.warehouseBinCode = '';
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.warehouseBinCode = code;
|
|
||||||
this.$nextTick(() => this.resolveWarehouseBin());
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleBinPhoneScan() {
|
handleBinPhoneScan() {
|
||||||
if (!this.canScan || !this.orderId) {
|
if (!this.canScan || !this.orderId) {
|
||||||
this.showError('请先提交保存后再扫码');
|
this.showError('请先提交保存后再扫码');
|
||||||
@ -151,7 +141,8 @@ export default {
|
|||||||
this.phoneScanTarget = 'bin';
|
this.phoneScanTarget = 'bin';
|
||||||
this.openPhoneScan({
|
this.openPhoneScan({
|
||||||
callback: (scanResult) => {
|
callback: (scanResult) => {
|
||||||
this.applyWarehouseBinScan(scanResult);
|
this.warehouseBinCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
|
||||||
|
this.$nextTick(() => this.resolveWarehouseBin());
|
||||||
},
|
},
|
||||||
fail: () => {},
|
fail: () => {},
|
||||||
});
|
});
|
||||||
@ -200,7 +191,8 @@ export default {
|
|||||||
if (!code) return;
|
if (!code) return;
|
||||||
// 删除模式:直接按布匹码删除;未扫仓位时枪扫优先解析为仓位
|
// 删除模式:直接按布匹码删除;未扫仓位时枪扫优先解析为仓位
|
||||||
if (!this.BarCodeDelStatus && !this.warehouseBinId) {
|
if (!this.BarCodeDelStatus && !this.warehouseBinId) {
|
||||||
this.applyWarehouseBinScan(code);
|
this.warehouseBinCode = code;
|
||||||
|
this.$nextTick(() => this.resolveWarehouseBin());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.QRBarCode = code;
|
this.QRBarCode = code;
|
||||||
@ -247,7 +239,6 @@ export default {
|
|||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
this.warehouseBinId = 0;
|
this.warehouseBinId = 0;
|
||||||
this.warehouseBinCode = '';
|
|
||||||
this.warehouseBinName = '';
|
this.warehouseBinName = '';
|
||||||
this.showError(e.message || '仓位识别失败');
|
this.showError(e.message || '仓位识别失败');
|
||||||
});
|
});
|
||||||
|
|||||||
@ -121,16 +121,6 @@ export default {
|
|||||||
this.warehouseBinName = '';
|
this.warehouseBinName = '';
|
||||||
this.phoneContinuousScan = false;
|
this.phoneContinuousScan = false;
|
||||||
},
|
},
|
||||||
/** 重扫仓位:先清空输入框再填入,避免残留旧码拼接 */
|
|
||||||
applyWarehouseBinScan(scanResult) {
|
|
||||||
const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
|
|
||||||
if (!code) return;
|
|
||||||
this.warehouseBinCode = '';
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.warehouseBinCode = code;
|
|
||||||
this.$nextTick(() => this.resolveWarehouseBin());
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleBinPhoneScan() {
|
handleBinPhoneScan() {
|
||||||
if (!this.canScan || !this.orderId) {
|
if (!this.canScan || !this.orderId) {
|
||||||
this.showError('请先提交保存后再扫码');
|
this.showError('请先提交保存后再扫码');
|
||||||
@ -140,7 +130,8 @@ export default {
|
|||||||
this.phoneScanTarget = 'bin';
|
this.phoneScanTarget = 'bin';
|
||||||
this.openPhoneScan({
|
this.openPhoneScan({
|
||||||
callback: (scanResult) => {
|
callback: (scanResult) => {
|
||||||
this.applyWarehouseBinScan(scanResult);
|
this.warehouseBinCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
|
||||||
|
this.$nextTick(() => this.resolveWarehouseBin());
|
||||||
},
|
},
|
||||||
fail: () => {},
|
fail: () => {},
|
||||||
});
|
});
|
||||||
@ -189,7 +180,8 @@ export default {
|
|||||||
if (!code) return;
|
if (!code) return;
|
||||||
// 删除模式:直接按布匹码删除;未扫仓位时枪扫优先解析为仓位
|
// 删除模式:直接按布匹码删除;未扫仓位时枪扫优先解析为仓位
|
||||||
if (!this.BarCodeDelStatus && !this.warehouseBinId) {
|
if (!this.BarCodeDelStatus && !this.warehouseBinId) {
|
||||||
this.applyWarehouseBinScan(code);
|
this.warehouseBinCode = code;
|
||||||
|
this.$nextTick(() => this.resolveWarehouseBin());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.QRBarCode = code;
|
this.QRBarCode = code;
|
||||||
@ -236,7 +228,6 @@ export default {
|
|||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
this.warehouseBinId = 0;
|
this.warehouseBinId = 0;
|
||||||
this.warehouseBinCode = '';
|
|
||||||
this.warehouseBinName = '';
|
this.warehouseBinName = '';
|
||||||
this.showError(e.message || '仓位识别失败');
|
this.showError(e.message || '仓位识别失败');
|
||||||
});
|
});
|
||||||
|
|||||||
@ -134,16 +134,6 @@ export default {
|
|||||||
this.warehouseBinName = '';
|
this.warehouseBinName = '';
|
||||||
this.phoneContinuousScan = false;
|
this.phoneContinuousScan = false;
|
||||||
},
|
},
|
||||||
/** 重扫仓位:先清空输入框再填入,避免残留旧码拼接 */
|
|
||||||
applyWarehouseBinScan(scanResult) {
|
|
||||||
const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
|
|
||||||
if (!code) return;
|
|
||||||
this.warehouseBinCode = '';
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.warehouseBinCode = code;
|
|
||||||
this.$nextTick(() => this.resolveWarehouseBin());
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleBinPhoneScan() {
|
handleBinPhoneScan() {
|
||||||
if (!this.canScan || !this.orderId) {
|
if (!this.canScan || !this.orderId) {
|
||||||
this.showError('请先提交保存后再扫码');
|
this.showError('请先提交保存后再扫码');
|
||||||
@ -153,7 +143,8 @@ export default {
|
|||||||
this.phoneScanTarget = 'bin';
|
this.phoneScanTarget = 'bin';
|
||||||
this.openPhoneScan({
|
this.openPhoneScan({
|
||||||
callback: (scanResult) => {
|
callback: (scanResult) => {
|
||||||
this.applyWarehouseBinScan(scanResult);
|
this.warehouseBinCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
|
||||||
|
this.$nextTick(() => this.resolveWarehouseBin());
|
||||||
},
|
},
|
||||||
fail: () => {},
|
fail: () => {},
|
||||||
});
|
});
|
||||||
@ -202,7 +193,8 @@ export default {
|
|||||||
if (!code) return;
|
if (!code) return;
|
||||||
// 删除模式:直接按布匹码删除;未扫仓位时枪扫优先解析为仓位
|
// 删除模式:直接按布匹码删除;未扫仓位时枪扫优先解析为仓位
|
||||||
if (!this.BarCodeDelStatus && !this.warehouseBinId) {
|
if (!this.BarCodeDelStatus && !this.warehouseBinId) {
|
||||||
this.applyWarehouseBinScan(code);
|
this.warehouseBinCode = code;
|
||||||
|
this.$nextTick(() => this.resolveWarehouseBin());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.QRBarCode = code;
|
this.QRBarCode = code;
|
||||||
@ -249,7 +241,6 @@ export default {
|
|||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
this.warehouseBinId = 0;
|
this.warehouseBinId = 0;
|
||||||
this.warehouseBinCode = '';
|
|
||||||
this.warehouseBinName = '';
|
this.warehouseBinName = '';
|
||||||
this.showError(e.message || '仓位识别失败');
|
this.showError(e.message || '仓位识别失败');
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user