新的

app/admin/controller/project/Cost.php

@@ -209,7 +209,8 @@ class Cost extends BaseController
             $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
             $order = empty($param['order']) ? 'id desc' : $param['order'];
 
-            $openid = get_login_admin('openid');
+            $userId = get_login_admin('id');
+            $openid = Db::name("admin")->where('id',$userId)->value("openid");
             $follow_project_id = Db::name('follow_project')->where('openid',$openid)->column("project_id");
 
             // halt($openid,$follow_project_id);
@@ -222,9 +223,8 @@ class Cost extends BaseController
             }
 
             $where[] = ["delete_time", "=", 0];
-            $where[] = ["project_status", ">", 0];
             $where2[] = ["delete_time", "=", 0];
-            $where2[] = ["project_status", ">", 0];
+
 
             $where3 =[];
             if (!empty($param['project_status'])) {

app/admin/controller/project/CostCompany.php

@@ -343,7 +343,8 @@ class CostCompany extends BaseController
             }
             $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
             $order = empty($param['order']) ? 'project_receive_time desc,id desc' : $param['order'];
-            $openid = get_login_admin('openid');
+            $userId = get_login_admin('id');
+            $openid = Db::name("admin")->where('id',$userId)->value("openid");
             $follow_project_id = Db::name('follow_project')->where('openid',$openid)->column("project_id");
             // halt($openid,$follow_project_id);
             $list = $this->model

app/admin/view/project/cost/follow_project.html

@@ -94,7 +94,7 @@
 {block name="script"}
 <script>
     const moduleInit = ['tool', 'oaTool'];
-  
+
     function gouguInit() {
         var table = layui.table, tool = layui.tool, form = layui.form, oaTool = layui.oaTool;
 
@@ -140,7 +140,7 @@
                         title: '项目状态',
                         align: 'center',
                         width: 100,
-                       
+
                         templet: function (item) {
 
                             var html = '';
@@ -164,6 +164,15 @@
                                 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){
+                                if(item.proprietor_status===0){
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800 !important">业主立项中</span> '
+                                }else if(item.proprietor_status===1){
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #b30095 !important"">业主审核中</span> '
+                                }else if(item.proprietor_status===2){
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #b88230 !important">财评待接收</span> '
+                                }
+
                             }
                             return html;
                         }
@@ -199,7 +208,7 @@
                         title: '项目名称',
                         align: 'center',
                         width: 400,
-                       
+
                         templet: function (d) {
 
 
@@ -243,21 +252,21 @@
                             var html;
 
                             if (item.project_status == 8 || item.project_status == 9 ){
-                                 html =
-                                "<div>" +
-                                layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
-                                "至" +
-                                layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
+                                html =
+                                    "<div>" +
+                                    layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
+                                    "至" +
+                                    layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
 
-                                "</div>";
+                                    "</div>";
                             }else{
                                 html =
-                                "<div>" +
-                                layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
-                                "至" +
-                                layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
-                                "&nbsp;&nbsp;" + timestr +
-                                "</div>";
+                                    "<div>" +
+                                    layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
+                                    "至" +
+                                    layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
+                                    "&nbsp;&nbsp;" + timestr +
+                                    "</div>";
                             }
 
 
@@ -282,7 +291,7 @@
                         title: '评审机构',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -291,7 +300,7 @@
                         title: '评审机构负责人',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -300,7 +309,7 @@
                         title: '评审机构负责人电话',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -309,7 +318,7 @@
                         title: '送审单位',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -318,7 +327,7 @@
                         title: '送审单位负责人',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -327,7 +336,7 @@
                         title: '送审单位负责人电话',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -336,7 +345,7 @@
                         title: '施工单位',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -345,7 +354,7 @@
                         title: '施工单位负责人',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -354,7 +363,7 @@
                         title: '施工单位负责人电话',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -366,7 +375,7 @@
                         title: '工程类别',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -375,7 +384,7 @@
                         title: '项目类型',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -384,7 +393,7 @@
                         title: '项目区域',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -396,7 +405,7 @@
                         title: '送审服务费',
                         align: 'center',
                         width: 100,
-                        
+
                     },
 
 
@@ -405,7 +414,7 @@
                         title: '送审单位承担审核费',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -414,7 +423,7 @@
                         title: '施工单位负责核减超5%评审费部分',
                         align: 'center',
                         width: 230,
-                        
+
                     },
 
 
@@ -423,7 +432,7 @@
                         title: '送审金额',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -432,7 +441,7 @@
                         title: '审定金额',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -441,14 +450,14 @@
                         title: '审增额',
                         align: 'center',
                         width: 150,
