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

app/acctconnect/common.php

@@ -442,7 +442,7 @@ function new_msg($project_id,$type)
     $aaa = Db::name('admin_group_access')->column("uid");
     $a = Db::name("admin")->column("id");
     $c = array_diff($aaa,$a);
-    dump($c,$aaa,$a);
+//    dump($c,$aaa,$a);
 }
 
 
@@ -504,7 +504,7 @@ function fileCard($item)
             } else if (in_array($item[$a]['fileext'], $doc)) {
                 $path = '/static/home/images/icon/' . $item[$a]['fileext'] . '.png';
             }
-            dump($item);
+//            dump($item);
             $li .= '<li id="' . $item[$a]['id'] . '" data-id="' . $item[$a]['id'] .
                 '" data-title="' . $item[$a]['name'] . '" data-ext="' . $item[$a]['fileext'] .
                 '"><img src="' . $path . '" alt="' . $item[$a]['name'] .

app/admin/common.php

@@ -443,7 +443,7 @@ function new_msg($project_id,$type)
     $aaa = Db::name('admin_group_access')->column("uid");
     $a = Db::name("admin")->column("id");
     $c = array_diff($aaa,$a);
-    dump($c,$aaa,$a);
+//    dump($c,$aaa,$a);
 }
 
 

app/admin/controller/Index.php

@@ -933,7 +933,6 @@ class Index extends BaseController
             }
 
         }
-
         View::assign("sent_review_cost", $sent_review_cost_real);
         View::assign("amount", $amount_real);
         View::assign("num", $num);

app/admin/controller/project/Cost.php

@@ -99,7 +99,18 @@ class Cost extends BaseController
 
             $where3 =[];
             if (!empty($param['project_status'])) {
-                $where3[] = ['project_status', '=', $param['project_status']];
+                if($param['project_status'] == 100){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 0];
+                }else if($param['project_status'] == 101){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 1];
+                }else if($param['project_status'] == 102){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 2];
+                }else{
+                    $where3[] = ['project_status', '=', $param['project_status']];
+                }
             }
             if (!empty($param['province'])) {
                 $where3[] = ['province', '=', $param['province']];
@@ -995,7 +1006,7 @@ class Cost extends BaseController
                     ["type", "=", 1], //1表示业主
                     ["entrust_unit", "=", $unit_name]
                 ])->column('unit_name');
-            dump( $proprietor_unit_name);
+//            dump( $proprietor_unit_name);
             $admin_group_id=Db::name("admin")->where("id", $leader_id)->value("admin_group_id");
             $where = [
                 ['status', '>=', 0],

app/admin/controller/project/CostCompany.php

@@ -85,9 +85,19 @@ class CostCompany extends BaseController
             }
             $where3 = array();
             if (!empty($param['project_status'])) {
-                $where3[] = ['project_status', '=', $param['project_status']];
+                if($param['project_status'] == 100){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 0];
+                }else if($param['project_status'] == 101){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 1];
+                }else if($param['project_status'] == 102){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 2];
+                }else{
+                    $where3[] = ['project_status', '=', $param['project_status']];
+                }
             }
-
             if (!empty($param['province'])) {
                 $where3[] = ['province', '=', $param['province']];
             }

app/admin/controller/project/CostProprietor.php

@@ -67,7 +67,21 @@ class CostProprietor extends BaseController
                 $param["project_end_time"] = $param["project_end_time"] ? strtotime($param["project_end_time"]) : 0;
             }
             if (!empty($param['project_status'])) {
-                $where[] = ['project_status', '=', $param['project_status']];
+                if($param['project_status'] == 100){
+                    $where[] = ['project_status', '=', 0];
+                    $where[] = ['proprietor_status', '=', 0];
+                }else if($param['project_status'] == 101){
+                    $where[] = ['project_status', '=', 0];
+                    $where[] = ['proprietor_status', '=', 1];
+                }else if($param['project_status'] == 102){
+                    $where[] = ['project_status', '=', 0];
+                    $where[] = ['proprietor_status', '=', 2];
+                }else{
+                    $where[] = ['project_status', '=', $param['project_status']];
+                }
+            }
+            if (!empty($param['proprietor_status'])) {
+                $where[] = ['proprietor_status', '=', $param['proprietor_status']];
             }
             if (!empty($param['province'])) {
                 $where[] = ['province', '=', $param['province']];
@@ -976,6 +990,12 @@ class CostProprietor extends BaseController
         // return View();
         return $project_log;
     }
+
+    public function ceshi($id)
+    {
+        View::assign('detailId', $id);
+        return view();
+    }
 }
 
 

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

