caiping

app/admin/controller/Pushmessage.php

@@ -143,7 +143,6 @@ class Pushmessage{
                 $arr[2] = 2;
             }
             $param['is_who'] = implode(',', $arr);
-            // halt($param);
             $data = [
                 'id' => $param['id'],
                 'title' => $param['title'],

app/admin/controller/project/Audit.php

@@ -160,7 +160,7 @@ 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) {
 
@@ -309,8 +309,8 @@ class Audit extends BaseController
         $id = isset($param['id']) ? $param['id'] : 0;
 
         $detail = $this->model->getCostProjectById($id);
-
         $comment = Db::name("project_comment")->where("project_id", $id)->order('create_time', 'desc')->select();
+
         $file_array = Db::name('ProjectFile')
             ->field('mf.id,mf.topic_id,mf.admin_id,f.name,f.filesize,f.filepath,f.fileext,f.create_time,f.admin_id,a.nickname as admin_name')
             ->alias('mf')
@@ -2413,7 +2413,7 @@ class Audit extends BaseController
                 $this->model->update(["id" => $project_id, "proprietor_status" => 2]);//改为待接收
 
             }
-            $this->model->update(["id" => $project_id, "proprietor_status" => 2]);
+//            $this->model->update(["id" => $project_id, "proprietor_status" => 2]);
 
             $sponsor_id = $this->Auditmodel->where('id', $id)->value('sponsor_id');
             // $fiscal_nature = Db::name('CostProject')->where('project_id', $project_id)->value('fiscal_nature');

app/admin/controller/project/Comment.php

@@ -64,13 +64,14 @@ class Comment extends BaseController
 
 
         function get_unit_id($uint_id){
+//            halt($uint_id);
             $id = Db::name("department")->where("id",$uint_id)->field("id,pid")->find();
+
+//            halt($id);
             $pid = $id["pid"];
             if($pid == 0 ){
                 return $id["id"];
             }else{
-
-
                 return get_unit_id($id["pid"]);
             }
         }
@@ -78,6 +79,7 @@ class Comment extends BaseController
                 $param["thumb"] = cleanHtml($param["thumb"]);
         }
         $uint_id =  get_login_admin("unit_name");
+
         $unit = Db::name("department")->where("id",get_unit_id($uint_id))->field("title,type")->find();
         $param["unit_name"] = $unit["title"];
         $param["unit_type"] = $unit["type"];

app/admin/middleware/Auth.php

@@ -109,14 +109,15 @@ class Auth
 
             $uid = Session::get($session_admin)['id'];
 
-//            halt($uid);
+
             // 检查上次密码更换时间
             $lastPasswordChange = Db::name('Admin')->where('id', $uid)->value('last_password_change');
 
-            if ($lastPasswordChange) {
+            if ($lastPasswordChange && $pathInfo != "api/edit_password.") {
+
                 $daysSinceLastChange = (time() - strtotime($lastPasswordChange)) / (60 * 60 * 24);
                 if ($daysSinceLastChange > 180) {
-                    $this->apiError('您的密码已超过180天未更换，请重置密码后再登录。');
+                    redirect('/admin/api/edit_password.html')->send();
                 }
             }
             //验证用户访问权限

app/admin/view/project/approval/project_overview.html

@@ -66,6 +66,13 @@
                 {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}
             </th>

app/admin/view/project/audit/project_overview.html

@@ -66,6 +66,13 @@
                 {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}
             </th>

app/admin/view/project/audit_company/project_overview.html

@@ -66,6 +66,13 @@
                 {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}
             </th>

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

@@ -635,6 +635,13 @@
         {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}
       </th>

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

@@ -106,6 +106,13 @@
                 {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}
             </th>

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

@@ -399,6 +399,13 @@
                 {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}
             </th>

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

@@ -117,6 +117,13 @@
                 {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}
             </th>

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

@@ -417,7 +417,7 @@
                 </select>
             </th>
 
-            <th class="form-title">审批人（二）<font style="color: red !important;">*</font></th>
+            <th class="form-title">审批人（二）</th>
             <th colspan="2">
                 <select name="sent_review_second_approver" lay-reqText="请选择第一审批人">
                     <option value="">请选择第二审批人(可选)</option>

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

@@ -166,7 +166,7 @@
                                 }else if(item.proprietor_status===2){
                                     html = '<span class="layui-badge layui-bg-orange" style="background-color: #ffb800">待接收</span> '
                                 }
-                                
+
                             }
                             return html;
                         }

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

@@ -425,7 +425,7 @@
 
       <th class="form-title">送审金额 <font style="color: red !important;">*</font></th>
       <th colspan="2">
-          <input type="text" id="sent_review_amount" name="sent_review_amount"  autocomplete="off" placeholder="请输入送审金额" class="layui-input">
+          <input type="text" id="sent_review_amount" value="{$detail.sent_review_amount}" name="sent_review_amount"  autocomplete="off" placeholder="请输入送审金额" class="layui-input">
       </th>
     </tr>
 
@@ -472,7 +472,7 @@
           {/volist}
         </select>
       </th>
-      <th class="form-title">审批人（二）<font style="color: red !important;">*</font></th>
+      <th class="form-title">审批人（二）</th>
       <th colspan="2">
         <select name="sent_review_second_approver"  lay-reqText="请选择审批人">
           <option value="">请选择第二审批人(可选)</option>
@@ -557,6 +557,13 @@
         {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}
       </th>
@@ -942,14 +949,14 @@
       rangeLinked: true
     });
 
-    var selectedNature = $('input[name="fiscal_nature"]:checked').val();
-    if (selectedNature  == "财政资金") {
-      $(".entrust_unit").show();
-      $(".review_unit").hide();
-    } else {
-      $(".review_unit").show();
-      $(".entrust_unit").hide();
-    }
+    // var selectedNature = $('input[name="fiscal_nature"]:checked').val();
+    // if (selectedNature  == "财政资金") {
+    //   $(".entrust_unit").show();
+    //   $(".review_unit").hide();
+    // } else {
+    //   $(".review_unit").show();
+    //   $(".entrust_unit").hide();
+    // }
     //radio选择
     form.on('radio(tax)', function (data) {
 

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

@@ -36,7 +36,7 @@
         width: fit-content;
         margin: 0.3vw 1.5vw 1vw 1.5vw;
         padding: 0.5vw 0vw;
-        text-indent: 1.2em;
+        text-indent: 1.2em
         line-height: 2.1vh;
         background-color: rgb(255, 255, 255);
         border-radius: 0.5vw;

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

@@ -68,6 +68,13 @@
                 {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}
             </th>