cykj/hzdyjs
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码修改为准

Browse Source
This commit is contained in:
zlwu committed 2025-07-15 10:12:21 +08:00
1 parent eaad94f10b
commit 9dff23fc68
22 files changed
+373 -299
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web/src/views/hq/satCategory/index.vue
+4 -4
View File
@@ -266,21 +266,21 @@ const handleDelete = async (row?: SatCategoryVO) => {
if (row) {
// 单个删除
confirmMessage = `是否确认删除题目分类"${row.categoryName}（${row.categoryCode}）"的数据项？`;
confirmMessage = `是否确认删除题目分类\"${row.categoryName}（${row.categoryCode}）\"的数据项？\n\n【提示】本操作为逻辑删除，数据不会被物理移除，可在后台恢复。`;
} else {
// 批量删除
const selectedRows = satCategoryList.value.filter((item) => ids.value.includes(item.id));
if (selectedRows.length === 1) {
confirmMessage = `是否确认删除题目分类"${selectedRows[0].categoryName}（${selectedRows[0].categoryCode}）"的数据项？`;
confirmMessage = `是否确认删除题目分类\"${selectedRows[0].categoryName}（${selectedRows[0].categoryCode}）\"的数据项？\n\n【提示】本操作为逻辑删除，数据不会被物理移除，可在后台恢复。`;
} else {
const categoryNames = selectedRows.map((item) => `${item.categoryName}（${item.categoryCode}）`).join('、');
confirmMessage = `是否确认删除题目分类"${categoryNames}"的数据项？`;
confirmMessage = `是否确认删除题目分类\"${categoryNames}\"的数据项？\n\n【提示】本操作为逻辑删除，数据不会被物理移除，可在后台恢复。`;
}
}
await proxy?.$modal.confirm(confirmMessage).finally(() => (loading.value = false));
await delSatCategory(_ids);
proxy?.$modal.msgSuccess('删除成功');
proxy?.$modal.msgSuccess('已逻辑删除');
await getList();
};
web/src/views/hq/satOption/index.vue
+4 -4
View File
@@ -257,22 +257,22 @@ const handleDelete = async (row?: SatOptionVO) => {
let confirmMessage = '';
if (row) {
// 单项删除
confirmMessage = `是否确认删除评分选项"${row.optionText}（${row.optionValue}分）"？`;
confirmMessage = `是否确认删除评分选项\"${row.optionText}（${row.optionValue}分）\"？\n\n【提示】本操作为逻辑删除，数据不会被物理移除，可在后台恢复。`;
} else {
// 批量删除
const selectedItems = satOptionList.value.filter((item) => ids.value.includes(item.id));
if (selectedItems.length === 1) {
const item = selectedItems[0];
confirmMessage = `是否确认删除评分选项"${item.optionText}（${item.optionValue}分）"？`;
confirmMessage = `是否确认删除评分选项\"${item.optionText}（${item.optionValue}分）\"？\n\n【提示】本操作为逻辑删除，数据不会被物理移除，可在后台恢复。`;
} else {
const itemTexts = selectedItems.map((item) => `${item.optionText}（${item.optionValue}分）`).join('、');
confirmMessage = `是否确认删除以下评分选项：${itemTexts}？`;
confirmMessage = `是否确认删除以下评分选项：${itemTexts}？\n\n【提示】本操作为逻辑删除，数据不会被物理移除，可在后台恢复。`;
}
}
await proxy?.$modal.confirm(confirmMessage).finally(() => (loading.value = false));
await delSatOption(_ids);
proxy?.$modal.msgSuccess('删除成功');
proxy?.$modal.msgSuccess('已逻辑删除');
await getList();
};
web/src/views/hq/satQuestion/index.vue
+49 -24
View File
@@ -9,36 +9,50 @@
<el-option v-for="dict in sys_item_delete" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> -->
<el-form-item label="题目标题" prop="questionTitle">
<el-input v-model="queryParams.questionTitle" placeholder="请输入题目标题" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="所属分类" prop="categoryId">
<el-select v-model="queryParams.categoryId" placeholder="请选择所属分类" clearable @change="handleQuery">
<el-option v-for="category in satCategoryList" :key="category.id" :label="category.categoryName" :value="category.id" />
</el-select>
</el-form-item>
<el-form-item label="题目类型" prop="questionType">
<el-select v-model="queryParams.questionType" placeholder="请选择题目类型" clearable>
<el-option v-for="dict in sys_question_category" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="是否必填" prop="isRequired">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="题目标题" prop="questionTitle">
<el-input v-model="queryParams.questionTitle" placeholder="请输入题目标题" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属分类" prop="categoryId">
<el-select v-model="queryParams.categoryId" placeholder="请选择所属分类" clearable @change="handleQuery">
<el-option v-for="category in satCategoryList" :key="category.id" :label="category.categoryName" :value="category.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="题目类型" prop="questionType">
<el-select v-model="queryParams.questionType" placeholder="请选择题目类型" clearable>
<el-option v-for="dict in sys_question_category" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-form-item label="是否必填" prop="isRequired">
<el-select v-model="queryParams.isRequired" placeholder="请选择是否必填" clearable>
<el-option v-for="dict in sys_item_required" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> -->
<!-- <el-form-item label="排序" prop="sortOrder">
<!-- <el-form-item label="排序" prop="sortOrder">
<el-input v-model="queryParams.sortOrder" placeholder="请输入排序" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option v-for="dict in sys_item_enable" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option v-for="dict in sys_item_enable" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" class="search-btn-container">
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</div>
@@ -422,4 +436,15 @@ onMounted(() => {
max-width: 200px;
display: inline-block;
}
/* 搜索按钮容器样式 */
.search-btn-container {
display: flex;
justify-content: flex-end;
margin-top: 10px;
.el-form-item {
margin-bottom: 0 !important;
}
}
</style>
web/src/views/hq/satSurvey/index.vue
+101 -39
View File
@@ -3,57 +3,95 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div ref="searchRef" v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form ref="queryFormRef" :model="queryParams" label-width="100px">
<!-- <el-form-item label="删除标志" prop="deleted">
<el-select v-model="queryParams.deleted" placeholder="请选择删除标志" clearable >
<el-option v-for="dict in sys_item_delete" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> -->
<el-form-item label="问卷编号" prop="surveyCode">
<el-input v-model="queryParams.surveyCode" placeholder="请输入问卷编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="问卷标题" prop="surveyTitle">
<el-input v-model="queryParams.surveyTitle" placeholder="请输入问卷标题" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="问卷描述" prop="surveyDesc">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="问卷编号" prop="surveyCode">
<el-input v-model="queryParams.surveyCode" placeholder="请输入问卷编号" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="问卷标题" prop="surveyTitle">
<el-input v-model="queryParams.surveyTitle" placeholder="请输入问卷标题" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-form-item label="问卷描述" prop="surveyDesc">
<el-input v-model="queryParams.surveyDesc" placeholder="请输入问卷描述" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="填写说明" prop="surveyInstruction">
<el-input v-model="queryParams.surveyInstruction" placeholder="请输入填写说明" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="目标群体" prop="targetGroup">
<el-select v-model="queryParams.targetGroup" placeholder="请选择目标群体" clearable>
<el-option v-for="dict in sys_survey_people" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择开始时间" />
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择结束时间" />
</el-form-item>
<!-- <el-form-item label="最大提交次数" prop="maxSubmitTimes">
<el-form-item label="目标群体" prop="targetGroup">
<el-select v-model="queryParams.targetGroup" placeholder="请选择目标群体" clearable>
<el-option v-for="dict in sys_survey_people" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
clearable
v-model="queryParams.startTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择开始时间"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
clearable
v-model="queryParams.endTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择结束时间"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-form-item label="最大提交次数" prop="maxSubmitTimes">
<el-input v-model="queryParams.maxSubmitTimes" placeholder="请输入最大提交次数" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="是否匿名" prop="isAnonymous">
<el-select v-model="queryParams.isAnonymous" placeholder="请选择是否匿名" clearable>
<el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="是否发布" prop="isPublished">
<el-select v-model="queryParams.isPublished" placeholder="请选择是否发布" clearable>
<el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option v-for="dict in sys_survey_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item label="是否匿名" prop="isAnonymous">
<el-select v-model="queryParams.isAnonymous" placeholder="请选择是否匿名" clearable>
<el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否发布" prop="isPublished">
<el-select v-model="queryParams.isPublished" placeholder="请选择是否发布" clearable>
<el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option v-for="dict in sys_survey_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" class="search-btn-container">
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</div>
@@ -3325,4 +3363,28 @@ onMounted(() => {
}
}
}
/* 搜索按钮容器样式 */
.search-btn-container {
display: flex;
justify-content: flex-end;
margin-top: 10px;
.el-form-item {
margin-bottom: 0 !important;
}
}
/* 强制el-date-editor及其内部input宽度100% */
:deep(.el-date-editor) {
width: 100% !important;
min-width: 0 !important;
}
:deep(.el-date-editor .el-input__wrapper) {
width: 100% !important;
min-width: 0 !important;
}
:deep(.el-date-editor input) {
width: 100% !important;
min-width: 0 !important;
}
</style>