@@ -8,7 +8,7 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">立项中</option>
+                    <option value="1">财政局立项中</option>
                     <option value="2">审批中</option>
                     <option value="3">待接收</option>
                     <option value="4">分配中</option>
@@ -17,6 +17,9 @@
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
+                    <option value="100">立项中</option>
+                    <option value="101">审核中</option>
+                    <option value="102">待接收</option>
                 </select>
             </div>
 

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

@@ -7,7 +7,7 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">立项中</option>
+                    <option value="1">财政局立项中</option>
                     <option value="2">审批中</option>
                     <option value="3">待接收</option>
                     <option value="4">分配中</option>
@@ -16,6 +16,9 @@
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
+                    <option value="100">立项中</option>
+                    <option value="101">审核中</option>
+                    <option value="102">待接收</option>
                 </select>
             </div>
 

app/admin/view/project/cost_proprietor/ceshi.html

@@ -0,0 +1,97 @@
+{extend name="common/base"/}
+
+{block name="style"}
+<style>
+    .footer{
+        display: none;
+    }
+    
+    .layui-input-block{
+        padding: 15px;
+    }
+    
+    .note{
+        padding: 0 0 0 15px;
+    }
+    
+    .button{
+        text-align: center;
+    }
+</style>
+{/block}
+
+<!-- 主体 -->
+{block name="body"}
+<div id="ID-test-layer-wrapper" >
+    <div style="height: 100px;display: flex;align-items: center;padding-left: 15px;">
+        <button class="layui-btn layui-btn layui-bg-blue" style="float: center;" type="button"
+            id="uploadBtn" >选择附件
+        <div>
+            
+        </div>
+    </div>
+    <form class="layui-form layui-form-pane" action="">
+      <div class="layui-form-item">
+      <div class="layui-form-item layui-form-text">
+        <div class="note">附件说明：</div>
+        <div class="layui-input-block">
+          <textarea name="remark" placeholder="请输入附件说明" class="layui-textarea"></textarea>
+        </div>
+      </div>
+      <div class="layui-form-item button">
+        <button class="layui-btn" lay-submit lay-filter="demo2" onclick="parent.location.reload();" value="刷新父页面">确认</button>
+        <button id="closeIframe" class="layui-btn layui-btn-primary">取消</button>
+      </div>
+    </form>
+</div>
+{/block}
+{block name="script"}
+<script>
+    const moduleInit = ['tool', 'oaTool'];
+    function gouguInit() {
+       var table = layui.table, tool = layui.tool, form = layui.form, oaTool = layui.oaTool;
+       let formData;
+        oaTool.addFile({
+          type: 1,
+          isSave: true,
+          ajaxSave: function (res) {
+            formData = res
+            if(res.code == 0 ){
+                layer.msg(res.msg)   
+            }
+          }
+        });
+        
+      
+        
+        var index = parent.layer.getFrameIndex(window.name);
+        $('#closeIframe').click(function(){
+            parent.layer.close(index);
+        });
+        form.on('submit(demo2)', function(data){
+          var field = data.field;  
+          let callback = function (e) {
+              if("msg" in e){
+                layer.msg(e.msg);
+              }else{
+                layer.msg('上传成功！')
+              }
+              setTimeout(function () {
+                parent.layer.close(index);
+                $("#filesBox2").load(location.href+" #filesBox>*","type=2")
+              }, 500)
+            }
+        //   console.log(field)
+            tool.post("/admin/project.api/add_file", {    // 上传附件
+              'topic_id': "{$detailId}",
+              'file_id': formData.data.id,
+              'file_name': formData.data.name,
+              'module': 'project',
+              'remark': field.remark
+            }, callback);
+          return false; // 阻止默认 form 跳转
+        });
+     
+    }
+</script>
+{/block}

app/admin/view/project/cost_proprietor/datalist.html

@@ -8,7 +8,7 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">立项中</option>
+                    <option value="1">财政局立项中</option>
                     <option value="2">审批中</option>
                     <option value="3">待接收</option>
                     <option value="4">分配中</option>
@@ -17,6 +17,9 @@
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
+                    <option value="100">立项中</option>
+                    <option value="101">审核中</option>
+                    <option value="102">待接收</option>
                 </select>
             </div>
 
@@ -141,7 +144,7 @@
 
                             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: #ffb800">财政局立项中</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 === 3) {

app/admin/view/project/cost_proprietor/edit.html

@@ -763,7 +763,7 @@
                     layer.msg(e.msg);
                     $('[lay-filter="webform"]').click();
                 }
