commit

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

@@ -147,7 +147,7 @@ public class FlowTodoCenterController {
                   t.h5FormKey
                 FROM
                   wf_process_instance ins
-                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10
+                  LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 20
                   LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
                   LEFT JOIN wf_process_category cat ON cat.id = def.category
                 $condition

src/main/java/com/budwk/app/sys/controller/SysUserController.java

@@ -36,6 +36,7 @@ import org.nutz.mvc.annotation.Param;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -360,16 +361,24 @@ public class SysUserController {
     @SaCheckLogin
     public Result rootMenuByPath(@Param("pathname") String pathname, HttpServletResponse response) {
         if (StrUtil.isBlank(pathname)) {
-
-        }
-//        Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%"));
-        Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "=", pathname));
-        if (menu == null) {
             return Result.success();
         }
-        List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
+        try {
-        Sys_menu rootMenu = SysMenuUtil.getRootMenu(menus, menu);
+            URI uri = new URI(pathname);
-        return Result.success().addData(rootMenu);
+            String path = uri.getPath();
+//        Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%"));
+            Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "=", path));
+            if (menu == null) {
+                return Result.success();
+            }
+            List<Sys_menu> menus = sysUserService.getMenus(SecurityUtil.getUserId());
+            Sys_menu rootMenu = SysMenuUtil.getRootMenu(menus, menu);
+            return Result.success().addData(rootMenu);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error();
+        }
+
     }
 
     /**

src/main/resources/views/layouts/v4/home/user.js

@@ -258,7 +258,7 @@ const user = {
                 this.$message.warning("当前流程没有配置地址")
                 return
             }
-            window.open(formKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey + "&tab=" + this.activeTab)
+            window.open(formKey + "?taskId=" + taskId + "&bizId=" + businessNo + "&taskKey=" + taskKey + "&tab=" + this.activeTab)
         },
         getRoleNames() {
             $.post("/platform/sys/role/getRoleNames").then(res => {

src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html

@@ -388,6 +388,8 @@ layout("/layouts/platform_h5.html"){
             showTimePickerClick() {
                 if (this.formData.occurTime) {
                     this.formData.occurDate = new Date(this.formData.occurTime)
+                }else{
+                    this.formData.occurDate = new Date()
                 }
                 this.showTimePicker = true
             },
@@ -493,6 +495,10 @@ layout("/layouts/platform_h5.html"){
             },
             async onSubmit() {
                 this.$refs.formRef.validate().then(() => {
+                    if (!this.formData.signature){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交申请吗？"
@@ -508,6 +514,10 @@ layout("/layouts/platform_h5.html"){
             },
             async onFinishTask() {
                 this.$refs.formRef.validate().then(() => {
+                    if (!this.formData.signature){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交申请吗？"

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html

@@ -187,7 +187,6 @@ layout("/layouts/platform_h5.html"){
                 <van-field
                     v-model="formData.bankUserName"
                     label="户名"
-                    type="number"
                     placeholder="请填写户名"
                     :rules="[{ required: true }]"
                     required
@@ -196,7 +195,6 @@ layout("/layouts/platform_h5.html"){
                 <van-field
                     v-model="formData.bankOfDeposit"
                     label="开户行"
-                    type="number"
                     placeholder="请填写开户行"
                     :rules="[{ required: true }]"
                     required
@@ -350,6 +348,10 @@ layout("/layouts/platform_h5.html"){
             // 提交
             onSubmit() {
                 this.$refs.formRef.validate().then(() => {
+                    if (!this.formData.sign){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
@@ -379,6 +381,10 @@ layout("/layouts/platform_h5.html"){
 
             onFinishTask() {
                 this.$refs.formRef.validate().then(() => {
+                    if (!this.formData.sign){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"