From 1bd438a4bc5d3532237c423622f22f529b6b6349 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:54:09 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=8A=E8=AF=91?= =?UTF-8?q?=E6=96=87=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=8D=95=20=E5=9F=BA=E7=A1=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/components/navMenu/index.vue | 20 +- .../components/addModal.vue | 149 ++++++++++ ...dardTranslationAcquisitionRequestModal.vue | 195 +++++++++++++ .../index.vue | 256 ++++++++++++++++++ .../pages/standardSearch/index.vue | 10 + src/router/index.js | 9 + 7 files changed, 637 insertions(+), 4 deletions(-) create mode 100644 src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue create mode 100644 src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue create mode 100644 src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue diff --git a/src/App.vue b/src/App.vue index 75d3b7ce4..932b7c256 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,7 @@ - + diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5a1bf6d34..61b9c3e8e 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -40,7 +40,7 @@ v-for="(children, childrenIndex) in item.children" :key="childrenIndex" :index="children.path" - style="text-align: center;" + style="padding-right: 15px; padding-left: 30px;font-size: 14px" v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo > @@ -52,6 +52,9 @@ {{ children.title }} + +
{{children.title}}
+
{{ children.title }}
@@ -161,6 +164,11 @@ path: '/standQA', menuId: '2621269642ea4c6c8c42905863b2dc09' }, + { + title: '标准/译文获取申请管理', + path: '/standardTranslationAcquisitionRequest', + menuId: '' + }, // { // title: '零部件编号申请', // path: '/partCodeApply', @@ -606,6 +614,7 @@ width: 58px; height: 100%; overflow-y: auto; + overflow-x: hidden; user-select: none; box-sizing: border-box; position: absolute; @@ -785,7 +794,7 @@ } } .el-menu-item { - padding-left: 0 !important; + //padding-left: 0 !important; font-size: 16px; font-weight: normal; height: 40px; @@ -812,5 +821,10 @@ } } } - + .miniBadge{ + /deep/ .is-dot{ + left: -18px; + top: 14px; + } + } diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue new file mode 100644 index 000000000..12200c7a0 --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue new file mode 100644 index 000000000..dd6fd1942 --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue new file mode 100644 index 000000000..8bcecf66e --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch/index.vue b/src/pages/searchCenter/pages/standardSearch/index.vue index 8015bb824..5b3136625 100644 --- a/src/pages/searchCenter/pages/standardSearch/index.vue +++ b/src/pages/searchCenter/pages/standardSearch/index.vue @@ -81,6 +81,7 @@
首页
+ 标准/译文获取申请
数据获取中 @@ -236,6 +237,15 @@ export default { this.getData() }, methods: { + toStandardTranslationAcquisitionRequest () { + let url = this.$router.resolve({ + name: 'standardTranslationAcquisitionRequest', + query: { + tag: 'fromSearchCenter' + } + }) + window.open(url.href, '_blank') + }, onSearch () { this.searchForm.page = 1 this.getData() diff --git a/src/router/index.js b/src/router/index.js index aa3b41ed3..ca9e4c30c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4112,6 +4112,15 @@ const routes = [ menuId: '' } }, + { + path: '/standardTranslationAcquisitionRequest', + name: 'standardTranslationAcquisitionRequest', + component: () => import('@/pages/regulatoryRepository/standardTranslationAcquisitionRequest'), + meta: { + requireAuth: true, + title: '标准/译文获取申请管理' + } + }, // 本地产品/项目库详情页 { path: '/localProductDetail', From 48dcf7fa555e382dc5d7e2a6f01962eb2bd4b5c8 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:24:19 +0800 Subject: [PATCH 02/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModal.vue | 8 +- .../components/detailModal.vue | 126 ++++++++++++++++++ ...dardTranslationAcquisitionRequestModal.vue | 13 +- .../index.vue | 7 +- 4 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index 12200c7a0..13e35d297 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -76,9 +76,8 @@
- 提交 - 取消 - 关闭 + 提交 + 取消
@@ -110,8 +109,7 @@ export default { handleClose () { this.visible = false }, - showModal (isEdit, id) { - this.isEdit = isEdit + showModal (id) { this.visible = true this.$nextTick(()=>{ this.$refs.addFormRef.clearValidate() diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue new file mode 100644 index 000000000..c0de8620f --- /dev/null +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index dd6fd1942..43abf2885 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -109,16 +109,19 @@ 保存 提交 - + + + + diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index be67b8860..284249038 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -2,28 +2,40 @@
- + - + - + - + - + + + + - + 查询 @@ -34,11 +46,11 @@
- 批量驳回 - 批量通过 + 批量驳回 + 批量通过
- 标准/译文获取申请 + 标准/译文获取申请 列表导出
@@ -50,9 +62,10 @@ row-key="id" border :loading="tableLoading" - :data="tableData" + :data="StandardApplyForEO" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - @selection-change="handleSelectionChange"> + @selection-change="handleSelectionChange" + > @@ -76,55 +89,55 @@ label="标准编号" width="150" align="center" - prop="aa" + prop="standNum" /> @@ -132,6 +145,7 @@ +
@@ -139,68 +153,112 @@ import standardsAndTranslationModal from './components/standardTranslationAcquisitionRequestModal'; import addModal from './components/addModal'; import detailModal from './components/detailModal'; +import exportDialog from './components/exportDialog'; + export default { name: 'StandardTranslationAcquisitionRequest', components: { standardsAndTranslationModal, addModal, - detailModal + detailModal, + exportDialog }, data () { return { tableLoading: false, total: 0, - searchForm: { + StandardApplyForEOPage: { page: 1, pageSize: this.$store.getters.userInfo.configContent, }, - tableData: [ { aa: '123' } ], - selectedList: [] + StandardApplyForEO: [], + selectedList: [], + url: { + getList: '/lawss/standardApplyFor/queryByPage', + updateState: '/lawss/standardApplyFor/batchUpdateStatus' + } } }, mounted () { if (this.$route.query && this.$route.query.tag === 'fromSearchCenter') { - this.standardsAndTranslationRequest() + this.standardsAndTranslationRequestShowModal() this.$router.replace({ query: { ...this.$route.query, tag: undefined } }) } + this.getList() }, methods: { searchData () { + this.page = 1 this.getList() }, clearSerach () { - this.searchForm = {} - }, - batchPass () { - if (this.selectedList.length === 0) { - this.$message({ - message: '请选择至少一条数据', - type: 'warning', - offset: 20 - }) + this.StandardApplyForEOPage = { + page: 1, + pageSize: this.$store.getters.userInfo.configContent } - }, - batchOverrule () { - if (this.selectedList.length === 0) { - this.$message({ - message: '请选择至少一条数据', - type: 'warning', - offset: 20 - }) - } - }, - exportList () { + this.getList() }, getList () { + this.tableLoading = true + this.$http.get(this.url.getList, { + ...this.StandardApplyForEOPage + }, { + _this: this + }, res => { + if (res.ok) { + this.StandardApplyForEO = res.data.list + this.total = res.data.total + }else { + this.StandardApplyForEO = [] + this.total = 0 + } + this.tableLoading = false + }) + }, + + // 需要调整 + batchPass (id) { + if (id.length === 0) { + this.$message({ + message: '请选择至少一条数据', + type: 'warning', + offset: 20 + }) + return + } + const ids = id.join(',') + this.$http.postData(this.url.updateState, { status: 'pass', ids }, { _this: this }, res => { + if(res.ok) { + this.$message.success('操作成功') + } + }) + }, + batchOverrule (id) { + if (id.length === 0) { + this.$message({ + message: '请选择至少一条数据', + type: 'warning', + offset: 20 + }) + return + } + const ids = id.join(',') + this.$http.postData(this.url.updateState, { status: 'refuse', ids }, { _this: this }, res => { + if(res.ok) { + this.$message.success('操作成功') + } + }) + }, + + exportName(name){ + }, + exportList () { + this.$refs.exportDialogRef.openModel() }, toView (id) { this.$refs.detailModalRef.showModal(id) }, - pass (id) { - }, - overrule (id) { - }, - standardsAndTranslationRequest () { + standardsAndTranslationRequestShowModal () { this.$refs.standardsAndTranslationModalRef.showModal() }, pageChange (page) { @@ -211,10 +269,12 @@ export default { this.questionSerach.pageSize = pageSize this.getList() }, - formatClassification () { - }, handleSelectionChange (value) { - this.selectedList = value + const ids = [] + value.forEach(item => { + ids.push(item.id) + }) + this.selectedList = [ ...ids ] } }, } @@ -233,7 +293,7 @@ export default { display: flex; flex-direction: column; - .drag-table{ + .drag-table { flex-grow: 1; } @@ -245,15 +305,15 @@ export default { } } - .table-operate-btn{ + .table-operate-btn { display: inline-block; cursor: pointer; color: #409EFF; margin: 0 5px; } - .stand-date-range-picker{ - /deep/ .el-range-separator{ + .stand-date-range-picker { + /deep/ .el-range-separator { width: auto; } } From f7ec289695fe29cbec3dd110024c41557126a7a9 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Wed, 27 Mar 2024 19:09:20 +0800 Subject: [PATCH 09/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?/=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dardTranslationAcquisitionRequestModal.vue | 204 ++++++++++-------- 1 file changed, 115 insertions(+), 89 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index 43abf2885..ed22fadac 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -9,108 +9,105 @@ 新增标准/译文获取申请 导入 模版下载 - 批量删除 + 批量删除
- - - - - - + + +
保存 提交 - - + + @@ -127,50 +124,78 @@ export default { return { visible: false, tableLoading: false, - tableData: [], - serachForm: {}, - selectedList: [] + StandardApplyForEO: [], + selectedList: [], + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + total: 0, + url: { + deleteUrl: '/lawss/standardApplyFor/batchUpdateValidFlag', + getList: '/lawss/standardApplyFor/queryStagingByPage' + } } }, methods: { showModal () { this.visible = true + this.StandardApplyForEO = [] + this.page = 1 + this.getList() }, handleClose () { this.visible = false }, - handleSelectionChange (value) { - this.selectedList = value - }, toView (id) { - this.$refs.addModalRef.detailModalRef(id) + this.$refs.addModalRef.showModal(id) }, edit (id) { this.$refs.addModalRef.showModal(id) }, - deletItem(id){ + importData () { }, templateDownload () { }, - batchDelete () { - if (this.selectedList.length === 0) { + getList () { + this.tableLoading = true + this.$http.get(this.url.getList, { page: this.page, pageSize: this.pageSize }, { + _this: this, + }, res => { + if (res.ok) { + this.StandardApplyForEO = res.data.list + this.total = res.data.total + }else { + this.StandardApplyForEO = [] + this.total = 0 + } + }) + }, + batchDelete (id) { + if (id.length === 0) { this.$message({ message: '请选择至少一条数据', type: 'warning', offset: 20 }) + return } + const ids = id.join(',') + this.$http.postData(this.url.deleteUrl, ids, { _this: this }, res => { + this.$message.success('操作成功') + this.getList() + }) }, - importData () { + submitData (tag) { + }, + handleSelectionChange (value) { + const ids = [] + value.forEach(item => { + ids.push(item.id) + }) + this.selectedList = [ ...ids ] }, standardTranslationAcquisitionRequestAdd () { this.$refs.addModalRef.showModal() }, - submitData (tag) { - if (tag) { - return - } - }, pageChange (page) { this.questionSerach.page = page this.getList() @@ -184,12 +209,13 @@ export default { diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 50976a0a5..7af53e6c4 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -203,7 +203,7 @@ export default { _this: this }, res => { if (res.ok) { - this.StandardApplyForEO = res.data.list + this.StandardApplyForEO = res.data.records this.total = res.data.total }else { this.StandardApplyForEO = [] From 508e38976e2740435c5405bd7e5f0a4c71acc9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 28 Mar 2024 11:21:59 +0800 Subject: [PATCH 12/58] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=A0=87=E5=87=86/?= =?UTF-8?q?=E8=AF=91=E6=96=87=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModal.vue | 31 ++--- .../index.vue | 107 ++++++++++++++++-- 2 files changed, 113 insertions(+), 25 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index c94d14dd4..ad6004777 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -42,15 +42,15 @@ {{ opt.label }} @@ -61,15 +61,15 @@ {{ opt.label }} @@ -203,15 +203,18 @@ export default { submit () { this.$refs.addFormRef.validate((valid) => { if (valid) { + this.isSubmit = true const url = this.id ? this.url.editUrl : this.url.addUrl this.$http.postData(url, this.StandardApplyForEO, { _this: this }, res => { if (res.ok) { this.$emit('updateList') + this.$message.success(res.message) this.visible = false }else{ this.$message.warning(res.message) } + this.isSubmit = false }) } }) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 7af53e6c4..f13767eee 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -4,7 +4,20 @@
- + + + {{ opt.label }} + + @@ -35,7 +48,20 @@ /> - + + + {{ opt.label }} + + 查询 @@ -173,7 +199,26 @@ export default { url: { getList: '/lawss/standardApplyFor/queryByPage', updateState: '/lawss/standardApplyFor/batchUpdateStatus' - } + }, + typeList: [], + statusList: [ + { + label: '通过', + value: 'pass', + }, + { + label: '驳回', + value: 'refuse', + }, + { + label: '待审批', + value: 'pendingApproval', + }, + { + label: '草稿', + value: 'draft', + } + ], } }, mounted () { @@ -182,8 +227,17 @@ export default { this.$router.replace({ query: { ...this.$route.query, tag: undefined } }) } this.getList() + this.getDicTypeListCode() }, methods: { + getDicTypeListCode () { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.typeList = res.data.BZJYWTYPE // 标准类别 + }, e => { + }) + }, searchData () { this.page = 1 this.getList() @@ -209,6 +263,8 @@ export default { this.StandardApplyForEO = [] this.total = 0 } + this.selectedList = [] + this.$refs.selections.clearSelection() this.tableLoading = false }) }, @@ -224,11 +280,26 @@ export default { return } const ids = id.join(',') - this.$http.postData(this.url.updateState, { status: 'pass', ids }, { _this: this }, res => { - if(res.ok) { - this.$message.success('操作成功') - } + this.$confirm('确定通过？', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + type: 'warning', + roundButton: false + }).then(() => { + this.$http.postData(this.url.updateState, { status: 'pass', ids: ids }, { _this: this }, res => { + if (res.ok) { + this.$message.success('操作成功') + this.getList() + } else { + this.$message.warning(res.message) + } + }) + }).catch(() => { + // 取消删除，清空选择 + this.$refs.selections.clearSelection() }) + }, batchOverrule (id) { if (id.length === 0) { @@ -240,10 +311,24 @@ export default { return } const ids = id.join(',') - this.$http.postData(this.url.updateState, { status: 'refuse', ids }, { _this: this }, res => { - if(res.ok) { - this.$message.success('操作成功') - } + this.$confirm('确定驳回？', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + type: 'warning', + roundButton: false + }).then(() => { + this.$http.postData(this.url.updateState, { status: 'refuse', ids }, { _this: this }, res => { + if (res.ok) { + this.$message.success('操作成功') + this.getList() + } else { + this.$message.warning(res.message) + } + }) + }).catch(() => { + // 取消删除，清空选择 + this.$refs.selections.clearSelection() }) }, From eefdb524bcce7be91c1ca3839c898408a4b3b69a Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:09:57 +0800 Subject: [PATCH 13/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detailModal.vue | 27 ++++++++++--------- .../index.vue | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue index c1ab0b7fd..5fda9c846 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -13,62 +13,62 @@ - {{StandardApplyForEO.applyForUnitId}} + {{StandardApplyForEO.applyForUnitName ? StandardApplyForEO.applyForUnitName : '--'}} - {{StandardApplyForEO.applyForUserId}} + {{StandardApplyForEO.applyForUserName ? StandardApplyForEO.applyForUserName : '--'}} - {{StandardApplyForEO.type}} + {{StandardApplyForEO.type ? StandardApplyForEO.type : '--'}} - {{StandardApplyForEO.standType}} + {{StandardApplyForEO.standType ? StandardApplyForEO.standType : '--'}} - {{StandardApplyForEO.standLb}} + {{StandardApplyForEO.standLb ? StandardApplyForEO.standLb : '--'}} - {{StandardApplyForEO.standNum}} + {{StandardApplyForEO.standNum ? StandardApplyForEO.standNum : '--'}} - {{StandardApplyForEO.standYear}} + {{StandardApplyForEO.standYear ? StandardApplyForEO.standYear : '--'}} - {{StandardApplyForEO.requiredTime}} + {{StandardApplyForEO.requiredTime ? StandardApplyForEO.requiredTime : '--'}} - {{StandardApplyForEO.standName}} + {{StandardApplyForEO.standName ? StandardApplyForEO.standName : '--'}} - {{StandardApplyForEO.sourceLanguage}} + {{StandardApplyForEO.sourceLanguage ? StandardApplyForEO.sourceLanguage : '--'}} - {{StandardApplyForEO.targetLanguage}} + {{StandardApplyForEO.targetLanguage ? StandardApplyForEO.targetLanguage : '--'}} - {{StandardApplyForEO.reason}} + {{StandardApplyForEO.reason ? StandardApplyForEO.reason : '--'}} @@ -94,10 +94,11 @@ export default { handleClose () { this.visible = false }, - showModal (id) { + showModal (item) { this.visible = true this.$nextTick(() => { this.StandardApplyForEO = [] + this.StandardApplyForEO = item }) }, } diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index f13767eee..13284a340 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -154,7 +154,7 @@ /> From 9a949308a2be7d6bfb2b2fcb95fd7fe691b4e5cd Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:48:25 +0800 Subject: [PATCH 14/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=AF=BC=E5=85=A5/?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dardTranslationAcquisitionRequestModal.vue | 24 +++++++++++++++---- .../index.vue | 15 +++++++----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index 156ed46a0..4fbbec696 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -7,7 +7,17 @@ >
新增标准/译文获取申请 - 导入 + + 导入 + 模版下载 批量删除
@@ -129,9 +139,11 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, + fileList: '', url: { deleteUrl: '/lawss/standardApplyFor/batchUpdateValidFlag', - getList: '/lawss/standardApplyFor/queryStagingByPage' + getList: '/lawss/standardApplyFor/queryStagingByPage', + importData: '/lawss/standardApplyFor/importData' } } }, @@ -152,7 +164,11 @@ export default { edit (item) { this.$refs.addModalRef.showModal(item) }, - importData () { + importSuccess () { + this.$message.success('操作成功') + }, + importError () { + this.$message.warning('操作失败') }, templateDownload () { window.open('/api/lawss/standardApplyFor/exportTemplateFile?fileName=标准/译文获取申请模板.xlsx') @@ -209,7 +225,7 @@ export default { }) }, submitData () { - if (this.selectedList && this.selectedList.length > 0){ + if (this.selectedList && this.selectedList.length > 0) { const query = { status: 'pendingApproval', ids: this.selectedList.join(',') diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 13284a340..5db446d67 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -151,12 +151,16 @@ prop="status" align="center" min-width="100" - /> + > + + @@ -170,7 +174,7 @@
- +
@@ -299,7 +303,6 @@ export default { // 取消删除，清空选择 this.$refs.selections.clearSelection() }) - }, batchOverrule (id) { if (id.length === 0) { @@ -332,7 +335,7 @@ export default { }) }, - exportName(name){ + exportName (name) { }, exportList () { this.$refs.exportDialogRef.openModel() From 55798724e6f7ceb0e7e40c780e4f93255211230a Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:52:12 +0800 Subject: [PATCH 15/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=B1=82=E5=A4=B4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/standardTranslationAcquisitionRequestModal.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index 4fbbec696..1926ed3fa 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -9,6 +9,7 @@ 新增标准/译文获取申请 Date: Thu, 28 Mar 2024 15:31:45 +0800 Subject: [PATCH 16/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B/=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E8=81=94=E5=8A=A8=20=E4=B8=BB=E9=A1=B5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModal.vue | 18 +++++++++++++----- .../index.vue | 10 +++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index ad6004777..a5c9918e1 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -45,6 +45,7 @@ v-model="StandardApplyForEO.standType" :placeholder="'请选择标准类型'" clearable + @change="selectStandType" > - @@ -168,11 +168,10 @@ export default { }, methods: { getDicTypeListCode () { - this.$http.get('sys/dictype/getDicTypeListCode', '', { + this.$http.get('/lawss/standardApplyFor/getStandTypeDropDownData', {}, { _this: this }, res => { - this.typeList = res.data.BZJYWTYPE // 标准类别 - this.standTypeList = res.data.BZJYWSTADNTYPE + this.standTypeList = res.data }, e => { }) }, @@ -198,7 +197,16 @@ export default { this.$refs.addFormRef.clearValidate() }) }, - selectStandType () { + selectStandType (value) { + if (value === '') { + this.standLbList = [] + } + this.$http.get('/lawss/standardApplyFor/getStandLbDropDownData', { dicId: value },res=>{ + if (res.ok) { + this.standLbList = res.data + } + this.standLbList = [] + }) }, submit () { this.$refs.addFormRef.validate((valid) => { diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 5db446d67..24464c14d 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -116,7 +116,11 @@ width="150" align="center" prop="standNum" - /> + > + + From e231e8eed32682036308bfa38bf7dbbb3b2865c4 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:16:22 +0800 Subject: [PATCH 17/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B/=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModal.vue | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index a5c9918e1..9aa3151c1 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -133,16 +133,7 @@ export default { StandardApplyForEO: {}, typeList: [], standTypeList: [], - standLbList: [ - { - label: 'GB', - value: 'GB', - }, - { - label: 'GB/T', - value: 'GB/T', - } - ], + standLbList: [], addFormRules: { applyForUnitName: [ { required: true, message: '申请单位不能为空', trigger: 'blur' } ], applyForUserName: [ { required: true, message: '申请人不能为空', trigger: 'blur' } ], @@ -163,9 +154,6 @@ export default { } } }, - mounted () { - this.getDicTypeListCode() - }, methods: { getDicTypeListCode () { this.$http.get('/lawss/standardApplyFor/getStandTypeDropDownData', {}, { @@ -188,6 +176,7 @@ export default { this.StandardApplyForEO = { ...this.StandardApplyForEO } this.$nextTick(() => { this.$refs.addFormRef.clearValidate() + this.getDicTypeListCode() }) }, showModal (item) { @@ -201,11 +190,18 @@ export default { if (value === '') { this.standLbList = [] } - this.$http.get('/lawss/standardApplyFor/getStandLbDropDownData', { dicId: value },res=>{ + this.$http.get('/lawss/standardApplyFor/getStandLbDropDownData', { dicId: value }, { + _this: this + }, res => { if (res.ok) { - this.standLbList = res.data + this.$nextTick(() => { + this.standLbList = res.data + this.$set(this.StandardApplyForEO, 'standLb', null) + }) + return } this.standLbList = [] + this.$set(this.StandardApplyForEO, 'standLb', null) }) }, submit () { From 06dbb11e4139e7aec38f88669bdb8f1b2e85208b Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:47:43 +0800 Subject: [PATCH 18/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dardTranslationAcquisitionRequestModal.vue | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index 1926ed3fa..b8d607ba3 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -168,11 +168,24 @@ export default { edit (item) { this.$refs.addModalRef.showModal(item) }, - importSuccess () { - this.$message.success('操作成功') + importSuccess (response) { + if (response.ok) { + this.$message({ + message: response.message, + dangerouslyUseHTMLString: true, + type: 'success' + }) + }else { + this.$message({ + message: response.message, + dangerouslyUseHTMLString: true, + type: 'warning' + }) + } + this.getList() }, importError () { - this.$message.warning('操作失败') + this.$message.error('操作失败') }, templateDownload () { window.open('/api/lawss/standardApplyFor/exportTemplateFile?fileName=标准/译文获取申请模板.xlsx') From e8e5bbb1ebf932ca603e984da41a0385c7208963 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:53:11 +0800 Subject: [PATCH 19/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModal.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index 9aa3151c1..279a9771f 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -160,7 +160,11 @@ export default { _this: this }, res => { this.standTypeList = res.data - }, e => { + }) + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.typeList = res.data.BZJYWTYPE // 标准类别 }) }, handleClose () { From 0be61e3b97aea1e8f608426c21aa4b71d72d9051 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:34:38 +0800 Subject: [PATCH 20/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/exportDialog.vue | 3 +- .../index.vue | 42 +++++++++++++++---- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue index 2de2c53e0..c96204a9a 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/exportDialog.vue @@ -31,7 +31,8 @@ export default { this.exportModelFlag = false }, submit () { - this.$emit('exportName', this.exportName) + this.$emit('exportData', this.exportName) + this.exportModelFlag = false } } } diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 24464c14d..7bd6c5704 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -20,7 +20,20 @@ - + + + {{ opt.label }} + + @@ -118,7 +131,7 @@ prop="standNum" > 查看
通过
驳回
+
编辑
+
重新提交
@@ -178,7 +193,7 @@ - + @@ -206,9 +221,11 @@ export default { selectedList: [], url: { getList: '/lawss/standardApplyFor/queryByPage', - updateState: '/lawss/standardApplyFor/batchUpdateStatus' + updateState: '/lawss/standardApplyFor/batchUpdateStatus', + exportData: '/lawss/standardApplyFor/exportStandardApplyForEOExcel' }, typeList: [], + applicantUnitList: [], statusList: [ { label: '通过', @@ -243,6 +260,7 @@ export default { _this: this }, res => { this.typeList = res.data.BZJYWTYPE // 标准类别 + this.applicantUnitList = res.data.QCDW// 申请单位 }, e => { }) }, @@ -276,8 +294,6 @@ export default { this.tableLoading = false }) }, - - // 需要调整 batchPass (id) { if (id.length === 0) { this.$message({ @@ -338,9 +354,19 @@ export default { this.$refs.selections.clearSelection() }) }, - - exportName (name) { + exportData (name) { + let params = { + ...this.StandardApplyForEOPage, + exportFileName: name, + ids: this.selectedList.length > 0 ? this.selectedList.join(',') : '' + } + let url = '/api/lawss/standardApplyFor/exportStandardApplyForEOExcel?' + for (let key in params) { + url += `${key}=${params[key]}&` + } + window.open(url.slice(0, -1)) }, + exportList () { this.$refs.exportDialogRef.openModel() }, From f380a6bf4ed0fffd132dc12598d49b1062b8fe5b Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:26:00 +0800 Subject: [PATCH 21/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.vue | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 7bd6c5704..f8129e208 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -193,7 +193,7 @@ - + @@ -354,19 +354,24 @@ export default { this.$refs.selections.clearSelection() }) }, - exportData (name) { - let params = { + exportName(name) { + const params = { ...this.StandardApplyForEOPage, exportFileName: name, - ids: this.selectedList.length > 0 ? this.selectedList.join(',') : '' - } - let url = '/api/lawss/standardApplyFor/exportStandardApplyForEOExcel?' - for (let key in params) { - url += `${key}=${params[key]}&` - } - window.open(url.slice(0, -1)) - }, + ids: this.selectedList.length > 0 ? this.selectedList.join(',') : '', + }; + const url = '/api/lawss/standardApplyFor/exportStandardApplyForEOExcel?' + const formattedParams = Object.keys(params).map((key) => `${key}=${params[key]}`).join('&') + + const link = document.createElement('a') + link.href = `${url}${formattedParams}` + link.download = name + '.xlsx' + + document.body.appendChild(link) + link.click() + document.body.removeChild(link) + }, exportList () { this.$refs.exportDialogRef.openModel() }, From 417b49003975f706e59b05095b7d0a0dc3e3904c Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:34:45 +0800 Subject: [PATCH 22/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detailModal.vue | 6 ++--- .../index.vue | 25 +++---------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue index 5fda9c846..df9042a13 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -23,17 +23,17 @@ - {{StandardApplyForEO.type ? StandardApplyForEO.type : '--'}} + {{StandardApplyForEO.typeShow ? StandardApplyForEO.typeShow : '--'}} - {{StandardApplyForEO.standType ? StandardApplyForEO.standType : '--'}} + {{StandardApplyForEO.standTypeShow ? StandardApplyForEO.standTypeShow : '--'}} - {{StandardApplyForEO.standLb ? StandardApplyForEO.standLb : '--'}} + {{StandardApplyForEO.standLbShow ? StandardApplyForEO.standLbShow : '--'}} diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index f8129e208..5afc88a59 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -38,27 +38,8 @@ - - - - - + + From 9ec0d610b1bb22a575ee94b6db56e6c511450233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 29 Mar 2024 09:42:28 +0800 Subject: [PATCH 23/58] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=A0=87=E5=87=86/?= =?UTF-8?q?=E8=AF=91=E6=96=87=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.vue | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index 5afc88a59..32d04e8fd 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -182,6 +182,7 @@ import standardsAndTranslationModal from './components/standardTranslationAcquisitionRequestModal'; import detailModal from './components/detailModal'; import exportDialog from './components/exportDialog'; +import axios from '@/common/axiosV2' export default { name: 'StandardTranslationAcquisitionRequest', @@ -335,23 +336,36 @@ export default { this.$refs.selections.clearSelection() }) }, - exportName(name) { + exportName (name) { const params = { ...this.StandardApplyForEOPage, exportFileName: name, ids: this.selectedList.length > 0 ? this.selectedList.join(',') : '', }; - - const url = '/api/lawss/standardApplyFor/exportStandardApplyForEOExcel?' - const formattedParams = Object.keys(params).map((key) => `${key}=${params[key]}`).join('&') - - const link = document.createElement('a') - link.href = `${url}${formattedParams}` - link.download = name + '.xlsx' - - document.body.appendChild(link) - link.click() - document.body.removeChild(link) + axios({ + url: '/api/lawss/standardApplyFor/exportStandardApplyForEOExcel', + method: 'get', + responseType: 'blob', + params: params + }).then(res => { + const blob = new Blob([ res ], { type: 'application/vnd.ms-excel' }); + // 浏览器兼容，Google和火狐支持a标签的download，IE不支持 + if (window.navigator && window.navigator.msSaveBlob) { + // IE浏览器、微软浏览器 + /* 经过测试，微软浏览器Microsoft Edge下载文件时必须要重命名文件才可以打开， + IE可不重命名，以防万一，所以都写上比较好 */ + window.navigator.msSaveBlob(blob, name + '.xlsx'); + } else { + // 其他浏览器 + const link = document.createElement('a'); // 创建a标签 + link.style.display = 'none'; + const objectUrl = URL.createObjectURL(blob); + link.href = objectUrl; + link.download = name + '.xlsx'; + link.click(); + URL.revokeObjectURL(objectUrl); + } + }) }, exportList () { this.$refs.exportDialogRef.openModel() From fed97d2c91206b6382aeab03916b3b1402071365 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:12:59 +0800 Subject: [PATCH 24/58] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=B3=E8=AF=B7=20=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardTranslationAcquisitionRequestModal.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index b8d607ba3..bbf5c1ea4 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -49,7 +49,7 @@ @@ -59,7 +59,11 @@ width="150" align="center" prop="standNum" - /> + > + + + > + + @@ -199,6 +205,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, }, + applyForUserName: '', StandardApplyForEO: [], selectedList: [], url: { @@ -226,6 +233,10 @@ export default { value: 'draft', } ], + nodeList: [], + userType: '', + drawerTitle: '', + modalShowRoleFlag: false } }, mounted () { @@ -237,12 +248,44 @@ export default { this.getDicTypeListCode() }, methods: { + checkedRole (data) { + let idList = '' + let nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.StandardApplyForEOPage.applyForUserIds = idList + this.applyForUserName = nameList + }, + choiceWSSMR (type, title, id) { + this.nodeList = [] + if(id) { + const nameId = id.split(',') + let idList = [] + nameId.forEach(item => { + let a, b + a = item.substring(item.indexOf('(') + 1) + b = a.substring(0, a.lastIndexOf(')')) + idList.push(b) + }) + idList = idList.join(',') + this.nodeList.push(idList) + } + this.userType = type + this.drawerTitle = title + this.modalShowRoleFlag = true + }, getDicTypeListCode () { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { this.typeList = res.data.BZJYWTYPE // 标准类别 - this.applicantUnitList = res.data.QCDW// 申请单位 + this.applicantUnitList = res.data.GKGLBM // 归口管理部门 }, e => { }) }, @@ -251,6 +294,7 @@ export default { this.getList() }, clearSerach () { + this.applyForUserName = '' this.StandardApplyForEOPage = { page: 1, pageSize: this.$store.getters.userInfo.configContent From 700ba895d31a11f02fc88bd7eb03ccb1bbf98690 Mon Sep 17 00:00:00 2001 From: baoyu <102349094+Bytq@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:26:14 +0800 Subject: [PATCH 28/58] =?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=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModal.vue | 15 +-- .../components/detailModal.vue | 99 +++++++++++-------- .../index.vue | 16 ++- 3 files changed, 78 insertions(+), 52 deletions(-) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue index c97f16d36..10aad8617 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/addModal.vue @@ -1,6 +1,6 @@