diff --git a/src/App.vue b/src/App.vue index 4a473bc..fb05661 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,6 +31,7 @@ export default Vue.extend({ diff --git a/src/pages/raw/handover/feeding/create.vue b/src/pages/raw/handover/feeding/create.vue index 00a6d6d..1252e86 100644 --- a/src/pages/raw/handover/feeding/create.vue +++ b/src/pages/raw/handover/feeding/create.vue @@ -131,10 +131,16 @@ export default class RawReceiptDetail extends BasePage { materialCode: any = ''; async propoWindow() { this.show = !this.show; - await this.query(); + // await this.query(); + if (this.PopupList.length == 0) { + this.PageShow = false; + } else { + this.PageShow = true; + } } async query() { this.PageShow = false; + this.PopupList = []; let params = { prdOrder: this.prdOrder, materialCode: this.materialCode, @@ -154,6 +160,9 @@ export default class RawReceiptDetail extends BasePage { } Change(e: any) { this.PopupList = this.obj[e.current - 1]; + this.PopupList.forEach((item: any) => { + item.checked = false; + }); } selectItem(e: any) { console.log(e); @@ -178,7 +187,6 @@ export default class RawReceiptDetail extends BasePage { return; } this.show = !this.show; - this.model.MaterialList.length = 0; this.prdOrder = ''; this.materialCode = ''; } diff --git a/src/pages/raw/handover/virtual/model.ts b/src/pages/raw/handover/virtual/model.ts index d08ddeb..6c6c9e9 100644 --- a/src/pages/raw/handover/virtual/model.ts +++ b/src/pages/raw/handover/virtual/model.ts @@ -131,6 +131,9 @@ export class VirtualModule extends VuexModule { @MutationAction async queryProOrderResult(params: any) { const { list: proOrderResultList }: any = await http.post(url.virtual.query.ordoutlist, params); + proOrderResultList.forEach((item: any) => { + item.hvAmount = 0; + }); return { proOrderResultList }; } diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue index dfeeb7a..12a3ad2 100644 --- a/src/pages/raw/handover/virtual/summary.vue +++ b/src/pages/raw/handover/virtual/summary.vue @@ -178,15 +178,22 @@ export default class VirtualSummary extends BasePage { //选中其中某一行数据 ClickHandover(e: any) { console.log(e); - if (e.data.length != this.model.proOrderResultList.length) { - let index = e.data[e.data.length - 1].index; - let num: any = parseFloat(this.model.proOrderResultList[index].amount) - parseFloat(this.model.proOrderResultList[index].totalMoAmount); - this.model.proOrderResultList[index].hvAmount = num; - } else { - this.model.proOrderResultList.forEach((item: any) => { - let num: any = parseFloat(item.amount) - parseFloat(item.totalMoAmount); - item.hvAmount = num; - }); + this.model.proOrderResultList.forEach((item: any) => { + if (!item.checked) { + item.hvAmount = 0; + } + }); + if (e.data.length != 0) { + if (e.data.length != this.model.proOrderResultList.length) { + let index = e.data[e.data.length - 1].index; + let num: any = parseFloat(this.model.proOrderResultList[index].amount) - parseFloat(this.model.proOrderResultList[index].totalMoAmount); + this.model.proOrderResultList[index].hvAmount = num; + } else { + this.model.proOrderResultList.forEach((item: any) => { + let num: any = parseFloat(item.amount) - parseFloat(item.totalMoAmount); + item.hvAmount = num; + }); + } } } onSubmit() {