diff --git a/src/api/finance/purchasingrequisition.ts b/src/api/finance/purchasingrequisition.ts
index 3aae8e5..7847f71 100644
--- a/src/api/finance/purchasingrequisition.ts
+++ b/src/api/finance/purchasingrequisition.ts
@@ -100,3 +100,15 @@ export function delObj(id: number) {
});
}
+/**
+ * 获取采购申请附件列表
+ * @param purchaseId 采购申请ID
+ */
+export function getApplyFiles(purchaseId: string | number) {
+ return request({
+ url: '/purchase/purchasingfiles/applyFiles',
+ method: 'post',
+ params: { purchaseId }
+ });
+}
+
diff --git a/src/views/basic/basicstudent/index.vue b/src/views/basic/basicstudent/index.vue
index 1083426..ea2c07e 100644
--- a/src/views/basic/basicstudent/index.vue
+++ b/src/views/basic/basicstudent/index.vue
@@ -262,13 +262,25 @@
+
+
+ {{ getEducationLabel(scope.row.education) }}
+
+ -
+
是
否
-
- {{ scope.row.enrollStatus }}
+
+ {{ getEnrollStatusLabel(scope.row.enrollStatus) }}
+
-
@@ -427,7 +439,6 @@ import {
editIsleader,
updateInout,
updateStuSimpleInfo,
- getStuStatus,
prePrint
} from "/@/api/basic/basicstudent";
import { getDeptList, getClassListByRole } from "/@/api/basic/basicclass";
@@ -456,6 +467,7 @@ const deptList = ref([])
const classList = ref([])
const statusList = ref([])
const stuStatusList = ref([])
+const educationList = ref([])
const selectedRows = ref([])
const importCertificateDialogVisible = ref(false)
const uploadLoading = ref(false)
@@ -781,9 +793,17 @@ const getClassListData = async () => {
// 获取学籍状态列表
const getStatusListData = async () => {
try {
- const res = await getStuStatus()
+ const res = await getDicts('enroll_status')
if (res.data) {
- statusList.value = Array.isArray(res.data) ? res.data : []
+ if (Array.isArray(res.data)) {
+ // 确保数据格式统一为 {label, value}
+ statusList.value = res.data.map((item: any) => ({
+ label: item.label || item.name || item.dictLabel || item.text || '',
+ value: String(item.value || item.code || item.dictValue || item.id || '')
+ })).filter((item: any) => item.label && item.value !== undefined && item.value !== null && item.value !== '')
+ } else {
+ statusList.value = []
+ }
}
} catch (err) {
console.error('获取学籍状态列表失败', err)
@@ -791,6 +811,24 @@ const getStatusListData = async () => {
}
}
+// 获取文化程度字典
+const getEducationListData = async () => {
+ try {
+ const res = await getDicts('pre_school_education')
+ if (res.data && Array.isArray(res.data)) {
+ educationList.value = res.data.map((item: any) => ({
+ label: item.label || item.dictLabel || item.name,
+ value: item.value || item.dictValue || item.code
+ }))
+ } else {
+ educationList.value = []
+ }
+ } catch (err) {
+ console.error('获取文化程度字典失败', err)
+ educationList.value = []
+ }
+}
+
// 获取学生状态列表
const getStuStatusListData = async () => {
try {
@@ -813,6 +851,20 @@ const getStuStatusListData = async () => {
}
}
+// 根据学籍状态值获取标签
+const getEnrollStatusLabel = (value: any) => {
+ if (value === undefined || value === null || value === '') return ''
+ const status = statusList.value.find(item => String(item.value) === String(value))
+ return status ? status.label : ''
+}
+
+// 根据文化程度值获取标签
+const getEducationLabel = (value: any) => {
+ if (value === undefined || value === null || value === '') return ''
+ const item = educationList.value.find(i => String(i.value) === String(value))
+ return item ? item.label : ''
+}
+
// 根据学生状态值获取标签
const getStuStatusLabel = (value: any) => {
if (value === undefined || value === null || value === '') return ''
@@ -833,6 +885,7 @@ onMounted(() => {
getDeptListData()
getClassListData()
getStatusListData()
+ getEducationListData()
getStuStatusListData()
})
diff --git a/src/views/finance/purchasingrequisition/form.vue b/src/views/finance/purchasingrequisition/form.vue
index c1fa2b6..5cd2bc4 100644
--- a/src/views/finance/purchasingrequisition/form.vue
+++ b/src/views/finance/purchasingrequisition/form.vue
@@ -8,14 +8,14 @@
:class="{ 'view-dialog': isView }">
-
-
+ -->
+
+
+
+ {{ dataForm.purchaseNo || '-' }}
+
+
+
+
+ {{ dataForm.deptName || '-' }}
+
+
+
@@ -72,23 +84,34 @@
:value="item.value" />
-
-
-
-
-
+
+
{{ dataForm.budget ? Number(dataForm.budget).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }) : '-' }}
-
+
+
+
+
+
+
+
+
+
+
+
@@ -113,7 +136,11 @@
- {{ getDictLabel(isSpecialList, dataForm.isSpecial) || '-' }}
+ 紧急
+ 单一
+ 进口
+ 否
+ -
@@ -209,13 +237,15 @@
@@ -232,20 +262,48 @@
+
+
+
+
+
+
+ 下载《部门采购询价模版》模版
+
+
+
@@ -254,12 +312,12 @@
-
+
{{ dataForm.entrustCenterType === 'service_online' ? '服务类网上商城' : dataForm.entrustCenterType === 'other' ? '其他方式' : '-' }}
-
+
服务类网上商城
其他方式
@@ -267,49 +325,75 @@
-
-
- 有
- 无
+
+
+ {{ dataForm.hasSupplier === '1' || dataForm.hasSupplier === 'yes' ? '有' : dataForm.hasSupplier === '0' || dataForm.hasSupplier === 'no' ? '无' : '-' }}
+
+
+ 有
+ 无
+
+ {{ dataForm.suppliers || '-' }}
+
+
+
+
-
- 下载《服务商城项目需求模板（直选）》模版
-
+ :class="isView ? 'mb16' : 'mb20'">
+
+
+ 下载《服务商城项目需求模板（直选）》模版
+
+
-
- 下载《服务商城项目需求模板（公开比选）》模版
-
+ v-if="dataForm.hasSupplier === '0' || dataForm.hasSupplier === 'no'"
+ label="服务商城项目需求模板（邀请比选）"
+ prop="serviceInviteSelect"
+ :class="isView ? 'mb16' : 'mb20'">
+
+
+ 下载《服务商城项目需求模板（邀请比选）》模版
+
+
@@ -334,6 +418,8 @@
@@ -343,15 +429,15 @@
- {{ dataForm.hasRecommendedSupplier === 'yes' ? '有' : dataForm.hasRecommendedSupplier === 'no' ? '无' : '-' }}
+ {{ dataForm.hasRecommendedSupplier === '1' || dataForm.hasRecommendedSupplier === 'yes' ? '有' : dataForm.hasRecommendedSupplier === '0' || dataForm.hasRecommendedSupplier === 'no' ? '无' : '-' }}
- 有
- 无
+ 有
+ 无
@@ -369,6 +455,7 @@
@@ -385,11 +472,13 @@
@@ -406,55 +495,81 @@
+
+
+
+
+ 支持上传zip格式的压缩包文件
+
学校统一采购
-
-
-
- {{ getDictLabel(purchaseModeSchoolList, dataForm.purchaseMode) || '-' }}
-
-
-
-
-
-
-
-
-
- {{ getDictLabel(purchaseTypeUnionList, dataForm.purchaseTypeUnion) || '-' }}
-
-
-
-
-
-
-
+
+
+
+ {{ getDictLabel(purchaseModeSchoolList, dataForm.purchaseMode) || '-' }}
+
+
+
+
+
+
+
+
+
+ {{ getDictLabel(purchaseTypeUnionList, dataForm.purchaseTypeUnion) || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dataForm.deptClassifyName || '-' }}
+
+
+
+
+ {{ dataForm.schoolLeaderName || '-' }}
+
+
+
@@ -475,6 +590,8 @@
@@ -482,6 +599,21 @@
+
+
+
+
+
+
+
@@ -506,6 +638,8 @@
@@ -513,6 +647,8 @@
@@ -537,6 +673,8 @@
@@ -544,11 +682,38 @@
+
+
+
+
+
+
+ {{ dataForm.hasRecommendedSupplierSchool === 'yes' || dataForm.hasRecommendedSupplierSchool === '1' ? '有' : dataForm.hasRecommendedSupplierSchool === 'no' || dataForm.hasRecommendedSupplierSchool === '0' ? '无' : '-' }}
+
+
+ 有
+ 无
+
+
+
+
+
+ {{ dataForm.recommendedSuppliersSchool || '-' }}
+
+
+
+
+
@@ -564,10 +729,62 @@
+
+
+
+
+
+ 下载《服务商城项目需求模板（邀请比选）》模版
+
+
+
+
+
+
+
+ 下载《服务商城项目需求模板（公开比选）》模版
+
+
+
+
+
+
@@ -600,9 +819,21 @@
+
+
+
+
+ 支持上传zip格式的压缩包文件
+