From 255cd8fa50ca3e45cefeedce9cd1d301ba998f71 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 1 Apr 2024 09:15:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug:=20=E7=94=A8=E4=BA=8E=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=97=A7=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=A5=E6=9C=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 4 ++-- .../pages/processList/tabComponents/alreadyProcess/index.vue | 2 +- .../pages/processList/tabComponents/alreadySend/index.vue | 2 +- .../pages/processList/tabComponents/monitorProcess/index.vue | 2 +- .../pages/processList/tabComponents/processCenter/index.vue | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 29f266d95..593c2a88f 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -189,7 +189,7 @@ export default { break case 'buss1': let oldAndNewBuss = '' - const currentDateBuss = new Date('2024-01-25 23:59:59').getTime(); + const currentDateBuss = new Date('2024-04-01 00:00:00').getTime(); const dateBuss = new Date(row.creatTime); const timestampBuss = dateBuss.getTime(); if (currentDateBuss > timestampBuss){ @@ -329,7 +329,7 @@ export default { break; case '3': let oldAndNewBuss1 = '' - const currentDateBuss1 = new Date('2024-01-25 23:59:59').getTime(); + const currentDateBuss1 = new Date('2024-04-01 00:00:00').getTime(); const dateBuss1 = new Date(row.creatTime); const timestampBuss1 = dateBuss1.getTime(); if (currentDateBuss1 > timestampBuss1){ diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 3657257bf..51fe0c51b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -240,7 +240,7 @@ export default { }, dealWith (row) { // 查看 let oldAndNew = '' - const currentDate = new Date('2024-03-24 23:59:59').getTime(); + const currentDate = new Date('2024-04-01 00:00:00').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index f6e52a213..d8e0f7794 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -270,7 +270,7 @@ export default { }, dealWith (row) { // 查看 let oldAndNew = '' - const currentDate = new Date('2024-03-24 23:59:59').getTime(); + const currentDate = new Date('2024-04-01 00:00:00').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 1d4b7e424..9c4a2b95f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -243,7 +243,7 @@ export default { }, dealWith (row) { // 查看 let oldAndNew = '' - const currentDate = new Date('2024-03-24 23:59:59').getTime(); + const currentDate = new Date('2024-04-01 00:00:00').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f6c0b8b45..b0063bd9f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -349,7 +349,7 @@ export default { break case 'buss1': let oldAndNewBuss = '' - const currentDateBuss = new Date('2024-03-24 23:59:59').getTime(); + const currentDateBuss = new Date('2024-04-01 00:00:00').getTime(); const dateBuss = new Date(row.creatTime); const timestampBuss = dateBuss.getTime(); if (currentDateBuss > timestampBuss){ @@ -962,7 +962,7 @@ export default { break; case '3': let oldAndNew = '' - const currentDate = new Date('2024-03-24 23:59:59').getTime(); + const currentDate = new Date('2024-04-01 00:00:00').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ From 370082809e8a1a24ae6d6409795789007dc75819 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Mon, 1 Apr 2024 11:28:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E7=AE=A1=E7=90=86=E5=91=98=E5=92=8C?= =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4=20?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=A0=87=E8=AE=B0=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 2 +- .../components/addModal.vue | 1 + .../components/detailModal.vue | 6 +++--- .../standardTranslationAcquisitionRequest/index.vue | 6 ++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5a8f941aa..082a29876 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -561,7 +561,7 @@ mounted () { this.$http.get('/lawss/standardApplyFor/queryPendingApprovalCount', '', { _this: this }, res => { if (res.ok) { - this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data) + this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data.pendingApprovalCount) } }) }, diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index 57a214440..f2a274dc4 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -185,6 +185,7 @@ export default { this.$nextTick(() => { this.$refs.addFormRef.clearValidate() this.getDicTypeListCode() + this.standLbList = [] }) }, showModal (item) { diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue index 00c12fcc2..06d4257ea 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -31,7 +31,7 @@ -
{{ StandardApplyForEO.standTypeShow ? StandardApplyForEO.standTypeShow : '--' }}
+
{{ StandardApplyForEO.standTypeShow ? StandardApplyForEO.standTypeShow : '--' }}
 @@ -86,7 +86,7 @@ -
{{ StandardApplyForEO.reason ? StandardApplyForEO.reason : '--' }}
+
{{ StandardApplyForEO.reason ? StandardApplyForEO.reason : '--' }}
 @@ -104,7 +104,7 @@ -
{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--' }}
+
{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--' }}
 diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 5dd23956a..444eaff93 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -173,7 +173,7 @@ 重新提交
{ if (res.ok) { - this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data) + this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data.pendingApprovalCount) + this.moduleAdmin = res.data.isStandardApplyForAdministrator } }) }) From ebf13c861b8cdd8228c85054bb27eb65e8aaebe4 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Mon, 1 Apr 2024 11:47:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/standardTranslationAcquisitionRequestModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index 748f32e63..1740c9f4e 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -15,7 +15,7 @@ :on-error="importError" :show-file-list="false" :multiple="false" - accept=".xlsx,xls" + accept=".xlsx,.xls" > 导入 From 05fd0fe6c4660649e9e7a408682b086517080b37 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:49:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.vue | 441 +++++++++--------- 1 file changed, 231 insertions(+), 210 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 444eaff93..26a6b2abc 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -5,15 +5,15 @@ {{ opt.label }} @@ -21,31 +21,32 @@ - + - + {{ opt.label }} @@ -57,156 +58,174 @@
-
-
-
- 批量驳回 - 批量通过 - 列表导出 -
-
- 标准/译文获取申请 +
+
+ 批量驳回 + + 批量通过 + + 列表导出 + +
+
+ 标准/译文获取申请 + +
+
+
+
+
+ + + + + + + + + + + + + +
- - - - - - - - - - - - - - - + -
- - - - + /> + + + +
@@ -226,7 +245,7 @@ export default { exportDialog, addModal }, - data () { + data() { return { moduleAdmin: false, applyForUnitName: '', @@ -280,17 +299,17 @@ export default { nodeListDep: [] } }, - mounted () { + mounted() { this.account = JSON.parse(window.localStorage.getItem('userInfo')).account if (this.$route.query && this.$route.query.tag === 'fromSearchCenter') { this.standardsAndTranslationRequestShowModal() - this.$router.replace({ query: { ...this.$route.query, tag: undefined } }) + this.$router.replace({query: {...this.$route.query, tag: undefined}}) } this.getList() this.getDicTypeListCode() }, methods: { - batchDelete (id) { + batchDelete(id) { let ids = '' let tipsText = '' if (id) { @@ -304,17 +323,17 @@ export default { type: 'warning', roundButton: false }).then(() => { - this.$http.postData(this.url.deleteUrl, { ids: ids }, { _this: this }, res => { + this.$http.postData(this.url.deleteUrl, {ids: ids}, {_this: this}, res => { if (res.ok) { this.$message.success('操作成功') this.getList() - }else{ + } else { this.$message.warning(res.message) } }) }) }, - drawerCheckDep (data) { + drawerCheckDep(data) { let idList = '' let nameList = '' data.forEach(item => { @@ -328,7 +347,7 @@ export default { this.StandardApplyForEOPage.applyForUnitIds = idList; this.applyForUnitName = nameList; }, - choiceZRBM (type, title, id = '') { + choiceZRBM(type, title, id = '') { this.nodeListDep = [] if (id) { this.$set(this, 'nodeListDep', id.split(',')) @@ -336,24 +355,24 @@ export default { this.choiceTitle = title this.modalShowDepFlag = true }, - ResubmitOrWithdraw (id, status) { + ResubmitOrWithdraw(id, status) { const query = { status: status ? status : '', ids: id } - this.$http.postData('/lawss/standardApplyFor/batchUpdateStatus', query, { _this: this }, res => { + this.$http.postData('/lawss/standardApplyFor/batchUpdateStatus', query, {_this: this}, res => { if (res.ok) { this.$message.success('操作成功') this.getList() - }else{ + } else { this.$message.warning(res.message) } }) }, - edit (item) { + edit(item) { this.$refs.addModalRef.showModal(item) }, - checkedRole (data) { + checkedRole(data) { let idList = '' let nameList = '' data.forEach(item => { @@ -367,9 +386,9 @@ export default { this.StandardApplyForEOPage.applyForUserIds = idList this.applyForUserName = nameList }, - choiceWSSMR (type, title, id) { + choiceWSSMR(type, title, id) { this.nodeList = [] - if(id) { + if (id) { const nameId = id.split(',') let idList = [] nameId.forEach(item => { @@ -382,7 +401,7 @@ export default { this.drawerTitle = title this.modalShowRoleFlag = true }, - getDicTypeListCode () { + getDicTypeListCode() { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { @@ -391,11 +410,11 @@ export default { }, e => { }) }, - searchData () { + searchData() { this.StandardApplyForEOPage.page = 1 this.getList() }, - clearSerach () { + clearSerach() { this.applyForUnitName = '' this.applyForUserName = '' this.StandardApplyForEOPage = { @@ -404,7 +423,7 @@ export default { } this.getList() }, - getList () { + getList() { this.tableLoading = true this.$http.get(this.url.getList, { ...this.StandardApplyForEOPage @@ -414,14 +433,14 @@ export default { if (res.ok) { this.StandardApplyForEO = res.data.records this.total = res.data.total - }else { + } else { this.StandardApplyForEO = [] this.total = 0 } this.selectedList = [] this.$refs.selections.clearSelection() this.tableLoading = false - this.$http.get('/lawss/standardApplyFor/queryPendingApprovalCount', '', { _this: this }, res => { + this.$http.get('/lawss/standardApplyFor/queryPendingApprovalCount', '', {_this: this}, res => { if (res.ok) { this.$store.commit('SET_STANDARD_TRANSLATION_TODO', res.data.pendingApprovalCount) this.moduleAdmin = res.data.isStandardApplyForAdministrator @@ -429,7 +448,7 @@ export default { }) }) }, - batchPass (id) { + batchPass(id) { if (id.length === 0) { this.$message({ message: '请选择至少一条数据', @@ -454,7 +473,7 @@ export default { type: 'warning', roundButton: false }).then(() => { - this.$http.postData(this.url.updateState, { status: 'pass', ids: ids }, { _this: this }, res => { + this.$http.postData(this.url.updateState, {status: 'pass', ids: ids}, {_this: this}, res => { if (res.ok) { this.$message.success('操作成功') this.getList() @@ -467,7 +486,7 @@ export default { this.$refs.selections.clearSelection() }) }, - batchOverrule (id) { + batchOverrule(id) { if (id.length === 0) { this.$message({ message: '请选择至少一条数据', @@ -503,8 +522,8 @@ export default { } }, inputErrorMessage: '' - }).then(({ value }) => { - this.$http.postData(this.url.updateState, { status: 'refuse', refuseCause: value, ids }, { _this: this }, res => { + }).then(({value}) => { + this.$http.postData(this.url.updateState, {status: 'refuse', refuseCause: value, ids}, {_this: this}, res => { if (res.ok) { this.$message.success('操作成功') this.getList() @@ -517,7 +536,7 @@ export default { this.$refs.selections.clearSelection() }) }, - exportName (name) { + exportName(name) { const params = { ...this.StandardApplyForEOPage, exportFileName: name ? name : '标准及译文获取申请', @@ -529,7 +548,7 @@ export default { responseType: 'blob', params: params }).then(res => { - const blob = new Blob([ res ], { type: 'application/vnd.ms-excel' }); + const blob = new Blob([res], {type: 'application/vnd.ms-excel'}); // 浏览器兼容，Google和火狐支持a标签的download，IE不支持 if (window.navigator && window.navigator.msSaveBlob) { // IE浏览器、微软浏览器 @@ -548,24 +567,24 @@ export default { } }) }, - exportList () { + exportList() { this.$refs.exportDialogRef.openModel() }, - toView (id) { + toView(id) { this.$refs.detailModalRef.showModal(id) }, - standardsAndTranslationRequestShowModal () { + standardsAndTranslationRequestShowModal() { this.$refs.standardsAndTranslationModalRef.showModal() }, - pageChange (page) { + pageChange(page) { this.StandardApplyForEOPage.page = page this.getList() }, - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.StandardApplyForEOPage.pageSize = pageSize this.getList() }, - handleSelectionChange (value) { + handleSelectionChange(value) { const ids = [] value.forEach(item => { ids.push(item.id) @@ -574,7 +593,7 @@ export default { this.selectedTag = false } }) - this.selectedList = [ ...ids ] + this.selectedList = [...ids] } }, } @@ -585,23 +604,25 @@ export default { height: 100%; display: flex; flex-direction: column; + background-color: white; - .table-container { - background-color: white; - padding: 0 10px; - flex-grow: 1; + .operate-options { + display: flex; + align-items: center; + justify-content: space-between; + padding: 10px; + } + + .content { + flex: auto; + overflow: hidden; display: flex; flex-direction: column; - .drag-table { - flex-grow: 1; - } - - .operate-options { - display: flex; - align-items: center; - justify-content: space-between; - padding-bottom: 10px; + .table-wrap { + flex: auto; + overflow: hidden; + position: relative; } } From 7eb89d9d7a35be2b383ddbd0e0421f652a79aa96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 2 Apr 2024 09:25:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/common/formList.vue | 8 ++++++-- src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index ab0ef45f4..8617dbcaa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -173,7 +173,7 @@ -
+
-->
-
+
Date: Wed, 3 Apr 2024 17:16:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AE=8C=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BC=96=E8=BE=91=E5=90=8E?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7a474897d..ef5438a2e 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1692,6 +1692,7 @@ export default { this.isSubmit = false if (res.ok) { this.modalItemaddShowflag = false + this.selectMenu() // this.showItemRequestDetails() // let content = res.data.itermsConditions // $('#itemContentHtml').html(content)