Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl

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 }
+  })
+}

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<Partial<IEditorConfig>>,
-    default: () => undefined
+    default: () => ({})
   },
   readonly: propTypes.bool.def(false),
   modelValue: propTypes.string.def(''),

src/hooks/web/useCrudSchemas.ts

@@ -276,6 +276,7 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
       }
       if (schemaItem.form?.component == 'Editor') {
         descriptionsSchemaItem.span = 2
+        descriptionsSchemaItem.isEditor = true
       }
       if (schemaItem.dictType) {
         descriptionsSchemaItem.dictType = schemaItem.dictType

src/views/Basic/Dept/DeptForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
+  <Dialog v-if="dialogVisible" v-model="dialogVisible" :title="dialogTitle" width="800px">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -30,7 +30,12 @@
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="负责人" prop="leaderUserId">
-            <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
+            <el-select
+              v-model="formData.leaderUserId"
+              clearable
+              multiple
+              placeholder="请输入负责人"
+            >
               <el-option
                 v-for="item in userList"
                 :key="item.id"
@@ -59,7 +64,7 @@
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
           <el-form-item label="备注" prop="remark">
-            <Editor v-model:modelValue="formData.remark" />
+            <Editor v-model="formData.remark" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -510,7 +510,7 @@ async function handleChangeProdoce(row) {
     })
     message.success('修改成功')
     // 刷新列表
-    getTableList()
+    // getTableList()
   } catch {
     // 取消后，进行恢复按钮
     row.isProduced = !row.isProduced

src/views/Clue/Order/Comp/MallSettle.vue

@@ -246,6 +246,16 @@
         <el-form-item label="结算金额">
           {{ settleAmount }}
         </el-form-item>
+        <el-form-item label="结算日期">
+          <el-date-picker
+            v-model="form.settlementDate"
+            type="date"
+            placeholder="选择日期时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+          />
+        </el-form-item>
         <el-form-item label="结算备注" prop="remark">
           <Editor v-model:modelValue="form.remark" />
         </el-form-item>
@@ -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)

src/views/MiniMall/Purchase/Comp/DialogAdd.vue

@@ -33,9 +33,9 @@
             <el-select v-model="form.supplier" placeholder="选择供应商" filterable>
               <el-option
                 v-for="item in opts.supplier"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :key="item.id"
+                :label="item.supplierName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>

src/views/OKR/Meeting/MeetingInfo.vue

@@ -1,9 +1,12 @@
 <template>
   <div>
-    <!-- <el-affix postion="top" :offset="95" target="#app" v-if="!isDetail"> -->
+    <!-- <el-affix postion="top" :offset="95" v-if="!isDetail"> -->
     <div class="flex justify-between mb-4 bg-white" v-if="!isDetail">
       <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
-      <el-button type="success" @click="submit()">保存</el-button>
+      <div>
+        <el-button @click="submit(true)">保存至草稿</el-button>
+        <el-button type="success" @click="submit(false)">保存</el-button>
+      </div>
     </div>
     <!-- </el-affix> -->
     <el-form
@@ -76,7 +79,6 @@
             <el-select
               v-model="form.expectUsers"
               placeholder="选择参会人员"
-              clearable
               filterable
               style="width: 100%"
               multiple
@@ -87,7 +89,7 @@
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
-                :disabled="item.status == 1"
+                :disabled="item.status == 1 || item.id == userStore.getUser.id"
               />
             </el-select>
           </el-form-item>
@@ -106,7 +108,7 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24" :offset="0" v-if="!isAllActived">
+        <el-col :span="24" :offset="0" v-if="form.meetingId && !isAllActived">
           <el-form-item label="缺席原因" prop="absentReason">
             <el-input v-model="form.absentReason" placeholder="请输入缺席原因" />
           </el-form-item>