-                        
+
                     },
                     {
                         field: 'review_reduce_amount',
                         title: '审减额',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -457,7 +466,7 @@
                         title: '审增减率',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -466,7 +475,7 @@
                         title: '报告时间',
                         align: 'center',
                         width: 150,
-                        
+
                         templet: function (d) {
                             if (d.report_time) {
                                 return layui.util.toDateString(d.report_time * 1000, "yyyy-MM-dd")
@@ -482,7 +491,7 @@
                         title: '收费标准',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -491,7 +500,7 @@
                         title: '作业负责人',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -500,9 +509,9 @@
                         title: '作业成员',
                         align: 'center',
                         width: 300,
-                        
+
                     },
-                    
+
                     {
                         field: 'creator',
                         title: '创建人',
@@ -517,8 +526,8 @@
                         title: '项目创建日期',
                         align: 'center',
                         width: 180,
-                        
-                      
+
+
                     },
 
 
@@ -527,7 +536,7 @@
                         title: '项目归档日期',
                         align: 'center',
                         width: 120,
-                        
+
                         templet: function (d) {
                             if (d.project_dead_time) {
                                 return layui.util.toDateString(d.project_dead_time * 1000, "yyyy-MM-dd")
@@ -536,7 +545,7 @@
                             }
                         }
                     },
-                    
+
                     {
                         fixed: 'right', field: 'right', title: '操作', width: 136, align: 'center',
                         templet: function (a) {

app/admin/view/project/cost_company/follow_project.html

@@ -171,6 +171,15 @@
                                 html = '<span class="layui-badge layui-bg-orange" style="background-color: #881f1f !important">退审中</span> ';
                             } else if (item.project_status === 9) {
                                 html = '<span class="layui-badge layui-bg-green" style="background-color: #d81e06 !important">已退审</span> ';
+                            }else if(item.project_status === 0){
+                                if(item.proprietor_status===0){
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800 !important">业主立项中</span> '
+                                }else if(item.proprietor_status===1){
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #b30095 !important"">业主审核中</span> '
+                                }else if(item.proprietor_status===2){
+                                    html = '<span class="layui-badge layui-bg-orange" style="background-color: #b88230 !important">财评待接收</span> '
+                                }
+
                             }
                             return html;
                         }
@@ -205,7 +214,7 @@
                         title: '项目名称',
                         align: 'center',
                         width: 400,
-                       
+
                         templet: function (d) {
 
                             var html = "";
@@ -234,7 +243,7 @@
                         title: '项目周期',
                         align: 'center',
                         width: 270,
-                        
+
                         templet: function (item) {
                             let outcome = Math.round(new Date().getTime() / 1000).toString();
                             var advent_time = item.project_end_time - outcome
@@ -248,21 +257,21 @@
 
                             var html;
                             if (item.project_status == 8 || item.project_status == 9 ){
-                                 html =
-                                "<div>" +
-                                layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
-                                "至" +
-                                layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
-                                
-                                "</div>";
+                                html =
+                                    "<div>" +
+                                    layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
+                                    "至" +
+                                    layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
+
+                                    "</div>";
                             }else{
                                 html =
-                                "<div>" +
-                                layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
-                                "至" +
-                                layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
-                                "&nbsp;&nbsp;" + timestr +
-                                "</div>";
+                                    "<div>" +
+                                    layui.util.toDateString(item.project_start_time * 1000, 'yyyy-MM-dd') +
+                                    "至" +
+                                    layui.util.toDateString(item.project_end_time * 1000, 'yyyy-MM-dd') +
+                                    "&nbsp;&nbsp;" + timestr +
+                                    "</div>";
                             }
 
 
@@ -288,7 +297,7 @@
                         title: '委托单位',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -297,7 +306,7 @@
                         title: '委托单位负责人',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -306,7 +315,7 @@
                         title: '委托单位负责人电话',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -315,7 +324,7 @@
                         title: '送审单位',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -324,7 +333,7 @@
                         title: '送审单位负责人',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -333,7 +342,7 @@
                         title: '送审单位负责人电话',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -342,7 +351,7 @@
                         title: '项目规模',
                         align: 'center',
                         width: 150,
-                      },   
+                    },
 
 
                     {
@@ -350,7 +359,7 @@
                         title: '工程类别',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -359,7 +368,7 @@
                         title: '项目类型',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -368,7 +377,7 @@
                         title: '项目区域',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -377,7 +386,7 @@
                         title: '财政性质',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -386,7 +395,7 @@
                         title: '送审服务费',
                         align: 'center',
                         width: 100,
-                       
+
                     },
 
 
@@ -395,7 +404,7 @@
                         title: '送审金额',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -404,7 +413,7 @@
                         title: '审定金额',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -413,14 +422,14 @@
                         title: '审增额',
                         align: 'center',
                         width: 150,
-                        
+
                     },
                     {
                         field: 'review_reduce_amount',
                         title: '审减额',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -429,7 +438,7 @@
                         title: '审增减率',
                         align: 'center',
                         width: 150,
-                       
+
                     },
 
 
