1、删除DNC冗余组件 2、优化DNC文档版本、文档指派及文档预览功能代码

zhaowei

2025-03-21 63ac895629d2de0e7f4284b1617d9aa8cbd07d05

1、删除DNC冗余组件
2、优化DNC文档版本、文档指派及文档预览功能代码

 src/views/dnc/base/WorkDoneList.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/WorkUpcomingList.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineForm.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineModal.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/ActivitiSingExamine/ActivitiSignExamineModal__Style#Drawer.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserForm.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserModal.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/AssignApproveUser/AssignApproveUserModal__Style#Drawer.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue

@@ -160,7 +160,7 @@
        checkedKeys: [],
        expandedKeys: [],
        autoExpandParent: true,
        isExpandAllTreeNode: false,
        isExpandAllTreeNode: true,
        date: [],
        url: {
          list: '/nc/doc/find/list'

 src/views/dnc/base/modules/WorkDone/WorkDoneForm.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkDone/WorkDoneModal.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkDone/WorkDoneModal__Style#Drawer.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingApprovalForm.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingApprovalModal.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingForm.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingModal.vue

ÎļþÒÑɾ³ý

 src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingModal__Style#Drawer.vue

ÎļþÒÑɾ³ý

 src/views/dnc/common/DocumentVersionTableList.vue

@@ -1,157 +1,177 @@
<template>
  <div>
    <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false" :size="size" rowKey="fileId"
             :customRow="customRow">
      <template slot="rowIndex" slot-scope="text,record,index">
        <span :style="{color:setCurrentVersionColor(record.publishFlag)}">{{parseInt(index) + 1}}</span>
      </template>
             :customRow="customRow" :scroll="{y:189}">
      <template slot="fileName" slot-scope="text,record,index">
      <span :style="{color:setCurrentVersionColor(record.publishFlag)}">
        {{text}}.{{record.fileSuffix}}
      <span>
        {{ text }}.{{ record.fileSuffix }}
        <span v-if="record.publishFlag">[当前版本]</span>
      </span>
      </template>
      <template slot="docVersion" slot-scope="text,record">
        <span :style="{color:setCurrentVersionColor(record.publishFlag)}">{{text}}</span>
      </template>
      <template slot="fileSize" slot-scope="text,record">
        <span :style="{color:setCurrentVersionColor(record.publishFlag)}">{{(text/1024).toFixed(2)}}KB</span>
      </template>
    </a-table>

    <SelectFileCompareModal :dataSource="dataSource" :setCurrentVersionColor="setCurrentVersionColor"
                            ref="selectFileCompareModalRef"/>
  </div>
</template>

<script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { getAction } from '@/api/manage'
  import dncApi from '@/api/dnc'
  import SelectFileCompareModal from './SelectFileCompareModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage'
import dncApi from '@/api/dnc'
import SelectFileCompareModal from './SelectFileCompareModal'

  export default {
    name: 'DocumentVersionTableList',
    mixins: [JeecgListMixin],
    components: { SelectFileCompareModal },
    props: {
      currentDocumentInfo: {
        type: Object
      },
      size: {
        type: String
      }
export default {
  name: 'DocumentVersionTableList',
  mixins: [JeecgListMixin],
  components: { SelectFileCompareModal },
  props: {
    currentDocumentInfo: {
      type: Object
    },
    data() {
      return {
        disableMixinCreated: true,
        queryParams: {},
        currentDocumentVersion: '',
        columns: [
          { title: '序号', dataIndex: 'rowIndex', width: 65, align: 'center', scopedSlots: { customRender: 'rowIndex' } },
          { title: '文件名称', dataIndex: 'fileName', align: 'center', scopedSlots: { customRender: 'fileName' } },
          { title: '版本号', dataIndex: 'docVersion', align: 'center', scopedSlots: { customRender: 'docVersion' } },
          { title: '文件大小', dataIndex: 'fileSize', align: 'center', scopedSlots: { customRender: 'fileSize' } }
        ],
        url: {
          list: '/nc/file/find/list'
        }
      }
    },
    created() {
      this.$bus.$on('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod)
    },
    methods: {
      loadData() {
        this.dataSource = []
        if (!this.url.list) {
          this.$message.error('请设置url.list属性!')
          return
        }
        var params = this.getQueryParams()//查询条件
        params.docId = this.currentDocumentInfo.docId
        if (!params) {
          return false
        }
        this.loading = true
        getAction(this.url.list, params).then((res) => {
          if (res.success) {
            this.dataSource = res.list
            this.currentDocumentVersion = res.list.find(item => item.publishFlag).docVersion
            console.log('currentDocumentVersion', this.currentDocumentVersion)
          } else {
            this.$message.warning(res.message)
    size: {
      type: String
    }
  },
  data() {
    return {
      disableMixinCreated: true,
      queryParams: {},
      columns: [
        {
          title: '序号',
          dataIndex: 'rowIndex',
          width: 65,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        }).finally(() => {
          this.loading = false
        })
      },

      /**
       * æŒ‡å®šå½“前文档为当前版本
       * @param fileId æ–‡ä»¶Id
       */
      handleFileAssign({ fileId }) {
        const that = this
        dncApi.appointCurrentDocumentVersionApi(fileId)
          .then(res => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              const currentAssignDocumentVersion = that.dataSource.find(item => item.fileId === fileId).docVersion
              // å¦‚果当前指定版本的版本号与当前版本的版本号一致则不重新加载列表并且不重新释放预览接口调取
              if (that.currentDocumentVersion === currentAssignDocumentVersion) return
              that.loadData()
              that.$emit('releaseFilePreviewApi')
            } else {
              that.$notification.error({
                message: '消息',
                description: res.message
              })
            }
          })
          .catch(err => {
            that.$notification.error({
              message: '消息',
              description: err.message
            })
          })
      },

      handleFileAddRelative(_, modalTitle) {
        if (!this.$refs.selectFileCompareModalRef) return
        this.$refs.selectFileCompareModalRef.visible = true
        this.$refs.selectFileCompareModalRef.title = modalTitle
      },

      customRow(record) {
        return {
          on: {
            contextmenu: event => {
              event.preventDefault()
              this.$emit('handleTableContextMenuOpen', Object.assign({ param: 'file' }, record))
            }
          }
        }
      },

      triggerCorrespondingMethod({ methodName, level, modalTitle, tableRowInfo }) {
        if (this[methodName]) this[methodName](tableRowInfo, modalTitle)
      },

      /**
       * è®¾ç½®è¡¨æ ¼ä¸­ä¸ºå½“前版本的文件表格行颜色标识
       * @param publishFlag æ˜¯å¦ä¸ºå½“前版本
       * @returns {string} é¢œè‰²æ ‡è¯†
       */
      setCurrentVersionColor(publishFlag) {
        return publishFlag ? '#DB9538' : ''
        },
        { title: '文件名称', dataIndex: 'fileName', align: 'center', scopedSlots: { customRender: 'fileName' } },
        { title: '版本号', dataIndex: 'docVersion', align: 'center' },
        { title: '文件大小', dataIndex: 'fileSize', align: 'center' }
      ],
      url: {
        list: '/nc/file/find/list'
      }
    }
  },
  created() {
    this.$bus.$on('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod)
  },
  beforeDestroy() {
    this.$bus.$off('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod)
  },
  methods: {
    // åŠ è½½åˆ—表数据
    loadData() {
      this.dataSource = []
      if (!this.url.list) {
        this.$message.error('请设置url.list属性!')
        return
      }
      var params = this.getQueryParams()//查询条件
      params.docId = this.currentDocumentInfo.docId
      if (!params) {
        return false
      }
      this.loading = true
      getAction(this.url.list, params)
        .then((res) => {
          if (res.success) this.dataSource = res.list
          else {
            that.$notification.error({
              message: '消息',
              description: res.message
            })
          }
        })
        .finally(() => {
          this.loading = false
        })
    },

    /**
     * æŒ‡å®šå½“前文档为当前版本
     * @param fileId æ–‡ä»¶Id
     */
    handleFileAssign({ fileId, publishFlag }) {
      const that = this
      console.log('publishFlag', publishFlag)
      // å¦‚果当前指定版本的版本号与当前版本的版本号一致则不发起请求
      if (publishFlag) {
        that.$notification.info({
          message: '消息',
          description: '当前文档版本即为当前文件'
        })
        return
      }
      dncApi.appointCurrentDocumentVersionApi(fileId)
        .then(res => {
          if (res.success) {
            that.$notification.success({
              message: '消息',
              description: res.message
            })
            that.loadData()
            that.$emit('releaseFilePreviewApi')
          } else {
            that.$notification.error({
              message: '消息',
              description: res.message
            })
          }
        })
        .catch(err => {
          that.$notification.error({
            message: '消息',
            description: err.message
          })
        })
    },

    /**
     * æ¯”对两个版本的文档内容
     * @param _
     * @param modalTitle å¼¹çª—标题
     */
    handleFileAddRelative(_, modalTitle) {
      if (!this.$refs.selectFileCompareModalRef) return
      this.$refs.selectFileCompareModalRef.visible = true
      this.$refs.selectFileCompareModalRef.title = modalTitle
    },

    /**
     * å®šåˆ¶è¡¨æ ¼è¡Œæ ·å¼åŠåŠŸèƒ½
     * @param record è¡¨æ ¼è¡Œä¿¡æ¯
     * @returns {{style: {color: (string)}, on: {contextmenu: *}}} æ ·å¼åŠåŠŸèƒ½
     */
    customRow(record) {
      return {
        style: {
          color: this.setCurrentVersionColor(record.publishFlag)
        },
        on: {
          contextmenu: event => {
            event.preventDefault()
            this.$emit('handleTableContextMenuOpen', Object.assign({ param: 'file' }, record))
          }
        }
      }
    },

    /**
     * è®¾ç½®è¡¨æ ¼ä¸­ä¸ºå½“前版本的文件表格行颜色标识
     * @param publishFlag æ˜¯å¦ä¸ºå½“前版本
     * @returns {string} é¢œè‰²æ ‡è¯†
     */
    setCurrentVersionColor(publishFlag) {
      return publishFlag ? '#DB9538' : ''
    },

    triggerCorrespondingMethod({ methodName, modalTitle, tableRowInfo }) {
      if (this[methodName]) this[methodName](tableRowInfo, modalTitle)
    }
  }
}
</script>

<style scoped>

</style>

 src/views/dnc/common/FilePreview.vue

@@ -12,87 +12,88 @@
</template>

<script>
  import dncApi from '@/api/dnc'
import dncApi from '@/api/dnc'

  export default {
    name: 'FilePreview',
    components: {},
    props: {
      currentDocumentInfo: {
        type: Object
      }
    },
    data() {
      return {
        spinning: false,
        pdfUrl: ''
      }
    },
    methods: {
      getFilePreviewByApi() {
        const { docId, docSuffix } = this.currentDocumentInfo
        console.log('currentDocumentInfo', this.currentDocumentInfo)
        // if (docSuffix !== 'pdf') {
        //   document.getElementById('ncFileInfo').innerHTML = ''
        //   dncApi.getFilePreviewApi(docId)
        //     .then(res => {
        //       console.log('res----------------------------', res)
        //       if (res.success && res.list) {
        //         let str = ''
        //         res.list.forEach((val, k) => {
        //           str += val
        //           if (k != res.list.length - 1) {
        //             str += '\n'
        //           }
        //         })
        //         document.getElementById('ncFileInfo').innerHTML = str
        //       } else {
        //         this.$notification.error({
        //           message: '消息',
        //           description: res.message
        //         })
        //       }
        //     })
        // } else {
        //   dncApi.getPdfFilePreviewApi(docId)
        //     .then(res => {
        //       let url = window.URL.createObjectURL(new Blob([res], { type: 'application/zip' }))
        //       this.pdfUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent(url)
        //       console.log('url===========================', url)
        //       console.log('pdfUrl===========================', this.pdfUrl)
        //     })
        // }
        this.spinning = true
        document.getElementById('ncFileInfo').innerHTML = ''
        dncApi.getFilePreviewApi(docId)
          .then(res => {
            console.log('res----------------------------', res)
            if (res.success && res.list) {
              let str = ''
              res.list.forEach((val, k) => {
                str += val
                if (k != res.list.length - 1) {
                  str += '\n'
                }
              })
              document.getElementById('ncFileInfo').innerHTML = str
            } else {
              this.$notification.error({
                message: '消息',
                description: res.message
              })
            }
          })
          .finally(() => {
            this.spinning = false
          })
      },
export default {
  name: 'FilePreview',
  components: {},
  props: {
    currentDocumentInfo: {
      type: Object
    }
  },
  data() {
    return {
      spinning: false,
      pdfUrl: ''
    }
  },
  methods: {
    getFilePreviewByApi() {
      const { docId, docSuffix } = this.currentDocumentInfo
      console.log('currentDocumentInfo', this.currentDocumentInfo)
      // if (docSuffix !== 'pdf') {
      //   document.getElementById('ncFileInfo').innerHTML = ''
      //   dncApi.getFilePreviewApi(docId)
      //     .then(res => {
      //       console.log('res----------------------------', res)
      //       if (res.success && res.list) {
      //         let str = ''
      //         res.list.forEach((val, k) => {
      //           str += val
      //           if (k != res.list.length - 1) {
      //             str += '\n'
      //           }
      //         })
      //         document.getElementById('ncFileInfo').innerHTML = str
      //       } else {
      //         this.$notification.error({
      //           message: '消息',
      //           description: res.message
      //         })
      //       }
      //     })
      // } else {
      //   dncApi.getPdfFilePreviewApi(docId)
      //     .then(res => {
      //       let url = window.URL.createObjectURL(new Blob([res], { type: 'application/zip' }))
      //       this.pdfUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent(url)
      //       console.log('url===========================', url)
      //       console.log('pdfUrl===========================', this.pdfUrl)
      //     })
      // }
      document.getElementById('ncFileInfo').innerHTML = ''
      if (docSuffix == 'jpg' || docSuffix == 'png' || docSuffix == 'jpeg' || docSuffix === 'gif' || docSuffix == 'pdf') return
      this.spinning = true
      dncApi.getFilePreviewApi(docId)
        .then(res => {
          console.log('res----------------------------', res)
          if (res.success && res.list) {
            let str = ''
            res.list.forEach((val, k) => {
              str += val
              if (k != res.list.length - 1) {
                str += '\n'
              }
            })
            document.getElementById('ncFileInfo').innerHTML = str
          } else {
            this.$notification.error({
              message: '消息',
              description: res.message
            })
          }
        })
        .finally(() => {
          this.spinning = false
        })
    }
  }
}
</script>

<style scoped>
  /deep/ .ant-spin-container {
    height: 100%;
  }
/deep/ .ant-spin-container {
  height: 100%;
}
</style>

 src/views/dnc/common/SelectFileCompareModal.vue

@@ -1,27 +1,22 @@
<template>
  <a-modal :title="title" :visible="visible" :width="700" @cancel="handleCloseModal" @ok="handleOpenCompareModal"
           :maskClosable="false">
    <a-table :dataSource="dataSource" :columns="columns" :pagination="false" bordered :scroll="{y:364}"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" rowKey="fileId">
      <template slot="rowIndex" slot-scope="text,record,index">
        <span :style="{color:setCurrentVersionColor(record.publishFlag)}">{{parseInt(index) + 1}}</span>
      </template>
      <template slot="fileName" slot-scope="text,record,index">
      <span :style="{color:setCurrentVersionColor(record.publishFlag)}">
        {{text}}.{{record.fileSuffix}}
        <span v-if="record.publishFlag">[当前版本]</span>
      </span>
      </template>
      <template slot="docVersion" slot-scope="text,record">
        <span :style="{color:setCurrentVersionColor(record.publishFlag)}">{{text}}</span>
      </template>
    </a-table>
  <template>
    <a-modal :title="title" :visible="visible" :width="700" @cancel="handleCloseModal" @ok="handleOpenCompareModal"
             :maskClosable="false">
      <a-table :dataSource="dataSource" :columns="columns" :pagination="false" bordered :scroll="{y:364}"
               :customRow="customRow"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" rowKey="fileId">
        <template slot="fileName" slot-scope="text,record,index">
        <span :style="{color:setCurrentVersionColor(record.publishFlag)}">
          {{ text }}.{{ record.fileSuffix }}
          <span v-if="record.publishFlag">[当前版本]</span>
        </span>
        </template>
      </a-table>

    <FileCompareModal ref="fileCompareModalRef" :fileDiffObject="fileDiffObject" :fileVersionArray="fileVersionArray"/>
  </a-modal>
</template>
      <FileCompareModal ref="fileCompareModalRef" :fileDiffObject="fileDiffObject" :fileVersionArray="fileVersionArray"/>
    </a-modal>
  </template>

<script>
  <script>
  import dncApi from '@/api/dnc'
  import FileCompareModal from './FileCompareModal'

@@ -45,9 +40,17 @@
        fileVersionArray: [],
        selectedFileInfo: {},
        columns: [
          { title: '序号', dataIndex: 'rowIndex', width: 65, align: 'center', scopedSlots: { customRender: 'rowIndex' } },
          {
            title: '序号',
            dataIndex: 'rowIndex',
            width: 65,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          { title: '文件名称', dataIndex: 'fileName', align: 'center', scopedSlots: { customRender: 'fileName' } },
          { title: '版本号', dataIndex: 'docVersion', align: 'center', scopedSlots: { customRender: 'docVersion' } }
          { title: '版本号', dataIndex: 'docVersion', align: 'center' }
        ]
      }
    },
@@ -65,11 +68,29 @@
      }
    },
    methods: {
      /**
       * å®šåˆ¶è¡¨æ ¼è¡Œæ ·å¼
       * @param record è¡¨æ ¼è¡Œä¿¡æ¯
       * @returns {{style: {color: *}}} æ ·å¼
       */
      customRow(record) {
        return {
          style: {
            color: this.setCurrentVersionColor(record.publishFlag)
          }
        }
      },

      /**
       * å½“表格多选框改变时触发
       * @param selectedRowKeys é€‰ä¸­çš„每一行的key集合
       */
      onSelectChange(selectedRowKeys) {
        if (selectedRowKeys.length < 3) this.selectedRowKeys = selectedRowKeys
        else this.selectedRowKeys = selectedRowKeys.slice(-2)
      },

      // æ‰“开对比窗口
      handleOpenCompareModal() {
        const { $confirm, $notification, selectedRowKeys, title, dataSource } = this
        if (selectedRowKeys.length < 2) {
@@ -121,14 +142,15 @@
        })
      },

      // å…³é—­çª—口
      handleCloseModal() {
        this.visible = false
        this.selectedRowKeys = []
      }
    }
  }
</script>
  </script>

<style scoped>
  <style scoped>

</style>
  </style>