From 73cfdfac42eea9d66319561228b053f57159c85b Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 6 Apr 2023 09:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BA=93-=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95-=E6=8B=86=E5=88=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 297ccbe34..e31d8de91 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -834,6 +834,7 @@
   >编辑
   </el-button>
   <el-upload
+      :key="cfjgscUploadKey"
       style="display: inline-block;margin:0 5px;"
       :show-file-list = 'false'
       v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'"
@@ -1836,6 +1837,7 @@ export default {
   },
   data() {
     return {
+      cfjgscUploadKey:1,
       externalStatus: '',
       handleList: [],
       CycxOptions: [],
@@ -2179,7 +2181,7 @@ export default {
         splitType: '全部章节'
       },
       headers:{
-        token: localStorage.getItem('userInfo')?.token
+        token: JSON.parse(localStorage.getItem('userInfo')).token
       }
     }
   },
@@ -2192,24 +2194,29 @@ export default {
     },
     uploadSplitResultSuccess (res, file, fileList) {
       if (res.ok) {
-        this.uploadFilesplitEo.attId = res.data.attId
-        this.uploadFilesplitEo.fileName = res.data.name
-        if (res.data.standNum != null && res.data.standNum !== '') {
-          this.uploadFilesplitEo.standNumSplit = res.data.standNum
-        }
-        if (res.data.standName != null && res.data.standName !== '') {
-          this.uploadFilesplitEo.standNameSplit = res.data.standName
-        }
-        this.defaultImportSplitResultFileList.push(file)
-        this.$message.success('文件上传成功')
-        setTimeout(()=>{
-          this.handleImportSplitResult();
-        },1000)
+        this.$message.success(res.message)
+        this.cfjgscUploadKey++
+        // this.uploadFilesplitEo.attId = res.data.attId
+        // this.uploadFilesplitEo.fileName = res.data.name
+        // if (res.data.standNum != null && res.data.standNum !== '') {
+        //   this.uploadFilesplitEo.standNumSplit = res.data.standNum
+        // }
+        // if (res.data.standName != null && res.data.standName !== '') {
+        //   this.uploadFilesplitEo.standNameSplit = res.data.standName
+        // }
+        // this.defaultImportSplitResultFileList.push(file)
+        // this.$message.success('文件上传成功')
+        // setTimeout(()=>{
+        //   this.handleImportSplitResult();
+        // },1000)
       } else {
-        this.defaultImportSplitResultFileList = []
-        this.uploadFilesplitEo.attId = ''
+        // this.defaultImportSplitResultFileList = []
+        // this.uploadFilesplitEo.attId = ''
         this.$message.error(res.message)
       }
+      setTimeout(()=>{
+        this.$router.go(0)
+      },2000)
     },
     handleImportSplitResult(){
       console.log(123333)
@@ -2220,10 +2227,13 @@ export default {
         _formData.append('standNumSplit', this.uploadFilesplitEo.standNumSplit)
         _formData.append('standId', this.uploadFilesplitEo.standId)
         _formData.append('standNameSplit', this.uploadFilesplitEo.standNameSplit)
-        _formData.append('fileType', this.uploadFilesplitEo.fileType)
+        // _formData.append('fileType', this.uploadFilesplitEo.fileType)
+        console.log(this.textStatusMap[sarStandardsInfoEO.textStatus])
+        _formData.append('fileType', this.textStatusMap[sarStandardsInfoEO.textStatus])
         _formData.append('file', file.raw)
         if (fileTypeResult) {
           this.importSplitResultLoading = true
+          console.log(123)
           this.$http.postData('lawss/sarFileSplitItems/importSplitItemsZip', _formData, {
           }, res => {
             this.importSplitResultLoading = false
@@ -2256,11 +2266,12 @@ export default {
       }
       this.sarStandardsInfoEO.lawsName = this.sarStandardsInfoEO.standName
       this.sarStandardsInfoEO.stateName = this.sarStandardsInfoEO.standStateShow
-      // this.sarStandardsInfoEO.resType = this.$route.params.pageType
+      this.sarStandardsInfoEO.resType = this.$route.params.pageType
       this.uploadFilesplitEo.standNumSplit = this.sarStandardsInfoEO.lawsNumber
       this.uploadFilesplitEo.standNameSplit = this.sarStandardsInfoEO.lawsName
       this.uploadFilesplitEo.standId = this.sarStandardsInfoEO.id
-      this.uploadFilesplitEo.fileType = this.$route.params.pageType
+      // this.uploadFilesplitEo.fileType = this.$route.params.pageType
+      this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
 
       var filename = file.name
       var index1 = filename.lastIndexOf('.')