commit

src/main/java/com/budwk/app/flow/controller/FlowCommonController.java

@@ -4,6 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.vo.LabelValueVO;
 import com.budwk.app.flow.constant.FlowConst;
@@ -12,14 +14,8 @@ import com.budwk.app.flow.engine.event.ProcessEvent;
 import com.budwk.app.flow.engine.event.ProcessPublisher;
 import com.budwk.app.flow.engine.model.ProcessModel;
 import com.budwk.app.flow.engine.model.TaskModel;
-import com.budwk.app.flow.entity.Candidate;
+import com.budwk.app.flow.entity.*;
-import com.budwk.app.flow.entity.ProcessDefine;
+import com.budwk.app.flow.enums.*;
-import com.budwk.app.flow.entity.ProcessInstance;
-import com.budwk.app.flow.entity.ProcessTask;
-import com.budwk.app.flow.enums.ProcessEventTypeEnum;
-import com.budwk.app.flow.enums.ProcessInstanceStateEnum;
-import com.budwk.app.flow.enums.ProcessTaskPerformTypeEnum;
-import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.flow.vo.HighLightVO;
 import com.budwk.app.flow.vo.ProcessInstanceVO;
@@ -147,7 +143,7 @@ public class FlowCommonController {
     @ApiOperation("获取流程定义的审批记录")
     public Result approvalRecord(Long instanceId) {
 		List<ProcessTask> processTaskList = dao.query(ProcessTask.class, Cnd.where(ProcessTask::getProcessInstanceId, "=", instanceId)
-                .and(ProcessTask::getTaskState, "not in", List.of(ProcessTaskStateEnum.DOING, ProcessTaskStateEnum.WITHDRAW, ProcessTaskStateEnum.ABANDON))
+				.and(ProcessTask::getTaskState, "not in", List.of(ProcessTaskStateEnum.WITHDRAW, ProcessTaskStateEnum.ABANDON))
 				.asc(ProcessTask::getUpdatedAt));
 		List<ProcessTaskVO> res = new ArrayList<>();
 		processTaskList.forEach(processTask -> {
@@ -155,6 +151,11 @@ public class FlowCommonController {
 			if (vo.getTaskState().equals(ProcessTaskStateEnum.FINISHED.getCode()) && StrUtil.isNotBlank(vo.getOperator())) {
 
 			}
+			if(vo.getTaskState().equals(ProcessTaskStateEnum.DOING.getCode())) {
+				List<ProcessTaskActor> taskActorList = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", processTask.getId()));
+				List<JSONObject> list = JSONUtil.toList(JSONUtil.toJsonStr(taskActorList), JSONObject.class);
+				vo.setTaskActorList(list);
+			}
 
 			res.add(vo);
 		});

src/main/java/com/budwk/app/flow/service/FlowCommonService.java

@@ -19,6 +19,7 @@ import org.nutz.dao.Dao;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
 
 import java.util.List;
 
@@ -37,6 +38,7 @@ public class FlowCommonService {
      */
     public void executeTask(Dict args){
         Long processTaskId = args.getLong(FlowConst.PROCESS_TASK_ID_KEY);
+
 		String operator = SecurityUtil.getUserId();
         if (args.containsKey(FlowConst.EXT_ENABLE_OPERATOR)&&args.getBool(FlowConst.EXT_ENABLE_OPERATOR)){
             operator = FlowConst.ADMIN_ID;
@@ -46,6 +48,15 @@ public class FlowCommonService {
         if (submitType == null) {
             submitType = ProcessSubmitTypeEnum.AGREE.getCode();
         }
+
+		ProcessTask processTask = flowEngine.processTaskService().getById(processTaskId);
+		ProcessTask parentTask = flowEngine.processTaskService().getById(processTask.getTaskParentId());
+		Dict taskArgs = Json.fromJson(Dict.class, parentTask.getVariable());
+		if(taskArgs.containsKey("tf_sourceTaskKey") && !taskArgs.getBool("tf_audit")) {
+			submitType = ProcessSubmitTypeEnum.JUMP.getCode();
+			args.put(FlowConst.TASK_NAME, taskArgs.getStr("tf_sourceTaskKey"));
+		}
+
         args.put(FlowConst.SUBMIT_TYPE, submitType);
 
         // 设置办理人信息到表单参数

src/main/java/com/budwk/app/flow/service/impl/ProcessTaskServiceImpl.java

@@ -195,6 +195,11 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
 //            execution.getArgs().remove(key);
 //        }
 
+		// 删一下吧，只保证退回的那个任务节点有这两个字段，不然要出问题喔
+		if(execution.getArgs().containsKey("tf_sourceTaskKey")) {
+			execution.getArgs().remove("tf_sourceTaskKey");
+			execution.getArgs().remove("tf_audit");
+		}
         processTask.setVariable(JSONUtil.toJsonStr(execution.getArgs()));
         processTask.setCreatedAt(now);
         processTask.setUpdatedAt(now);

src/main/java/com/budwk/app/web/commons/proc/CspProcessor.java

@@ -15,7 +15,7 @@ import java.util.Base64;
 public class CspProcessor extends AbstractProcessor {
 
 	public void process(ActionContext ac) throws Throwable {
-		// 1. 生成 nonce
+		/*// 1. 生成 nonce
 		String nonce = Base64.getEncoder().encodeToString(
 				java.security.SecureRandom.getInstanceStrong().generateSeed(16)
 		);
@@ -34,7 +34,7 @@ public class CspProcessor extends AbstractProcessor {
 				"frame-ancestors 'self'; " +
 				"object-src 'self';";
 
-		ac.getResponse().setHeader("Content-Security-Policy", csp);
+		ac.getResponse().setHeader("Content-Security-Policy", csp);*/
 
 		doNext(ac);
 	}

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java

@@ -3,12 +3,15 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.vo.LabelValueVO;
 import com.budwk.app.flow.constant.FlowConst;
+import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
 import com.budwk.app.flow.enums.ProcessTaskStateEnum;
 import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.flow.service.ProcessTaskService;
@@ -136,13 +139,19 @@ public class ProposalSchoolLeaderApprovalController {
         return Result.success();
     }
 
-
-
     @At
     @SaCheckPermission("proposal.schoolLeaderApproval")
     @ApiOperation("执行任务")
     public Result executeTask(@Param("data") String data) {
         Dict args = Json.fromJson(Dict.class, data);
+
+		if("back".equals(args.getStr("tf_approval"))) {
+			args.put("submitType", ProcessSubmitTypeEnum.JUMP.getCode());
+			args.put("taskName", "committee");
+			flowCommonService.executeTask(args);
+			return Result.success();
+		}
+
         String proposalId = args.getStr("proposalId");
 
         ProcessTask thisTask = dao.fetch(ProcessTask.class, args.getLong(FlowConst.PROCESS_TASK_ID_KEY));
@@ -150,6 +159,18 @@ public class ProposalSchoolLeaderApprovalController {
         Dict dict = Json.fromJson(Dict.class, parentTask.getVariable());
 
         args.put("tf_caseFilingResult", dict.getStr("tf_caseFilingResult"));
+        args.put("tf_helpunitreply", dict.getStr("tf_helpunitreply"));
+        args.put("tf_masterUnitId", dict.getStr("tf_masterUnitId"));
+        args.put("tf_slaveUnitIds", dict.getObj("tf_slaveUnitIds"));
+
+		ProcessInstance instance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getId, "=", thisTask.getProcessInstanceId()));
+		Dict instanceDict = Json.fromJson(Dict.class, instance.getVariable());
+		instanceDict.put("tf_helpunitreply", dict.getStr("tf_helpunitreply"));
+		instanceDict.put("tf_masterUnitId", dict.getStr("tf_masterUnitId"));
+		instanceDict.put("tf_slaveUnitIds", dict.getObj("tf_slaveUnitIds"));
+		instance.setVariable(JSONUtil.toJsonStr(instanceDict));
+
+		dao.update(instance);
 
 		// 方案流程实例
 
@@ -161,7 +182,6 @@ public class ProposalSchoolLeaderApprovalController {
         }
 
         // 并案审核
-
         List<ProcessTask> mergeTasks = processTaskService.getDoingTaskByBizIdTaskName(mergeProposalIds, thisTask.getTaskName());
         for (ProcessTask mergeTask : mergeTasks) {
             Dict cloneArgs = args.clone();
@@ -170,7 +190,4 @@ public class ProposalSchoolLeaderApprovalController {
         }
         return Result.success();
     }
-
-
-
 }

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java

@@ -114,10 +114,11 @@ public class ProposalSecondedController {
                     LEFT JOIN teacher_congress_delegation tcd on tcd.id = info.delegationId
                 $condition
                 """);
+		sql.setParam("seconderId", SecurityUtil.getUserId());
+
         Cnd cnd = Cnd.NEW();
         cnd.and("t.taskName", "in", List.of("invite", "second", "delegation", "committee"));
-        cnd.and(new Static("ps.isAgree is null"));
+		cnd.and("ps.isAgree", "is", null);
-        sql.setParam("seconderId", SecurityUtil.getUserId());
 
         if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
             cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnSubmitQueryController.java

@@ -53,8 +53,8 @@ public class ProposalUnSubmitQueryController {
                     tcd.name as delegationName,
                     pt.name as typeName,
                     manner.name as mannerName,
-                     (select count(DISTINCT(seconderId))from proposal_seconded where proposalId = info.id) AS secondedNum,
+                    (select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id) AS secondedNum,
-                    (select count(DISTINCT(seconderId))from proposal_seconded where proposalId = info.id and isAgree = 1) AS secondedAgreeNum,
+                    (select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id and isAgree = 1) AS secondedAgreeNum,
                     IF(info.stateCode <= 200 ,'未审核','已审核') AS delegationAudit
                 FROM
                 	proposal_info info

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalSchoolLeaderAssignmentHandler.java

@@ -1,16 +1,24 @@
 package com.budwk.app.zhgh.democratic.proposal.handler;
 
 import cn.hutool.core.lang.Dict;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.exception.BaseException;
 import com.budwk.app.flow.engine.AssignmentHandler;
 import com.budwk.app.flow.engine.core.Execution;
 import com.budwk.app.flow.engine.core.ServiceContext;
 import com.budwk.app.flow.engine.model.TaskModel;
 import com.budwk.app.flow.entity.Candidate;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.web.controllers.open.commons.service.CommonService;
 import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 
 import java.util.List;
@@ -22,30 +30,19 @@ public class ProposalSchoolLeaderAssignmentHandler implements AssignmentHandler
 
     @Override
     public List<String> assign(TaskModel model, Execution execution) {
-        Dao dao = ServiceContext.find(Dao.class);
+		CommonService commonService = ServiceContext.find(CommonService.class);
-        ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
+		List<Sys_user> users = commonService.findUserInfoByRoleCode(RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name());
-        List<String> unitIds = proposalConfig.getSchoolLeaderUnitIds();
-        Sql sql = Sqls.create("select id,username,loginname from vw_user where unitId in (@unitIds)");
-        sql.setParam("unitIds", unitIds);
-        sql.setCallback(Sqls.callback.maps());
-        dao.execute(sql);
-        List<NutMap> list = sql.getList(NutMap.class);
 
-        List<Candidate> candidates = list.stream().map(item -> Candidate.builder()
+		if(Lang.isEmpty(users)) {
-                .userId(item.getString("id"))
+			throw new BaseException("未查询到相关审批人");
-                .userName(item.getString("username"))
-                .ext(Dict.of("loginName", item.getString("loginname")))
-                .build()
-        ).toList();
-        if(candidates.size() > 0) {
-            return candidates.stream().map(Candidate::getUserId).toList();
 		}
-        return List.of();
+
+		return users.stream().map(Sys_user::getId).toList();
     }
 
     @Override
     public String getMessage() {
-        return "指定主管校领导";
+        return "获取提案主管校领导";
     }
 
     @Override

src/main/java/com/budwk/app/zhgh/democratic/proposal/interceptor/ProposalCaseFilingInterceptor.java

@@ -3,6 +3,7 @@ package com.budwk.app.zhgh.democratic.proposal.interceptor;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.FlowInterceptor;
@@ -100,5 +101,11 @@ public class ProposalCaseFilingInterceptor implements FlowInterceptor {
         }
         dao.update(processTaskList,"variable");
 
+		String helpUnitReply = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "helpunitreply");
+		ProcessTask processTask = execution.getProcessTask();
+		Dict dict = JSONUtil.toBean(processTask.getVariable(), Dict.class);
+		dict.set(FlowConst.TASK_FORM_DATA_PREFIX + "helpunitreply", helpUnitReply);
+		processTask.setVariable(JSONUtil.toJsonStr(dict));
+		dao.update(processTask);
     }
 }

src/main/resources/views/platform/flow/define/preview.html

@@ -14,7 +14,8 @@
         <!-- 引入 core 包和对应 css-->
         <script src="/assets/platform/plugins/logicflow/logic-flow.js"></script>
         <link rel="stylesheet" href="/assets/platform/plugins/logicflow/index.css"/>
-    <script src="https://cdn.jsdelivr.net/npm/@logicflow/extension@2.1.4/dist/index.min.js"></script>
+        <script src="/assets/platform/plugins/logicflow/index.min.js"></script>
+        <!--    <script src="https://cdn.jsdelivr.net/npm/@logicflow/extension@2.1.4/dist/index.min.js"></script>-->
         <script src="/assets/platform/plugins/snaker/SnakerflowDesigner.umd.js"></script>
         <style>
             #snaker-flow-preview {
@@ -186,6 +187,9 @@
                             <span class="info-label">审批人：</span>
                             <span class="info-value" v-if="currentNode.id === 'startTask'">
                                 {{approvalInfo.ext?.initiatorName}}({{approvalInfo.ext?.initiatorAccount}})
+                            </span>
+                            <span class="info-value" v-else-if="approvalInfo.taskState === 10">
+                        {{ approvalInfo.taskActorList.map(u => u.actorName + '(' + u.actorAccount + ')').join('、') }}
                     </span>
                             <span class="info-value"
                                   v-else>{{approvalInfo.taskFormData.userName}}({{approvalInfo.taskFormData?.loginName}})</span>
@@ -196,23 +200,29 @@
                         </div>
                         <div class="info-row">
                             <span class="info-label">提交结果：</span>
-                    <span class="info-value">{{getSubmitTypeText(approvalInfo.ext.submitType)}}</span>
+                            <span class="info-value" v-if="approvalInfo.taskState !== 10">
+                        {{getSubmitTypeText(approvalInfo.ext.submitType)}}
+                    </span>
+                            <span class="info-value" v-else>
+                        暂未处理
+                    </span>
                         </div>
                         <div class="info-row">
                             <span class="info-label">提交意见：</span>
-                    <span class="info-value">{{approvalInfo.taskFormData.opinion}}</span>
+                            <span class="info-value" v-if="approvalInfo.taskState !== 10">{{approvalInfo.taskFormData.opinion}}</span>
+                            <span class="info-value" v-else>暂未处理</span>
                         </div>
                         <!--                    <div class="divider"></div>-->
                         <div class="info-row">
                             <span class="info-label">提交时间：</span>
-                    <span class="info-value">{{approvalInfo.finishTime}}</span>
+                            <span class="info-value">{{approvalInfo.finishTime || '暂未处理'}}</span>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </body>
-<script nonce="${cspNonce!}">
+    <script>
         Vue.use(SnakerflowDesigner.default)
         const vue = new Vue({
             el: "#snaker-flow-preview",
@@ -290,7 +300,7 @@
 
                             if (data.type !== "snaker:task") return
 
-                        const approvalInfos = this.hisApproval.filter((item) => item.taskName === data.id && item.taskState === 20)
+                            const approvalInfos = this.hisApproval.filter((item) => item.taskName === data.id && [10, 20].includes(item.taskState))
 
                             if (approvalInfos && approvalInfos.length > 0) {
                                 this.approvalInfos = approvalInfos

src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js

@@ -5,6 +5,7 @@ const PROPOSAL_INFO = {
         <div class="proposal-info">
             <div class="process-title">
                 提案基础信息
+                <el-link type="primary" @click="openChart">点击查看流程图</el-link>
             </div>
             <h3 style="text-align: center;font-weight: 600" class="pt10 pb10">
                 {{ viewData.name }}
@@ -197,6 +198,7 @@ const PROPOSAL_INFO = {
             </template>
 
             <slot></slot>
+            <snaker-chart ref="snakerChartRef"></snaker-chart>
         </div>
     `,
     dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE", "PROCESS_TASK_SUBMIT_TYPE", "PROPOSAL_FEEDBACK"],
@@ -246,6 +248,9 @@ const PROPOSAL_INFO = {
             })
         },
 
+        openChart(){
+            this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
+        }
     },
     style:
     /*language=CSS*/

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html

@@ -68,9 +68,9 @@ layout("/layouts/platform.html"){
                     v-if="column.visible !== false"
                 >
                     <template v-if="column.prop === 'caseFilingResult'" scope="{row}">
-                        <dict-tag v-if="row.taskState!==10"
+                        <dict-tag
                                   :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
-                                  :value="row.caseFilingResult"></dict-tag>
+                                  :value="JSON.parse(row.taskVariable)?.tf_caseFilingResult"></dict-tag>
                     </template>
                     <template v-else-if="column.prop === 'merge'" scope="{row}">
                         <el-tag v-if="row.merge" size="small">是</el-tag>
@@ -148,9 +148,9 @@ layout("/layouts/platform.html"){
                                 ></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="审核意见" prop="approvalOpinion"
+                        <el-form-item label="审核意见" prop="tf_opinion"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
                     </el-form>
                     <el-row type="flex" justify="end">

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html

@@ -69,9 +69,9 @@ layout("/layouts/platform.html"){
 						v-if="column.visible !== false"
 				>
 					<template v-if="column.prop === 'caseFilingResult'" scope="{row}">
-						<dict-tag v-if="row.taskState!==10"
+                        <dict-tag
                                 :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
-						          :value="row.caseFilingResult"></dict-tag>
+                                :value="JSON.parse(row.taskVariable)?.tf_caseFilingResult"></dict-tag>
 					</template>
 					<template v-else-if="column.prop === 'merge'" scope="{row}">
 						<el-tag v-if="row.merge" size="small">是</el-tag>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/index.html

@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
         </el-card>
         <el-card shadow="never">
             <table-tool :columns.sync="tableColumns">
-	            <el-button class="ml5" icon="el-icon-upload2" plain type="primary"
+	            <el-button class="ml5" icon="el-icon-upload2" type="primary" size="small"
 	                       @click="openImport">导入提案
 	            </el-button>
             </table-tool>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/preAudit/index.html

@@ -74,7 +74,8 @@ layout("/layouts/platform.html"){
 					</el-form>
 					<el-row type="flex" justify="end">
 						<el-button @click="$refs.guava.index()" size="small">取消</el-button>
-						<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
+						<el-button @click="handleTaskAction(4)" size="small" type="info">退回到提案人(不审核)</el-button>
+						<el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人(审核)</el-button>
 						<el-button @click="handleTaskAction(2)" size="small" type="danger">不同意</el-button>
 						<el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
 					</el-row>
@@ -128,7 +129,8 @@ layout("/layouts/platform.html"){
 					this.showApprovalForm = true
 					this.formData = {
 						processTaskId: row.taskId,
-						taskName: row.curTaskName
+						taskName: row.curTaskName,
+                        taskKey: row.taskKey
 					}
 					this.$refs.proposalInfoRef.onOpen(row)
 				})
@@ -142,7 +144,6 @@ layout("/layouts/platform.html"){
 						if (this.sessionOptions) {
 							this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
 							this.pageData()
-							this.listDelegation()
 						}
 					}
 				})
@@ -156,11 +157,17 @@ layout("/layouts/platform.html"){
 						cancelButtonText: "取消",
 						type: "warning"
 					}).then(() => {
-						this.$axios.post("/flow/common/executeTask", {
+                        const params = {
-							data: JSON.stringify({
                             ...this.formData,
-								submitType: val
+                            submitType: val,
-							})
+                            taskName: 'startTask'
+                        }
+                        if(val === 4) {
+                            params.tf_sourceTaskKey = this.formData.taskKey
+                            params.tf_audit = false
+                        }
+						this.$axios.post("/flow/common/executeTask", {
+							data: JSON.stringify(params)
 						}).then((res) => {
 							if (res.code === 0) {
 								this.$refs.guava.index()
@@ -170,7 +177,22 @@ layout("/layouts/platform.html"){
 						})
 					})
 				})
+			},
+
+            onRevoke(row) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
                         }
+                    })
+                })
+            },
 		}
 	})
 </script>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html

@@ -108,9 +108,8 @@ layout("/layouts/platform.html"){
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
-                        <el-button @click="handleTaskAction('back')" size="small" type="danger">退回重新答复
+                        <el-button @click="handleTaskAction('back')" size="small" type="danger">退回提委会立案</el-button>
-                        </el-button>
+                        <el-button @click="handleTaskAction('agree')" size="small" type="primary">同意</el-button>
-                        <el-button @click="handleTaskAction('agree')" size="small" type="primary">同意答复</el-button>
                     </el-row>
                 </div>
             </proposal-info>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html

@@ -161,14 +161,14 @@ layout("/layouts/platform.html"){
                                 this.$refs.guava.index()
                                 this.$message.success(res.msg)
                                 this.doSearch()
-	                            this.updateSecond(val)
+	                            this.updateSecond(val, false)
                             }
                         })
                     })
                 })
             },
 
-	        updateSecond(submitType) {
+	        updateSecond(submitType, flag = true) {
 		        this.$axios.post("/platform/proposal/seconded/updateInfo", {
 			        proposalId: this.row.id,
 			        taskActorUserId: this.row.taskActorUserId,
@@ -177,7 +177,7 @@ layout("/layouts/platform.html"){
 		        }).then((res) => {
 			        if (res.code === 0) {
 				        this.$refs.guava.index()
-				        this.$message.success(res.msg)
+                        if(flag) this.$message.success(res.msg)
                         this.doSearch()
 			        }
 		        })

src/main/resources/views/platform/zhgh/democratic/proposal/transact/unSubmitQuery/index.html

@@ -13,9 +13,9 @@ layout("/layouts/platform.html"){
 						           v-for="item in sessionOptions"></el-option>
 					</el-select>
 				</search-item>
-				<search-item>
+				<search-item label="名称/编号">
 					<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
-					          style="width: 90%" v-model="pageForm.searchKeyword">
+					          v-model="pageForm.searchKeyword">
 						<el-select placeholder="查询类型" slot="prepend" style="width: 110px;"
 						           v-model="pageForm.searchName">
 							<el-option label="提案名称" value="proposalName"></el-option>
@@ -23,10 +23,10 @@ layout("/layouts/platform.html"){
 						</el-select>
 					</el-input>
 				</search-item>
-				<search-item>
+				<search-item label="提案人">
 					<el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
-					          style="width: 90%" v-model="pageForm.searchKeyword2">
+					          v-model="pageForm.searchKeyword2">
-						<el-select placeholder="查询类型" slot="prepend" style="width: 100px;"
+						<el-select placeholder="查询类型" slot="prepend" style="width: 110px;"
 						           v-model="pageForm.searchName2">
 							<el-option label="提案人" value="su.username"></el-option>
 							<!--                                <el-option label="附议人" value="seconded.username"></el-option>-->
@@ -36,6 +36,7 @@ layout("/layouts/platform.html"){
 			</search>
 		</el-card>
 		<el-card shadow="never">
+            <table-tool label="提案列表" :columns.sync="tableColumns"></table-tool>
 			<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
 				<el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
 				<el-table-column
@@ -60,7 +61,7 @@ layout("/layouts/platform.html"){
 						          size="small"></enum-tag>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" fixed="right" width="300px">
+				<el-table-column label="操作" fixed="right" width="120px">
 					<template slot-scope="{row}">
 						<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
 					</template>
@@ -119,7 +120,9 @@ layout("/layouts/platform.html"){
 					{label: "团长审核", prop: "delegationAudit"},
 				],
 				pageForm: {
-					approval: false
+                    approval: false,
+                    searchName: "proposalName",
+                    searchName2: "su.username",
                 },
 				showApprovalForm: false,
 				sessionOptions: []
@@ -149,9 +152,6 @@ layout("/layouts/platform.html"){
 		},
 		created() {
 			this.pageData()
-			
-			// 加载教代会信息
-			this.listOpenSession()
 		}
 	})
 </script>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html

@@ -9,9 +9,7 @@ layout("/layouts/platform.html"){
         <el-card shadow="never">
             <snaker-start slot="header" label="撰写提案" define_key="JDHTA">
 	            <template slot="header-right-label">
-		            <span style="margin-right: 15px" v-if="!formData.id">
+                    <el-link type="primary" @click="openImport" v-if="!formData.id" style="margin-right: 15px">导入提案</el-link>
-			            <el-link type="success" @click="openImport">导入</el-link>
-		            </span>
                 </template>
             </snaker-start>
             <template>
@@ -186,6 +184,7 @@ layout("/layouts/platform.html"){
 			:close-on-click-modal="false"
 			width="50%"
 	>
+        <el-timeline>
             <el-timeline-item timestamp="下载模板" placement="top">
                 <el-card>
                     <el-row :gutter="24">
@@ -229,6 +228,8 @@ layout("/layouts/platform.html"){
                     </el-upload>
                 </el-card>
             </el-timeline-item>
+        </el-timeline>
+
 		<span slot="footer" class="dialog-footer">
             <el-button @click="importVisible = false" :disabled="importLoading">取 消</el-button>
             <el-button type="primary" @click="doImport" :loading="importLoading">确定</el-button>