From b5342f8ee11781479c42fcb81a4f13c010687b18 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Wed, 13 Apr 2022 16:24:05 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E8=A1=A5=E6=96=99=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=20&&=20=E8=99=9A=E6=8B=9F=E5=8D=95=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                | 16 ++++++++++++++
 src/pages/raw/handover/feeding/create.vue  | 12 +++++++++--
 src/pages/raw/handover/virtual/model.ts    |  3 +++
 src/pages/raw/handover/virtual/summary.vue | 25 ++++++++++++++--------
 4 files changed, 45 insertions(+), 11 deletions(-)

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({
 <style lang="scss">
 /* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 @import '~uview-ui/index.scss';
+
 /*每个页面公共css */
 page {
   height: 100%;
@@ -40,27 +41,33 @@ page {
   width: 100%;
   height: 100rpx;
   display: flex;
+
   .library-left {
     width: 45%;
     height: 100%;
     display: flex;
+
     view {
       // width: 120rpx;
       line-height: 100rpx;
     }
+
     .search {
       padding-left: 30px;
     }
   }
+
   .library-right {
     width: 55%;
     height: 100%;
     display: flex;
+
     .library-right-title {
       width: 140rpx;
       height: 100%;
       line-height: 100rpx;
     }
+
     .input {
       width: 200rpx;
       height: 70rpx;
@@ -69,6 +76,7 @@ page {
     }
   }
 }
+
 // .uni-input-input:disabled{
 //   background:red;
 // }
@@ -77,7 +85,15 @@ page {
   background: #ecefefb3;
   color: rgb(158, 157, 157);
 }
+
 .u-mode-center-box {
   padding: 5px;
 }
+
+.uni-modal {
+  z-index: 20000;
+}
+uni-modal {
+  z-index: 19000;
+}
 </style>
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() {