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

src/api/process.js

@@ -604,6 +604,15 @@ export function getConvertFileByAttId(data) {
   })
 }
 
+// 获取openOffice 在线预览文件
+export function getBusStandFileByAttId(data) {
+  return axios({
+    url: 'api/att/attFile/getBusStandFileByAttId',
+    method: 'get',
+    params: data
+  })
+}
+
 // 未符合项跟踪修改状态
 export function updateBaseInfo(data) {
   return axios({

src/components/CustomFormComponents/File.vue

@@ -67,7 +67,8 @@
 </template>
 
 <script>
-import { getConvertFileByAttId } from 'api/process'
+import { getConvertFileByAttId,getBusStandFileByAttId } from 'api/process'
+let Base64 = require('js-base64').Base64;
 export default {
   name: 'CustomFile',
   data() {
@@ -335,29 +336,43 @@ export default {
     handlePreview(file) {
       const attId = file.response.data.id
       if (this.preview) {
-        this.getConvertFileByAttId(attId)
-          .then(res => {
-            switch (res.convertState) {
-              case 'ERROR':
-                this.$message.warning('文档转换失败')
-                break
-              case 'LODING':
-                this.$message.info('文档转换中，请稍后查看')
-                break
-              case 'SUCCESS':
-                const { convertFileInfo } = res
-                window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
-                break
-            }
-          }).catch(e => {
-            this.$message.warning('文档转换失败')
-        })
+          if (attId) {
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          } else {
+              this.$message.warning('文件不存在,下载失败')
+          }
       } else {
-        if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
-        } else {
-          this.$message.warning('文件不存在,下载失败')
-        }
+          this.getBusStandFileByAttId(attId)
+              .then(res => {
+                  console.log(res)
+                  if(res){
+                      const editFileInfo = res
+                      console.log(editFileInfo)
+                      if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
+                          window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
+                      }else {
+                          const nowTime = new Date().getTime()
+                          // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
+                          window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                      }
+                      // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+                  }
+                  // switch (res.convertState) {
+                  //   case 'ERROR':
+                  //     this.$message.warning('文档转换失败')
+                  //     break
+                  //   case 'LODING':
+                  //     this.$message.info('文档转换中，请稍后查看')
+                  //     break
+                  //   case 'SUCCESS':
+                  //     const { convertFileInfo } = res
+                  //     window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
+                  //     break
+                  // }
+              }).catch(e => {
+              console.log(e)
+              this.$message.warning('文件不存在,预览失败')
+          })
       }
     },
 
@@ -377,6 +392,21 @@ export default {
         })
       })
     },
+    getBusStandFileByAttId(attId) {
+      return new Promise((resolve, reject) => {
+        getBusStandFileByAttId({
+          attId
+        }).then(res => {
+          if (res.ok) {
+            resolve(res.data)
+          } else {
+            reject()
+          }
+        }).catch(e => {
+          reject(e)
+        })
+      })
+    },
 
     /**
      * @description: 获取展示的文件

src/components/treeSelect/treeSelectNew.vue

@@ -139,7 +139,7 @@
                 isShowSelect: false, // 是否显示树状选择器
                 options: [],
                 selectedData: [], // 选中的节点
-                style: 'width:' + this.width + 'px;' + 'height:100%;',
+                style: 'width:' + this.width + 'px;' + '',
                 selectStyle: 'width:100%;',
                 checkedIds: [],
                 checkedData: [],

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

@@ -164,7 +164,7 @@
                     <ProcessTitle v-show="verifySarStandard">
                         <template slot="title">实施日期</template>
                     </ProcessTitle>
-                    <div class="prc-content-border" v-show="verifySarStandard" >
+                    <div class="prc-content-border content_input" v-show="verifySarStandard" >
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
@@ -1285,6 +1285,7 @@
               zbjbdFileList: [],
               kwjFileList: [],
               glwjFileList: [],
+              nodeList5: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1468,6 +1469,8 @@
                     zrUserName: '',
                     jlUserId: '',
                     jlUserName: '',
+                    wssmr: '',
+                    wssmrId: '',
                     applyUpdUserId: this.$store.getters.userInfo.userId,
                     applyUpdUserName: this.$store.getters.userInfo.userName,
                     prcCreateUser: this.$store.getters.userInfo.userId,
@@ -2805,6 +2808,11 @@
         position: relative;
         overflow: hidden;
       }
+      .prc-content-border {
+        /deep/ .el-input__inner {
+          padding-left: 30px;
+        }
+      }
       /deep/ .el-dialog__body {
         padding: 0 20px 10px;
         color: #606266;