zhanglinxin před 1 rokem
rodič
revize
c1fd971bad

+ 1 - 2
application/approve/view/approve_flow/form.html

@@ -52,8 +52,7 @@
                     <label class="layui-form-label">第{$key+1}级:</label>
                     <div class="layui-input-block">
                         <div class="layui-input-inline">
-                            <select class="layui-select select1" name="user_data[{$key}][user_type]"
-                                    id="c-user_type-{$key}" lay-filter="user_type">
+                            <select class="layui-select select1" name="user_data[{$key}][user_type]" id="c-user_type-{$key}" lay-filter="user_type">
                                 {foreach $get_user_type_list as $kk=>$vv}
                                 {eq name='val.user_type' value='$kk.""'}
                                 <option selected value="{$kk}">{$vv}</option>

+ 3 - 3
application/common/service/DingtalkService.php

@@ -208,7 +208,7 @@ class DingtalkService
                 Department::insertAll($add_department_data);
             }
             if ($del_department_data) {
-                Department::where('id', 'in', $del_department_data)->update(['is_deleted'=>CommonConstant::IS_DELETED_1]);
+                Department::where('id', 'in', $del_department_data)->update(['is_deleted' => CommonConstant::IS_DELETED_1]);
             }
 
             // 更新员工
@@ -248,12 +248,12 @@ class DingtalkService
                 User::insertAll($add_user_data);
             }
             if ($del_user_data) {
-                User::where('id', 'in', $del_user_data)->update(['is_deleted'=>CommonConstant::IS_DELETED_1]);
+                User::where('id', 'in', $del_user_data)->update(['is_deleted' => CommonConstant::IS_DELETED_1]);
             }
             Db::commit();
         } catch (Exception $e) {
             Db::rollback();
-            except('出现错误:' . $e->getMessage());
+            except('出现错误:' . $e->getMessage() . $e->getFile() . $e->getLine());
         }
         return true;
     }

+ 9 - 0
application/user/controller/Member.php

@@ -16,6 +16,7 @@
 namespace app\user\controller;
 
 use app\common\constant\CommonConstant;
+use app\common\service\DingtalkService;
 use app\common\service\UserService;
 use library\Controller;
 
@@ -185,4 +186,12 @@ class Member extends Controller
         $this->_save($this->table, ['signature_status' => $signature_status]);
     }
 
+    /**
+     * 更新员工和部门
+     **/
+    public function renew(){
+        DingtalkService::renew();
+        $this->success('更新员工和部门成功');
+    }
+
 }

+ 24 - 4
application/user/view/member/index.html

@@ -22,9 +22,6 @@
             <th class='list-table-check-td think-checkbox'>
                 <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
             </th>
-            <th class='list-table-sort-td'>
-                <button type="button" class="layui-btn layui-btn-xs" data-reload >刷 新</button>
-            </th>
             <th class='text-left nowrap'>头像地址</th>
             <th class='text-left nowrap'>昵称</th>
             <th class='text-left nowrap'>用户姓名</th>
@@ -44,7 +41,6 @@
             <td class='list-table-check-td think-checkbox'>
                 <input class="list-check-box" value='{$vo.id}' type='checkbox'>
             </td>
-            <td class='text-left nowrap'></td>
             <td class='text-left nowrap'>
                 <img data-tips-image style="width:50px;height:50px;vertical-align:top" src="{$vo.avatar|default=''}">
             </td>
@@ -84,3 +80,27 @@
     {empty name='list'}<span class="notdata">没 有 记 录 哦!</span>{else}{$pagehtml|raw|default=''}{/empty}
 </div>
 {/block}
+{block name='script'}
+<script>
+    // 更新
+    function btn_renew(msg) {
+        layer.confirm('请确定是否'+msg, {btn: ['确定', '取消'], title: "提示"}, function () {
+            var url = "/user/member/renew";
+            layer.closeAll();
+            $.ajax({
+                type: "post",
+                url: url,
+                data: {},
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    layer.msg(data.info);
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000)
+                }
+            });
+        });
+    }
+</script>
+{/block}

+ 4 - 0
application/user/view/member/index_search.html

@@ -54,6 +54,10 @@
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
         </div>
     </form>
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-sm layui-btn-primary" onclick="btn_renew('更新');">更新员工和部门</button>
+        <button class="layui-btn layui-btn-sm layui-btn-primary" data-reload>刷 新</button>
+    </div>
     <script>
         form.render();
         // laydate.render({range: true, elem: '[name="create_at"]'})