问题模块

src/api/home/question/index.ts

@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+
+// 问题 VO
+export interface QuestionVO {
+  id: number // id
+  userId: number // 申请人的用户编号
+  userName: string // 作者
+  typeId: number // 类型id
+  deptId: number // 部门id
+  deptName: string // 部门名字
+  title: string // 问题标题
+  content: string // 内容
+  status: number // 状态
+  filePath: string // 文件路径
+  module: string // 所属模块
+}
+
+// 问题 API
+export const QuestionApi = {
+  // 查询问题分页
+  getQuestionPage: async (params: any) => {
+    return await request.get({ url: `/home/question/page`, params })
+  },
+
+  // 查询问题详情
+  getQuestion: async (id: number) => {
+    return await request.get({ url: `/home/question/get?id=` + id })
+  },
+
+  // 新增问题
+  createQuestion: async (data: QuestionVO) => {
+    return await request.post({ url: `/home/question/create`, data })
+  },
+
+  // 修改问题
+  updateQuestion: async (data: QuestionVO) => {
+    return await request.put({ url: `/home/question/update`, data })
+  },
+
+  // 删除问题
+  deleteQuestion: async (id: number) => {
+    return await request.delete({ url: `/home/question/delete?id=` + id })
+  },
+
+  // 导出问题 Excel
+  exportQuestion: async (params) => {
+    return await request.download({ url: `/home/question/export-excel`, params })
+  }
+}

src/main.ts

@@ -25,6 +25,7 @@ import '@/styles/index.scss'
 // 引入动画
 import '@/plugins/animate.css'
 
+
 // 路由
 import router, { setupRouter } from '@/router'
 

src/utils/dict.ts

