From 86a2d0fc49b6b9be578625a56c9304514d4d656f Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 22 Dec 2021 16:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E8=AE=AE=E9=A2=98=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E3=80=81=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/phone.js | 1 + src/api/process.js | 19 +- src/pages/localTool/standCalendar/index.vue | 555 ++++++++++++++++-- .../pages/creatProcess/wfhxzg/step1.vue | 4 + .../pages/creatProcess/wfhxzg/step3.vue | 2 + .../pages/creatProcess/wfhxzg/step4.vue | 3 +- 6 files changed, 542 insertions(+), 42 deletions(-) diff --git a/src/api/phone.js b/src/api/phone.js index ae39051e5..f1dbbb271 100644 --- a/src/api/phone.js +++ b/src/api/phone.js @@ -1,5 +1,6 @@ import axios from "@/common/axiosV2"; +// 手机端查询人 export function phoneUser(params) { return axios({ url: "api/sys/user/getUserByPhone", diff --git a/src/api/process.js b/src/api/process.js index 1c260eefc..6bb77e017 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -713,7 +713,7 @@ export function workGroup(data) { params: data }) } -// +// 手机端查询token export function loginMobile(data) { return axios({ url: 'api/lawss/activiti/loginMobile', @@ -721,3 +721,20 @@ export function loginMobile(data) { params: data }) } + +// 日历信息编辑 +export function updateMeet(data) { + return axios({ + url: '/api/sapMeetInfo/updateMeeting', + method: 'post', + params: data + }) +} + +export function upFile(data) { + return axios({ + url: '/api/att/attFile/upload', + method: 'post', + data + }) +} diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index d180f3e1e..108d53c8d 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -17,8 +17,8 @@ -
- 今天 +
+ 今天
@@ -61,41 +61,228 @@ 会议 会议 + + 编辑会议内容 + {{ item.title }} -
- 会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} -
-
- 参与人 : {{ item.partPeople.join('、') }} -
-
- 会议内容 : {{ item.content }} -
-
- 会议地点 : {{ item.place }} -
-
+
+
+ 会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} +
+
+ 参与人 : {{ item.partPeople.join('、') }} +
+
+ 会议内容 : {{ item.content }} +
+
+ 会议地点 : {{ item.place }} +
+
+ + + +
+ + + + + +
+ + 新增 + + + 批量删除 + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ 添加 + 批量删除 +
+ + + + + + + +
+ + + + + + + 上传文件 + + + +
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + +
+ +
+
@@ -343,7 +814,7 @@ export default { } /deep/ .el-card__body { - padding: 10px; + padding: 5px 0px 10px 10px; } .card_info_empty { @@ -354,27 +825,33 @@ export default { height: 190px; margin-top: 10px; - .content_text { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - word-break: break-all; - line-height: normal; - margin-top: 10px; - font-size: 5px; - } + .content_style { + height: 150px; + overflow-y: auto; + width: 100%; - .content_text2 { - text-overflow: ellipsis; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 4; - line-clamp: 4; - -webkit-box-orient: vertical; - line-height: normal; - margin-top: 10px; - font-size: 5px; + .content_text { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; + line-height: normal; + margin-top: 10px; + font-size: 5px; + } + + .content_text2 { + text-overflow: ellipsis; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 4; + line-clamp: 4; + -webkit-box-orient: vertical; + line-height: normal; + margin-top: 10px; + font-size: 5px; + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 81bf27d9b..9d794af6a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -199,6 +199,7 @@ @import '~@/assets/styles/style'; .wfhxzgStep1 { + /deep/.el-table--scrollable-y .el-table__body-wrapper { + height: calc(100% - 80px) !important; + } /deep/.el-drawer__container { .prc-content-border { border: none; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 8edf17f52..5871570a6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -262,6 +262,8 @@ export default { this.$nextTick(() => { if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo + let fileData = JSON.parse(JSON.stringify(item)).dockUserList + this.dataList = fileData[0].standardInfoList } else { let fileData = JSON.parse(JSON.stringify(item)).dockUserList for (let i = 0; i
-
+