From 1c5305f796aea56a56dd68716c4b738dedf0d9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Tue, 27 Jun 2023 18:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/scm/basicInformation/poundlist/ImportForm.vue  | 5 ++++-
 .../src/views/scm/basicInformation/poundlist/salesForm.vue   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue
index ace4984b..313b0465 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/ImportForm.vue
@@ -162,6 +162,7 @@ export default {
     },
     next() {
       if (this.active == 2) {
+        debugger
         if (!this.list.length) return this.$message({ message: '导入数据为空', type: 'warning' })
         this.btnLoading = true
         // this.btnLoading = false
@@ -171,12 +172,14 @@ export default {
         // this.active++
          ImportData({ list: this.list }).then(res => {
           if (res.data.resultType == 0){
+            debugger
             this.btnLoading = false
             this.$nextTick(() => {
               this.$refs.JNPFForm.init2(res.data.poundlistEntityList)
             })
             this.active++
-            this.cancel()
+            // this.visible = false
+            // this.cancel()
           }else if (res.data.resultType == 1) {
             this.result = res.data
             this.resultList = res.data.failResult
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index 6a9a5efb..4cb69412 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -1093,6 +1093,7 @@
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       init2(list) {
+        debugger
         this.visible = true
         this.dataForm.salesorder_item0List = list
         this.dataForm.documentNo = list[0].documentNo
@@ -1103,7 +1104,7 @@
         this.dataForm.customerName = list[0].customerName
         this.dataForm.isTransfer = list.isTransfer
         this.dataForm.purchaseOrderId = list.purchaseOrderId
-        this.dataForm.businessDate = new Date()
+        this.dataForm.businessDate = new Date().getTime()
         var num = 0
         var amount = 0
         var advance = 0