[update] 修改bug81393

src/api/workCenter.js

@@ -435,6 +435,8 @@ const generateEmptyFileTemplate = (params) => getAction('/onlyOffice/saveEditFil
 const queryFileInfoByEditId = (params) => getAction('/onlyOffice/queryById', params)
 // 在线编辑-过程稿件文件id获取在线编辑文件id
 const getOnlineFileIdByFileId = (params) => getAction('/onlyOffice/saveEditFileWithOss', params)
+// 在线编辑-获取企标开始在线编辑的时候可以带入在线编辑的文件--获取到的是在线编辑的文件id不是系统的文件id
+const getStandardEditFileByNo = (params) => getAction('/onlyOffice/findEditFileByStandardNo', params)
 
 export {
   getProcessNodeList,
@@ -655,5 +657,6 @@ export {
 
   generateEmptyFileTemplate,
   queryFileInfoByEditId,
-  getOnlineFileIdByFileId
+  getOnlineFileIdByFileId,
+  getStandardEditFileByNo
 }

src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue

@@ -258,7 +258,7 @@ import UpdateListModal from './UpdateListModal'
 import TextContentModal from '../../../businessSupport/askForAdvice/modules/TextContentModal'
 import { getEnterpriseStandardInfoById } from '../../../../api/enterpriseStandardLibraryApi'
 import { onlineEditor } from '../../../../utils/onlyOfficeUtils'
-import { getOnlineFileIdByFileId } from '@/api/workCenter'
+import { getOnlineFileIdByFileId, getStandardEditFileByNo } from '@/api/workCenter'
 
 export default {
   name: 'MainDrafterInitBaseInfo',
@@ -453,7 +453,7 @@ export default {
         }
       })
       if (!data.onEditFile) {
-        await this.getStandardFile(data.standardId)
+        await this.getStandardFile(data.standardNumber)
       }
       // 在线编辑
       this.onEditFile = data.onEditFile
@@ -488,28 +488,10 @@ export default {
       })
     },
     // 获取标准本身的文件