@@ -114,26 +116,106 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
-          <el-form-item label="会议内容" prop="meetingContent">
-            <div v-if="!!isDetail" v-dompurify-html="form.meetingContent" class="w-full"></div>
-            <Editor v-else v-model="form.meetingContent" height="500px" style="width: 100%" />
-          </el-form-item>
+          <el-tabs v-model="currentUserId" tab-position="top" @tab-click="userTabChange">
+            <el-tab-pane
+              v-for="item in form.meetingContentList"
+              :key="item.userId"
+              :label="item.userName"
+              :name="item.userId + ''"
+            />
+          </el-tabs>
+          <el-tabs v-model="currentContentId" tab-position="left" addable @edit="handleTabsEdit">
+            <el-tab-pane
+              v-for="(item, index) in form.meetingContentList.find(
+                (it) => it.userId == currentUserId
+              )?.userMeetingContentList"
+              :key="index"
+              :label="'内容' + (index + 1)"
+              :name="index"
+              :closable="index > 0"
+            >
+              <div v-if="!!isDetail" v-dompurify-html="item.content" class="w-full"></div>
+              <Editor v-else v-model="item.content" height="500px" style="width: 100%" />
+            </el-tab-pane>
+          </el-tabs>
         </el-col>
         <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
-          <el-form-item label="会议纪要" prop="meetingSummary" label-width="80px">
-            <!-- <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
-            <Editor v-else v-model="form.meetingSummary" height="500px" /> -->
-            <div v-if="!!isDetail" class="w-full">{{ form.meetingSummary }}</div>
-            <el-input
-              v-else
-              v-model="form.meetingSummary"
-              type="textarea"
-              placeholder="请输入会议纪要"
-              :maxlength="-1"
-              :show-word-limit="false"
-              :autosize="{ minRows: 20 }"
-            />
-          </el-form-item>
+          <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
+          <div v-else>
+            <el-tabs v-model="summaryIdx" addable @edit="meetingSummaryEdit">
+              <el-tab-pane
+                v-for="(item, index) in form.meetingSummaryList"
+                :key="index"
+                :label="`会议纪要${index || ''}`"
+                :name="index"
+                :closable="index > 0"
+              >
+                <Editor
+                  v-model="item.summary"
+                  :toolbarConfig="toolbarConfig"
+                  height="350px"
+                  placeholder="请输入会议纪要"
+                  style="width: 100%"
+                />
+                <div class="mt-10px">
+                  <el-form-item label="是否创建待办" label-width="auto">
+                    <el-radio-group v-model="item.isCreateAgentWork">
+                      <el-radio :label="true" :value="true"> 创建待办 </el-radio>
+                      <el-radio :label="false" :value="false"> 不创建待办 </el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </div>
+                <div class="flex items-center" v-if="item.isCreateAgentWork">
+                  <el-select
+                    class="flex-1"
+                    v-model="item.agentUserList"
+                    placeholder="选择执行人"
+                    clearable
+                    filterable
+                    multiple
+                  >
+                    <el-option
+                      v-for="it in userOptions"
+                      :key="it.id"
+                      :label="it.name"
+                      :value="it.id"
+                      :disabled="it.status == 1"
+                    />
+                  </el-select>
+                  <el-date-picker
+                    class="flex-1 ml-10px"
+                    v-model="item.endDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择截止时间"
+                  />
+                </div>
+              </el-tab-pane>
+            </el-tabs>
+            <el-divider />
+            <div class="text-black text-12px">
+              注：如果选择创建待办，请选择执行人及截止日期，默认每天9:00循环提醒，可于待办中修改
+            </div>
+            <div class="mt-10px">
+              <el-form-item label="会议纪要发送至群聊：" label-width="auto">
+                <el-select
+                  filterable
+                  clearable
+                  v-model="form.wxId"
+                  placeholder="请输入群聊名称"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in groupOptions"
+                    :key="item.wxGroupId"
+                    :label="item.wxGroupName"
+                    :value="item.wxGroupId"
+                  />
+                </el-select>
+              </el-form-item>
+            </div>
+          </div>
         </el-col>
       </el-row>
     </el-form>
