Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue

@@ -968,7 +968,6 @@ export default {
             this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
             this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
             this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
-
             this.$emit('emitDataLoading',false)
         }
     },
@@ -986,15 +985,15 @@ export default {
   mounted () {
     if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
         this.getDataAsync()
-        this.form = this.formSub
+        this.form = JSON.parse(JSON.stringify(this.formSub))
         console.log(this.QTWJBUSSFileListSub)
-        this.FBGBUSSFileList= this.FBGBUSSFileListSub
-        this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
-        this.LSBBBUSSFileList= this.LSBBBUSSFileListSub
-        this.QTWJBUSSFileList= this.QTWJBUSSFileListSub
-        this.GLWJBUSSFileList= this.GLWJBUSSFileListSub
-        this.summaryFileList= this.summaryFileListSub
-        this.madelSubList= this.madelSubListSub
+        this.FBGBUSSFileList= this.FBGBUSSFileListSub?JSON.parse(JSON.stringify(this.FBGBUSSFileListSub)):[]
+        this.LSBBBUSSFileList= this.LSBBBUSSFileListSub?JSON.parse(JSON.stringify(this.LSBBBUSSFileListSub)):[]
+        this.BZSMBUSSFileList=this.BZSMBUSSFileListSub?JSON.parse(JSON.stringify(this.BZSMBUSSFileListSub)):[]
+        this.QTWJBUSSFileList= this.QTWJBUSSFileListSub?JSON.parse(JSON.stringify(this.QTWJBUSSFileListSub)):[]
+        this.GLWJBUSSFileList= this.GLWJBUSSFileListSub?JSON.parse(JSON.stringify(this.GLWJBUSSFileListSub)):[]
+        this.summaryFileList= this.summaryFileListSub?JSON.parse(JSON.stringify(this.summaryFileListSub)):[]
+        this.madelSubList= this.madelSubListSub?JSON.parse(JSON.stringify(this.madelSubListSub)):[]
     }
   },
   watch: {

src/pages/processCenter/pages/creatProcess/qbrk/step5.vue

@@ -1458,7 +1458,7 @@
                             }else {
                                 const nowTime = new Date().getTime()
                                 // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
+                                this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf';
                             }
                             this.iframeLoading = false
                             this.$forceUpdate()

src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue

@@ -50,8 +50,7 @@
                                 ref="selection"
                                 tooltip-effect="dark"
                                 style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
-                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-                                        fontWeight: 'bold', height: '48px'}"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',fontWeight: 'bold', height: '48px'}"
                                 :data="form.fileModelList"
                                 border
                                 default-expand-all>
@@ -802,7 +801,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
-                tablePHeight:'',
+                tablePHeight:'auto',
                 tableHeight: {
                     standardTableHeight: null
                 },