Merge remote-tracking branch 'origin/dev' into dev

app/admin/view/datastat/datastat/cost.html

@@ -57,12 +57,13 @@
         </div>
     </form>
 </div>
+
 <div class="p-3">
     <div class="layui-row layui-col-space12">
-        <div class="layui-col-xs6">
+        <div class="layui-col-xs12">
             <div class="layui-card">
                 <div class="layui-card-body table">
-                    <table id='table-1'>
+                    <table id='table-1' style="width: 100vw;">
                         <tr>
                             <th>项目数量</th>
                             <th>1月</th>
@@ -77,7 +78,6 @@
                             <th>10月</th>
                             <th>11月</th>
                             <th>12月</th>
-
                         </tr>
                         <tr>
                             <th>{$sent.all.project_number}</th>
@@ -188,51 +188,10 @@
                 </div>
             </div>
         </div>
-
-        <div class="layui-col-xs3">
-            <div class="layui-card">
-                <div class="layui-card-header">
-                    <span id="time1"></span><span>年项目分布统计图</span>
-                </div>
-                <div class="layui-card-body">
-                    <div id="main1" style="height: 100%"></div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-xs3">
-            <div class="layui-card">
-                <div class="layui-card-header">
-                    <span id="time2"></span><span>年项目送审、审定总额分布图</span>
-                </div>
-                <div class="layui-card-body">
-                    <div id="main2" style="height: 100%;"></div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-xs3">
-            <div class="layui-card">
-                <div class="layui-card-header">
-                    <span id="time3"></span><span>年项目送审服务费分布图</span>
-                </div>
-                <div class="layui-card-body">
-                    <div id="main3" style="height: 100%;"></div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-xs3">
-            <div class="layui-card">
-                <div class="layui-card-header">
-                    <span id="time4"></span><span>年送审总额占比分布图</span>
-                </div>
-                <div class="layui-card-body">
-                    <div id="main4" style="height: 100%;"></div>
-                </div>
-            </div>
-        </div>
     </div>
 
     <div class="layui-row layui-col-space12">
-        <div class="layui-col-xs6">
+        <div class="layui-col-xs12">
             <div class="layui-card">
                 <div class="layui-card-body table">
                      <table id='table-1'>
@@ -266,13 +225,88 @@
                         </tr>
                         {/volist}
                         </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        
+    </div>
+
+    <div class="layui-row layui-col-space12">
+        <div class="layui-col-xs12">
+            <div class="layui-card">
+                <div class="layui-card-body table-bottom">
+
+                     <table id='table-1'>
+                        <thead>
+                        <tr>
+                            <th>建设单位</th>
+                            <th>项目数量</th>
+                            <th>送审总额</th>
+                            <th>预算总额</th>
+                            <th>结算总额</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {volist name="sent_poportion" id="vo"}
+                        <tr>
+                            <th>{$vo.sent_review_unit_name}</th>
+                            <th>{$vo.project_number}</th>
+                            <th>{$vo.all_sent_amount}</th>
+                            <th>{$vo.budget_amount}</th>
+                            <th>{$vo.settlement_amount}</th>
+                        </tr>
+                        {/volist}
+                        </tbody>
 
                     </table>
 
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs3">
+
+        <div class="layui-col-xs6">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    <span id="time1"></span><span>年项目分布统计图</span>
+                </div>
+                <div class="layui-card-body">
+                    <div id="main1" style="height: 100%"></div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    <span id="time2"></span><span>年项目送审、审定总额分布图</span>
+                </div>
+                <div class="layui-card-body">
+                    <div id="main2" style="height: 100%;"></div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    <span id="time3"></span><span>年项目送审服务费分布图</span>
+                </div>
+                <div class="layui-card-body">
+                    <div id="main3" style="height: 100%;"></div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    <span id="time4"></span><span>年送审总额占比分布图</span>
+                </div>
+                <div class="layui-card-body">
+                    <div id="main4" style="height: 100%;"></div>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-xs6">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <span>评审机构项目数量排行</span>
@@ -282,7 +316,7 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs3">
+        <div class="layui-col-xs6">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <span>评审机构送审总额排行</span>
@@ -292,7 +326,7 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs3">
+        <div class="layui-col-xs6">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <span>评审机构审定总额排行</span>
@@ -302,7 +336,7 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs3">
+        <div class="layui-col-xs6">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <span>建设单位项目数量排行</span>
@@ -312,41 +346,8 @@
                 </div>
             </div>
         </div>
