Merge branch 'dev' of http://gogs.gisvg.com/yzx/caiping into dev

app/admin/controller/Index.php

@@ -452,7 +452,6 @@ class Index extends BaseController
         View::assign("sent_review_amount_tol", $sent_review_amount_tol_real);
         // dump(self::getHomeFive());
         View::assign("home_five", self::getHomeFive());
-
         return View();
     }
 
@@ -695,6 +694,7 @@ class Index extends BaseController
         View::assign("num_project", $num_project);
         View::assign("sent_review_amount_tol", $sent_review_amount_tol_real);
         View::assign("home_five", self::getHomeFive_company());
+
         return View();
     }
 
@@ -941,7 +941,6 @@ class Index extends BaseController
         View::assign("sent_review_amount_tol", $sent_review_amount_tol_real);
         // dump(self::getHomeFive());
         View::assign("home_five", self::getHomeFive_proprietor());
-        dump(self::getHomeFive_proprietor());
         return View();
     }
 
@@ -967,7 +966,7 @@ class Index extends BaseController
     public function head()
     {
         $param = get_params();
-//        halt($param);
+        halt($param);
         $where = [];
         if(!empty($param["nickname"])){
             $where = [["a.nickname","like","%".$param["nickname"]."%"]];

app/admin/controller/project/Audit.php

@@ -231,10 +231,11 @@ class Audit extends BaseController
             $param = get_params();
 
             $where = [
-                ["cp_project_audit.approver", "=", $this->uid],
-                ["cp_project_audit.audit_type", "<", 4],
-                ["cp_project_audit.audit_status", "=", 1],
+                ["a.approver", "=", $this->uid],//审批人是登录的
+                ["a.audit_type", "<=", 1],//
+                ["a.audit_status", "=", 1]
             ];
+//            halt($where);
             if(!empty($param["keywords"])){
                 $where[] = ["c.review_unit_name|c.engineering_type|a.project_name","like","%".$param["keywords"]."%"];
             }
@@ -242,15 +243,15 @@ class Audit extends BaseController
             $order = empty($param['order']) ? 'id desc' : $param['order'];
 
             $list2 = $this->Auditmodel->alias('a')->join("cost_project c", "a.project_id=c.id", 'left')
-                ->field("a.*,c.project_status,c.sent_review_amount,c.engineering_type,c.review_unit_name")->where($where)->order($order)
+                ->field("a.*,c.project_status,c.sent_review_amount,c.engineering_type,c.review_unit_name,c.proprietor_status")
+                ->where($where)->order($order)
                 ->paginate($rows, false, ['query' => $param])
                 ->each(function ($item) {
-
-                    if ($item->audit_type == 2) {
+                    if ($item->audit_type == 2) {//报告
                         $a = Db::name("project_report")->where("id", $item->else_id)->field("title,status")->find();
                         $item->else_name = $a["title"];
                         $item->else_status = $a["status"];
-                    } elseif ($item->audit_type == 3) {
+                    } elseif ($item->audit_type == 3) {//联系函
                         $a = Db::name("contact")->where("id", $item->else_id)->field("title,status")->find();
                         $item->else_name = $a["title"];
                         $item->else_status = $a["status"];

app/admin/controller/project/CostProprietor.php

@@ -164,40 +164,46 @@ class CostProprietor extends BaseController
 
 
     //TODO
-
-
-
-
-
-
     public function list()
     {
 //        if (request()->isAjax()) {
         $param = get_params();
         strtotime('-10 days');
 //        halt(strtotime('-10 days'));
-        $where = [
+
+
+        $where2 = [
             ["delete_time", "=", 0],
-            ["entrust_maker", "=", $this->uid],
+            ["sent_review_head", "=", $this->uid],
             ['project_end_time', '<', strtotime('15 days')],
             ['project_end_time', '>', time()],
+            ["sent_review_unit", "=", get_login_admin("unit_name")],
             ["project_status", "<", 7],
             ["project_status", ">", 3]
         ];
 
-        $where2 = [
+        $where3 = [
             ["delete_time", "=", 0],
-            ["entrust_approver", "=", $this->uid],
+            ["sent_review_approver", "=", $this->uid],
             ['project_end_time', '<', strtotime('15 days')],
             ['project_end_time', '>', time()],
+            ["sent_review_unit", "=", get_login_admin("unit_name")],
             ["project_status", "<", 7],
             ["project_status", ">", 3]
         ];
 
-
+        $where4 = [
+            ["delete_time", "=", 0],
+            ["sent_review_second_approver", "=", $this->uid],
+            ['project_end_time', '<', strtotime('15 days')],
+            ["sent_review_unit", "=", get_login_admin("unit_name")],
+            ['project_end_time', '>', time()],
+            ["project_status", "<", 7],
+            ["project_status", ">", 3]
+        ];
         $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
         $order = empty($param['order']) ? 'id desc' : $param['order'];
-        $list = $this->model->whereOr([$where, $where2])
+        $list = $this->model->whereOr([ $where2,$where3,$where4])
             ->order($order)
             ->paginate($rows, false, ['query' => $param])
             ->each(function ($item) {
@@ -213,29 +219,36 @@ class CostProprietor extends BaseController
     {
 //        if (request()->isAjax()) {
         $param = get_params();
-        strtotime('-10 days');
-//        halt(strtotime('-10 days'));
-        $where = [
+
+        $where2 = [
             ["delete_time", "=", 0],
-            ["entrust_maker", "=", $this->uid],
+            ["sent_review_head", "=", $this->uid],
             ['project_end_time', '<', time()],
+            ["sent_review_unit", "=", get_login_admin("unit_name")],
             ["project_status", "<", 7],
             ["project_status", ">", 3]
         ];
 
-        $where2 = [
+        $where3 = [
             ["delete_time", "=", 0],
-            ["entrust_approver", "=", $this->uid],
+            ["sent_review_approver", "=", $this->uid],
             ['project_end_time', '<', time()],
+            ["sent_review_unit", "=", get_login_admin("unit_name")],
             ["project_status", "<", 7],
             ["project_status", ">", 3]
         ];
 
-
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $where4 = [
+            ["delete_time", "=", 0],
+            ["sent_review_second_approver", "=", $this->uid],
+            ['project_end_time', '<', time()],
+            ["sent_review_unit", "=", get_login_admin("unit_name")],
+            ["project_status", "<", 7],
+            ["project_status", ">", 3]
+        ];
         $order = empty($param['order']) ? 'id desc' : $param['order'];
-        $list = $this->model->whereOr([$where, $where2])
-            ->order($order)->paginate($rows, false, ['query' => $param])
+        $list = $this->model->whereOr([$where2,$where3,$where4])
+            ->order($order)->paginate(99999, false, ['query' => $param])
             ->each(function ($item) {
 
             });

app/admin/view/index/index.html

@@ -229,7 +229,10 @@
             <div class="layui-body" id="GouguAppBody">
                 <div class="gg-tab-page layui-show" id="tabItem0">
                     <iframe id="0" data-frameid="0" name="myiframe"
-                        src="{if $type==0}{:url('/admin/index/main')}{elseif $type==2}{:url('/admin/index/main_company')}{/if}"
+                        src="{if $type==0}{:url('/admin/index/main')}
+                        {elseif $type==2}{:url('/admin/index/main_company')}
+                        {elseif $type==1}{:url('/admin/index/main_proprietor')}
+                        {/if}"
                         frameborder="0" align="left" width="100%" height="100%" scrolling="yes"></iframe>
                 </div>
             </div>

app/admin/view/index/main_proprietor.html

@@ -796,18 +796,17 @@
         var table = layui.table,
             tool = layui.tool,
             form = layui.form;
-
+        var num_aaa =0;
         var allcount;
-
-        //审核表格
         layui.pageTable = table.render({
             elem: '#cost_project',
+            id: "cost_project",
             title: '待审核任务',
-            // toolbar: '#toolbarDemo',
+            toolbar: '#toolbarDemo',
             url: '/admin/project.audit/proprietor_list',
-            page: false,
+            page: true,
             limit: 20,
-            cellMinWidth: 80,
+
             parseData: function(res) { // 数据解析回调函数
                 // 在这里可以获取数据总数
                 allcount =  res.count;
@@ -820,30 +819,46 @@
             },
             cols: [
                 [
-                    {fixed: 'left', field: 'id', title: '编号', align: 'center', width: 80,
+                    {fixed: 'left', field: 'id', title: '编号', align: 'center', width: 100,
                         templet: function(d){
                             return allcount - (d.LAY_NUM-1);
                         }
-                    }, {
-                    field: 'project_status',
-                    title: '项目状态',
-                    align: 'center',
-                    width: 100,
-                    templet: function (item) {
+                    },
+                    {
+                        field: 'project_status',
+                        title: '项目状态',
+                        align: 'center',
+                        width: 100,
+                        templet: function (item) {
+                            //console.log(item);
+                            var html = '';
+                            if (item.project_status === 1) {
+                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800 !important">立项中</span> ';
+                            } else if (item.project_status === 2) {
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095 !important">审批中</span> ';
+                            } else if (item.project_status === -1) {
+                                html = '<span class="layui-badge layui-bg-red" style="background-color: #5825aa !important">待修改</span> ';
+                            } else if (item.project_status === 3) {
+                                html = '<span class="layui-badge layui-bg-green" style="background-color: #d37000 !important">待接收</span> ';
+                            } else if (item.project_status === 4) {
+                                html = '<span class="layui-badge" style="background-color: #005fa8 !important">分配中</span> ';
+                            } else if (item.project_status === 5) {
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #1e9fff !important">作业中</span> ';
+                            } else if (item.project_status === 6) {
+                                html = '<span class="layui-badge" style="background-color: #007244 !important">归档中</span> ';
+                            } else if (item.project_status === 7) {
+                                html = '<span class="layui-badge" style="background-color: #881f1f !important">退审中</span> ';
+                            } else if (item.project_status === 8) {
+                                html = '<span class="layui-badge" style="background-color: #16b777 !important">已归档</span> ';
+                            } else if (item.project_status === 9) {
+                                html = '<span class="layui-badge" style="background-color: #d81e06 !important">已退审</span> ';
+                            } else if (item.project_status === 0) {
+                                html = '<span">业主端进行中</span> ';
 
-                        var html = '';
-                        if (item.project_status === 2) {
-                            html = '<span class="layui-badge layui-bg-blue">审批中</span> ';
-                        } else if (item.project_status === 6) {
-                            html = '<span class="layui-badge layui-bg-blue">归档中</span> ';
-                        } else if (item.project_status === 7) {
-                            html = '<span class="layui-badge layui-bg-blue">退审中</span> ';
-                        } else if (item.project_status === 5) {
-                            html = '<span class="layui-badge layui-bg-blue">作业中</span> ';
+                            }
+                            return html;
                         }
-                        return html;
-                    }
-                }, {
+                    }, {
                     field: 'audit_status',
                     title: '审批状态',
                     align: 'center',
@@ -852,6 +867,9 @@
 
                         var html = '';
                         if (item.audit_status === 1) {
+
+                            num_aaa += 1;
+
                             html = '<span class="layui-badge layui-bg-blue">待审核</span> ';
                         } else if (item.audit_status === 2) {
                             html = '<span class="layui-badge layui-bg-green">已通过</span> ';
@@ -864,12 +882,10 @@
                     field: 'project_name',
                     title: '项目名称',
                     align: 'center',
-                    width: 400
-                }, {
-                    field: 'project_type',
-                    title: '项目类型',
-                    align: 'center',
-                    width: 100
+                    width: 100,
+                    templet: function (d) {
+                        return '<div style="text-align:left">' + d.project_name + '</div>'
+                    }
                 }, {
                     field: 'audit_name',
                     title: '流程名称',
@@ -880,31 +896,45 @@
                     title: '发起人',
                     align: 'center',
                     width: 150
-                }, {
-                    field: 'sponsor_unit',
-                    title: '发起单位/部门',
-                    align: 'center',
-                    width: 200
                 }, {
                     field: 'create_time',
                     title: '发起时间',
                     align: 'center',
-                    width: 150
+                    width: 150,
+                    templet: function (d) {
+                        if (d.create_time) {
+                            return layui.util.toDateString(d.create_time * 1000, "yyyy-MM-dd")
+                        } else {
+                            return "";
+                        }
+                    }
                 }, {
                     field: 'approver_name',
                     title: '审批人',
                     align: 'center',
                     width: 150
                 }, {
-                    field: 'update_time',
+                    field: 'audit_time',
                     title: '审批时间',
                     align: 'center',
-                    width: 150
+                    width: 100,
+                    templet: function (d) {
+                        if (d.audit_time) {
+                            return layui.util.toDateString(d.audit_time * 1000, "yyyy-MM-dd")
+                        } else {
+                            return "";
+                        }
+                    }
                 }, {
                     field: 'remark',
-                    title: '审批原因',
+                    title: '申请原因',
                     align: 'center',
-                    width: 150
+                    width: 250,
+                }, {
+                    field: 'audit_remark',
+                    title: '审批回执',
+                    align: 'center',
+                    width: 250,
                 }, {
                     fixed: 'right',
                     field: 'right',
@@ -923,181 +953,100 @@
                         }
                         return h;
                     }
-                }]
-            ]
+                }
+                ]
+            ],
+            done:function () {
+                if(num_aaa === 0){
+                    parent.showhongdian()
+                    // console.log('2执行了')
+                }
+            }
         });
-        var abc = 0;
-        ////审核表格 监听表格行工具事件
+
+
+        let abc = 0;
+        //监听表格行工具事件
         table.on('tool(cost_project)', function (obj) {
             var data = obj.data;
             if (obj.event === 'read') {
-
-                if (data.audit_type == 1) {
-                    tool.side('/admin/project.audit/read?id=' + data.project_id);
-                } else if (data.audit_type == 2) {
-
-                    tool.side('/admin/project.report/view_proprietor?id=' + data.else_id);
-                } else if (data.audit_type == 3) {
-
-                    tool.side(' /admin/project.contact/view?id=' + data.else_id);
-                }else {
-                    layer.msg("审核内容不存在！")
-                }
-
-
-                // console.log(obj.data.getTrusteeName.institution)
-                tool.side('/admin/project.audit/read?id=' + obj.data.project_id);
+                tool.side('/admin/project.audit/read?id=' + data.project_id);
             } else if (obj.event === 'edit') {
                 layer.confirm("确认是否审批通过？", function (index) {
-                    console.log(data)
-                    if (abc == 0) {
-
-                        let callback = function (e) {
-
-                            abc = 0
-                            layer.msg(e.msg);
-
-
-                            setTimeout(function () {
-                                window.location.reload()
-                                layer.close(index);
-                            }, 1000)
-                        }
-
-                        if (data.audit_type == 0) {
-                            //立项审批
-                            if (data.project_status == 0) {//业主端
-                                tool.post("/admin/project.audit/proprietor_agree", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                }, callback);
-                            }
-                        }
-                        else if (data.audit_type == 1) {
-                            if (data.project_status == 0) {//业主端
-                                //立项审批
-                                tool.post("/admin/project.audit/proprietor_agree2", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                }, callback);
-                            } else if (data.project_status == 6) {
-
-                                tool.post("/admin/project.audit/project_edit_second", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-
-
-                                }, callback);
-
-
-                            } else if (data.project_status == 7) {
-                                //退审审批
-
-                                tool.post("/admin/project.audit/project_edit_third", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-
-                                }, callback);
-
-
-                            }
-                        } else if (data.audit_type == 2) {
-                            if (data.else_status == 0) {
-                                //报告新建
-
-                                console.log(1)
-                                tool.post("/admin/project.report/proprietor_agree_report", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    type: 1000,
-
-
-                                }, callback);
-
-
-                            } else if (data.else_status == 3) {
-                                //报告删除
-
-                                tool.post("/admin/project.report/proprietor_agree_delete", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    type: 1000,
-
-
-                                }, callback);
-
-
-                            }
-                        } else if (data.audit_type == 3) {
-                            if (data.else_status == 0) {
-                                //联系函新建
-
-
-                                tool.post("/admin/project.contact/agree_contact", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    type: 1000,
-
-
-                                }, callback);
-
-
-                            } else if (data.else_status == 3) {
-                                //联系函删除
-
-
-                                tool.post("/admin/project.contact/agree_delete", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    type: 1000,
-
+                    console.log(abc, data.else_status)
+                    let callback = function (e) {
+                        select_Data = [];
+                        abc = 0
+                        layer.msg(e.msg);
+
+                        setTimeout(function () {
+                            layui.pageTable.reload()
+                            layer.close(index);
+                        }, 1000)
+                    }
+                    if (data.audit_type ==1){
+
+                        tool.post("/admin/project.audit/proprietor_agree", {
+                            id: data.id,
+                            else_id: data.else_id,
+                            audit_type: data.audit_type,
+                            project_id: data.project_id,
+                            project_status: data.project_status,
+                        }, callback);
 
-                                }, callback);
+                    }
+                    if (data.audit_type ==0){
+
+                        tool.post("/admin/project.audit/proprietor_agree2", {
+                            id: data.id,
+                            else_id: data.else_id,
+                            audit_type: data.audit_type,
+                            project_id: data.project_id,
+                            project_status: data.project_status,
+                        }, callback);
 
+                    }else if (data.audit_type == 2) {
+                        if (data.else_status == 1) {
+                            //业主审核报告新建
+                            console.log(1)
+                            tool.post("/admin/project.report/proprietor_agree_report", {
+                                id: data.id,
+                                else_id: data.else_id,
+                                audit_type: data.audit_type,
+                                project_id: data.project_id,
+                                project_status: data.project_status,
+                                type: 1000,
+
+                            }, callback);
+
+                        } else if (data.else_status == 4) {
+                            //业主审核报告删除
+                            tool.post("/admin/project.report/proprietor_agree_delete", {
+                                id: data.id,
+                                else_id: data.else_id,
+                                audit_type: data.audit_type,
+                                project_id: data.project_id,
+                                project_status: data.project_status,
+                                type: 1000,
+                            }, callback);
 
-                            }
-                        }else{
-                            layer.msg("请联系管理员")
                         }
-                        // console.log(abc, data.else_status)
-                        abc = 1;
                     }
-                }, function () {
 
+                    abc = 1;
+                }, function () {
                     abc = 0;
                 })
+
+
             } else if (obj.event === 'overrule') {
-                layer.prompt({
+
+
+                var ttxx = layer.prompt({
                     title: '请输入<span style="color: red">拒绝</span>原因',
                     formType: 2,
                     area: ['35vw', '15vw']
                 }, function (text, index) {
-
-
                     if (text == '') {
                         layer.msg('请先完善拒绝原因');
                         return false;
@@ -1105,73 +1054,39 @@
                         let callback = function (e) {
 
                             layer.msg(e.msg);
-                            listount--;
-                            if (listount == 0) {
-                                parent.showhongdian()
-                            }
+
                             setTimeout(function () {
-                                window.location.reload()
+                                layui.pageTable.reload()
                                 layer.close(index);
                             }, 2000)
 
 
                         }
-
-
-                        if (data.audit_type == 1) {
-                            if (data.project_status == 2) {
-                                //立项
-
-
-                                tool.post("/admin/project.audit/project_overrule_first", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    audit_remark: text,
-
-                                }, callback);
-
-
-                            } else if (data.project_status == 6) {
-                                //归档
-
-
-                                tool.post("/admin/project.audit/project_overrule_second", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    audit_remark: text,
-
-
-                                }, callback);
-
-
-                            } else if (data.project_status == 7) {
-                                //退审
-
-
-                                tool.post("/admin/project.audit/project_overrule_third", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    audit_remark: text,
-
-
-                                }, callback);
-
-
-                            }
-                        } else if (data.audit_type == 2) {
+                        if (data.audit_type==1){
+
+                            tool.post("/admin/project.audit/proprietor_disagree", {
+                                id: data.id,
+                                else_id: data.else_id,
+                                audit_type: data.audit_type,
+                                project_id: data.project_id,
+                                project_status: data.project_status,
+                                audit_remark:text,
+                            }, callback);
+
+                        }else if (data.audit_type==0){
+
+                            tool.post("/admin/project.audit/proprietor_disagree2", {
+                                id: data.id,
+                                else_id: data.else_id,
+                                audit_type: data.audit_type,
+                                project_id: data.project_id,
+                                project_status: data.project_status,
+                                audit_remark:text,
+                            }, callback);
+
+                        }else if (data.audit_type == 2) {
                             if (data.else_status == 1) {
-                                //报告新建
-
-
+                                //财评报告新建通过，业主报告新建拒绝
                                 tool.post("/admin/project.report/proprietor_un_report", {
                                     id: data.id,
                                     else_id: data.else_id,
@@ -1185,9 +1100,7 @@
 
 
                             } else if (data.else_status == 4) {
-                                //报告删除
-
-
+                                //财评报告删除通过，业主报告删除拒绝
                                 tool.post("/admin/project.report/proprietor_un_delete", {
                                     id: data.id,
                                     else_id: data.else_id,
@@ -1197,62 +1110,36 @@
                                     audit_remark: text,
                                     type: 1000,
 
-
-                                }, callback);
-
-
-                            }
-
-                        } else if (data.audit_type == 3) {
-                            if (data.else_status == 0) {
-                                //联系函新建
-
-
-                                tool.post("/admin/project.contact/un_contact", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    audit_remark: text,
-                                    type: 1000,
-
-
-                                }, callback);
-
-
-                            } else if (data.else_status == 3) {
-                                //联系函删除
-
-
-                                tool.post("/admin/project.contact/un_delete", {
-                                    id: data.id,
-                                    else_id: data.else_id,
-                                    audit_type: data.audit_type,
-                                    project_id: data.project_id,
-                                    project_status: data.project_status,
-                                    audit_remark: text,
-                                    type: 1000,
-
-
                                 }, callback);
 
 
                             }
 
                         }
-                        else{
-                            layer.msg("请联系管理员")
-                        }
 
                     }
 
 
+                }, function () {
+                    abc = 0;
                 })
             }
             return false;
         });
 
+        //监听搜索提交
+        form.on('submit(searchform)', function (data) {
+            layui.pageTable.reload({
+                where: {
+                    keywords: data.field.keywords
+                },
+                page: {
+                    curr: 1
+                }
+            });
+            return false;
+        });
+
         //临期表格
         layui.pageTable = table.render({
             elem: '#advent_project',