geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-cjw

Browse Source 
# Conflicts:
#	src/utils/helper/generatorHelper.ts
This commit is contained in:
chen_junior
2025-04-09 14:19:01 +08:00
parent 319d53e088 15cae8aae2
commit 65a4df55b8
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/SecondDev/OpinionDialog.vue
View File

@ -175,7 +175,7 @@
return message.error('请选择审批人'); return message.error('请选择审批人');
} }
flowNextNodes.value.forEach((nNode) => { flowNextNodes.value.forEach((nNode) => {
nextTaskUser[nNode.activityId] = isEnd.value ? '' : nNode.assignees.join(','); nextTaskUser[nNode.activityId] = isEnd.value ? '' : (typeof(nNode.assignees) == 'string' ? nNode.assignees : nNode.assignees.join(','));
}); });
} }
if (_action.value === 'reject') { if (_action.value === 'reject') {

38
src/utils/helper/generatorHelper.ts
View File

@ -2318,7 +2318,8 @@ export const listProps = {
datasource: [], datasource: [],
workflowConfig:{ workflowConfig:{
Pk:'${designType == 'data' ? camelCase(mainTable.pkField) : 'id'}', Pk:'${designType == 'data' ? camelCase(mainTable.pkField) : 'id'}',
Formid:'${model.formId}' Formid:'${model.formId}',
schemaId: '',
}, },
//列配置 //列配置
columnConfigs: [ columnConfigs: [
@ -2374,7 +2375,7 @@ export const listProps = {
export const formProps = ${JSON.stringify(formProps, (key, value) => { export const formProps = ${JSON.stringify(formProps, (key, value) => {
if (key === 'api') { if (key === 'api') {
//TODO 后续新增API 这里也要修改 //TODO 后续新增API 这里也要修改
if (value.toString().includes('uploadApi')) { if (value.toString().includes('uploadApi')) {
return `#{upload}#`; return `#{upload}#`;
} else { } else {
@ -2590,7 +2591,7 @@ async function setForm(){
data data
} = await get${pascalMainTableName}(formConfig.id); } = await get${pascalMainTableName}(formConfig.id);
if (data) { if (data) {
await formRef.value.setFormData({...data,...props.formModel}) await formRef.value.setFormData({...props.formModel, ...data})
} }
} }
//新增 //新增
@ -2622,6 +2623,22 @@ async function setWorkflowForm(){
renderKey.value++; renderKey.value++;
await setForm(); await setForm();
} }
// 根据行唯一ID查询行数据，并设置表单数据 【编辑】
async function setFormDataFromId(rowId, skipUpdate) {
try {
const {
data
} = await get${pascalMainTableName}(rowId);
if (skipUpdate) {
return data;
}
setFormData(data);
formConfig.id = data[rowKey]
return data;
} catch (error) {
}
}
// 工作流辅助设置表单数据 // 工作流辅助设置表单数据
function setWorkflowFormData(formProps){ function setWorkflowFormData(formProps){
let options = cloneDeep(formProps); let options = cloneDeep(formProps);
@ -2652,16 +2669,17 @@ let formModelIdVal = reactive({
try { try {
await formRef.value.validate(); await formRef.value.validate();
const formData = await formRef.value.getFormData(); const formData = await formRef.value.getFormData();
if(formConfig.type == FromPageType.EDIT || formModelIdVal[listProps.rowKey]){ if(formData[rowKey]){
formData[listProps.rowKey]=formConfig.id; formConfig.id = formData[rowKey]
await update${pascalMainTableName}(formData); await update${pascalMainTableName}(formData);
formModelIdVal[listProps.rowKey] = isFirst.value ? formConfig.id : formModelIdVal[listProps.rowKey]; formModelIdVal[rowKey]=formConfig.id;
} }
else{ else{
let res = await add${pascalMainTableName}(formData); let res = await add${pascalMainTableName}(formData);
isFirst.value = false; formModelIdVal[rowKey]=res.data;
formModelIdVal[listProps.rowKey]=res.data; formConfig.id = res.data
} }
await setFormDataFromId(formConfig.id)
} catch (err) { } catch (err) {
console.log(err); console.log(err);
} }
@ -2689,7 +2707,7 @@ async function reset() {
async function getFormData() { async function getFormData() {
let formModelObj = await formRef.value.getFormData(); let formModelObj = await formRef.value.getFormData();
if(formConfig.type == FromPageType.EDIT||formConfig.type == FromPageType.VIEW){ if(formConfig.type == FromPageType.EDIT||formConfig.type == FromPageType.VIEW){
formModelObj[listProps.rowKey]=formConfig.id; formModelObj[rowKey]=formConfig.id;
} }
return formModelObj; return formModelObj;
} }