diff --git a/src/pages/raw/STO/STO-OutboundTai/index.vue b/src/pages/raw/STO/STO-OutboundTai/index.vue
index 5ef5efb..440e872 100644
--- a/src/pages/raw/STO/STO-OutboundTai/index.vue
+++ b/src/pages/raw/STO/STO-OutboundTai/index.vue
@@ -41,7 +41,7 @@
-
+
@@ -132,10 +132,10 @@ export default class KanDanHandOver extends BasePage {
this.customToast(this.$t('message.Commission_tips6') as string);
return;
}
- if (this.NEWqty == '' || parseFloat(this.NEWqty) == 0) {
- this.customToast(this.$t('message.PleaseQuantity') as string);
- return;
- }
+ // if (this.NEWqty == '' || parseFloat(this.NEWqty) == 0) {
+ // this.customToast(this.$t('message.PleaseQuantity') as string);
+ // return;
+ // }
// if (parseFloat(this.NEWqty) > parseFloat(this.orderlist.qty)) {
// this.customToast(this.$t('message.greater') as string);
// return;
@@ -152,7 +152,7 @@ export default class KanDanHandOver extends BasePage {
stoNo: this.order3,
stoItem: this.orderlist.stoItem,
materialCode: this.orderlist.materialCode,
- orderAmount: this.NEWqty,
+ orderAmount: this.orderlist.orderAmount,
deliveryFactory: this.orderlist.deliveryFactory,
deliveryWlcode: this.orderlist.deliveryWlcode,
receiveFactory: this.orderlist.receiveFactory,
@@ -166,7 +166,7 @@ export default class KanDanHandOver extends BasePage {
});
this.orderlist = {};
this.model.materielList.length = 0;
- this.NEWqty = '';
+ //this.NEWqty = '';
this.query();
}
}
diff --git a/src/pages/raw/STO/STO-OutboundTai/model.ts b/src/pages/raw/STO/STO-OutboundTai/model.ts
index c36202c..7032535 100644
--- a/src/pages/raw/STO/STO-OutboundTai/model.ts
+++ b/src/pages/raw/STO/STO-OutboundTai/model.ts
@@ -1,7 +1,7 @@
/*
* @Author: zhou lei
* @Date: 2022-11-12 11:41:43
- * @LastEditTime: 2022-11-12 18:25:16
+ * @LastEditTime: 2022-11-12 19:15:54
* @LastEditors: zhou lei
* @Description:111
* @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-OutboundTai\model.ts
@@ -13,7 +13,7 @@ import http from '@/utils/request';
import { url } from '@/utils/url';
// import { page } from '@/utils/page';
import { session } from '@/store/modules/session';
-import vm from '@/main';
+//import vm from '@/main';
class OrderInInfo {
checked?: boolean;
@@ -61,26 +61,26 @@ export class STOOutboundTai extends VuexModule {
@MutationAction
async takeYKOrder(order3: any) {
// console.log('获取来的数据咋啊啊啊');
- try {
- const records: any = await http.post(url.warehouse.rowTransfer.findStoOutOrderInfo, {
- ...order3,
- factoryCode: session.factoryCode,
- loginName: session.loginName,
- });
- console.log('records', records);
- const code = records.code;
- const orderInInfoList = records.data;
- const materielList = orderInInfoList.map((item: any) => ({
- label: item.materialCode,
- value: item.materialCode,
- ...item,
- }));
- console.log('materielList', materielList);
- return { orderInInfoList, materielList, code };
- } catch {
- //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });
- vm.customToast(vm.$t('message.Warehouse_Tip11') as any);
- }
+ // try {
+ const records: any = await http.post(url.warehouse.rowTransfer.findStoOutOrderInfo, {
+ ...order3,
+ factoryCode: session.factoryCode,
+ loginName: session.loginName,
+ });
+ console.log('records', records);
+ const code = records.code;
+ const orderInInfoList = records.data;
+ const materielList = orderInInfoList.map((item: any) => ({
+ label: item.materialCode,
+ value: item.materialCode,
+ ...item,
+ }));
+ console.log('materielList', materielList);
+ return { orderInInfoList, materielList, code };
+ // } catch {
+ // //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });
+ // vm.customToast(vm.$t('message.Warehouse_Tip11') as any);
+ // }
}
@MutationAction
diff --git a/src/pages/raw/STO/STO-StorageTai/model.ts b/src/pages/raw/STO/STO-StorageTai/model.ts
index 74f5f72..2faef63 100644
--- a/src/pages/raw/STO/STO-StorageTai/model.ts
+++ b/src/pages/raw/STO/STO-StorageTai/model.ts
@@ -1,7 +1,7 @@
/*
* @Author: zhou lei
* @Date: 2022-11-12 11:41:58
- * @LastEditTime: 2022-11-12 18:24:19
+ * @LastEditTime: 2022-11-12 19:16:03
* @LastEditors: zhou lei
* @Description: 111
* @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-StorageTai\model.ts
@@ -13,7 +13,7 @@ import http from '@/utils/request';
import { url } from '@/utils/url';
// import { page } from '@/utils/page';
import { session } from '@/store/modules/session';
-import vm from '@/main';
+//import vm from '@/main';
class OrderInInfo {
checked?: boolean;
@@ -61,26 +61,26 @@ export class STOStorageTai extends VuexModule {
@MutationAction
async takeYKOrder(order3: any) {
// console.log('获取来的数据咋啊啊啊');
- try {
- const records: any = await http.post(url.warehouse.rowTransfer.findStoReceiveOrderInfo, {
- ...order3,
- factoryCode: session.factoryCode,
- loginName: session.loginName,
- });
- console.log('records', records);
- const code = records.code;
- const orderInInfoList = records.data;
- const materielList = orderInInfoList.map((item: any) => ({
- label: item.materialCode,
- value: item.materialCode,
- ...item,
- }));
- console.log('materielList', materielList);
- return { orderInInfoList, materielList, code };
- } catch {
- //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });
- vm.customToast(vm.$t('message.Warehouse_Tip11') as any);
- }
+ // try {
+ const records: any = await http.post(url.warehouse.rowTransfer.findStoReceiveOrderInfo, {
+ ...order3,
+ factoryCode: session.factoryCode,
+ loginName: session.loginName,
+ });
+ console.log('records', records);
+ const code = records.code;
+ const orderInInfoList = records.data;
+ const materielList = orderInInfoList.map((item: any) => ({
+ label: item.materialCode,
+ value: item.materialCode,
+ ...item,
+ }));
+ console.log('materielList', materielList);
+ return { orderInInfoList, materielList, code };
+ // } catch {
+ // //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });
+ // vm.customToast(vm.$t('message.Warehouse_Tip11') as any);
+ // }
}
@MutationAction