-    </div>
 
-    <div class="layui-row layui-col-space12">
         <div class="layui-col-xs6">
-            <div class="layui-card">
-                <div class="layui-card-body table-bottom">
-
-                     <table id='table-1'>
-                        <thead>
-                        <tr>
-                            <th>建设单位</th>
-                            <th>项目数量</th>
-                            <th>送审总额</th>
-                            <th>预算总额</th>
-                            <th>结算总额</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {volist name="sent_poportion" id="vo"}
-                        <tr>
-                            <th>{$vo.sent_review_unit_name}</th>
-                            <th>{$vo.project_number}</th>
-                            <th>{$vo.all_sent_amount}</th>
-                            <th>{$vo.budget_amount}</th>
-                            <th>{$vo.settlement_amount}</th>
-                        </tr>
-                        {/volist}
-                        </tbody>
-
-                    </table>
-
-                </div>
-            </div>
-        </div>
-        <div class="layui-col-xs3">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <span>建设单位送审总额排行</span>
@@ -356,7 +357,7 @@
                 </div>
             </div>
         </div>
-        <div class="layui-col-xs3">
+        <div class="layui-col-xs6">
             <div class="layui-card">
                 <div class="layui-card-header">
                     <span>建设单位送审总额占比图</span>

app/admin/view/index/main_proprietor.html

@@ -714,9 +714,9 @@
                             <li class="layui-this" style="font-size: 0.95vw;">
                                 内部
                             </li>
-                            <li style="font-size: 0.95vw;">
+                            <!-- <li style="font-size: 0.95vw;">
                                 外部
-                            </li>
+                            </li> -->
 
                         </ul>
 
@@ -833,27 +833,31 @@
                             //console.log(item);
                             var html = '';
                             if (item.project_status === 1) {
-                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800 !important">立项中</span> ';
+                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffaa64 !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> ';
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095 !important">财评审批中</span> ';
                             } else if (item.project_status === 3) {
-                                html = '<span class="layui-badge layui-bg-green" style="background-color: #d37000 !important">待接收</span> ';
+                                html = '<span class="layui-badge layui-bg-green" style="background-color: #769fcd !important">公司待接收</span> ';
                             } else if (item.project_status === 4) {
-                                html = '<span class="layui-badge" style="background-color: #005fa8 !important">分配中</span> ';
+                                html = '<span class="layui-badge" style="background-color: #005fa8">分配中</span> ';
                             } else if (item.project_status === 5) {
-                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #1e9fff !important">作业中</span> ';
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #1e9fff">作业中</span> ';
                             } else if (item.project_status === 6) {
-                                html = '<span class="layui-badge" style="background-color: #007244 !important">归档中</span> ';
+                                html = '<span class="layui-badge" style="background-color: #007244">归档中</span> ';
                             } else if (item.project_status === 7) {
-                                html = '<span class="layui-badge" style="background-color: #881f1f !important">退审中</span> ';
+                                html = '<span class="layui-badge" style="background-color: #881f1f">退审中</span> ';
                             } else if (item.project_status === 8) {
-                                html = '<span class="layui-badge" style="background-color: #16b777 !important">已归档</span> ';
+                                html = '<span class="layui-badge" style="background-color: #16b777">已归档</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> ';
+                                html = '<span class="layui-badge" style="background-color: #d81e06">已退审</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;
@@ -1175,33 +1179,34 @@
 
                         var html = '';
                         if (item.project_status === 1) {
-                            html = '<span class="layui-badge layui-bg-orange">立项中</span> ';
-                        } else if (item.project_status === 2) {
-                            html = '<span class="layui-badge layui-bg-blue">审批中</span> ';
-                        } else if (item.project_status === -1) {
-                            html = '<span class="layui-badge layui-bg-red">待修改</span> ';
-                        } else if (item.project_status === 3) {
-                            html = '<span class="layui-badge layui-bg-green">待接收</span> ';
-                        } else if (item.project_status === 4) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">分配中</span> ';
-                        } else if (item.project_status === 5) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">作业中</span> ';
-                        } else if (item.project_status === 6) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">归档中</span> ';
-                        } else if (item.project_status === 7) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">退审中</span> ';
-                        } else if (item.project_status === 8) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">已归档</span> ';
-                        } else if (item.project_status === 9) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">已退审</span> ';
-                        }
-                        return html;
+                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffaa64 !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 === 3) {
+                                html = '<span class="layui-badge layui-bg-green" style="background-color: #769fcd !important">公司待接收</span> ';
+                            } else if (item.project_status === 4) {
+                                html = '<span class="layui-badge" style="background-color: #005fa8">分配中</span> ';
+                            } else if (item.project_status === 5) {
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #1e9fff">作业中</span> ';
+                            } else if (item.project_status === 6) {
+                                html = '<span class="layui-badge" style="background-color: #007244">归档中</span> ';
+                            } else if (item.project_status === 7) {
+                                html = '<span class="layui-badge" style="background-color: #881f1f">退审中</span> ';
+                            } else if (item.project_status === 8) {
+                                html = '<span class="layui-badge" style="background-color: #16b777">已归档</span> ';
+                            } else if (item.project_status === 9) {
+                                html = '<span class="layui-badge" style="background-color: #d81e06">已退审</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;
                     }
                 }, {
                     field: 'project_name',
@@ -1342,31 +1347,32 @@
 
                         var html = '';
                         if (item.project_status === 1) {
-                            html = '<span class="layui-badge layui-bg-orange">立项中</span> ';
+                            html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffaa64 !important">财评立项中</span> ';
                         } else if (item.project_status === 2) {
-                            html = '<span class="layui-badge layui-bg-blue">审批中</span> ';
-                        } else if (item.project_status === -1) {
-                            html = '<span class="layui-badge layui-bg-red">待修改</span> ';
+                            html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095 !important">财评审批中</span> ';
                         } else if (item.project_status === 3) {
-                            html = '<span class="layui-badge layui-bg-green">待接收</span> ';
+                            html = '<span class="layui-badge layui-bg-green" style="background-color: #769fcd !important">公司待接收</span> ';
                         } else if (item.project_status === 4) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">分配中</span> ';
+                            html = '<span class="layui-badge" style="background-color: #005fa8">分配中</span> ';
                         } else if (item.project_status === 5) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">作业中</span> ';