@@ -143,14 +225,17 @@
 <script setup name="MeetingInfo">
 import { listToTree } from '@/utils/tree'
 import { getAllNodeTree } from '@/api/okr/okr'
+import { getWaitPage } from '@/api/okr/wait'
 import * as MeetingApi from '@/api/okr/meeting'
 import { formatDate } from '@/utils/formatTime'
 import { getEmployeeSimpleList } from '@/api/pers/employee'
 import { useTagsViewStore } from '@/store/modules/tagsView'
+import { useUserStore } from '@/store/modules/user'
 
 const route = useRoute()
 const message = useMessage()
 const tagsViewStore = useTagsViewStore()
+const userStore = useUserStore()
 
 const defaultProps = {
   value: 'nodeId',
@@ -159,14 +244,34 @@ const defaultProps = {
 }
 
 const isDetail = route.query.isDetail
+const currentUserId = ref(undefined)
+const currentContentId = ref(0) // 默认选中第一个标签页
+const summaryIdx = ref(0) // 会议纪要的索引
+
+const toolbarConfig = {
+  toolbarKeys: []
+}
 
 onMounted(async () => {
+  getWxGroupOptions()
   await getOptions()
   if (route.params.id && route.params.id != 0) {
     // 这里可以调用API获取会议详情数据
     getMeetingInfo(route.params.id)
   } else {
-    console.error('会议不存在')
+    form.value.meetingContentList = [
+      {
+        userId: userStore.getUser.id + '',
+        userName: userStore.getUser.nickname,
+        userMeetingContentList: [
+          {
+            content: ''
+          }
+        ]
+      }
+    ]
+    currentContentId.value = 0
+    searchUserWait([userStore.getUser.id])
   }
 })
 
@@ -180,23 +285,13 @@ function getOptions() {
         children: 'children'
       })
       userOptions.value = employeeResp.map((it) => ({ ...it, id: it.id + '' }))
-      // handleUserChange()
+      form.value.expectUsers = [userStore.getUser.id + ''] // 默认添加当前用户为预约参会人员
+      // form.value.actualUsers = [userStore.getUser.id + '']
+      currentUserId.value = userStore.getUser.id + '' // 默认选中当前用户
     })
     .catch((error) => {
       console.error('获取数据失败:', error)
     })
