文件上传改为相对路径、待办改为跳转页面、终审才有审核意见、项目进展加滚动

.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.105:9040'
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+VUE_APP_BASE_API = 'http://192.168.0.106:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/assets/styles/public.scss

@@ -489,6 +489,8 @@
       margin-bottom: 47px;
     }
     .schedule-timeline {
+      overflow-y: scroll;
+      padding: 15px 10px;
       .el-timeline {
         padding-left: 0;
         .timeline-item-green {

src/views/onlineDeclaration/declareAddContent/index.vue

@@ -1355,7 +1355,7 @@ export default {
         this.uploadLabel = '证明材料'
         break;
     }
-    console.log('this.templateInfo: ', this.templateInfo);
+    // console.log('this.templateInfo: ', this.templateInfo);
     getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => {
       this.baseInfo = response.data
     })
@@ -1456,7 +1456,7 @@ export default {
             detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
             detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
             params.fundingDetailList = detailList
-            console.log('11', params);
+            // console.log('11', params);
             addProjectSettlementAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1487,7 +1487,7 @@ export default {
             detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
             detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
             params.fundingDetailList = detailList
-            console.log('11', params);
+            // console.log('11', params);
             addBigStrongAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1521,7 +1521,7 @@ export default {
                 params.fireReport+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addCarrierConstructionAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1540,7 +1540,7 @@ export default {
                 params.agreement+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addPlatformConstructionAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1576,7 +1576,7 @@ export default {
                 params.material+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addSceneOpeningAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1607,7 +1607,7 @@ export default {
                 params.auditReport+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addCreditManagement(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1625,7 +1625,7 @@ export default {
                 params.material+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addIndustrialInternetAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1663,7 +1663,7 @@ export default {
                 params.financialStatements+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addManufacturingServicesAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1701,7 +1701,7 @@ export default {
                 params.auditReport+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addLogisticsDevelopmentAward(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1775,7 +1775,7 @@ export default {
                 params.otherEvidence+=`${item.url},`
               }
             })
-            console.log('11', params);
+            // console.log('11', params);
             addIntegrationIndustries(params).then((response) => {
               this.$message.success("上传成功");
               this.$router.go(-1)
@@ -1790,7 +1790,7 @@ export default {
       this.fileList = fileList
     },
     handleFileUpload(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1802,10 +1802,10 @@ export default {
         this.fileList.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         this.form.fileList = this.fileList
-        console.log('this.fileList: ', this.fileList);
+        // console.log('this.fileList: ', this.fileList);
       })
     },
     deleteUpload(value) {
@@ -1815,7 +1815,7 @@ export default {
     },
     /* 上传一 */
     handleFileUploadOne(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1825,7 +1825,7 @@ export default {
         this.fileListOne.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListOne.push(data)
         // this.form.fileListOne = this.fileListOne
         this.$set(this.form, 'fileListOne', this.fileListOne)
@@ -1834,7 +1834,7 @@ export default {
     },
     /* 上传二 */
     handleFileUploadTwo(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1844,7 +1844,7 @@ export default {
         this.fileListTwo.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListTwo.push(data)
         // this.form.fileListTwo = this.fileListTwo
         this.$set(this.form, 'fileListTwo', this.fileListTwo)
@@ -1853,7 +1853,7 @@ export default {
     },
     /* 上传三 */
     handleFileUploadThree(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1863,7 +1863,7 @@ export default {
         this.fileListThree.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListThree.push(data)
         // this.form.fileListThree = this.fileListThree
         this.$set(this.form, 'fileListThree', this.fileListThree)
@@ -1872,7 +1872,7 @@ export default {
     },
     /* 上传四 */
     handleFileUploadFour(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1882,7 +1882,7 @@ export default {
         this.fileListFour.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFour.push(data)
         // this.form.fileListFour = this.fileListFour
         this.$set(this.form, 'fileListFour', this.fileListFour)
@@ -1891,7 +1891,7 @@ export default {
     },
     /* 上传五 */
     handleFileUploadFive(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1901,7 +1901,7 @@ export default {
         this.fileListFive.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFive.push(data)
         // this.form.fileListFive = this.fileListFive
         this.$set(this.form, 'fileListFive', this.fileListFive)
@@ -1910,7 +1910,7 @@ export default {
     },
     /* 上传六 */
     handleFileUploadSix(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1920,7 +1920,7 @@ export default {
         this.fileListSix.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSix.push(data)
         // this.form.fileListSix = this.fileListSix
         this.$set(this.form, 'fileListSix', this.fileListSix)
@@ -1929,7 +1929,7 @@ export default {
     },
     /* 上传七 */
     handleFileUploadSeven(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1939,7 +1939,7 @@ export default {
         this.fileListSeven.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSeven.push(data)
         // this.form.fileListSeven = this.fileListSeven
         this.$set(this.form, 'fileListSeven', this.fileListSeven)
@@ -1948,7 +1948,7 @@ export default {
     },
     /* 上传八 */
     handleFileUploadEight(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1958,7 +1958,7 @@ export default {
         this.fileListEight.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListEight.push(data)
         // this.form.fileListEight = this.fileListEight
         this.$set(this.form, 'fileListEight', this.fileListEight)
@@ -1967,7 +1967,7 @@ export default {
     },
     /* 上传九 */
     handleFileUploadNine(params) {
-      console.log('params: ', params);
+      // console.log('params: ', params);
       this.form.fileName = params.file.name
       const file = params.file
       let form = new FormData()
@@ -1977,7 +1977,7 @@ export default {
         this.fileListNine.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListNine.push(data)
         // this.form.fileListNine = this.fileListNine
         this.$set(this.form, 'fileListNine', this.fileListNine)

src/views/onlineDeclaration/declareDetailContent/index.vue

@@ -1964,22 +1964,22 @@ export default {
           let otherMaterials = this.form.otherMaterials.split(',')
           let report = this.form.report.split(',')
           agreement.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           businessLicense.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           otherMaterials.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           report.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
@@ -2016,7 +2016,7 @@ export default {
           })
           let developmentPlan = this.form.developmentPlan.split(',')
           developmentPlan.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -2027,17 +2027,17 @@ export default {
           let businessLicense = this.form.businessLicense.split(',')
           let fireReport = this.form.fireReport.split(',')
           supportingMaterials.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           businessLicense.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           fireReport.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
@@ -2046,7 +2046,7 @@ export default {
           this.form = response.data.bmsPlatformConstructionAward //4
           let agreement = this.form.agreement.split(',')
           agreement.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -2056,7 +2056,7 @@ export default {
           this.form.level = this.form.level + ''
           let evidence = this.form.evidence.split(',')
           evidence.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -2066,7 +2066,7 @@ export default {
           this.form.type = this.form.type + ''
           let material = this.form.material.split(',')
           material.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -2077,17 +2077,17 @@ export default {
           let usesFunds = this.form.usesFunds.split(',')
           let auditReport = this.form.auditReport.split(',')
           projectPlan.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           usesFunds.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           auditReport.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
@@ -2096,7 +2096,7 @@ export default {
           this.form = response.data.bmsIndustrialInternetAward //8
           let material = this.form.material.split(',')
           material.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -2108,22 +2108,22 @@ export default {
           let auditReport = this.form.auditReport.split(',')
           let financialStatements = this.form.financialStatements.split(',')
           filingNotice.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           invoice.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           auditReport.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           financialStatements.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
@@ -2135,22 +2135,22 @@ export default {
           let filingNotice = this.form.filingNotice.split(',')
           let auditReport = this.form.auditReport.split(',')
           honorCertificate.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           platformName.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           filingNotice.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           auditReport.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
@@ -2168,47 +2168,47 @@ export default {
           let capitalVerificationReport = this.form.capitalVerificationReport.split(',')
           let otherEvidence = this.form.otherEvidence.split(',')
           evidence.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           businessLicense.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           taxPaymentCertificate.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           auditReport.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
           equityStructureChart.forEach(item => {
-            this.uploadListFive.push({name: item,url: item})
+            this.uploadListFive.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFive = [...this.uploadListFive]
             this.form.fileListFive = [...this.uploadListFive]
           })
           declarationReport.forEach(item => {
-            this.uploadListSix.push({name: item,url: item})
+            this.uploadListSix.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListSix = [...this.uploadListSix]
             this.form.fileListSix = [...this.uploadListSix]
           })
           independentAccounting.forEach(item => {
-            this.uploadListSeven.push({name: item,url: item})
+            this.uploadListSeven.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListSeven = [...this.uploadListSeven]
             this.form.fileListSeven = [...this.uploadListSeven]
           })
           capitalVerificationReport.forEach(item => {
-            this.uploadListEight.push({name: item,url: item})
+            this.uploadListEight.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListEight = [...this.uploadListEight]
             this.form.fileListEight = [...this.uploadListEight]
           })
           otherEvidence.forEach(item => {
-            this.uploadListNine.push({name: item,url: item})
+            this.uploadListNine.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListNine = [...this.uploadListNine]
             this.form.fileListNine = [...this.uploadListNine]
           })
@@ -2669,7 +2669,7 @@ export default {
         this.fileList.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         this.form.fileList = this.fileList
         // console.log('this.fileList: ', this.fileList);
@@ -2692,7 +2692,7 @@ export default {
         this.fileListOne.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         this.form.fileListOne = this.fileListOne
         // console.log('this.fileListOne: ', this.fileListOne);
@@ -2710,7 +2710,7 @@ export default {
         this.fileListTwo.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListTwo.push(data)
         this.form.fileListTwo = this.fileListTwo
         // console.log('this.fileListTwo: ', this.fileListTwo);
@@ -2728,7 +2728,7 @@ export default {
         this.fileListThree.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListThree.push(data)
         this.form.fileListThree = this.fileListThree
         console.log('this.fileListThree: ', this.fileListThree);
@@ -2746,7 +2746,7 @@ export default {
         this.fileListFour.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFour.push(data)
         this.form.fileListFour = this.fileListFour
         // console.log('this.fileListFour: ', this.fileListFour);
@@ -2764,7 +2764,7 @@ export default {
         this.fileListFive.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFive.push(data)
         this.form.fileListFive = this.fileListFive
         // console.log('this.fileListFive: ', this.fileListFive);
@@ -2782,7 +2782,7 @@ export default {
         this.fileListSix.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSix.push(data)
         this.form.fileListSix = this.fileListSix
         // console.log('this.fileListSix: ', this.fileListSix);
@@ -2800,7 +2800,7 @@ export default {
         this.fileListSeven.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSeven.push(data)
         this.form.fileListSeven = this.fileListSeven
         // console.log('this.fileListSeven: ', this.fileListSeven);
@@ -2818,7 +2818,7 @@ export default {
         this.fileListEight.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListEight.push(data)
         this.form.fileListEight = this.fileListEight
         // console.log('this.fileListEight: ', this.fileListEight);
@@ -2836,7 +2836,7 @@ export default {
         this.fileListNine.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListNine.push(data)
         this.form.fileListNine = this.fileListNine
         // console.log('this.fileListNine: ', this.fileListNine);

src/views/onlineDeclaration/enterpriseDirectory/index.vue

@@ -194,7 +194,7 @@
               label-width="150px" 
               prop="fileList"
               :rules="form.isFrame == 1 ? rules.fileList : [
-					      {required: false, message: '请填写存在内容', trigger: 'change' }]"
+					      {required: false, message: '请导入所需的文件', trigger: 'change' }]"
             >
               <el-upload
                 class="upload-demo"

src/views/onlineDeclaration/pendingReview/index.vue

@@ -151,8 +151,13 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="审批意见" prop="approvalOpinions">
+          <el-col :span="24" v-if="deptId == '103'">
+            <el-form-item 
+              label="审批意见" 
+              prop="approvalOpinions"
+              :rules="deptId == '103' ? rules.approvalOpinions : [
+					      {required: false, message: '请导入所需的文件', trigger: 'blur' }]"
+            >
               <el-input v-model="form.approvalOpinions" type="textarea" placeholder="请输入审批意见" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
@@ -326,7 +331,7 @@ export default {
         this.form.fileList = this.fileList
         let data = {}
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         // console.log('this.fileList: ', this.fileList);
       })

src/views/onlineDeclaration/records/components/index.vue

@@ -762,22 +762,22 @@ export default {
           let otherMaterials = this.form.otherMaterials.split(',')
           let report = this.form.report.split(',')
           agreement.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           businessLicense.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           otherMaterials.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           report.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
@@ -786,7 +786,7 @@ export default {
           this.form = response.data.bmsBigStrongAwardQueryVo //2
           let developmentPlan = this.form.developmentPlan.split(',')
           developmentPlan.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -797,17 +797,17 @@ export default {
           let businessLicense = this.form.businessLicense.split(',')
           let fireReport = this.form.fireReport.split(',')
           supportingMaterials.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           businessLicense.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           fireReport.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
@@ -816,7 +816,7 @@ export default {
           this.form = response.data.bmsPlatformConstructionAward //4
           let agreement = this.form.agreement.split(',')
           agreement.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -826,7 +826,7 @@ export default {
           this.form.level = this.form.level + ''
           let evidence = this.form.evidence.split(',')
           evidence.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -836,7 +836,7 @@ export default {
           this.form.type = this.form.type + ''
           let material = this.form.material.split(',')
           material.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
           })
@@ -847,17 +847,17 @@ export default {
           let usesFunds = this.form.usesFunds.split(',')
           let auditReport = this.form.auditReport.split(',')
           projectPlan.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           usesFunds.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           auditReport.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
@@ -866,7 +866,7 @@ export default {
           this.form = response.data.bmsIndustrialInternetAward //8
           let material = this.form.material.split(',')
           material.forEach(item => {
-            this.uploadList.push({name: item,url: item})
+            this.uploadList.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             // console.log(this.uploadList);
             this.fileList = [...this.uploadList]
             this.form.fileList = [...this.uploadList]
@@ -879,22 +879,22 @@ export default {
           let auditReport = this.form.auditReport.split(',')
           let financialStatements = this.form.financialStatements.split(',')
           filingNotice.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           invoice.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           auditReport.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           financialStatements.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
@@ -906,22 +906,22 @@ export default {
           let filingNotice = this.form.filingNotice.split(',')
           let auditReport = this.form.auditReport.split(',')
           honorCertificate.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           platformName.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           filingNotice.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           auditReport.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
@@ -938,47 +938,47 @@ export default {
           let capitalVerificationReport = this.form.capitalVerificationReport.split(',')
           let otherEvidence = this.form.otherEvidence.split(',')
           evidence.forEach(item => {
-            this.uploadListOne.push({name: item,url: item})
+            this.uploadListOne.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListOne = [...this.uploadListOne]
             this.form.fileListOne = [...this.uploadListOne]
           })
           businessLicense.forEach(item => {
-            this.uploadListTwo.push({name: item,url: item})
+            this.uploadListTwo.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListTwo = [...this.uploadListTwo]
             this.form.fileListTwo = [...this.uploadListTwo]
           })
           taxPaymentCertificate.forEach(item => {
-            this.uploadListThree.push({name: item,url: item})
+            this.uploadListThree.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListThree = [...this.uploadListThree]
             this.form.fileListThree = [...this.uploadListThree]
           })
           auditReport.forEach(item => {
-            this.uploadListFour.push({name: item,url: item})
+            this.uploadListFour.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFour = [...this.uploadListFour]
             this.form.fileListFour = [...this.uploadListFour]
           })
           equityStructureChart.forEach(item => {
-            this.uploadListFive.push({name: item,url: item})
+            this.uploadListFive.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListFive = [...this.uploadListFive]
             this.form.fileListFive = [...this.uploadListFive]
           })
           declarationReport.forEach(item => {
-            this.uploadListSix.push({name: item,url: item})
+            this.uploadListSix.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListSix = [...this.uploadListSix]
             this.form.fileListSix = [...this.uploadListSix]
           })
           independentAccounting.forEach(item => {
-            this.uploadListSeven.push({name: item,url: item})
+            this.uploadListSeven.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListSeven = [...this.uploadListSeven]
             this.form.fileListSeven = [...this.uploadListSeven]
           })
           capitalVerificationReport.forEach(item => {
-            this.uploadListEight.push({name: item,url: item})
+            this.uploadListEight.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListEight = [...this.uploadListEight]
             this.form.fileListEight = [...this.uploadListEight]
           })
           otherEvidence.forEach(item => {
-            this.uploadListNine.push({name: item,url: item})
+            this.uploadListNine.push({name: item,url: process.env.VUE_APP_BASE_API + item})
             this.fileListNine = [...this.uploadListNine]
             this.form.fileListNine = [...this.uploadListNine]
           })
@@ -1489,7 +1489,7 @@ export default {
         this.fileList.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         this.form.fileList = this.fileList
       })
@@ -1506,7 +1506,7 @@ export default {
         this.fileListOne.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListOne.push(data)
         this.form.fileListOne = this.fileListOne
         // console.log('this.fileListOne: ', this.fileListOne);
@@ -1524,7 +1524,7 @@ export default {
         this.fileListTwo.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListTwo.push(data)
         this.form.fileListTwo = this.fileListTwo
         // console.log('this.fileListTwo: ', this.fileListTwo);
@@ -1542,7 +1542,7 @@ export default {
         this.fileListThree.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListThree.push(data)
         this.form.fileListThree = this.fileListThree
         // console.log('this.fileListThree: ', this.fileListThree);
@@ -1560,7 +1560,7 @@ export default {
         this.fileListFour.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFour.push(data)
         this.form.fileListFour = this.fileListFour
         // console.log('this.fileListFour: ', this.fileListFour);
@@ -1578,7 +1578,7 @@ export default {
         this.fileListFive.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFive.push(data)
         this.form.fileListFive = this.fileListFive
         // console.log('this.fileListFive: ', this.fileListFive);
@@ -1596,7 +1596,7 @@ export default {
         this.fileListSix.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSix.push(data)
         this.form.fileListSix = this.fileListSix
         // console.log('this.fileListSix: ', this.fileListSix);
@@ -1614,7 +1614,7 @@ export default {
         this.fileListSeven.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSeven.push(data)
         this.form.fileListSeven = this.fileListSeven
         // console.log('this.fileListSeven: ', this.fileListSeven);
@@ -1632,7 +1632,7 @@ export default {
         this.fileListEight.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListEight.push(data)
         this.form.fileListEight = this.fileListEight
         // console.log('this.fileListEight: ', this.fileListEight);
@@ -1650,7 +1650,7 @@ export default {
         this.fileListNine.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListNine.push(data)
         this.form.fileListNine = this.fileListNine
         // console.log('this.fileListNine: ', this.fileListNine);

src/views/onlineDeclaration/supplementary/index.vue

@@ -1847,7 +1847,7 @@ export default {
         this.fileList.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         this.form.fileList = this.fileList
         console.log('this.fileList: ', this.fileList);
@@ -1870,7 +1870,7 @@ export default {
         this.fileListOne.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         // this.form.fileListOne = this.fileListOne
         this.$set(this.form, 'fileListOne', this.fileListOne)
@@ -1889,7 +1889,7 @@ export default {
         this.fileListTwo.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListTwo.push(data)
         // this.form.fileListTwo = this.fileListTwo
         this.$set(this.form, 'fileListTwo', this.fileListTwo)
@@ -1908,7 +1908,7 @@ export default {
         this.fileListThree.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListThree.push(data)
         // this.form.fileListThree = this.fileListThree
         this.$set(this.form, 'fileListThree', this.fileListThree)
@@ -1927,7 +1927,7 @@ export default {
         this.fileListFour.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFour.push(data)
         // this.form.fileListFour = this.fileListFour
         this.$set(this.form, 'fileListFour', this.fileListFour)
@@ -1946,7 +1946,7 @@ export default {
         this.fileListFive.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListFive.push(data)
         // this.form.fileListFive = this.fileListFive
         this.$set(this.form, 'fileListFive', this.fileListFive)
@@ -1965,7 +1965,7 @@ export default {
         this.fileListSix.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSix.push(data)
         // this.form.fileListSix = this.fileListSix
         this.$set(this.form, 'fileListSix', this.fileListSix)
@@ -1984,7 +1984,7 @@ export default {
         this.fileListSeven.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListSeven.push(data)
         // this.form.fileListSeven = this.fileListSeven
         this.$set(this.form, 'fileListSeven', this.fileListSeven)
@@ -2003,7 +2003,7 @@ export default {
         this.fileListEight.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListEight.push(data)
         // this.form.fileListEight = this.fileListEight
         this.$set(this.form, 'fileListEight', this.fileListEight)
@@ -2022,7 +2022,7 @@ export default {
         this.fileListNine.push(file)
         let data = {};
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadListNine.push(data)
         // this.form.fileListNine = this.fileListNine
         this.$set(this.form, 'fileListNine', this.fileListNine)

src/views/project/projectInfo/components/projectProgress/index copy.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="L-projectProgress">
-    <div class="projectProgress-title">【项目进展】</div>
-    <div class="schedule-timeline">
+  <div class="L-projectProgress" id="L-size-main">
+    <div class="projectProgress-title" id="L-header">【项目进展】</div>
+    <div class="schedule-timeline" :style="Mystyle">
       <el-timeline>
         <el-timeline-item
           v-for="(activity, index) in activities"
@@ -64,16 +64,33 @@ export default {
         status: 0,
       }],
       flow:[],
+      Mystyle:{
+        height:"",
+      }
     }
   },
   mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+    
     this.getFlow(this.$route.query.userId)
   },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   methods:{
     getFlow(id){
       declarationRecordsId(id).then(res=>{
         this.flow = res.data;
       })
+    },
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      this.Mystyle.height = elementHeight - headerHeight - 10 + 'px';
     }
   },
 }

src/views/project/projectInfo/components/projectProgress/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="L-projectProgress">
-    <div class="projectProgress-title">【项目进展】</div>
-    <div class="schedule-timeline">
+  <div class="L-projectProgress" id="L-size-main-right">
+    <div class="projectProgress-title" id="L-xiangmujinzhan">【项目进展】</div>
+    <div class="schedule-timeline" :style="Mystyle">
       <el-timeline>
         <el-timeline-item
           v-for="(activity, index) in flow"
@@ -45,7 +45,7 @@
                   <span>审核结果</span>
                   <span>{{ activity.approvalByName }}审核不通过</span>
                 </div>
-                <div class="card-content-two">
+                <div class="card-content-two" v-show="activity.approvalOpinions">
                   <span>审核意见</span>
                   <span>{{ activity.approvalOpinions }}</span>
                 </div>
@@ -85,17 +85,33 @@ export default {
       //   status: 0,
       // }],
       flow:[],
+      Mystyle:{
+        height:"",
+      }
     }
   },
   mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+    
     this.getFlow(this.$route.query.userId)
   },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   methods:{
-    // approvalStatus   0:待审核 1:审核通过 2:审核不通过
     getFlow(id){
       declarationRecordsId(id).then(res=>{
-        this.flow = res.data[0] ? res.data : [];
+        this.flow = res.data;
       })
+    },
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('L-size-main-right'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('L-xiangmujinzhan'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      this.Mystyle.height = elementHeight - headerHeight - 77 + 'px';
     }
   },
 }

src/views/workbench/index.vue

@@ -175,7 +175,7 @@ export default {
         this.form.fileList = this.fileList
         let data = {}
         data.name = response.originalFilename;
-        data.url = response.url;
+        data.url = response.fileName;
         this.uploadList.push(data)
         // console.log('this.fileList: ', this.fileList);
       })