+                            html = '<span class="layui-badge layui-bg-blue" style="background-color: #1e9fff">作业中</span> ';
                         } else if (item.project_status === 6) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">归档中</span> ';
+                            html = '<span class="layui-badge" style="background-color: #007244">归档中</span> ';
                         } else if (item.project_status === 7) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">退审中</span> ';
+                            html = '<span class="layui-badge" style="background-color: #881f1f">退审中</span> ';
                         } else if (item.project_status === 8) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">已归档</span> ';
+                            html = '<span class="layui-badge" style="background-color: #16b777">已归档</span> ';
                         } else if (item.project_status === 9) {
-                            html =
-                                '<span class="layui-badge" style="background-color: #31bdec">已退审</span> ';
+                            html = '<span class="layui-badge" style="background-color: #d81e06">已退审</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;
                     }
@@ -1517,17 +1523,14 @@
 
                             var html = '';
                             if (item.project_status === 1) {
-                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800">立项中</span> ';
+                                html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffaa64 !important">财评立项中</span> ';
                             } else if (item.project_status === 2) {
-                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095">审批中</span> ';
-                            } else if (item.project_status === -1) {
-                                html = '<span class="layui-badge layui-bg-red" style="background-color: #5825aa">待修改</span> ';
+                                html = '<span class="layui-badge layui-bg-blue" style="background-color: #b30095 !important">财评审批中</span> ';
                             } else if (item.project_status === 3) {
-                                html = '<span class="layui-badge layui-bg-green" style="background-color: #d37000">待接收</span> ';
+                                html = '<span class="layui-badge layui-bg-green" style="background-color: #769fcd !important">公司待接收</span> ';
                             } else if (item.project_status === 4) {
                                 html = '<span class="layui-badge" style="background-color: #005fa8">分配中</span> ';
                             } else if (item.project_status === 5) {
-
                                 html = '<span class="layui-badge layui-bg-blue" style="background-color: #1e9fff">作业中</span> ';
                             } else if (item.project_status === 6) {
                                 html = '<span class="layui-badge" style="background-color: #007244">归档中</span> ';
@@ -1537,6 +1540,15 @@
                                 html = '<span class="layui-badge" style="background-color: #16b777">已归档</span> ';
                             } else if (item.project_status === 9) {
                                 html = '<span class="layui-badge" style="background-color: #d81e06">已退审</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;
                         }

app/mobile/view/index/detail.html

@@ -85,23 +85,23 @@
                             </span>
                         <span class="title-img" style="color: #1287ff;">
                                 <span><img src="{__MOBILE__}/img/await.png" alt="" style="width: 5vw;"></span>&nbsp;
