diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index a99d942..4dfc198 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -12,6 +12,7 @@
+
@@ -20,6 +21,7 @@
+
@@ -27,10 +29,11 @@
+
-
+
diff --git a/src/pages/product/warehouse/wholeTransfer/Local-details.vue b/src/pages/product/warehouse/wholeTransfer/Local-details.vue
index 06ed252..d2ebbfd 100644
--- a/src/pages/product/warehouse/wholeTransfer/Local-details.vue
+++ b/src/pages/product/warehouse/wholeTransfer/Local-details.vue
@@ -9,7 +9,7 @@
-
+
{{ $t('message.Query') }}
@@ -28,10 +28,12 @@ import model from './model';
export default class RawReceiptDetail extends BasePage {
model = model;
headers = Headers;
- cpRef4: any = '';
detailedList: any = [];
+ onReady() {
+ this.generate();
+ }
async generate() {
- if (this.cpRef4 == '') {
+ if (model.userDefined4 == '') {
uni.showToast({
icon: 'none',
title: this.$t('message._tips6') as any,
@@ -41,7 +43,7 @@ export default class RawReceiptDetail extends BasePage {
let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
let content = {
loginName: person.session.user.loginName,
- cpRef4: this.cpRef4,
+ cpRef4: model.userDefined4,
};
await this.model.querydetaildlist(content);
let arr = this.model.detailedList;
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index 372d87f..935c54c 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -73,9 +73,7 @@ interface OptionType {
},
})
export default class productCheckReceipt extends BasePage {
- /**
- * 表单引用
- */
+ //表单引用
@Ref('form') readonly $form!: VForm;
model = model;
form = {
@@ -86,13 +84,9 @@ export default class productCheckReceipt extends BasePage {
cboPlaceSelect = false;
rules: VFormRules = {
documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
- // originWl: [{ required: true, message: '请选择库位地点' }],
aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
};
- // back() {
- // uni.navigateBack({ delta: 1 });
- // }
value = '';
show = false;
//选择目标库位回调函数
@@ -120,6 +114,7 @@ export default class productCheckReceipt extends BasePage {
onReady() {
this.$form.setRules(this.rules);
this.model.queryLocation();
+ this.model.empty();
}
//点击生成随机移库码
async generate() {
@@ -134,7 +129,7 @@ export default class productCheckReceipt extends BasePage {
}
//移库确认
onSubmit() {
- this.$form.validate((valid: boolean) => {
+ this.$form.validate(async (valid: boolean) => {
if (!valid) return;
if (model.userDefined4 == ' ' || model.userDefined4.length == 0) {
uni.showToast({
@@ -177,7 +172,18 @@ export default class productCheckReceipt extends BasePage {
userDefined4: model.userDefined4,
},
];
- this.model.onTakeoutConfirm(orderlist);
+ await this.model.onTakeoutConfirm(orderlist);
+ if (model.code == '1') {
+ uni.showToast({
+ icon: 'none',
+ title: this.$t('message.Warehouse_Tip9') as string,
+ });
+ this.form.productCode = '';
+ model.empty();
+ setTimeout(() => {
+ this.toPage(this.page.product.warehouse.wholeTransfer.index);
+ }, 2000);
+ }
});
}
}
diff --git a/src/pages/product/warehouse/wholeTransfer/model.ts b/src/pages/product/warehouse/wholeTransfer/model.ts
index 0d8716f..dde70b0 100644
--- a/src/pages/product/warehouse/wholeTransfer/model.ts
+++ b/src/pages/product/warehouse/wholeTransfer/model.ts
@@ -108,19 +108,16 @@ export class wholeTransfer extends VuexModule {
@MutationAction
async empty() {
const orderInInfo: any = [];
- return { orderInInfo };
+ const userDefined4 = '';
+ const WlList = [];
+ const code = '';
+ return { orderInInfo, userDefined4, WlList, code };
}
@MutationAction
async onTakeoutConfirm(list: any) {
const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
- if (records.code == 1) {
- uni.showToast({
- icon: 'success',
- title: 'success',
- });
- // uni.navigateTo({ url: page.product.warehouse.index });
- }
- return {};
+ const code = records.code;
+ return { code };
}
//生成移库码
@MutationAction