提交 d6807a14 authored 作者: liuluyu's avatar liuluyu

更新字段

上级 f7616295
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<a-card class="box-card"> <a-card class="box-card">
<template #title> <template #title>
<!-- <span><FileTextOutlined /> 待办任务</span> --> <!-- <span><FileTextOutlined /> 待办任务</span> -->
<div style="float: right"> <!-- <div style="float: right">
<a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag> <a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag>
<a-tag>任务节点:{{ taskName }}</a-tag> <a-tag>任务节点:{{ taskName }}</a-tag>
</div> </div> -->
</template> </template>
<a-tabs v-model:activeKey="activeName" @tab-click="handleClick"> <a-tabs v-model:activeKey="activeName" @tab-click="handleClick">
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<a-card class="box-card"> <a-card class="box-card">
<template #title> <template #title>
<!-- <span><FileTextOutlined /> 待办任务</span> --> <!-- <span><FileTextOutlined /> 待办任务</span> -->
<div style="float: right"> <!-- <div style="float: right">
<a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag> <a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag>
<a-tag>任务节点:{{ taskName }}</a-tag> <a-tag>任务节点:{{ taskName }}</a-tag>
</div> </div> -->
</template> </template>
<a-tabs v-model:activeKey="activeName" @tab-click="handleClick"> <a-tabs v-model:activeKey="activeName" @tab-click="handleClick">
...@@ -195,7 +195,6 @@ ...@@ -195,7 +195,6 @@
const taskDataObj = ref(); const taskDataObj = ref();
const iniData = async (data) => { const iniData = async (data) => {
console.log('-----why data:', data); console.log('-----why data:', data);
taskDataObj.value = data; taskDataObj.value = data;
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
width="90%" width="90%"
style="margin: 0px; padding: 0px" style="margin: 0px; padding: 0px"
> >
<template #extra> <!-- <template #extra>
<div style="float: right"> <div style="float: right">
<a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag> <a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag>
<a-tag>任务节点:{{ taskName }}</a-tag> <a-tag>任务节点:{{ taskName }}</a-tag>
</div> </div>
</template> </template> -->
<TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" /> <TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" />
</a-drawer> </a-drawer>
</div> </div>
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
width="90%" width="90%"
style="margin: 0px; padding: 0px" style="margin: 0px; padding: 0px"
> >
<template #extra> <!-- <template #extra>
<div style="float: right"> <div style="float: right">
<a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag> <a-tag style="margin-left: 10px">发起人:{{ startUser }}</a-tag>
<a-tag>任务节点:{{ taskName }}</a-tag> <a-tag>任务节点:{{ taskName }}</a-tag>
</div> </div>
</template> </template> -->
<TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" /> <TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" />
</a-drawer> </a-drawer>
</div> </div>
......
...@@ -216,9 +216,6 @@ export const formSchema: FormSchema[] = [ ...@@ -216,9 +216,6 @@ export const formSchema: FormSchema[] = [
component: 'DatePicker', component: 'DatePicker',
colProps: { lg: 12 }, colProps: { lg: 12 },
itemProps: { labelCol: { xs: { span: 24 }, sm: { span: 6 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 18 } } }, itemProps: { labelCol: { xs: { span: 24 }, sm: { span: 6 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 18 } } },
dynamicRules: ({ model, schema }) => {
return [{ required: true, message: '请选择计划开始日期!' }];
},
}, },
{ {
label: '计划结束日期', label: '计划结束日期',
...@@ -226,9 +223,6 @@ export const formSchema: FormSchema[] = [ ...@@ -226,9 +223,6 @@ export const formSchema: FormSchema[] = [
component: 'DatePicker', component: 'DatePicker',
colProps: { lg: 12 }, colProps: { lg: 12 },
itemProps: { labelCol: { xs: { span: 24 }, sm: { span: 6 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 18 } } }, itemProps: { labelCol: { xs: { span: 24 }, sm: { span: 6 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 18 } } },
dynamicRules: ({ model, schema }) => {
return [{ required: true, message: '请选择计划结束日期!' }];
},
}, },
{ {
label: '优先级', label: '优先级',
...@@ -319,9 +313,6 @@ export const formSchema: FormSchema[] = [ ...@@ -319,9 +313,6 @@ export const formSchema: FormSchema[] = [
field: 'projectDesc', field: 'projectDesc',
component: 'InputTextArea', component: 'InputTextArea',
itemProps: { labelCol: { xs: { span: 24 }, sm: { span: 3 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 21 } } }, itemProps: { labelCol: { xs: { span: 24 }, sm: { span: 3 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 21 } } },
dynamicRules: ({ model, schema }) => {
return [{ required: false, message: '请输入备注说明!' }];
},
}, },
{ {
label: '相关附件', label: '相关附件',
......
...@@ -137,12 +137,12 @@ ...@@ -137,12 +137,12 @@
<!-- 待办抽屉 --> <!-- 待办抽屉 -->
<div v-if="isShowDrawer"> <div v-if="isShowDrawer">
<a-drawer destroyOnClose v-model:open="isShowDrawer" class="flat-drawer" title="待办任务" placement="right" width="90%"> <a-drawer destroyOnClose v-model:open="isShowDrawer" class="flat-drawer" title="待办任务" placement="right" width="90%">
<template #extra> <!-- <template #extra>
<div class="drawer-tags"> <div class="drawer-tags">
<span class="tag">发起人: {{ startUser }}</span> <span class="tag">发起人: {{ startUser }}</span>
<span class="tag">任务节点: {{ taskName }}</span> <span class="tag">任务节点: {{ taskName }}</span>
</div> </div>
</template> </template> -->
<TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" /> <TodoIndex v-if="isShowDrawer" ref="refTodoIndex" @callback="handleSuccess" />
</a-drawer> </a-drawer>
</div> </div>
...@@ -359,6 +359,9 @@ ...@@ -359,6 +359,9 @@
function pickStartResult(res: any) { function pickStartResult(res: any) {
const base = res?.data ?? res?.result ?? res; const base = res?.data ?? res?.result ?? res;
// 添加调试信息,查看API返回的数据结构
console.log('API返回数据:', res);
console.log('提取的数据:', base);
return base || {}; return base || {};
} }
...@@ -537,6 +540,10 @@ ...@@ -537,6 +540,10 @@
}, },
{ {
label: '流转记录', label: '流转记录',
ifShow: () => {
if (record['bpmStatus'] !== null && record['bpmStatus'] !== '') return true;
else return false;
},
onClick: handleProgressDetail.bind(null, record), onClick: handleProgressDetail.bind(null, record),
}, },
{ {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论