From 89f7f9df5efa7811d74be084fd81adb4f20c3bfc Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Mon, 12 Aug 2024 11:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9=E5=88=B7=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yys/yysmaterialprocurementplan/form.vue   | 40 ++++++++++---------
 .../yysmaterialprocurementplan/formOrder.vue  |  2 +-
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
index fa0ccc0..3e46e84 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
@@ -568,7 +568,7 @@
       <JNPF-Form-Order
         v-if="formOrderVisible"
         ref="JNPFFormOrder"
-        @refresh="fnRefreshFormOrder"
+        @refreshFormOrder="fnRefreshFormOrder"
       />
     </div>
   </transition>
@@ -749,9 +749,10 @@ export default {
   },
   mounted() {},
   methods: {
-    fnRefreshFormOrder(isrRefresh) {
-      this.formOrderVisible = false;
-      if (isrRefresh) this.reset();
+    fnRefreshFormOrder() {
+      console.log("刷新");
+      console.log(this.dataForm.id)
+      this.init(this.dataForm.id)
     },
     fnProcurementOrderCreate(row) {
       this.$nextTick(() => {
@@ -897,21 +898,21 @@ export default {
       this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
     },
     init(id, isDetail, allList) {
-      this.prevDis = false;
-      this.nextDis = false;
-      this.allList = allList || [];
-      if (allList.length) {
-        this.index = this.allList.findIndex(item => item.id === id);
-        if (this.index == 0) {
-          this.prevDis = true;
-        }
-        if (this.index == this.allList.length - 1) {
-          this.nextDis = true;
-        }
-      } else {
-        this.prevDis = true;
-        this.nextDis = true;
-      }
+      // this.prevDis = false;
+      // this.nextDis = false;
+      // this.allList = allList || [];
+      // if (allList.length) {
+      //   this.index = this.allList.findIndex(item => item.id === id);
+      //   if (this.index == 0) {
+      //     this.prevDis = true;
+      //   }
+      //   if (this.index == this.allList.length - 1) {
+      //     this.nextDis = true;
+      //   }
+      // } else {
+      //   this.prevDis = true;
+      //   this.nextDis = true;
+      // }
       this.dataForm.id = id || 0;
       this.visible = true;
       this.$nextTick(() => {
@@ -921,6 +922,7 @@ export default {
             url: "/api/example/YysMaterialProcurementPlan/" + this.dataForm.id,
             method: "get"
           }).then(res => {
+            console.log(res)
             this.dataInfo(res.data);
             this.loading = false;
           });
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/formOrder.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/formOrder.vue
index 447f48d..26ef407 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/formOrder.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/formOrder.vue
@@ -238,7 +238,7 @@ export default {
     },
     goBack() {
       this.visible = false;
-      this.$emit("refreshDataList", true);
+      this.$emit("refreshFormOrder", true);
     },
     init(dataForm, row) {
       this.dataForm = dataForm;