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,23 +1,15 @@ <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)}"> <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> @@ -45,12 +37,19 @@ return { disableMixinCreated: true, queryParams: {}, currentDocumentVersion: '', 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: 'fileSize', align: 'center', scopedSlots: { customRender: 'fileSize' } } { title: 'çæ¬å·', dataIndex: 'docVersion', align: 'center' }, { title: 'æä»¶å¤§å°', dataIndex: 'fileSize', align: 'center' } ], url: { list: '/nc/file/find/list' @@ -60,7 +59,11 @@ created() { this.$bus.$on('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod) }, beforeDestroy() { this.$bus.$off('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod) }, methods: { // å è½½åè¡¨æ°æ® loadData() { this.dataSource = [] if (!this.url.list) { @@ -73,15 +76,17 @@ 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) getAction(this.url.list, params) .then((res) => { if (res.success) this.dataSource = res.list else { that.$notification.error({ message: 'æ¶æ¯', description: res.message }) } }).finally(() => { }) .finally(() => { this.loading = false }) }, @@ -90,8 +95,17 @@ * æå®å½åææ¡£ä¸ºå½åçæ¬ * @param fileId æä»¶Id */ handleFileAssign({ fileId }) { 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) { @@ -99,9 +113,6 @@ 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 { @@ -119,14 +130,27 @@ }) }, /** * æ¯å¯¹ä¸¤ä¸ªçæ¬çææ¡£å 容 * @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() @@ -136,10 +160,6 @@ } }, triggerCorrespondingMethod({ methodName, level, modalTitle, tableRowInfo }) { if (this[methodName]) this[methodName](tableRowInfo, modalTitle) }, /** * è®¾ç½®è¡¨æ ¼ä¸ä¸ºå½åçæ¬çæä»¶è¡¨æ ¼è¡é¢è²æ è¯ * @param publishFlag æ¯å¦ä¸ºå½åçæ¬ @@ -147,11 +167,11 @@ */ 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
@@ -62,8 +62,9 @@ // console.log('pdfUrl===========================', this.pdfUrl) // }) // } this.spinning = true 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) @@ -86,7 +87,7 @@ .finally(() => { this.spinning = false }) }, } } } </script> src/views/dnc/common/SelectFileCompareModal.vue
@@ -2,18 +2,13 @@ <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="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> @@ -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,6 +142,7 @@ }) }, // å ³éçªå£ handleCloseModal() { this.visible = false this.selectedRowKeys = []