From c34623287c57afc22575091966f9dc3f0b440e92 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 4 Aug 2025 17:21:38 +0800 Subject: [PATCH 1/6] sc --- src/views/Clue/Order/Comp/MallOrderList.vue | 2 +- src/views/OKR/Meeting/MeetingInfo.vue | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue index e20a70c..85ad1b1 100644 --- a/src/views/Clue/Order/Comp/MallOrderList.vue +++ b/src/views/Clue/Order/Comp/MallOrderList.vue @@ -510,7 +510,7 @@ async function handleChangeProdoce(row) { }) message.success('修改成功') // 刷新列表 - getTableList() + // getTableList() } catch { // 取消后，进行恢复按钮 row.isProduced = !row.isProduced diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue index a23a78e..93b5fa2 100644 --- a/src/views/OKR/Meeting/MeetingInfo.vue +++ b/src/views/OKR/Meeting/MeetingInfo.vue @@ -121,9 +121,15 @@ - -
{{ form.meetingSummary }}
+
+ + @@ -152,6 +158,10 @@ const route = useRoute() const message = useMessage() const tagsViewStore = useTagsViewStore() +const toolbarConfig = { + toolbarKeys: [] +} + const defaultProps = { value: 'nodeId', label: 'nodeName', From 6ebe33e48cb9910115330985293cdcee0e75a54d Mon Sep 17 00:00:00 2001 From: qsh <> Date: Fri, 8 Aug 2025 11:03:30 +0800 Subject: [PATCH 2/6] sc --- src/views/Clue/Order/Comp/MallSettle.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/Clue/Order/Comp/MallSettle.vue b/src/views/Clue/Order/Comp/MallSettle.vue index e6d00af..bb95bab 100644 --- a/src/views/Clue/Order/Comp/MallSettle.vue +++ b/src/views/Clue/Order/Comp/MallSettle.vue @@ -246,6 +246,16 @@ {{ settleAmount }} + + + @@ -269,7 +279,7 @@ import * as SettleApi from '@/api/clue/settle' import { getSupplierSimpleList } from '@/api/school/setting/supplier' import { removeNullField } from '@/utils/index' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, formatDate } from '@/utils/formatTime' const message = useMessage() // 消息弹窗 @@ -394,6 +404,7 @@ function batchSettle() { showDailog.value = true form.value = { settlementIds: selectList.value.map((it) => it.settlementId), + settlementDate: formatDate(new Date(), 'YYYY-MM-DD'), reamrk: undefined } settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0) From 9b323b68f97d484fcde8ab98c8025623324168c6 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 11 Aug 2025 23:50:45 +0800 Subject: [PATCH 3/6] sc --- src/api/okr/meeting.js | 16 ++ src/components/Editor/src/Editor.vue | 2 +- src/views/Basic/Dept/DeptForm.vue | 11 +- src/views/OKR/Meeting/MeetingInfo.vue | 318 +++++++++++++++++++++----- src/views/OKR/Meeting/index.vue | 10 + 5 files changed, 296 insertions(+), 61 deletions(-) diff --git a/src/api/okr/meeting.js b/src/api/okr/meeting.js index 6cdaad4..df17772 100644 --- a/src/api/okr/meeting.js +++ b/src/api/okr/meeting.js @@ -43,3 +43,19 @@ export const getMeetingPage = (params) => { // headers: { 'instance-id': 1016 } }) } + +// 刷新微信群列表 +export const refreshWxGroupList = () => { + return request.get({ + url: '/admin-api/system/wx/reFreshWeChatGroupList' + // headers: { 'instance-id': 1016 } + }) +} + +// 获取微信群聊列表 +export const getWxGroupList = () => { + return request.get({ + url: '/admin-api/system/wx/getWeChatGroupList' + // headers: { 'instance-id': 1016 } + }) +} diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue index 22df80b..24a1e45 100644 --- a/src/components/Editor/src/Editor.vue +++ b/src/components/Editor/src/Editor.vue @@ -21,7 +21,7 @@ const props = defineProps({ height: propTypes.oneOfType([Number, String]).def('40vh'), editorConfig: { type: Object as PropType>, - default: () => undefined + default: () => ({}) }, readonly: propTypes.bool.def(false), modelValue: propTypes.string.def(''), diff --git a/src/views/Basic/Dept/DeptForm.vue b/src/views/Basic/Dept/DeptForm.vue index e96642b..7c1f3eb 100644 --- a/src/views/Basic/Dept/DeptForm.vue +++ b/src/views/Basic/Dept/DeptForm.vue @@ -1,5 +1,5 @@