@@ -438,7 +447,7 @@
                         title: '报告时间',
                         align: 'center',
                         width: 150,
-                        
+
                         templet: function (d) {
                             if (d.report_time) {
                                 return layui.util.toDateString(d.report_time * 1000, "yyyy-MM-dd")
@@ -454,7 +463,7 @@
                         title: '收费标准',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -463,7 +472,7 @@
                         title: '作业负责人',
                         align: 'center',
                         width: 150,
-                        
+
                     },
 
 
@@ -472,9 +481,9 @@
                         title: '作业成员',
                         align: 'center',
                         width: 300,
-                        
+
                     },
-                    
+
                     {
                         field: 'creator',
                         title: '创建人',
@@ -489,8 +498,8 @@
                         title: '项目创建日期',
                         align: 'center',
                         width: 180,
-                        
-                        
+
+
                     },
 
 
@@ -499,7 +508,7 @@
                         title: '项目归档日期',
                         align: 'center',
                         width: 120,
-                        
+
                         templet: function (d) {
                             if (d.project_dead_time) {
                                 return layui.util.toDateString(d.project_dead_time * 1000, "yyyy-MM-dd")

app/mobile/view/temporary/detail.html

@@ -50,16 +50,15 @@
                 <div class="basic-top">
                     <div class="basic-title">
                         <div class="title-img">
-                                <span><img src="{__MOBILE__}/img/project1.png" alt=""
-                                           style="width: 5vw;margin-right: 1vw;"></span>
-                            <span style="font-size: 2vh;"><b>{if $field.project_name}{$detail.project_name}{/if}</b></span>
+                            <span><img src="{__MOBILE__}/img/project1.png" alt=""
+                                       style="width: 5vw;margin-right: 1vw;"></span>
+                            <span style="font-size: 2vh;width: 67vw !important;"><b>{if $field.project_name}{$detail.project_name}{/if}</b></span>
+                            <span>
+                                <button id="followBtn">关注</button>
+                            </span>
                         </div>
 
-                        <div>
-
 
-                            <button id="followBtn">关注项目</button>
-                        </div>
                     </div>
 
                     <div style="display:flex;align-items: center;">
@@ -67,7 +66,7 @@
                             <span class="title-img" style="color: #1287ff;">
                                 <span><img src="{__MOBILE__}/img/await.png" alt="" style="width: 5vw;"></span>&nbsp;
                                 <span style="font-weight:600;">
-                                    {if $field.project_status}
+
                                     {switch $detail.project_status}
                                     {case 1}<span style="color: #ffaa64">财评立项中</span>{/case}
                                     {case 2}<span style="color: #b30095">财评审批中</span>{/case}
@@ -79,7 +78,7 @@
                                     {case 8}<span style="color: #16b777">已归档</span>{/case}
                                     {case 9}<span style="color: #d81e06">已退审</span>{/case}
                                     {case 0}
-                                    {switch $vo.proprietor_status}
+                                    {switch $detail.proprietor_status}
                                     {case 0}<span style="color: #ffb800">业主立项中</span>{/case}
                                     {case 1}<span style="color: #b30095">业主审核中</span>{/case}
                                     {case 2}<span style="color: #b88230">财评待接收</span>{/case}
@@ -87,7 +86,7 @@
                                     {/case}
                                     {default /}未知
                                     {/switch}
-                                    {/if}
+
                                 </span>
                             </span>
 
@@ -1002,7 +1001,7 @@
                                 followBtn.classList.add('followed');
                                 isFollowed = true;
                             }else{
-                                followBtn.textContent = '关注项目';
+                                followBtn.textContent = '关注';
                                 followBtn.classList.remove('followed');
                                 isFollowed = false;
                             }
@@ -1057,7 +1056,7 @@
                     data: { openid: openid , id : id},
                     success: function(response) {
                         layer.msg(response.msg)
-                        followBtn.textContent = '关注项目';
+                        followBtn.textContent = '关注';
                         followBtn.classList.remove('followed');
                         isFollowed = false;
                     }