@@ -143,6 +143,7 @@ export enum DICT_TYPE {
   OA_NUMBERS_NUM = 'oa_numbers_num',
   FWGL_MJ_TYPE = 'fwgl_mj_type',
   FWGl_JH_TYPE = 'fwgl_jh_type',
+  QUESTIONTYPE = 'questiontype',
   // ========== SYSTEM 模块 ==========
   SYSTEM_USER_SEX = 'system_user_sex',
   SYSTEM_MENU_TYPE = 'system_menu_type',

src/views/Home/qjgl/draft/indexDraft.vue

@@ -69,14 +69,14 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-<!--        <el-button-->
-<!--            type="primary"-->
-<!--            plain-->
-<!--            @click="handleCreate()"-->
-<!--            v-hasPermi="['home:qjgl:create']"-->
-<!--        >-->
-<!--          <Icon icon="ep:plus" class="mr-5px" /> 发起请假-->
-<!--        </el-button>-->
+        <el-button
+            type="primary"
+            plain
+            @click="handleCreate()"
+            v-hasPermi="['home:qjgl:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 发起请假
+        </el-button>
         <el-button
             type="success"
             plain

src/views/Home/qjgl/qjsq/QjglCreate.vue

@@ -1,9 +1,11 @@
 <template>
-  <el-card shadow="never" >
-    <template #header>
-      <span style="font-size: 16px">请假管理流程</span>
-    </template>
-<!--  <Dialog :title="dialogTitle" v-model="dialogVisible">-->
+<!--  <el-card shadow="never" >-->
+  <el-tabs type="border-card">
+    <el-tab-pane>
+      <template v-slot:label>
+          <span class="highlight-text">请假管理流程</span>
+      </template>
+
     <el-form
       ref="formRef"
       :model="formData"
@@ -93,17 +95,32 @@
           <el-input v-model="formData.reason" type="textarea" placeholder="请输入请假原因"  />
         </el-form-item>
     </el-form>
+    </el-tab-pane>
+    <el-tab-pane >
+      <template v-slot:label>
+        <span class="highlight-text">流程图</span>
+      </template>
 
-    <template #footer>
+      <div class="form-scroll-area">
+        <ProcessInstanceBpmnViewer
+          v-show="
+                  processDefinition.modelType && processDefinition.modelType === BpmModelType.BPMN
+                "
+          :loading="processInstanceLoading"
+          :model-view="processModelView"
+        />
+      </div>
+    </el-tab-pane>
+<!--    <template #footer>-->
       <el-button @click="submitForm" type="primary" :disabled="formLoading">提交审批</el-button>
       <el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
-    </template>
-  </el-card>
+<!--    </template>-->
+
+  </el-tabs>
 </template>
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { QjglApi, QjglVO } from '@/api/home/qjgl'
-
 import * as DefinitionApi from '@/api/bpm/definition'
 import * as UserApi from '@/api/system/user'
 import {useTagsViewStore} from "@/store/modules/tagsView";
@@ -111,6 +128,11 @@ import {getUserProfile, ProfileVO} from "@/api/system/user/profile";
 import {FormProcessMappingApi} from "@/api/bpm/formprocessmapping";
 import {CalendarApi, CalendarVO} from "@/api/home/calendar";
 import {NjglApi, NjglVO} from "@/api/home/njgl";
+import {BpmModelType} from "@/utils/constants";
+import ProcessInstanceSimpleViewer
+  from "@/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue";
+import ProcessInstanceBpmnViewer
+  from "@/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue";
 /** 请假管理 表单 */
 defineOptions({ name: 'QjglCreate' })
 
@@ -120,9 +142,13 @@ const { delView } = useTagsViewStore() // 视图操作
 const { push, currentRoute } = useRouter() // 路由
 // const dialogVisible = ref(false) // 弹窗的是否展示
 // const dialogTitle = ref('') // 弹窗的标题
+const processDefinition = ref<any>({}) // 流程定义
+const processModelView = ref<any>({}) // 流程模型视图
+const processInstanceLoading = ref(false) // 流程实例的加载中
+
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const draftButton = ref(false)
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+// const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   title: undefined,
@@ -440,3 +466,12 @@ onMounted(async () => {
 })
 
 </script>
+<style scoped>
+.highlight-text {
+    font-size: 18px;
+    font-weight: bold;
+    color: #409EFF;
+    display: inline-block;  /* 设置为内联块元素 */
+    line-height: 40px;  /* 如果需要调整垂直居中 */
+}
+</style>

src/views/Home/qjgl/qjsq/index.vue

@@ -220,21 +220,21 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-              v-hasPermi="['home:qjgl:export']"
-              link
-              type="primary"
-              @click="handleDetail(scope.row)"
-          >
-            详情
-          </el-button>
+<!--          <el-button-->
+<!--              v-hasPermi="['home:qjgl:export']"-->
+<!--              link-->
+<!--              type="primary"-->
+<!--              @click="handleDetail(scope.row)"-->
+<!--          >-->
+<!--            详情-->
+<!--          </el-button>-->
           <el-button
               link
               type="danger"
               @click="handleProcessDetail(scope.row)"
               v-hasPermi="['home:qjgl:export']"
           >
-            进度
+            详情
           </el-button>
 <!--          <el-button-->
 <!--            link-->

src/views/Home/question/info/QuestionForm.vue

@@ -0,0 +1,187 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-col :span="24">
+        <el-form-item label="问题标题" prop="title">
+          <el-input v-model="formData.title" placeholder="请输入问题标题" />
+        </el-form-item>
+      </el-col>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="作者" prop="userName">
+            <el-input v-model="formData.userName" placeholder="请输入起草人" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="承办部门" prop="deptId">
+            <el-input v-model="formData.deptId" placeholder="请输入部门信息" v-show="false"  />
+            <el-input v-model="formData.deptName" placeholder="请输入部门信息" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-col :span="24">
+        <el-form-item label="类型" prop="typeId">
+          <el-radio-group v-model="formData.typeId">
+            <el-radio
+              v-for="dict in getIntDictOptions(DICT_TYPE.QUESTIONTYPE)"
+              :key="dict.value"
+              :label="dict.value"
+            >
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="内容" prop="content">
+          <Editor v-model="formData.content" height="150px" />
+        </el-form-item>
+      </el-col>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="所属模块" prop="module">
+            <el-input v-model="formData.module" placeholder="请输入所属模块" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-col :span="24">
+        <el-form-item label="文件路径" prop="filePath">
+          <UploadFile v-model="formData.filePath" />
+        </el-form-item>
+      </el-col>
+
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { QuestionApi, QuestionVO } from '@/api/home/question'
+import {getUserProfile} from "@/api/system/user/profile";
+
+/** 问题 表单 */
+defineOptions({ name: 'QuestionForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  userId: undefined,
+  userName: undefined,
+  typeId: undefined,
+  deptId: undefined,
+  deptName: undefined,
+  title: undefined,
+  content: undefined,
+  status: undefined,
+  filePath: undefined,
+  module: undefined
+})
+const formRules = reactive({
+  userName: [{ required: true, message: '作者不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const getUserInfo = async () => {
+  const users = await getUserProfile()
+  console.log("getUserInfo......1")
+  if (formData.value.deptId == '' || formData.value.deptId == undefined) {
+    formData.value.deptId = users.dept.id
+  }
+  if (formData.value.deptName == '' || formData.value.deptName == undefined) {
+    console.log( "1111111111" )
+    formData.value.deptName = users.dept.name
+  }
+console.log( users.dept.name )
+  if (formData.value.userName == '' || formData.value.userName == undefined) {
+    formData.value.userName = users.nickname
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+
+  resetForm()
+  await getUserInfo()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await QuestionApi.getQuestion(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as QuestionVO
+    if (formType.value === 'create') {
+      await QuestionApi.createQuestion(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await QuestionApi.updateQuestion(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    userId: undefined,
+    userName: undefined,
+    typeId: 2,
+    deptId: undefined,
+    deptName: undefined,
+    title: undefined,
+    content: undefined,
+    status: 0,
+    filePath: undefined,
+    module: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/Home/question/info/index.vue

@@ -0,0 +1,289 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+<!--      <el-form-item label="申请人的用户编号" prop="userId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userId"-->
+<!--          placeholder="请输入申请人的用户编号"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="作者" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入作者"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="typeId">
+
+        <el-select v-model="queryParams.typeId" placeholder="请选择" class="!w-240px">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.QUESTIONTYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </el-option>
+        </el-select>
+<!--        <el-radio-group v-model="formData.typeId">-->
+<!--          <el-radio-->
+<!--            v-for="dict in getIntDictOptions(DICT_TYPE.QUESTIONTYPE)"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.value"-->
+<!--          >-->
+<!--            {{ dict.label }}-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+      </el-form-item>
+<!--      <el-form-item label="部门id" prop="deptId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deptId"-->
+<!--          placeholder="请输入部门id"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="部门名字" prop="deptName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deptName"-->
+<!--          placeholder="请输入部门名字"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="问题标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入问题标题"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['home:question:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['home:question:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+<!--      <el-table-column label="id" align="center" prop="id" />-->
+<!--      <el-table-column label="申请人的用户编号" align="center" prop="userId" />-->
+      <el-table-column label="序号" align="center" type="index" width="55" />
+      <el-table-column label="作者" align="center" prop="userName" />
+      <el-table-column label="类型" align="center" prop="typeId">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.QUESTIONTYPE" :value="scope.row.typeId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="所属模块" align="center" prop="module" />
+<!--      <el-table-column label="部门id" align="center" prop="deptId" />-->
+      <el-table-column label="部门" align="center" prop="deptName" />
+      <el-table-column label="问题标题" align="center" prop="title" />
+<!--      <el-table-column label="内容" align="center" prop="content" />-->
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="文件路径" align="center" prop="filePath" />-->
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['home:question:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['home:question:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <QuestionForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { QuestionApi, QuestionVO } from '@/api/home/question'
+import QuestionForm from './QuestionForm.vue'
+
+/** 问题 列表 */
+defineOptions({ name: 'Question' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<QuestionVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: undefined,
+  userName: undefined,
+  typeId: undefined,
+  deptId: undefined,
+  deptName: undefined,
+  title: undefined,
+  content: undefined,
+  status: undefined,
+  filePath: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await QuestionApi.getQuestionPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const formWidth = ref('80%'); // 你想要的宽度
+const openForm = (type: string, id?: number) => {
+  formRef.value.width = formWidth.value; // 设置宽度
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await QuestionApi.deleteQuestion(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await QuestionApi.exportQuestion(queryParams)
+    download.excel(data, '问题.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>