Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
This commit is contained in:
+1
-1
@@ -59,7 +59,7 @@ public class ProposalDashboardController {
|
|||||||
nodes.add(NutMap.NEW().addv("name", "提案总数").addv("id", "total").addv("type", "total").addv("count", 0));
|
nodes.add(NutMap.NEW().addv("name", "提案总数").addv("id", "total").addv("type", "total").addv("count", 0));
|
||||||
|
|
||||||
// 节点
|
// 节点
|
||||||
ProcessDefine define = processDefineService.getLastByName("JDHTA");
|
ProcessDefine define = processDefineService.getLastByName("JDHTA_NC");
|
||||||
ProcessModel processModel = processDefineService.processDefineToModel(define);
|
ProcessModel processModel = processDefineService.processDefineToModel(define);
|
||||||
List<TaskModel> taskModels = processModel.getTasks();
|
List<TaskModel> taskModels = processModel.getTasks();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -141,7 +141,7 @@ public class ProposalQueryChartController {
|
|||||||
FROM
|
FROM
|
||||||
wf_process_design
|
wf_process_design
|
||||||
WHERE
|
WHERE
|
||||||
NAME = 'JDHTA'
|
NAME = 'JDHTA_NC'
|
||||||
""");
|
""");
|
||||||
sql.setCallback(Sqls.callback.map());
|
sql.setCallback(Sqls.callback.map());
|
||||||
dao.execute(sql);
|
dao.execute(sql);
|
||||||
|
|||||||
+1
-1
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
|
|||||||
<div id="app" v-cloak>
|
<div id="app" v-cloak>
|
||||||
<template>
|
<template>
|
||||||
<el-card shadow="never">
|
<el-card shadow="never">
|
||||||
<snaker-start slot="header" label="撰写提案" define_key="JDHTA">
|
<snaker-start slot="header" label="撰写提案" define_key="JDHTA_NC">
|
||||||
<template slot="header-right-label">
|
<template slot="header-right-label">
|
||||||
<el-link type="primary" @click="openImport" v-if="!formData.id" style="margin-right: 15px">导入提案</el-link>
|
<el-link type="primary" @click="openImport" v-if="!formData.id" style="margin-right: 15px">导入提案</el-link>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user