-                                <span style="width:12vw;font-weight:600;">
+                                <span style="font-weight:600;">
                                     {if $field.project_status}
                                     {switch $detail.project_status}
-                                    {case 1}立项中{/case}
-                                    {case 2}审批中{/case}
-                                    {case 3}待接收{/case}
-                                    {case 4}待分配{/case}
-                                    {case 5}作业中{/case}
-                                    {case 6}归档中{/case}
-                                    {case 7}退审中{/case}
-                                    {case 8}已归档{/case}
-                                    {case 9}已退审{/case}
+                                    {case 1}<span style="color: #ffaa64">财评立项中</span>{/case}
+                                    {case 2}<span style="color: #b30095">财评审批中</span>{/case}
+                                    {case 3}<span style="color: #769fcd">公司待接收</span>{/case}
+                                    {case 4}<span style="color: #005fa8">待分配</span>{/case}
+                                    {case 5}<span style="color: #1e9fff">作业中</span>{/case}
+                                    {case 6}<span style="color: #007244">归档中</span>{/case}
+                                    {case 7}<span style="color: #881f1f">退审中</span>{/case}
+                                    {case 8}<span style="color: #16b777">已归档</span>{/case}
+                                    {case 9}<span style="color: #d81e06">已退审</span>{/case}
                                     {case 0}
-                                    {switch $detail.proprietor_status}
-                                    {case 0}立项中{/case}
-                                    {case 1}审核中{/case}
-                                    {case 2}待接收{/case}
+                                    {switch $vo.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}
                                     {/switch}
                                     {/case}
                                     {default /}未知
@@ -114,7 +114,7 @@
                         <span>
                             {if $field.project_num} {$detail.project_num} {/if}
                         </span>
-                        <span style="width:12vw;">
+                        <span>
                             <b>
 
                                 {switch $detail.report_status}

app/mobile/view/index/kan_list.html

@@ -77,8 +77,8 @@
                                 <span
                                         style="color: #187FDD;background-color: rgb(218, 235, 252);width:50vw;padding: 0.5vw 1vw;font-size: 3.7vw;
                                 line-height: 2.7vh;border-radius: 1.5vw;padding: 0.5vw 0;text-align: center;"><b>{$vo.project_start_time|date="Y-m-d"}&nbsp;至&nbsp;{$vo.project_end_time|date="Y-m-d"}</b></span>
-                            <span style="display:flex;justify-content: space-between;width:27vw;">
-                                    <span>
+                            <span style="display:flex;justify-content: space-around;">
+                                    <span style="padding-right: 2vw;">
                                         <b>
                                             {switch $vo.report_status}
                                                 {case 0}<span style="color: #ffb800">初稿中</span>{/case}
@@ -93,20 +93,20 @@
                                     <span>
                                         <b>
                                             {switch $vo.project_status}
-                                            {case 1}立项中{/case}
-                                            {case 2}审批中{/case}
-                                            {case 3}待接收{/case}
-                                            {case 4}待分配{/case}
-                                            {case 5}作业中{/case}
-                                            {case 6}归档中{/case}
-                                            {case 7}退审中{/case}
-                                            {case 8}已归档{/case}
-                                            {case 9}已退审{/case}
+                                            {case 1}<span style="color: #ffaa64">财评立项中</span>{/case}
+                                            {case 2}<span style="color: #b30095">财评审批中</span>{/case}
+                                            {case 3}<span style="color: #769fcd">公司待接收</span>{/case}
+                                            {case 4}<span style="color: #005fa8">待分配</span>{/case}
+                                            {case 5}<span style="color: #1e9fff">作业中</span>{/case}
+                                            {case 6}<span style="color: #007244">归档中</span>{/case}
+                                            {case 7}<span style="color: #881f1f">退审中</span>{/case}
+                                            {case 8}<span style="color: #16b777">已归档</span>{/case}
+                                            {case 9}<span style="color: #d81e06">已退审</span>{/case}
                                             {case 0}
                                             {switch $vo.proprietor_status}
-                                            {case 0}立项中{/case}
-                                            {case 1}审核中{/case}
-                                            {case 2}待接收{/case}
+                                            {case 0}<span style="color: #ffb800">业主立项中</span>{/case}
+                                            {case 1}<span style="color: #b30095">业主审核中</span>{/case}
+                                            {case 2}<span style="color: #b88230">财评待接收</span>{/case}
                                             {/switch}
                                             {/case}
                                             {default /}未知