-                tool.delete("/admin/project.api/delete_file_company", {id: id}, callback);
+                tool.delete("/admin/project.api/delete_file_proprietor", {id: id}, callback);
             });
         })
         layui.use(['form', 'jquery'], function () {

app/admin/view/project/cost_proprietor/edit_first.html

@@ -488,23 +488,21 @@
 
     <tr>
       <th colspan="9" class="forleft">相关附件
-        <button class="layui-btn layui-btn-xs layui-btn-danger" style="float: right;" type="button"
-                id="uploadBtn">上传附件
+        <!--<button class="layui-btn layui-btn-xs layui-btn-danger" style="float: right;" type="button"-->
+        <!--        id="uploadBtn">上传附件-->
+        <!--</button>-->
+        <!--<button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-on="page" style="float: right;">上传附件</button>-->
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-on="test-iframe-handle" style="float: right;">
+          上传附件
+          <span id="ID-test-iframe-mark"></span>
         </button>
       </th>
     </tr>
 
     <tr>
-      <th colspan="9" class="fujianimg" style="padding: 9px 0;">
+      <th colspan="9" class="fujianimg" style="padding: 0px 0px;">
         <div id="filesBox2">
-          <div class="filelist" id="filesBigBox">
-            <ul id="filesBox" style="overflow: scroll;">
-              {:fileCard($file_array)}
-            </ul>
-          </div>
-          {empty name="$file_array" }
-          <div class="layui-data-none">暂无附件</div>
-          {/empty}
+          <table class="layui-hide" id="get_file" lay-filter="get_file"></table>
         </div>
       </th>
     </tr>
@@ -872,7 +870,7 @@
                  res()
             }
         }
-        tool.delete("/admin/project.api/delete_file", {id: id}, callback);// 删除附件
+        tool.delete("/admin/project.api/delete_file_proprietor", {id: id}, callback);// 删除附件
         layer.close(index);
 
       });

app/admin/view/project/cost_proprietor/project_report.html

@@ -16,7 +16,7 @@
             title: '文档列表',
             toolbar: '#toolbarreport',
             cellMinWidth: 80,
-            url: "/admin/project.report/datalist",
+            url: "/admin/project.report/datalist_proprietor",
             where: {'project_id': project_id},
             page: true, //开启分页
             limit: 20,

app/mobile/controller/Index.php

@@ -842,7 +842,6 @@ class Index
                 $red_kan = 1;
             }
         }
-        // halt($real_list);
         View::assign("red_kan", $red_kan);
         View::assign("detail", $real_list);
         View::assign("red", $red);
@@ -1286,6 +1285,7 @@ class Index
         }
 
         $appointmentList = $this->AppointmentModel->where("project_id",$id)->paginate(9999, false, ['query' => $param])
+            ->order("create_time","desc")
             ->each(function ($item) {
                 if($item->sponsor_unit==get_login_admin("unit_name")){
                     $item->operate = false;
@@ -1312,6 +1312,7 @@ class Index
             View::assign('person', $person);
             View::assign('red', $red);
             View::assign('unit_type', $unit_type);
+
             return view();
         } else {
             throw new \think\exception\HttpException(404, '找不到页面');

app/mobile/view/index/detail.html

@@ -88,15 +88,22 @@
                                 <span style="width:12vw;font-weight:600;">
                                     {if $field.project_status}
                                     {switch $detail.project_status}
-                                    {case 1}<span style="color: #ffb800">立项中</span>{/case}
-                                    {case 2}<span style="color: #b30095">审批中</span>{/case}
-                                    {case 3}<span style="color: #ea8816">待接收</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 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 0}
+                                    {switch $detail.proprietor_status}
+                                    {case 0}立项中{/case}
+                                    {case 1}审核中{/case}
+                                    {case 2}待接收{/case}
+                                    {/switch}
+                                    {/case}
                                     {default /}未知
                                     {/switch}
                                     {/if}
@@ -109,6 +116,7 @@
                         </span>
                         <span style="width:12vw;">
                             <b>
+
                                 {switch $detail.report_status}
                                     {case 0}<span style="color: #ffb800">初稿中</span>{/case}
                                     {case 1}<span style="color: #005fa8">对数中</span>{/case}

app/mobile/view/index/kan_list.html

@@ -93,15 +93,22 @@
                                     <span>
                                         <b>
                                             {switch $vo.project_status}
-                                            {case 1}<span style="color: #ffb800">立项中</span>{/case}
-                                            {case 2}<span style="color: #b30095">审批中</span>{/case}
-                                            {case 3}<span style="color: #ea8816">待接收</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 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 0}
+                                            {switch $vo.proprietor_status}
+                                            {case 0}立项中{/case}
+                                            {case 1}审核中{/case}
+                                            {case 2}待接收{/case}
+                                            {/switch}
+                                            {/case}
                                             {default /}未知
                                             {/switch}
                                         </b>