-  // // 获取OKR节点数据
-  // getAllNodeTree().then((resp) => {
-  //   peroidList.value = listToTree(resp?.tree || [], {
-  //     id: 'nodeId',
-  //     pid: 'parentId',
-  //     children: 'children'
-  //   })
-  // })
-  // // 获取人员数据
-  // getEmployeeSimpleList().then((data) => {
-  //   userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
-  // })
 }
 
 const form = ref({
@@ -211,7 +306,9 @@ const form = ref({
   status: '1',
   meetingContent: '',
   meetingSummary: '',
-  absentReason: ''
+  absentReason: '',
+  meetingContentList: [],
+  meetingSummaryList: []
 })
 const rules = {
   meetingSubject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
@@ -239,15 +336,37 @@ const getMeetingInfo = async (meetingId) => {
     const resp = await MeetingApi.getMeetingDetail({ meetingId })
     loading.value = false
     if (resp) {
+      let summaryList = []
+      if (resp.meetingSummaryList && resp.meetingSummaryList.length > 0) {
+        summaryList = resp.meetingSummaryList.map((item) => ({
+          ...item,
+          isCreateAgentWork: !!item.isCreateAgentWork,
+          agentUserList: item.agentUserList ? item.agentUserList.map((it) => it + '') : []
+        }))
+      } else {
+        summaryList = [
+          {
+            summary: resp.meetingSummary || '',
+            agentUserList: [],
+            endDate: '',
+            isCreateAgentWork: true
+          }
+        ]
+      }
+
       form.value = {
         ...form.value,
         ...resp,
         startTime: formatDate(resp.startTime, 'YYYY-MM-DD HH:mm'),
         expectEndTime: formatDate(resp.expectEndTime, 'YYYY-MM-DD HH:mm'),
         expectUsers: resp.expectUsers || [],
-        actualUsers: resp.actualUsers || []
+        actualUsers: resp.actualUsers || [],
+        meetingSummaryList: summaryList
       }
-      handleUserChange()
+      currentContentId.value = 0
+      expectUserOptions.value = userOptions.value.filter((user) =>
+        form.value.expectUsers.some((it) => it == user.id)
+      )
     }
   } catch (error) {
     loading.value = false
@@ -255,7 +374,62 @@ const getMeetingInfo = async (meetingId) => {
   }
 }
 
-function handleUserChange() {
+const groupOptions = ref([])
+
+function getWxGroupOptions() {
+  MeetingApi.refreshWxGroupList().then(() => {
+    MeetingApi.getWxGroupList()
+      .then((resp) => {
+        groupOptions.value = resp || []
+      })
+      .catch((error) => {
+        console.error('获取微信群列表失败:', error)
+      })
+  })
+}
+
+function userTabChange() {
+  currentContentId.value = 0
+}
+
+function handleTabsEdit(targetName, action) {
+  if (action === 'add') {
+    form.value.meetingContentList.forEach((item) => {
+      if (item.userId == currentUserId.value) {
+        item.userMeetingContentList.push({
+          content: ''
+        })
+      }
+    })
+  } else if (action === 'remove') {
+    form.value.meetingContentList.forEach((item) => {
+      if (item.userId == currentUserId.value) {
+        item.userMeetingContentList.splice(targetName, 1)
+        // 如果删除的是当前选中的标签页，则切换到下一个标签页
+        if (currentContentId.value == targetName) {
+          currentContentId.value = targetName - 1
+        }
+      }
+    })
+  }
+}
+
+function meetingSummaryEdit(targetName, action) {
+  if (action === 'add') {
+    form.value.meetingSummaryList.push({
+      summary: '',
+      agentUserList: [],
+      endDate: '',
+      isCreateAgentWork: true
+    })
+  } else if (action === 'remove') {
+    form.value.meetingSummaryList.splice(targetName, 1)
+    summaryIdx.value = targetName - 1
+  }
+}
+
+const checkedUsers = ref([])
+function handleUserChange(val) {
   // 当预约参会人员变化时，更新实际参会人员选项
   expectUserOptions.value = userOptions.value.filter((user) =>
     form.value.expectUsers.some((it) => it == user.id)
@@ -263,30 +437,101 @@ function handleUserChange() {
   if (!isDetail) {
     form.value.actualUsers = [...form.value.expectUsers]
   }
+  // 先过滤掉不存在的参会人员
+  form.value.meetingContentList = form.value.meetingContentList.filter((item) => {
+    return val.some((it) => it == item.userId)
+  })
+  // 再补充新增的
+  val.map((item) => {
+    if (!form.value.meetingContentList.some((it) => it.userId == item)) {
+      form.value.meetingContentList.push({
+        userId: item,
+        userName: userOptions.value.find((it) => it.id == item).name,
+        userMeetingContentList: [
+          {
+            content: ''
+          }
+        ]
+      })
+    }
+  })
+  if (!form.value.meetingId) {
+    searchUserWait(val)
+  }
+}
+
+function searchUserWait(val) {
+  val.map((item) => {
+    if (!checkedUsers.value.includes(item)) {
+      checkedUsers.value.push(item)
+      // 新增会议时，根据参会人员拉取代办事项
+      getWaitPage({
+        pageNo: 1,
+        pageSize: -1,
+        workUserId: item,
+        creator: userStore.getUser.id,
+        completeStatus: 1
+      }).then((resp) => {
+        joinContent(resp.list)
+      })
+    }
+  })
+}
+
+function joinContent(arr) {
+  arr.map((wait) => {
+    let text = '<p>未完成事项：' + wait.title + '</p>'
+    text += wait.content
+    text += `<p>执行人：${wait.userNameStr}</p>`
+    text += `<p>截止日期：${formatDate(wait.endDate, 'YYYY-MM-DD')}</p>`
+    text += '<p><br></p>'
+    form.value.meetingContentList[0].userMeetingContentList[0].content =
+      text + form.value.meetingContentList[0].userMeetingContentList[0].content
+  })
 }
 
 const router = useRouter()
-async function submit() {
+async function submit(isDraft = false) {
   // 校验表单
   if (!formRef.value) return
   const valid = await formRef.value.validate()
   if (!valid) return
 
   try {
+    form.value.isDraft = isDraft
     // 提交表单数据
     if (form.value.meetingId) {
-      if (form.value.status == 2 && !form.value.meetingSummary) {
+      if (
+        form.value.status == 2 &&
+        form.value.meetingSummaryList.some((it) => it.summary.trim() == '')
+      ) {
         message.error('会议结束时，会议纪要不能为空')
         return
+      } else {
+        let text = ''
+        form.value.meetingSummaryList.map((item, index) => {
+          if (form.value.meetingSummaryList.length > 1) {
+            text += '<p>会议纪要' + (index + 1) + '：</p>'
+          }
+          text += item.summary
+          if (item.isCreateAgentWork) {
+            text += `<p>执行人：`
+            item.agentUserList.map((it) => {
+              if (it) {
+                text += `${userOptions.value.find((user) => user.id == it).name} `
+              }
+            })
+            text += '</p>'
+            text += `<p>截止日期：${item.endDate}</p>`
+          }
+          text += '<p><br></p>'
+        })
+        form.value.meetingSummary = text
       }
       // 更新会议
       await MeetingApi.updateMeeting(form.value)
       message.success('会议更新成功')
     } else {
-      if (form.value.status == 1 && !form.value.meetingContent) {
-        message.error('预约会议时，会议内容不能为空')
-        return
-      }
       form.value.actualUsers = []
       // 新增会议
       await MeetingApi.createMeeting(form.value)

src/views/OKR/Meeting/index.vue

@@ -11,6 +11,15 @@
           @keyup.enter="handleSearch"
         />
       </el-form-item>
+      <el-form-item>
+        <el-input
+          v-model="searchForm.creator"
+          placeholder="发起人"
+          style="width: 120px"
+          clearable
+          @keyup.enter="handleSearch"
+        />
+      </el-form-item>
       <el-form-item>
         <el-select
           v-model="searchForm.status"
@@ -117,6 +126,7 @@ const message = useMessage()
 
 const searchForm = ref({
   meetingSubject: undefined,
+  creator: undefined,
   status: '1',
   dateRange: [],
   nodeId: undefined,

src/views/OKR/Wait/Components/DialogWait.vue

@@ -4,7 +4,7 @@
       <el-form
         :model="form"
         ref="formRef"
-        :disabled="formType == 'do'"
+        :disabled="['do', 'detail'].includes(formType)"
         :rules="rules"
         label-width="80px"
         class="flex-1"
@@ -239,7 +239,9 @@ const followList = ref([])
 
 function open(type, id) {
   show.value = true
-  title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度' }[type]
+  title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度', detail: '待办详情' }[
+    type
+  ]
   formType.value = type
   resetForm()
   if (id) {

src/views/OKR/Wait/index.vue

@@ -139,6 +139,15 @@
           >
             修改
           </el-button>
+          <el-button
+            v-if="row.completeStatus == 2"
+            style="padding: 0; margin-right: 10px; margin-left: 0"
+            type="primary"
+            text
+            @click="handleDetail(row)"
+          >
+            详情
+          </el-button>
           <el-button
             v-if="row.creator == currentUserId && row.completeStatus == 1"
             style="padding: 0; margin-right: 10px; margin-left: 0"
@@ -271,6 +280,10 @@ function handleEdit(row) {
   waitDialogRef.value.open('update', row.workId)
 }
 
+function handleDetail(row) {
+  waitDialogRef.value.open('detail', row.workId)
+}
+
 function handleDelete(row) {
   message.confirm('确定删除待办事项吗？').then(() => {
     deleteWait(row.workId).then(() => {