From 07608cbd32694d3d51c484ab8d845ae2109ccd00 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Tue, 28 May 2024 14:00:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E3=80=81=E5=A4=87=E5=BF=98=E5=BD=95=E5=AF=BC=E5=87=BA=E3=80=81?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BA=93=E5=AF=B9=E6=8E=A5=E2=8C=88=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A4=8D=E5=88=B6=E6=9D=A5=E8=87=AA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85=E8=BF=98=E6=9C=AA=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=20=E2=8C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/jin_ji_hu/enterList/index.js | 45 ++ src/api/jin_ji_hu/home/index.js | 19 + src/api/jin_ji_hu/policyDocument/index.js | 2 +- src/assets/styles/public.scss | 7 + src/components/Breadcrumb/index.vue | 2 +- src/router/index.js | 6 + src/views/components/Pagination/index.vue | 2 +- src/views/enterpriselibrary/index.vue | 389 ++++++++---------- .../projectInfo/components/index.js | 4 + .../projectInfo/components/tabFour/index.vue | 306 ++++++++++++++ .../projectInfo/components/tabOne/index.vue | 175 ++++++++ .../projectInfo/components/tabThree/index.vue | 50 +++ .../projectInfo/components/tabTwo/index.vue | 40 ++ .../enterpriselibrary/projectInfo/index.vue | 111 +++++ src/views/infoMaintain/index.vue | 2 + src/views/onlineDeclaration/records/index.vue | 8 +- .../projectInfo/components/tabFour/index.vue | 31 +- src/views/workbench/index.vue | 78 +++- 19 files changed, 1042 insertions(+), 237 deletions(-) create mode 100644 src/api/jin_ji_hu/enterList/index.js create mode 100644 src/api/jin_ji_hu/home/index.js create mode 100644 src/views/enterpriselibrary/projectInfo/components/index.js create mode 100644 src/views/enterpriselibrary/projectInfo/components/tabFour/index.vue create mode 100644 src/views/enterpriselibrary/projectInfo/components/tabOne/index.vue create mode 100644 src/views/enterpriselibrary/projectInfo/components/tabThree/index.vue create mode 100644 src/views/enterpriselibrary/projectInfo/components/tabTwo/index.vue create mode 100644 src/views/enterpriselibrary/projectInfo/index.vue diff --git a/package.json b/package.json index c36fa11..b8fc4be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202405241500", + "version": "1.0.202405281028", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/jin_ji_hu/enterList/index.js b/src/api/jin_ji_hu/enterList/index.js new file mode 100644 index 0000000..e67dcef --- /dev/null +++ b/src/api/jin_ji_hu/enterList/index.js @@ -0,0 +1,45 @@ +import request from "@/utils/request" + +// 分页查询企业基础信息 +export function getEnterList(params) { + return request({ + url: "/system/enterpriseBasicInfo/list", + method: "get", + params + }) +} + +// 新增企业基础信息 +export function enterpriseBasicInfoNew(data) { + return request({ + url: "/system/enterpriseBasicInfo", + method: "post", + data + }) +} + +// 修改企业基础信息 +export function enterpriseBasicInfoChange(data) { + return request({ + url: "/system/enterpriseBasicInfo", + method: "put", + data + }) +} + +// 根据主键查询企业基础信息 +export function enterpriseBasicInfoId(id) { + return request({ + url: "/system/enterpriseBasicInfo/" + id, + method: "get", + }) +} + +// 删除企业基础信息 +export function enterpriseBasicInfoDel(params) { + return request({ + url: "/system/enterpriseBasicInfo" + id, + method: "delete", + params + }) +} \ No newline at end of file diff --git a/src/api/jin_ji_hu/home/index.js b/src/api/jin_ji_hu/home/index.js new file mode 100644 index 0000000..179d546 --- /dev/null +++ b/src/api/jin_ji_hu/home/index.js @@ -0,0 +1,19 @@ +import request from "@/utils/request" + +// 工作台查项目 +export function selectAll(params) { + return request({ + url: "/jjh/jProject/selectAll", + method: "get", + params + }) +} + +// 工作台查企业 +export function workSearch(params) { + return request({ + url: "/system/enterpriseBasicInfo/workSearch", + method: "get", + params + }) +} \ No newline at end of file diff --git a/src/api/jin_ji_hu/policyDocument/index.js b/src/api/jin_ji_hu/policyDocument/index.js index afa07c5..ab4e172 100644 --- a/src/api/jin_ji_hu/policyDocument/index.js +++ b/src/api/jin_ji_hu/policyDocument/index.js @@ -18,7 +18,7 @@ export function jPolicyFileNew(data) { }) } -// 删除政策文件 +// 修改政策文件 export function jPolicyFileChange(data) { return request({ url: "/jjh/jPolicyFile", diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index b544c22..81d52cc 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -35,10 +35,17 @@ background-color: #fff; header { margin-bottom: 25px; + .btnss { + display: flex; + align-items: center; + } .import-btn { margin-top: 3px; padding: 6px 15px; } + .import-btn-export { + padding: 8px 20px; + } } section { width: 100%; diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 00733bc..79abf1d 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -16,7 +16,7 @@ import('@/views/enterpriselibrary/projectInfo/index'), + name: 'enterInfo', + meta: { title: '企业详情', icon: 'user' } + }, ] } ]; diff --git a/src/views/components/Pagination/index.vue b/src/views/components/Pagination/index.vue index 7e5887a..cb1348c 100644 --- a/src/views/components/Pagination/index.vue +++ b/src/views/components/Pagination/index.vue @@ -136,7 +136,7 @@ export default { }, handleCurrentChange(val) { this.mypageNum = val; - console.log(68 / 10); + // console.log(68 / 10); this.$emit('pagination', { page: val, limit: this.pageSize }) if (this.autoScroll) { scrollTo(0, 800) diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue index 4f1f16e..0a18962 100644 --- a/src/views/enterpriselibrary/index.vue +++ b/src/views/enterpriselibrary/index.vue @@ -3,21 +3,15 @@
- - - + + + + + + + + + diff --git a/src/views/enterpriselibrary/projectInfo/components/tabOne/index.vue b/src/views/enterpriselibrary/projectInfo/components/tabOne/index.vue new file mode 100644 index 0000000..5641bf6 --- /dev/null +++ b/src/views/enterpriselibrary/projectInfo/components/tabOne/index.vue @@ -0,0 +1,175 @@ + + diff --git a/src/views/enterpriselibrary/projectInfo/components/tabThree/index.vue b/src/views/enterpriselibrary/projectInfo/components/tabThree/index.vue new file mode 100644 index 0000000..fc8c8e1 --- /dev/null +++ b/src/views/enterpriselibrary/projectInfo/components/tabThree/index.vue @@ -0,0 +1,50 @@ + + diff --git a/src/views/enterpriselibrary/projectInfo/components/tabTwo/index.vue b/src/views/enterpriselibrary/projectInfo/components/tabTwo/index.vue new file mode 100644 index 0000000..4705266 --- /dev/null +++ b/src/views/enterpriselibrary/projectInfo/components/tabTwo/index.vue @@ -0,0 +1,40 @@ + + diff --git a/src/views/enterpriselibrary/projectInfo/index.vue b/src/views/enterpriselibrary/projectInfo/index.vue new file mode 100644 index 0000000..8b8b7e3 --- /dev/null +++ b/src/views/enterpriselibrary/projectInfo/index.vue @@ -0,0 +1,111 @@ + + diff --git a/src/views/infoMaintain/index.vue b/src/views/infoMaintain/index.vue index d4b2374..89381c2 100644 --- a/src/views/infoMaintain/index.vue +++ b/src/views/infoMaintain/index.vue @@ -35,6 +35,8 @@
+ + diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue index f3f82d7..1425f54 100644 --- a/src/views/onlineDeclaration/records/index.vue +++ b/src/views/onlineDeclaration/records/index.vue @@ -430,14 +430,14 @@ export default { mounted() { this.cancalDebounce(); window.addEventListener('resize', this.cancalDebounce); + if(this.$route.params.statusChange) { + this.queryParams.statusChange = this.$route.params.statusChange + } + this.getList(); }, destroyed() { window.removeEventListener('resize', this.cancalDebounce); }, - created() { - // console.log(this.$store.state.user.enterpriseId); - this.getList(); - }, methods: { // 屏幕尺寸变化 cancalDebounce(){ diff --git a/src/views/project/projectInfo/components/tabFour/index.vue b/src/views/project/projectInfo/components/tabFour/index.vue index 355eb7b..ad65483 100644 --- a/src/views/project/projectInfo/components/tabFour/index.vue +++ b/src/views/project/projectInfo/components/tabFour/index.vue @@ -7,7 +7,7 @@
【备忘录】
新建备忘录 - 一键导出 + 一键导出
@@ -141,6 +141,8 @@ export default { }, memoList:[], loading:false, + // 导出遮罩层 + exportLoading: false, } }, props:{ @@ -187,6 +189,33 @@ export default { this.memoData.name = this.$store.getters.name; this.memoData.createTime = this.getDate(); }, + // 导出 + exportMemo(){ + if(this.memoList.length > 0) { + this.$confirm("是否确认导出备忘录?", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.exportLoading = true; + this.download( + "/jjh/jMemorandum/export", + { + ...this.formInline + }, + "备忘录" + new Date().getTime() + ".xlsx" + ); + this.exportLoading = false; + }) + .catch(() => { }); + } else { + this.$message({ + type: "warning", + message: "备忘录列表为空，无法导出！", + }); + } + }, // 获取备忘录列表 getList() { this.loading = true; diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 6c16081..4d646ae 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -1,9 +1,9 @@