提交

application/approve/controller/ApproveFlow.php

@@ -103,9 +103,12 @@ class ApproveFlow extends Controller
             }
         }
         if($this->request->isPost()) {
+            if(!isset_full($data,'user_data')){
+                $this->error('请添加审批层级');
+            }
             $user_data = array_filter($data['user_data']);
             if(!$user_data){
-                $this->error('请添加审批层级');
+                $this->error('请添加审批层级!');
             }
             $save_data = [];
             foreach ($user_data as $key=>$val){

application/approve/view/approve_flow/flow.html

@@ -16,7 +16,7 @@
         <tr>
             <td class='text-left'>{$vo|default='--'}</td>
             <td class='text-center nowrap'>
-                <a class="layui-btn layui-btn-xs" data-href="/admin.html#{:url('index')}?module={$key}">编 辑</a>
+                <a class="layui-btn layui-btn-xs" data-open='{:url("index")}?module={$key}'>编 辑</a>
             </td>
         </tr>
         {/foreach}

application/approve/view/approve_flow/form.html

@@ -2,7 +2,7 @@
 
 {block name="button"}
 
-<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-href="/admin.html#{:url('index')}?module={$vo.module}">返回</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-open="{:url('index')}?module={$vo.module}">返回</button>
 
 {/block}
 

application/approve/view/approve_flow/index.html

@@ -2,7 +2,8 @@
 
 {block name="button"}
 
-<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-href="/admin.html#{:url('flow')}">返回</button>
+<button class="layui-btn layui-btn-sm layui-btn-primary" type='button' data-open="{:url('flow')}">返回
+</button>
 
 {/block}
 
@@ -29,7 +30,7 @@
                 {eq name='vo.flow_item' value='0'}--{else}{$get_item_list[$vo.flow_item]}{/eq}
             </td>
             <td class='text-center nowrap'>
-                <a class="layui-btn layui-btn-xs" data-href="/admin.html#{:url('edit')}?id={$vo.id}">编 辑</a>
+                <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">编 辑</a>
             </td>
         </tr>
         {/foreach}

application/common/service/DingtalkService.php

@@ -138,7 +138,7 @@ class DingtalkService
         $config = config('app.dingtalk');
         $agentId = $config['agentId'];
         $corpId = $config['corpId'];
-        return compact("agentId","corpId","nonceStr","timeStamp","signature");
+        return compact("agentId","corpId","nonceStr","timeStamp","signature","url");
     }
 
 }

application/user/controller/Member.php

@@ -91,10 +91,6 @@ class Member extends Controller
         }
     }
 
-    protected function _form_filter(&$data)
-    {
-
-    }
 
     /**
      * 编辑
@@ -112,6 +108,19 @@ class Member extends Controller
     }
 
     /**
+     * 表单处理
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _form_filter(&$data)
+    {
+//        p($data);
+    }
+
+
+    /**
      * 启用
      * @auth true
      * @throws \think\Exception

application/user/view/member/index.html

@@ -74,9 +74,8 @@
                 <a class="layui-btn layui-btn-xs layui-bg-blue" data-confirm="确定要审核通过吗？" data-action="{:url('signature_status')}" data-value="id#{$vo.id};signature_status#3" data-csrf="{:systoken('signature_status')}">审核通过</a>
                 <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要审核驳回吗？" data-action="{:url('signature_status')}" data-value="id#{$vo.id};signature_status#4" data-csrf="{:systoken('signature_status')}">审核驳回</a>
                 {/if}
-                <a class="layui-btn layui-btn-xs" data-confirm="确定要审核驳回吗？"
-                   data-action="{:url('signature_status')}" data-value="id#{$vo.id};signature_status#4"
-                   data-csrf="{:systoken('signature_status')}">详情</a>
+                <a class="layui-btn layui-btn-xs" data-open="{:url('edit')}?id={$vo.id}">详情</a>
+<!--                <a class="layui-btn layui-btn-xs" data-modal="{:url('edit')}?id={$vo.id}">详情</a>-->
             </td>
         </tr>
         {/foreach}