diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 3fcd023..e3ba01d 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -173,7 +173,7 @@ export default class LoginPage extends BasePage {
//修改俄罗斯版本号
this.Version = '1.1.10';
} else {
- this.Version = '1.0.41';
+ this.Version = '1.0.43';
}
console.log('////', this.Version);
}
diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index b7512d7..57837c2 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -286,10 +286,10 @@ export default class stoOutboundDom extends BasePage {
onOk() {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
- if (parseInt(this.form.orderAmount) <= this.form.scanAmount) {
- this.customToast(this.$t('message.product_Tip6') as string);
- return;
- }
+ // if (parseInt(this.form.orderAmount) <= this.form.scanAmount) {
+ // this.customToast(this.$t('message.product_Tip6') as string);
+ // return;
+ // }
if (this.form.barCode == '') {
this.customToast(this.$t('message.barcode') as string);
return;
diff --git a/src/pages/raw/handover/RUS-picking/ByOrder.vue b/src/pages/raw/handover/RUS-picking/ByOrder.vue
index ef1e0d0..feb08cb 100644
--- a/src/pages/raw/handover/RUS-picking/ByOrder.vue
+++ b/src/pages/raw/handover/RUS-picking/ByOrder.vue
@@ -75,7 +75,7 @@
{{ $t('message.detailed') }}
-
+
{{ $t('message.po_Submit') }}
@@ -117,6 +117,7 @@ export default class RawReceiptDetail extends BasePage {
* 页面Module
*/
model = model;
+ disableflg = false;
type = 'text';
wlCode: any = '';
LOCKProOrderResultListParams: any = '';
@@ -386,6 +387,7 @@ export default class RawReceiptDetail extends BasePage {
* 提交
*/
async onSubmit() {
+ this.disableflg = true;
const dataList: any = [];
this.model.proOrderResultList.forEach((item: any) => {
if (item.checked == true) {
@@ -394,26 +396,32 @@ export default class RawReceiptDetail extends BasePage {
});
if (dataList.length == 0) {
this.customToast(this.$t('message.Warehouse_Tip6') as any);
+ this.disableflg = false;
return;
}
- await this.model.saveProOrderResultUploadRussia(dataList);
- if (this.model.code == '1') {
- uni.showToast({
- //icon: 'success',
- title: this.$t('message.Warehouse_Tip9') as any,
- duration: 2000,
- image: '/static/icons/icon-51.png',
- });
- // this.GetLocation();
- setTimeout(() => {
- this.onAggregate();
- }, 2000);
+ try {
+ await this.model.saveProOrderResultUploadRussia(dataList);
+ if (this.model.code == '1') {
+ uni.showToast({
+ //icon: 'success',
+ title: this.$t('message.Warehouse_Tip9') as any,
+ duration: 2000,
+ image: '/static/icons/icon-51.png',
+ });
+ // this.GetLocation();
+ setTimeout(() => {
+ this.onAggregate();
+ }, 2000);
+ }
+ } catch (e) {
+ this.disableflg = false;
}
}
async onAggregate() {
await this.model.queryProOrder(this.model.formParams);
await this.model.queryProOrderResult(this.model.NEWparams);
if (this.model.proOrderResultList.length == 0) {
+ this.disableflg = false;
this.some = {};
this.LocationList = [];
this.wlCode = '';
@@ -422,6 +430,7 @@ export default class RawReceiptDetail extends BasePage {
}
this.LOCKProOrderResultListParams = this.model.proOrderResultList;
await this.model.lockProOrderResult(this.model.proOrderResultList);
+ this.disableflg = false;
this.some = {};
this.LocationList = [];
this.wlCode = '';
@@ -487,6 +496,7 @@ export default class RawReceiptDetail extends BasePage {
.right {
flex: 1;
}
+
.u-th {
flex: auto;
}
@@ -576,6 +586,7 @@ export default class RawReceiptDetail extends BasePage {
// text-align: center;
// }
}
+
.single-left {
width: 100%;
height: 100rpx;
@@ -588,6 +599,7 @@ export default class RawReceiptDetail extends BasePage {
line-height: 100rpx;
}
}
+
.library-right {
width: 100%;
height: 100rpx;
diff --git a/src/pages/raw/handover/RUS-picking/BySummary.vue b/src/pages/raw/handover/RUS-picking/BySummary.vue
index d833ef6..c9cc4d0 100644
--- a/src/pages/raw/handover/RUS-picking/BySummary.vue
+++ b/src/pages/raw/handover/RUS-picking/BySummary.vue
@@ -74,7 +74,7 @@
{{ $t('message.detailed') }}
-
+
{{ $t('message.po_Submit') }}
@@ -109,6 +109,7 @@ export default class RawReceiptDetail extends BasePage {
receiverName: '',
password: '',
};
+ disableflg = false;
model = model;
type = 'text';
wlCode: any = '';
@@ -366,6 +367,7 @@ export default class RawReceiptDetail extends BasePage {
}
//点击提交 上传数据
async onSubmit() {
+ this.disableflg = true;
const includeOrderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
const dataList: any = [];
this.model.aggregateList.forEach((item: any) => {
@@ -375,6 +377,7 @@ export default class RawReceiptDetail extends BasePage {
});
if (dataList.length == 0) {
this.customToast(this.$t('message.Warehouse_Tip6') as any);
+ this.disableflg = false;
return;
}
const params = {
@@ -383,16 +386,21 @@ export default class RawReceiptDetail extends BasePage {
dataList,
includeOrderOutIdList,
};
- await this.model.saveAggregateUploadRussia(params);
- if (this.model.code == '1') {
- uni.showToast({
- duration: 2000,
- title: this.$t('message.Warehouse_Tip9') as string,
- image: '/static/icons/icon-51.png',
- });
- setTimeout(() => {
- this.onAggregate();
- }, 2000);
+ try {
+ await this.model.saveAggregateUploadRussia(params);
+ if (this.model.code == '1') {
+ //this.disableflg = false;
+ uni.showToast({
+ duration: 2000,
+ title: this.$t('message.Warehouse_Tip9') as string,
+ image: '/static/icons/icon-51.png',
+ });
+ setTimeout(() => {
+ this.onAggregate();
+ }, 2000);
+ }
+ } catch (e) {
+ this.disableflg = false;
}
}
async onAggregate() {
@@ -406,6 +414,7 @@ export default class RawReceiptDetail extends BasePage {
};
this.unLockParams = params;
await this.model.queryAggregateList(params);
+ this.disableflg = false;
this.some = {};
this.LocationList = [];
this.wlCode = '';
@@ -471,9 +480,11 @@ export default class RawReceiptDetail extends BasePage {
.right {
flex: 1;
}
+
.u-th {
flex: auto;
}
+
.icon {
display: flex;
justify-content: center;
@@ -559,6 +570,7 @@ export default class RawReceiptDetail extends BasePage {
// text-align: center;
// }
}
+
.single-left {
width: 100%;
height: 100rpx;
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index cda64e6..c2acabb 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -69,7 +69,7 @@
{{ $t('message.detailed') }}
-
+
{{ $t('message.po_Submit') }}
@@ -115,6 +115,7 @@ export default class RawReceiptDetail extends BasePage {
wlCode: any = '';
LOCKProOrderResultListParams: any = '';
border = true;
+ disableflg = false;
//添加库位和数量的列表
LocationList: any = [];
//库位
@@ -292,6 +293,7 @@ export default class RawReceiptDetail extends BasePage {
* 提交
*/
async onSubmit() {
+ this.disableflg = true;
const dataList: any = [];
this.model.proOrderResultList.forEach((item: any) => {
if (item.checked == true) {
@@ -300,26 +302,32 @@ export default class RawReceiptDetail extends BasePage {
});
if (dataList.length == 0) {
this.customToast(this.$t('message.Warehouse_Tip6') as any);
+ this.disableflg = false;
return;
}
- await this.model.saveProOrderResultUpload(dataList);
- if (this.model.code == '1') {
- uni.showToast({
- //icon: 'success',
- title: this.$t('message.Warehouse_Tip9') as any,
- duration: 2000,
- image: '/static/icons/icon-51.png',
- });
- // this.GetLocation();
- setTimeout(() => {
- this.onAggregate();
- }, 2000);
+ try {
+ await this.model.saveProOrderResultUpload(dataList);
+ if (this.model.code == '1') {
+ uni.showToast({
+ //icon: 'success',
+ title: this.$t('message.Warehouse_Tip9') as any,
+ duration: 2000,
+ image: '/static/icons/icon-51.png',
+ });
+ // this.GetLocation();
+ setTimeout(() => {
+ this.onAggregate();
+ }, 2000);
+ }
+ } catch (e) {
+ this.disableflg = false;
}
}
async onAggregate() {
await this.model.queryProOrder(this.model.formParams);
await this.model.queryProOrderResult(this.model.NEWparams);
if (this.model.proOrderResultList.length == 0) {
+ this.disableflg = false;
this.some = {};
this.LocationList = [];
this.wlCode = '';
@@ -327,6 +335,7 @@ export default class RawReceiptDetail extends BasePage {
}
this.LOCKProOrderResultListParams = this.model.proOrderResultList;
await this.model.lockProOrderResult(this.model.proOrderResultList);
+ this.disableflg = false;
this.some = {};
this.LocationList = [];
this.wlCode = '';
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index cb9e879..ee60431 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -67,7 +67,7 @@
{{ $t('message.detailed') }}
-
+
{{ $t('message.po_Submit') }}
@@ -102,6 +102,7 @@ export default class RawReceiptDetail extends BasePage {
receiverName: '',
password: '',
};
+ disableflg = false;
model = model;
type = 'text';
wlCode: any = '';
@@ -272,6 +273,7 @@ export default class RawReceiptDetail extends BasePage {
}
//点击提交 上传数据
async onSubmit() {
+ this.disableflg = true;
const includeOrderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
const dataList: any = [];
this.model.aggregateList.forEach((item: any) => {
@@ -281,6 +283,7 @@ export default class RawReceiptDetail extends BasePage {
});
if (dataList.length == 0) {
this.customToast(this.$t('message.Warehouse_Tip6') as any);
+ this.disableflg = false;
return;
}
const params = {
@@ -289,16 +292,21 @@ export default class RawReceiptDetail extends BasePage {
dataList,
includeOrderOutIdList,
};
- await this.model.saveAggregateUpload(params);
- if (this.model.code == '1') {
- uni.showToast({
- duration: 2000,
- title: this.$t('message.Warehouse_Tip9') as string,
- image: '/static/icons/icon-51.png',
- });
- setTimeout(() => {
- this.onAggregate();
- }, 2000);
+ try {
+ await this.model.saveAggregateUpload(params);
+ if (this.model.code == '1') {
+ //this.disableflg = false;
+ uni.showToast({
+ duration: 2000,
+ title: this.$t('message.Warehouse_Tip9') as string,
+ image: '/static/icons/icon-51.png',
+ });
+ setTimeout(() => {
+ this.onAggregate();
+ }, 2000);
+ }
+ } catch (e) {
+ this.disableflg = false;
}
}
async onAggregate() {
@@ -312,6 +320,7 @@ export default class RawReceiptDetail extends BasePage {
};
this.unLockParams = params;
await this.model.queryAggregateList(params);
+ this.disableflg = false;
this.some = {};
this.LocationList = [];
this.wlCode = '';