diff --git a/src/components/LowDesign/src/LowTable/index.vue b/src/components/LowDesign/src/LowTable/index.vue index fb7f9eb..f2e9349 100644 --- a/src/components/LowDesign/src/LowTable/index.vue +++ b/src/components/LowDesign/src/LowTable/index.vue @@ -483,10 +483,10 @@ const props = withDefaults(defineProps(), { } }) const handleSetFormData = (key, val) => { - console.log(key); - console.log(val); + const cleaned = val.split('|').map(s => s.trim()).join(','); // "1975577437793124352 | 1965778349088899074" + console.log(cleaned); // 在这里添加其他处理逻辑 - useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + val, { + useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + cleaned, { }).then(res => { if (res.length > 0) { message.success('下发成功') @@ -548,6 +548,17 @@ const userVBind = { }else if(props.tableId=='1968562717683908610'){ // 考试计划 useFun.requestApi('get', '/jeelowcode/examIssus/addRecord?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, { + }).then(res => { + if (res.length > 0) { + message.success('下发成功') + useFun.refreshChange() + } else { + message.error(res.message) + } + }) + }else if(props.tableId=='1983351353033953281'){ // 工作事项 + useFun.requestApi('get', '/jeelowcode/itemIssus/addResult?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, { + }).then(res => { if (res.length > 0) { message.success('下发成功') diff --git a/src/components/LowDesign/src/utils/controlOption.ts b/src/components/LowDesign/src/utils/controlOption.ts index 9315358..21984f0 100644 --- a/src/components/LowDesign/src/utils/controlOption.ts +++ b/src/components/LowDesign/src/utils/controlOption.ts @@ -34,7 +34,7 @@ const dicObj = { { label: '邮箱', value: 'email' }, { label: '性别', value: 'sex' }, { label: '岗位', value: 'post' }, { label: '部门', value: 'deptName' } ], userFindType: [{ label: '全部用户', value: 'all' }, { label: '本级用户', value: 'now' }, { label: '本级及下级用户', value: 'sub' }], - deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }], + deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }, { label: '外协单位', value: 'out' }], customControlType: [{ label: '未全局注册', value: false }, { label: '已全局注册', value: true }], regionType: [{ label: '全球-国家', value: 'gj' }, { label: '中国-省市区', value: 'ssq' }, { label: '中国-省市', value: 'ss' }, { label: '中国-省', value: 's' }], dictTextFormatter: [ diff --git a/src/components/LowDesign/src/utils/formUtil.ts b/src/components/LowDesign/src/utils/formUtil.ts index 1ce75f8..d371ca9 100644 --- a/src/components/LowDesign/src/utils/formUtil.ts +++ b/src/components/LowDesign/src/utils/formUtil.ts @@ -546,13 +546,15 @@ export const formDataFormatting = (formOption, formData, formType) => { echoObj[dicKey].push(...data[key].split(',')) } } else echoObj[type].push(...data[key].split(',')) - } else if (column[key]?.controlType == 'date') { + } else if (column[key]?.controlType == 'date'||key=='create_time') { + if (data[key]) { if (typeof data[key] == 'number' || typeof data[key] == 'string') { data[key] = data[key] + '' if (!(/[-|\/]/g.test(data[key]))) { //如果是时间戳强制转换 - data[key] = formatDate(new Date(data[key]), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss') + const timestamp = parseInt(data[key], 10) + data[key] = formatDate(new Date(timestamp), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss') } } } diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index 2c41566..df2f1e5 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -233,6 +233,10 @@ const getProcessInstance = async () => { if (processDefinition.formType === 10) { detailForm.value.formId = processDefinition.formId detailForm.value.optionsData = JSON.parse(processDefinition.formConf) + if (data.formVariables.jeelowcode_subtable_data) { + data.formVariables = { ...data.formVariables, ...data.formVariables.jeelowcode_subtable_data } + delete data.formVariables.jeelowcode_subtable_data + } detailForm.value.defaultData = data.formVariables // setConfAndFields2( // detailForm,