Merge branch 'develop' into FOTON

src/components/CustomFormComponents/File.vue

@@ -360,6 +360,8 @@ export default {
                     console.log(editFileInfo)
                     if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
                       window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
+                    }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
+                        window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
                     }else {
                       const nowTime = new Date().getTime()
                       // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -430,6 +430,7 @@ export default {
 
       },
       qdform: {
+        projectId:"",
         projectNumber: "",
         projectName: "",
         detailedListName: "",
@@ -528,6 +529,7 @@ export default {
       } else {
         this.qdform.projectNumber = this.selectProject[0].projectNumber;
         this.qdform.projectName = this.selectProject[0].projectName;
+        this.qdform.projectId = this.selectProject[0].id;
         this.projectModel = false;
       }