diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue
index 95baaa4..018e174 100644
--- a/src/pages/raw/handover/aggregating/order.vue
+++ b/src/pages/raw/handover/aggregating/order.vue
@@ -156,6 +156,8 @@ export default class AggregatingOrder extends BasePage {
}
clickIndex(e: any) {
this.spliceItem = e.data[0].lineData.orderOutId;
+ let num:any = parseFloat(e.data[0].lineData.totalMoAmount) - parseFloat(e.data[0].lineData.totalHvAmount)
+ this.amountForm.amount = num
}
/**
* 接收人确认
diff --git a/src/pages/raw/handover/virtual/config.ts b/src/pages/raw/handover/virtual/config.ts
index e057a71..f01bb47 100644
--- a/src/pages/raw/handover/virtual/config.ts
+++ b/src/pages/raw/handover/virtual/config.ts
@@ -6,7 +6,22 @@ export const headers = [
{
label: vm.$t('message.Pi_OrderNo'),
key: 'prdOrder',
- width: 550,
+ width: 250,
+ },
+ {
+ label: vm.$t('message.po_DemandQuantity'),
+ key: 'amount',
+ width: 255,
+ },
+ {
+ label: vm.$t('message.Pi_materielNo'),
+ key: 'materialCode',
+ width: 250,
+ },
+ {
+ label: vm.$t('message.CommissionedMaterielDesc'),
+ key: 'materialDesc',
+ width: 300,
},
];
diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue
index b1e5e16..cddb2f7 100644
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@@ -278,11 +278,14 @@ export default class Virtual extends BasePage {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
let orderNoList = [];
+ let materialCodeList = []
if (this.isFormChange || this.model.proOrderList.length === 0) {
await model.queryProOrder(this.formParams);
orderNoList = model.proOrderList.map((_: any) => _.prdOrder);
+ materialCodeList = model.proOrderList.map((_: any) => _.materialCode);
} else {
orderNoList = this.model.checkedProOrderList.map((_: any) => _.prdOrder);
+ materialCodeList = this.model.checkedProOrderList.map((_: any) => _.materialCode);
}
if (orderNoList.length === 0 && this.model.proOrderList.length > 0) {
this.customToast(this.$t('message.Pi_OrderNoNotSelected') as string);
@@ -294,6 +297,7 @@ export default class Virtual extends BasePage {
const params = {
...this.formParams,
orderNoList: orderNoList,
+ materialCodeList:materialCodeList,
};
await this.model.queryProOrderResult(params);
this.model.setSapFactoryCode({ sapFactoryCode: this.form.sapFactoryCode });
diff --git a/src/pages/raw/handover/virtual/model.ts b/src/pages/raw/handover/virtual/model.ts
index 65898f6..45943c2 100644
--- a/src/pages/raw/handover/virtual/model.ts
+++ b/src/pages/raw/handover/virtual/model.ts
@@ -113,14 +113,10 @@ export class VirtualModule extends VuexModule {
*/
@MutationAction
async queryProOrder(params: any) {
- const { values }: any = await http.post(url.virtual.query.orderno, params);
- const proOrderList = values.map((v: string) => ({ prdOrder: v }));
+ const {list}: any = await http.post(url.virtual.query.orderno, params);
+ const proOrderList = list.map((v: string) => ({ prdOrder: v }));
proOrderList.forEach((_: any) => (_.checked = true));
if (!proOrderList.length) {
- // uni.showToast({
- // icon: 'none',
- // title: 'No data found!',
- // });
vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
}
return { proOrderList };
diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue
index 870c1b7..8354558 100644
--- a/src/pages/raw/handover/virtual/summary.vue
+++ b/src/pages/raw/handover/virtual/summary.vue
@@ -20,8 +20,8 @@
-->
-
-
+
+
@@ -29,13 +29,13 @@
-
-
+
+
-
-
+
+