-    async getStandardFile (standardId) {
+    async getStandardFile (standardNumber) {
-      await getEnterpriseStandardInfoById({ id: standardId, type: '2' }).then(res => {
+      await getStandardEditFileByNo({ standardNo: standardNumber }).then(res => {
         if (res.success) {
-          // 过程稿件id 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿
+          const fileId = res.result ? res.result.id : ''
-          // const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft']
-          // const needSuffixArr = ['doc', 'docx']
-          // let fileId = ''
-          // for (const item of fieldArr) {
-          //   if (!fileId) {
-          //     const fileNameArr = res.result[item + '_dictText'].split(',')
-          //     for (let i = 0; i < fileNameArr.length; i++) {
-          //       // 截取文件后缀名
-          //       const fileSuffix = (fileNameArr[i] ? fileNameArr[i].split('.')[fileNameArr[i].split('.').length - 1] : '').toLowerCase()
-          //       if (needSuffixArr.includes(fileSuffix)) {
-          //         // 说明是支持在线编辑的文件格式
-          //         console.log('支持在线编辑的文件', res.result[item].split(',')[i], res.result[item + '_dictText'].split(',')[i])
-          //         fileId = res.result[item].split(',')[i]
-          //       }
-          //     }
-          //   }
-          // }
-          const fileId = res.result.publish_of_original_standardSplit || ''
           this.standardCanOnlineEditFile = fileId
         }
       })
@@ -517,7 +499,7 @@ export default {
     // 上方表单企标编号修改了
     async listChange (value) {
       console.log(value)
-      await this.getStandardFile(value[0].id)
+      await this.getStandardFile(value[0].standardNumber)
       console.log(this.onEditFile)
     },
     // 外层要获取数据
@@ -634,15 +616,7 @@ export default {
       const validateResult = this.$refs.baseInfoForm.validateFormByFields(requiredField)
       if (validateResult) {
         console.log(this.onEditFile)
-        if (this.standardCanOnlineEditFile) {
+        this.onEditFile = await onlineEditor(params, this.onEditFile || this.standardCanOnlineEditFile)
-          getOnlineFileIdByFileId({ ossFileId: this.standardCanOnlineEditFile }).then(async res => {
-            if (res.success) {
-              this.onEditFile = await onlineEditor(params, res.result.id)
-            }
-          })
-        } else {
-          this.onEditFile = await onlineEditor(params, this.onEditFile)
-        }
       }
     }
   }

src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue

@@ -227,6 +227,10 @@ export default {
     }
   },
   watch: {
+    // 制修订类型，发起节点是修订的话需要外层获取在线编辑可以带进去的文件
+    'formInline.typeOfRevision' (val) {
+      this.$emit('typeOfRevisionChange', val, this.formInline.originEnStandardNo)
+    },
     // 标准等级分类改变后授权部门需要自动带出
     'formInline.grade_classification' (val) {
       if (val && !this.isEditSetData) {
@@ -396,6 +400,8 @@ export default {
             // 制修订类型
             formInline.typeOfRevision = res.result.applicationCategory
             formInline.typeOfRevision_dictText = res.result.applicationCategory_dictText
+            // 原企标编号，用于获取发布稿，带到在线编辑里面去
+            formInline.originEnStandardNo = res.result.originEnStandardNo
             // 企标编号
             formInline.standard_number = res.result.newEnStandardNo
             // 企标名称
@@ -610,6 +616,8 @@ export default {
     // 4、从企标计划选择企标编号的话，把其他字段也回显
     listChange (value) {
       console.log(value)
+      // 原企标编号，用于获取发布稿，带到在线编辑里面去
+      this.formInline.originEnStandardNo = value[0].originEnStandardNo
       // 回显企标编号
       this.formInline.standard_number = value[0].newEnStandardNo
       // 回显制修订类型

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <base-info-form ref="baseInfoForm" v-bind="$attrs" :disabled="disabled" @processNameChange="processNameChange"></base-info-form>
+    <base-info-form ref="baseInfoForm" v-bind="$attrs" :disabled="disabled" @processNameChange="processNameChange" @typeOfRevisionChange="typeOfRevisionChange"></base-info-form>
     <!--  标准文本 -->
     <div class="box-title-text form-flex-item">
       <div class="title-text">
@@ -56,6 +56,9 @@ import JTable from '@/components/jero/JTable'
 import BaseInfoForm from './BaseInfoForm'
 import AddEditDrafterDrawer from './AddEditDrafterDrawer'
 import { onlineEditor } from '../../../../utils/onlyOfficeUtils'
+import { getEnterpriseStandardInfoById } from '../../../../api/enterpriseStandardLibraryApi'
+import { ProjectType } from '../../../../enums/commonEnums'
+import { getStandardEditFileByNo } from '../../../../api/workCenter'
 
 export default {
   name: 'MainDrafterSentBaseInfo',
@@ -121,7 +124,8 @@ export default {
       dataSource: [],
       loading: false,
       modalType: undefined, // 当前是新增还是编辑编辑的话是edit+编辑行的下标
-      onEditFile: '' // 在线编辑文件
+      onEditFile: '', // 在线编辑文件
+      standardCanOnlineEditFile: '' // 修订的时候企标本身可以带进在线编辑的文件
     }
   },
   methods: {
@@ -168,6 +172,23 @@ export default {
         return false
       }
     },
+    // 获取标准本身的文件
+    async getStandardFile (standardNum) {
+      await getStandardEditFileByNo({ standardNo: standardNum }).then(res => {
+        if (res.success) {
+          const fileId = res.result ? res.result.id : ''
+          this.standardCanOnlineEditFile = fileId
+        }
+      })
+    },
+    // 制修订类型改变
+    typeOfRevisionChange (val, originStandardNum) {
+      if (val === ProjectType.ENACT.value) {
+        this.standardCanOnlineEditFile = ''
+      } else if (val === ProjectType.MODIFY.value) {
+        this.getStandardFile(originStandardNum)
+      }
+    },
     processNameChange (value) {
       this.$emit('processNameChange', value)
     },
@@ -216,7 +237,8 @@ export default {
       const requiredField = ['implementation_date', 'release_date', 'standard_name', 'standard_number', 'espId']
       const validateResult = this.$refs.baseInfoForm.validateFormByFields(requiredField)
       if (validateResult) {
-        this.onEditFile = await onlineEditor(params, this.onEditFile)
+        console.log(this.onEditFile || this.standardCanOnlineEditFile || '')
+        this.onEditFile = await onlineEditor(params, this.onEditFile || this.standardCanOnlineEditFile || '')
       }
     }
   }