yxk-20260721

改善提案
代码生成
This commit is contained in:
ye1023
2026-07-21 16:22:57 +08:00
parent f54b4ef2ae
commit b56f75484a
5 changed files with 1131 additions and 0 deletions
@@ -0,0 +1,87 @@
import {defHttp} from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/improvementproposal/improvementProposal/list',
save='/improvementproposal/improvementProposal/add',
edit='/improvementproposal/improvementProposal/edit',
deleteOne = '/improvementproposal/improvementProposal/delete',
deleteBatch = '/improvementproposal/improvementProposal/deleteBatch',
importExcel = '/improvementproposal/improvementProposal/importExcel',
exportXls = '/improvementproposal/improvementProposal/exportXls',
queryDataById = '/improvementproposal/improvementProposal/queryById',
improvementDeptScoreList = '/improvementproposal/improvementProposal/queryImprovementDeptScoreByMainId',
improvementInstituteVoteList = '/improvementproposal/improvementProposal/queryImprovementInstituteVoteByMainId',
}
/**
* 导出api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* 导入api
*/
export const getImportUrl = Api.importExcel;
/**
* 查询子表数据
* @param params
*/
export const queryImprovementDeptScoreListByMainId = (id) => defHttp.get({url: Api.improvementDeptScoreList, params:{ id }});
/**
* 查询子表数据
* @param params
*/
export const queryImprovementInstituteVoteListByMainId = (id) => defHttp.get({url: Api.improvementInstituteVoteList, params:{ id }});
/**
* 列表接口
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
* 删除单个
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
* 保存或者更新
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}
/**
* 根据id查询数据
* @param params
*/
export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }});
@@ -0,0 +1,318 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '提案编号',
align:"center",
dataIndex: 'proposalNo'
},
{
title: '提案名称',
align:"center",
dataIndex: 'proposalName'
},
{
title: '提出日期',
align:"center",
dataIndex: 'proposalDate',
customRender:({text}) =>{
text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
return text;
},
},
{
title: '提案部门ID',
align:"center",
dataIndex: 'proposalDeptId'
},
{
title: '提案部门名称',
align:"center",
dataIndex: 'proposalDeptName'
},
{
title: '申请人ID',
align:"center",
dataIndex: 'applicantId'
},
{
title: '申请人姓名',
align:"center",
dataIndex: 'applicantName'
},
{
title: '团队名称',
align:"center",
dataIndex: 'teamName'
},
{
title: '提案类别',
align:"center",
dataIndex: 'proposalCategory'
},
{
title: '问题描述',
align:"center",
dataIndex: 'problemDesc'
},
{
title: '改善方法及措施',
align:"center",
dataIndex: 'improvementMethod'
},
{
title: '最终奖项',
align:"center",
dataIndex: 'finalAward'
},
{
title: '业务展示状态',
align:"center",
dataIndex: 'bpmStatus'
},
];
//子表表格配置
export const improvementDeptScoreColumns: JVxeColumn[] = [
{
title: '改善提案主表ID',
key: 'mainId',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '流程任务ID',
key: 'processTaskId',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '评委ID',
key: 'scorerId',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '评委姓名',
key: 'scorerName',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '评分状态:pending/completed',
key: 'scoreStatus',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '改善效果得分',
key: 'effectScore',
type: JVxeTypes.inputNumber,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '可推广度得分',
key: 'promotionScore',
type: JVxeTypes.inputNumber,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '独创性得分',
key: 'originalityScore',
type: JVxeTypes.inputNumber,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '努力度得分',
key: 'effortScore',
type: JVxeTypes.inputNumber,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '加权总分',
key: 'totalScore',
type: JVxeTypes.inputNumber,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '评分意见',
key: 'scoreOpinion',
type: JVxeTypes.textarea,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '评分时间',
key: 'scoreTime',
type: JVxeTypes.datetime,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
]
export const improvementInstituteVoteColumns: JVxeColumn[] = [
{
title: '改善提案主表ID',
key: 'mainId',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '流程任务ID',
key: 'processTaskId',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '投票人ID',
key: 'voterId',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '投票人姓名',
key: 'voterName',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '投票状态:pending/voted',
key: 'voteStatus',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [
{ required: true, message: '${title}不能为空' },
],
},
{
title: '投票结果:agree/disagree',
key: 'voteResult',
type: JVxeTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '投票意见',
key: 'voteOpinion',
type: JVxeTypes.textarea,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '投票时间',
key: 'voteTime',
type: JVxeTypes.datetime,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
]
// 高级查询数据
export const superQuerySchema = {
proposalNo: {title: '提案编号',order: 0,view: 'text', type: 'string',},
proposalName: {title: '提案名称',order: 1,view: 'text', type: 'string',},
proposalDate: {title: '提出日期',order: 2,view: 'date', type: 'string',},
proposalDeptId: {title: '提案部门ID',order: 3,view: 'text', type: 'string',},
proposalDeptName: {title: '提案部门名称',order: 4,view: 'text', type: 'string',},
applicantId: {title: '申请人ID',order: 5,view: 'text', type: 'string',},
applicantName: {title: '申请人姓名',order: 6,view: 'text', type: 'string',},
teamName: {title: '团队名称',order: 7,view: 'text', type: 'string',},
proposalCategory: {title: '提案类别',order: 8,view: 'text', type: 'string',},
problemDesc: {title: '问题描述',order: 9,view: 'textarea', type: 'string',},
improvementMethod: {title: '改善方法及措施',order: 10,view: 'textarea', type: 'string',},
finalAward: {title: '最终奖项',order: 14,view: 'text', type: 'string',},
bpmStatus: {title: '业务展示状态',order: 15,view: 'text', type: 'string',},
//子表高级查询
improvementDeptScore: {
title: '部门评议评分表',
view: 'table',
fields: {
mainId: {title: '改善提案主表ID',order: 0,view: 'text', type: 'string',},
processTaskId: {title: '流程任务ID',order: 1,view: 'text', type: 'string',},
scorerId: {title: '评委ID',order: 2,view: 'text', type: 'string',},
scorerName: {title: '评委姓名',order: 3,view: 'text', type: 'string',},
scoreStatus: {title: '评分状态:pending/completed',order: 4,view: 'text', type: 'string',},
effectScore: {title: '改善效果得分',order: 5,view: 'number', type: 'number',},
promotionScore: {title: '可推广度得分',order: 6,view: 'number', type: 'number',},
originalityScore: {title: '独创性得分',order: 7,view: 'number', type: 'number',},
effortScore: {title: '努力度得分',order: 8,view: 'number', type: 'number',},
totalScore: {title: '加权总分',order: 9,view: 'number', type: 'number',},
scoreOpinion: {title: '评分意见',order: 10,view: 'textarea', type: 'string',},
scoreTime: {title: '评分时间',order: 11,view: 'datetime', type: 'string',},
}
},
improvementInstituteVote: {
title: '所级评议投票表',
view: 'table',
fields: {
mainId: {title: '改善提案主表ID',order: 0,view: 'text', type: 'string',},
processTaskId: {title: '流程任务ID',order: 1,view: 'text', type: 'string',},
voterId: {title: '投票人ID',order: 2,view: 'text', type: 'string',},
voterName: {title: '投票人姓名',order: 3,view: 'text', type: 'string',},
voteStatus: {title: '投票状态:pending/voted',order: 4,view: 'text', type: 'string',},
voteResult: {title: '投票结果:agree/disagree',order: 5,view: 'text', type: 'string',},
voteOpinion: {title: '投票意见',order: 6,view: 'textarea', type: 'string',},
voteTime: {title: '投票时间',order: 7,view: 'datetime', type: 'string',},
}
},
};
@@ -0,0 +1,303 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="proposalName">
<template #label><span title="提案名称">提案名称</span></template>
<JInput v-model:value="queryParam.proposalName"/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="proposalCategory">
<template #label><span title="提案类别">提案类别</span></template>
<JInput v-model:value="queryParam.proposalCategory"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
<a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'improvementproposal:improvement_proposal:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'improvementproposal:improvement_proposal:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'improvementproposal:improvement_proposal:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'improvementproposal:improvement_proposal:deleteBatch'">批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<ImprovementProposalModal @register="registerModal" @success="handleSuccess"></ImprovementProposalModal>
<!-- 审批记录 -->
<BpmPictureModal @register="registerBpmModal" />
</div>
</template>
<script lang="ts" name="improvementproposal-improvementProposal" setup>
import {ref, reactive, computed, unref} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage'
import {useModal} from '/@/components/Modal';
import ImprovementProposalModal from './components/ImprovementProposalModal.vue'
import {columns, superQuerySchema} from './ImprovementProposal.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ImprovementProposal.api';
import {downloadFile} from '/@/utils/common/renderUtils';
import { useMessage } from '/@/hooks/web/useMessage';
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
import { startProcess } from '/@/api/common/api';
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
import { useUserStore } from '/@/store/modules/user';
const formRef = ref();
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
//注册model
const [registerModal, {openModal}] = useModal();
const userStore = useUserStore();
const { createMessage } = useMessage();
//注册table数据
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: 'improvement_proposal',
api: list,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed:'right'
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name:"improvement_proposal",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
})
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({id: record.id}, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ids: selectedRowKeys.value},handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: 'improvementproposal:improvement_proposal:edit'
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
let dropDownAction = [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record)
},
auth: 'improvementproposal:improvement_proposal:delete'
},
{
label: '审批进度',
onClick: handlePreviewPic.bind(null, record),
ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
}
];
if(record.bpmStatus == '1' || !record.bpmStatus){
dropDownAction.push({
label: '发起流程',
popConfirm: {
title: '确认提交流程吗?',
confirm: handleProcess.bind(null, record),
placement: 'topLeft',
}
})
}
return dropDownAction;
}
/**
* 提交流程
*/
async function handleProcess(record) {
let params = {
flowCode: 'dev_improvement_proposal_001',
id: record.id,
formUrl: 'improvementproposal/components/ImprovementProposalForm',
formUrlMobile: ''
}
await startProcess(params);
handleSuccess();
}
/**
* 审批进度
*/
async function handlePreviewPic(record) {
bpmPicModal(true, {
flowCode: 'dev_improvement_proposal_001',
dataId: record.id,
});
}
/* ----------------------以下为原生查询需要添加的-------------------------- */
const toggleSearchStatus = ref<boolean>(false);
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
});
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//刷新数据
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>
@@ -0,0 +1,356 @@
<template>
<a-spin :spinning="loading">
<JFormContainer :disabled="disabled">
<template #detail>
<a-form v-bind="formItemLayout" name="ImprovementProposalForm" ref="formRef">
<a-row>
<a-col :span="12">
<a-form-item label="提案编号" v-bind="validateInfos.proposalNo" id="ImprovementProposalForm-proposalNo" name="proposalNo">
<a-input v-model:value="formData.proposalNo" placeholder="请输入提案编号" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="提案名称" v-bind="validateInfos.proposalName" id="ImprovementProposalForm-proposalName" name="proposalName">
<a-input v-model:value="formData.proposalName" placeholder="请输入提案名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="提出日期" v-bind="validateInfos.proposalDate" id="ImprovementProposalForm-proposalDate" name="proposalDate">
<a-date-picker placeholder="请选择提出日期" v-model:value="formData.proposalDate" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="提案部门ID" v-bind="validateInfos.proposalDeptId" id="ImprovementProposalForm-proposalDeptId" name="proposalDeptId">
<a-input v-model:value="formData.proposalDeptId" placeholder="请输入提案部门ID" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="提案部门名称" v-bind="validateInfos.proposalDeptName" id="ImprovementProposalForm-proposalDeptName" name="proposalDeptName">
<a-input v-model:value="formData.proposalDeptName" placeholder="请输入提案部门名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="申请人ID" v-bind="validateInfos.applicantId" id="ImprovementProposalForm-applicantId" name="applicantId">
<a-input v-model:value="formData.applicantId" placeholder="请输入申请人ID" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="申请人姓名" v-bind="validateInfos.applicantName" id="ImprovementProposalForm-applicantName" name="applicantName">
<a-input v-model:value="formData.applicantName" placeholder="请输入申请人姓名" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="团队名称" v-bind="validateInfos.teamName" id="ImprovementProposalForm-teamName" name="teamName">
<a-input v-model:value="formData.teamName" placeholder="请输入团队名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="提案类别" v-bind="validateInfos.proposalCategory" id="ImprovementProposalForm-proposalCategory" name="proposalCategory">
<a-input v-model:value="formData.proposalCategory" placeholder="请输入提案类别" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="问题描述" v-bind="validateInfos.problemDesc" id="ImprovementProposalForm-problemDesc" name="problemDesc">
<a-textarea v-model:value="formData.problemDesc" :rows="4" placeholder="请输入问题描述" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="改善方法及措施" v-bind="validateInfos.improvementMethod" id="ImprovementProposalForm-improvementMethod" name="improvementMethod">
<a-textarea v-model:value="formData.improvementMethod" :rows="4" placeholder="请输入改善方法及措施" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="改善前情况描述" v-bind="validateInfos.beforeDesc" id="ImprovementProposalForm-beforeDesc" name="beforeDesc">
<a-textarea v-model:value="formData.beforeDesc" :rows="4" placeholder="请输入改善前情况描述" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="改善后情况描述" v-bind="validateInfos.afterDesc" id="ImprovementProposalForm-afterDesc" name="afterDesc">
<a-textarea v-model:value="formData.afterDesc" :rows="4" placeholder="请输入改善后情况描述" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="改善效果" v-bind="validateInfos.improvementEffect" id="ImprovementProposalForm-improvementEffect" name="improvementEffect">
<a-textarea v-model:value="formData.improvementEffect" :rows="4" placeholder="请输入改善效果" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="最终奖项" v-bind="validateInfos.finalAward" id="ImprovementProposalForm-finalAward" name="finalAward">
<a-input v-model:value="formData.finalAward" placeholder="请输入最终奖项" disabled allow-clear ></a-input>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
<!-- 子表单区域 -->
<a-tabs v-model:activeKey="activeKey" animated style="overflow:hidden;">
<a-tab-pane tab="部门评议评分表" key="improvementDeptScore" :forceRender="true">
<j-vxe-table
:keep-source="true"
resizable
ref="improvementDeptScoreTableRef"
:loading="improvementDeptScoreTable.loading"
:columns="improvementDeptScoreTable.columns"
:dataSource="improvementDeptScoreTable.dataSource"
:height="340"
:disabled="disabled"
:rowNumber="true"
:rowSelection="true"
:toolbar="true"/>
</a-tab-pane>
<a-tab-pane tab="所级评议投票表" key="improvementInstituteVote" :forceRender="true">
<j-vxe-table
:keep-source="true"
resizable
ref="improvementInstituteVoteTableRef"
:loading="improvementInstituteVoteTable.loading"
:columns="improvementInstituteVoteTable.columns"
:dataSource="improvementInstituteVoteTable.dataSource"
:height="340"
:disabled="disabled"
:rowNumber="true"
:rowSelection="true"
:toolbar="true"/>
</a-tab-pane>
</a-tabs>
<div v-if="showFlowSubmitButton" :span="24" style="width: 100%;text-align: center;margin-top: 10px">
<a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm"> </a-button>
</div>
</a-spin>
</template>
<script lang="ts">
import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
import { queryImprovementDeptScoreListByMainId, queryImprovementInstituteVoteListByMainId, queryDataById, saveOrUpdate } from '../ImprovementProposal.api';
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
import {improvementDeptScoreColumns, improvementInstituteVoteColumns} from '../ImprovementProposal.data';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue';
const useForm = Form.useForm;
export default defineComponent({
name: "ImprovementProposalForm",
components:{
JVxeTable,
JFormContainer,
},
props:{
formDisabled:{
type: Boolean,
default: false
},
formData: { type: Object, default: ()=>{} },
formBpm: { type: Boolean, default: true }
},
emits:['success'],
setup(props, {emit}) {
const loading = ref(false);
const formRef = ref();
const improvementDeptScoreTableRef = ref();
const improvementDeptScoreTable = reactive<Record<string, any>>({
loading: false,
columns: improvementDeptScoreColumns,
dataSource: []
});
const improvementInstituteVoteTableRef = ref();
const improvementInstituteVoteTable = reactive<Record<string, any>>({
loading: false,
columns: improvementInstituteVoteColumns,
dataSource: []
});
const activeKey = ref('improvementDeptScore');
const formData = reactive<Record<string, any>>({
id: '',
proposalNo: '',
proposalName: '',
proposalDate: '',
proposalDeptId: '',
proposalDeptName: '',
applicantId: '',
applicantName: '',
teamName: '',
proposalCategory: '',
problemDesc: '',
improvementMethod: '',
beforeDesc: '',
afterDesc: '',
improvementEffect: '',
finalAward: '',
});
//表单验证
const validatorRules = reactive({
proposalNo: [{ required: true, message: '请输入提案编号!'},],
proposalName: [{ required: true, message: '请输入提案名称!'},],
proposalDate: [{ required: true, message: '请输入提出日期!'},],
proposalDeptId: [{ required: true, message: '请输入提案部门ID!'},],
proposalDeptName: [{ required: true, message: '请输入提案部门名称!'},],
applicantId: [{ required: true, message: '请输入申请人ID!'},],
applicantName: [{ required: true, message: '请输入申请人姓名!'},],
proposalCategory: [{ required: true, message: '请输入提案类别!'},],
problemDesc: [{ required: true, message: '请输入问题描述!'},],
improvementMethod: [{ required: true, message: '请输入改善方法及措施!'},],
});
const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
const dbData = {};
const formItemLayout = {
labelCol: {xs: {span: 24}, sm: {span: 5}},
wrapperCol: {xs: {span: 24}, sm: {span: 16}},
};
// 表单禁用
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
onMounted(()=>{
initFormData();
});
//渲染流程表单数据
const queryByIdUrl = '/improvementproposal/improvementProposal/queryById';
async function initFormData(){
if(props.formBpm === true){
let params = {id: props.formData.dataId};
const row = await defHttp.get({url: queryByIdUrl, params});
//设置表单的值
Object.keys(row).map(k => {
formData[k] = row[k];
});
//子表数据
const improvementDeptScoreDataList = await queryImprovementDeptScoreListByMainId(row['id']);
improvementDeptScoreTable.dataSource = [...improvementDeptScoreDataList];
const improvementInstituteVoteDataList = await queryImprovementInstituteVoteListByMainId(row['id']);
improvementInstituteVoteTable.dataSource = [...improvementInstituteVoteDataList];
}
}
// 是否显示提交按钮
const showFlowSubmitButton = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return true
}
}
return false
});
function add() {
resetFields();
improvementDeptScoreTable.dataSource = [];
improvementInstituteVoteTable.dataSource = [];
}
async function edit(row) {
//主表数据
await queryMainData(row.id);
//子表数据
const improvementDeptScoreDataList = await queryImprovementDeptScoreListByMainId(row['id']);
improvementDeptScoreTable.dataSource = [...improvementDeptScoreDataList];
const improvementInstituteVoteDataList = await queryImprovementInstituteVoteListByMainId(row['id']);
improvementInstituteVoteTable.dataSource = [...improvementInstituteVoteDataList];
}
async function queryMainData(id) {
const row = await queryDataById(id);
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(row.hasOwnProperty(key)){
tmpData[key] = row[key]
}
})
//赋值
Object.assign(formData,tmpData);
}
const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
'improvementDeptScore': improvementDeptScoreTableRef,
'improvementInstituteVote': improvementInstituteVoteTableRef,
});
async function getFormData() {
try {
// 触发表单验证
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
return transformData(toRaw(formData))
}
async function submitForm() {
const mainData = await getFormData();
const subData = await getSubFormAndTableData();
const values = Object.assign({}, dbData, mainData, subData);
console.log('表单提交数据', values)
const isUpdate = values.id ? true : false
await saveOrUpdate(values, isUpdate);
//关闭弹窗
emit('success');
}
function setFieldsValue(values) {
if(values){
Object.keys(values).map(k=>{
formData[k] = values[k];
});
}
}
/**
* 值改变事件触发-树控件回调
* @param key
* @param value
*/
function handleFormChange(key, value) {
formData[key] = value;
}
return {
improvementDeptScoreTableRef,
improvementDeptScoreTable,
improvementInstituteVoteTableRef,
improvementInstituteVoteTable,
validatorRules,
validateInfos,
activeKey,
loading,
formData,
setFieldsValue,
handleFormChange,
formItemLayout,
disabled,
showFlowSubmitButton,
getFormData,
submitForm,
add,
edit,
formRef,
}
}
});
</script>
<style lang="less" scoped>
.ant-tabs-tabpane.sub-one-form {
max-height: 340px;
overflow: auto;
}
</style>
@@ -0,0 +1,67 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="896" @ok="handleSubmit">
<improvement-proposal-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></improvement-proposal-form>
</BasicModal>
</template>
<script lang="ts">
import { ref, unref } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import ImprovementProposalForm from './ImprovementProposalForm.vue';
import { useMessage } from '/@/hooks/web/useMessage';
const { createMessage } = useMessage();
export default {
name: "TestCgMainVxeModal",
components:{
BasicModal,
ImprovementProposalForm
},
emits:['register','success'],
setup(_p, {emit}){
const formComponent = ref()
const isUpdate = ref(true);
const formDisabled = ref(false);
const title = ref('')
//表单赋值
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
isUpdate.value = !!data?.isUpdate;
formDisabled.value = !data?.showFooter;
title.value = data?.isUpdate ? (unref(formDisabled) ? '详情' : '编辑') : '新增';
if (unref(isUpdate)) {
formComponent.value.edit(data.record)
}else{
formComponent.value.add()
}
});
function handleSubmit() {
formComponent.value.submitForm();
}
function submitSuccess(){
emit('success');
closeModal();
}
return {
registerModal,
title,
formComponent,
formDisabled,
handleSubmit,
submitSuccess,
}
}
}
</script>
<style lang="less" scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number) {
width: 100%;
}
:deep(.ant-calendar-picker) {
width: 100%;
}
</style>