Merge branch 'develop' into FOTON

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

@@ -223,7 +223,7 @@
                     drag
                     :action="fileUrl"
                     ref="importfile"
-                    :file-list="fileList"
+                    :file-list="form.fileList"
                     name="file"
                     accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="beginImportFile"
@@ -251,7 +251,6 @@
         name: "bzdyStep3",
         data() {
             return {
-                fileList: [],
                 commentText3: '',
                 newDocUser: '',
                 drawerModal: false,
@@ -267,6 +266,7 @@
                 acceptShow: false,
                 todoId: '',
                 form: {
+                    fileList: [],
                     dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
@@ -356,8 +356,10 @@
             },
             importFileRemove (file, fileList) {
                 if (fileList) {
-                    this.fileList = fileList.slice(-1)
+                    this.form.fileList = []
                 }
+                this.form.fileId = ''
+                this.form.fileName = ''
             },
             // 导入按钮 上传之前的钩子
             beginImportFile (file) {
@@ -387,10 +389,11 @@
             // 导入标准数据成功后执行
             importFileSuccess (response, file) {
                 if (response.ok) {
+                    this.form.fileList = []
                     this.fileMadel = false
                     this.form.fileId = response.data.id
                     this.form.fileName = response.data.name
-                    this.fileList = response.data
+                    this.form.fileList.push(response.data)
                     this.$message({
                         showClose: true,
                         message: response.message,
@@ -466,6 +469,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         let commitStatus = res.commitStatus
                         if(commitStatus && commitStatus > 0){
                             this.acceptShow = true
@@ -487,6 +491,7 @@
                         this.form.fileId = data.form ?  data.form.fileId : ''
                         this.form.dyhz = data.form ? data.form.dyhz : ''
                         this.newDocUser = data.form ? data.form.docUser : data.docUser
+                        this.form.fileList = data.form ? data.form.fileList : []
                     }).catch(e => {
                     })
                 })