yanghao пре 1 месец
родитељ
комит
ec64fff242
4 измењених фајлова са 311 додато и 2 уклоњено
  1. 1 1
      .env.local
  2. 30 0
      src/api/technology‌/index.ts
  3. 8 1
      src/utils/dict.ts
  4. 272 0
      src/views/findings/copyright/index.vue

+ 1 - 1
.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://192.168.188.86:38080'
+VITE_BASE_URL='http://172.30.41.105:38080'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

+ 30 - 0
src/api/technology‌/index.ts

@@ -29,3 +29,33 @@ export const deleteTechnology = (id: number) => {
 export const exportTechnology = (params) => {
   return request.get({ url: '/rd/core-technology/export', params, responseType: 'blob' })
 }
+
+// 研究成果列表
+export const getResultList = (params) => {
+  return request.get({ url: '/rd/research-achievement/page', params })
+}
+
+// 新增研究成果
+export const createResult = (data: any) => {
+  return request.post({ url: '/rd/research-achievement/create', data })
+}
+
+// 修改研究成果
+export const updateResult = (data: any) => {
+  return request.put({ url: '/rd/research-achievement/update', data })
+}
+
+// 删除研究成果
+export const deleteResult = (id: number) => {
+  return request.delete({ url: `/rd/research-achievement/delete?id=${id}` })
+}
+
+// 获取研究成果详情
+export const getResultDetail = (id: number) => {
+  return request.get({ url: `/rd/research-achievement/get?id=${id}` })
+}
+
+// 获得研究成果 论文 专利 软著 荣誉证书 扩展属性 列表
+export const getResultExtendList = (type) => {
+  return request.get({ url: `/rd/research-achievement-attrs/attrs?achievementType=${type}` })
+}

+ 8 - 1
src/utils/dict.ts

@@ -262,5 +262,12 @@ export enum DICT_TYPE {
   RD_EXPERT_ECHELON = 'rd_expert_echelon', //专家梯队
   RD_CORE_TECHNOLOGY_TYPE = 'rd_core_technology_type', // 核心技术类型
   RD_CORE_TECHNOLOGY_STATUS = 'rd_core_technology_status', // 核心技术状态
-  RD_CORE_TECHNOLOGY_LEVEL = 'rd_core_technology_level' // 核心技术级别
+  RD_CORE_TECHNOLOGY_LEVEL = 'rd_core_technology_level', // 核心技术级别
+
+  // 研究成果
+  ACHIEVEMENT_TYPE = 'rd_achievement_type', // 研究成果类型
+  PATENT_SUB_TYPE = 'rd_patent_sub_type', // 专利子类型
+  PAPER_SUB_TYPE = 'rd_paper_sub_type', // 论文子类型
+  COPYRIGHT_SUB_TYPE = 'rd_copyright_sub_type', // 软著子类型
+  HONOR_SUB_TYPE = 'rd_honor_sub_type' // 荣誉级别子类型
 }

+ 272 - 0
src/views/findings/copyright/index.vue

@@ -0,0 +1,272 @@
+<template>
+  <div
+    class="grid grid-cols-[auto_1fr] grid-rows-[auto_minmax(0,1fr)] gap-0 gap-x-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
+  >
+    <DeptTreeSelect
+      class="row-span-2"
+      :top-id="rootDeptId"
+      :deptId="deptId"
+      v-model="queryParams.deptId"
+      :init-select="false"
+      :show-title="false"
+      request-api="getSimpleDeptList"
+      @node-click="handleDeptNodeClick"
+    />
+
+    <div class="mb-1">
+      <el-form
+        ref="queryFormRef"
+        :model="queryParams"
+        :inline="true"
+        @submit.prevent
+        class="bg-white dark:bg-[#1d1e1f] rounded-lg shadow px-8 pt-4 flex items-center flex-wrap min-w-0"
+      >
+        <el-form-item label="成果名称" prop="achievementName">
+          <el-input v-model="queryParams.achievementName" placeholder="请输入成果名称" clearable style="width: 180px" />
+        </el-form-item>
+        <el-form-item label="成果类型" prop="achievementType">
+          <el-select v-model="queryParams.achievementType" placeholder="请选择成果类型" clearable style="width: 150px">
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.ACHIEVEMENT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </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')">
+            <Icon icon="ep:plus" class="mr-5px" />新增
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="bg-white dark:bg-[#1d1e1f] shadow rounded-lg flex flex-col p-2 pt-4 min-w-0">
+      <div class="flex-1 relative min-h-0">
+        <el-auto-resizer class="absolute">
+          <template #default="{ width, height }">
+            <zm-table :loading="loading" :data="list" :width="width" :height="height">
+              <zm-table-column label="序号" width="70" align="center">
+                <template #default="scope">{{ scope.$index + 1 }}</template>
+              </zm-table-column>
+              <zm-table-column label="成果名称" prop="achievementName" min-width="180" align="center" show-overflow-tooltip />
+              <zm-table-column label="成果类型" prop="achievementType" min-width="130" align="center">
+                <template #default="scope">
+                  <dict-tag :type="DICT_TYPE.ACHIEVEMENT_TYPE" :value="scope.row.achievementType" />
+                </template>
+              </zm-table-column>
+              <zm-table-column label="子类型" prop="subType" min-width="140" align="center">
+                <template #default="scope">
+                  <dict-tag :type="getSubTypeDict(scope.row.achievementType)" :value="scope.row.subType" />
+                </template>
+              </zm-table-column>
+              <zm-table-column label="部门" prop="deptId" min-width="150" align="center">
+                <template #default="{ row }">{{ getDeptName(row.deptId) }}</template>
+              </zm-table-column>
+              <zm-table-column label="概述" prop="summary" min-width="260" align="center" show-overflow-tooltip />
+              <zm-table-column label="操作" align="center" fixed="right" width="150" action>
+                <template #default="scope">
+                  <el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
+                  <el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
+                </template>
+              </zm-table-column>
+            </zm-table>
+          </template>
+        </el-auto-resizer>
+      </div>
+      <div class="h-8 mt-2 flex items-center justify-end">
+        <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </div>
+    </div>
+  </div>
+
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="680px" :close-on-click-modal="false" destroy-on-close>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+      <el-form-item label="部门" prop="deptId">
+        <el-tree-select v-model="formData.deptId" :data="deptList" :props="defaultProps" node-key="id" filterable clearable placeholder="请选择部门" class="w-full" />
+      </el-form-item>
+      <el-form-item label="成果名称" prop="achievementName">
+        <el-input v-model="formData.achievementName" placeholder="请输入成果名称" />
+      </el-form-item>
+      <el-form-item label="成果类型" prop="achievementType">
+        <el-select v-model="formData.achievementType" placeholder="请选择成果类型" clearable class="w-full" @change="handleAchievementTypeChange">
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.ACHIEVEMENT_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="子类型" prop="subType">
+        <el-select v-model="formData.subType" placeholder="请先选择成果类型" clearable class="w-full" :disabled="!formData.achievementType">
+          <el-option v-for="dict in subTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="概述" prop="summary">
+        <el-input v-model="formData.summary" type="textarea" :rows="5" placeholder="请输入成果概述" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="formLoading" @click="submitForm">确定</el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from 'vue'
+import { createResult, deleteResult, getResultDetail, getResultList, updateResult } from '@/api/technology‌'
+import * as DeptApi from '@/api/system/dept'
+import { useUserStore } from '@/store/modules/user'
+import { defaultProps } from '@/utils/tree'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'Copyright' })
+
+const rootDeptId = 156
+const deptId = useUserStore().getUser.deptId || rootDeptId
+const message = useMessage()
+const loading = ref(false)
+const formLoading = ref(false)
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formType = ref<'create' | 'update'>('create')
+const list = ref<any[]>([])
+const total = ref(0)
+const deptList = ref<Tree[]>([])
+const formRef = ref()
+const queryFormRef = ref()
+
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  deptId: undefined as number | undefined,
+  achievementName: undefined as string | undefined,
+  achievementType: undefined as string | undefined
+})
+
+const createDefaultForm = () => ({
+  id: undefined,
+  deptId: undefined as number | undefined,
+  achievementName: '',
+  achievementType: '',
+  subType: '',
+  summary: ''
+})
+
+const formData = ref(createDefaultForm())
+const formRules = {
+  deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
+  achievementName: [{ required: true, message: '请输入成果名称', trigger: 'blur' }],
+  achievementType: [{ required: true, message: '请选择成果类型', trigger: 'change' }],
+  subType: [{ required: true, message: '请选择子类型', trigger: 'change' }]
+}
+
+const getSubTypeDict = (achievementType: string | number) => {
+  const dictMap: Record<string, string> = {
+    '1': DICT_TYPE.PAPER_SUB_TYPE,
+    '2': DICT_TYPE.PATENT_SUB_TYPE,
+    '3': DICT_TYPE.COPYRIGHT_SUB_TYPE,
+    '4': DICT_TYPE.HONOR_SUB_TYPE
+  }
+  return dictMap[String(achievementType)] || DICT_TYPE.PAPER_SUB_TYPE
+}
+
+const subTypeOptions = computed(() =>
+  formData.value.achievementType ? getStrDictOptions(getSubTypeDict(formData.value.achievementType)) : []
+)
+
+const getDeptName = (id?: number) => {
+  if (!id) return '-'
+  const find = (items: Tree[]): string | undefined => {
+    for (const item of items) {
+      if (item.id === id) return item.name
+      const name = item.children ? find(item.children) : undefined
+      if (name) return name
+    }
+  }
+  return find(deptList.value) || String(id)
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await getResultList(queryParams)
+    list.value = data.list || []
+    total.value = data.total || 0
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleDeptNodeClick = (row: { id: number }) => {
+  queryParams.deptId = row.id
+  queryParams.pageNo = 1
+  getList()
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryParams.pageNo = 1
+  queryParams.deptId = undefined
+  queryParams.achievementName = undefined
+  queryParams.achievementType = undefined
+  queryFormRef.value?.resetFields()
+  getList()
+}
+
+const handleAchievementTypeChange = () => {
+  formData.value.subType = ''
+}
+
+const openForm = async (type: 'create' | 'update', id?: number) => {
+  formType.value = type
+  dialogTitle.value = type === 'create' ? '新增研究成果' : '编辑研究成果'
+  formData.value = createDefaultForm()
+  if (type === 'update') {
+    formLoading.value = true
+    try {
+      formData.value = { ...createDefaultForm(), ...(await getResultDetail(id!)) }
+    } finally {
+      formLoading.value = false
+    }
+  }
+  dialogVisible.value = true
+}
+
+const submitForm = async () => {
+  const valid = await formRef.value?.validate()
+  if (!valid) return
+  formLoading.value = true
+  try {
+    if (formType.value === 'create') {
+      await createResult(formData.value)
+      message.success('新增成功')
+    } else {
+      await updateResult(formData.value)
+      message.success('更新成功')
+    }
+    dialogVisible.value = false
+    getList()
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await deleteResult(id)
+    message.success('删除成功')
+    getList()
+  } catch {}
+}
+
+onMounted(async () => {
+  getList()
+  deptList.value = await DeptApi.getSimpleDeptList()
+})
+</script>