Merge branch 'develop' into 'FOTON'

commit

See merge request LAWS/laws-system-front-FOTON!274

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -220,15 +220,16 @@
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     class="upload-demo"
-                    multiple
                     drag
                     :action="fileUrl"
                     ref="importfile"
+                    :file-list="fileList"
                     name="file"
                     accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
-                    :show-file-list="false"
+                    :on-remove="importFileRemove"
+                    :show-file-list="true"
             >
                 <div style="padding: 20px 0">
                     <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -250,6 +251,7 @@
         name: "bzdyStep3",
         data() {
             return {
+                fileList: [],
                 commentText3: '',
                 newDocUser: '',
                 drawerModal: false,
@@ -352,6 +354,11 @@
                 let id = item.id
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
             },
+            importFileRemove (file, fileList) {
+                if(fileList){
+                    this.fileList = fileList.slice(-1)
+                }
+            },
             // 导入按钮 上传之前的钩子
             beginImportFile (file) {
                 var filename = file.name
@@ -383,6 +390,7 @@
                     this.fileMadel = false
                     this.form.fileId = response.data.id
                     this.form.fileName = response.data.name
+                    this.fileList = response.data
                     this.$message({
                         showClose: true,
                         message: response.message,

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -682,7 +682,7 @@ export default {
             })
           } else if (row.taskInfo === '责任对接人审批') {
             this.$router.push({
-              name: 'phoneBzdyStep4',
+              name: 'bzdyStep4',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,