WIN-2308041133\Administrator 4 days ago
parent
commit
b5fa7803c8
2 changed files with 16 additions and 9 deletions
  1. 14 9
      app/system/controller/Contract.php
  2. 2 0
      app/system/route/contract.php

+ 14 - 9
app/system/controller/Contract.php

@@ -153,7 +153,7 @@ class Contract extends BaseController
      */
     public function getContractInfo(Request $request) {
         [$id] = UtilService::getMore([
-            ['id','','empty','参数错误']
+            ['id','']
         ],$request,true);
         $adminInfo = UserContractRecordModel::get(compact('id'));
         return app('json')->success([
@@ -177,11 +177,16 @@ class Contract extends BaseController
             'balance' => $adminInfo['balance'],
             'content' => $adminInfo['content'],
             'period' => $adminInfo['period'],
-            'start_time' => date('Y-m-d H:i:s', $adminInfo['start_time']),
-            'end_time' => date('Y-m-d H:i:s', $adminInfo['end_time']),
-            'create_time' => date('Y-m-d H:i:s', $adminInfo['create_time']),
-            'delete_time' => date('Y-m-d H:i:s', $adminInfo['delete_time']),
-            'check_time' => date('Y-m-d H:i:s', $adminInfo['check_time']),
+            'start_time' =>$adminInfo['start_time'],
+            'end_time' =>$adminInfo['end_time'],
+            'create_time' =>$adminInfo['create_time'],
+            'delete_time' =>$adminInfo['delete_time'],
+            'check_time' =>$adminInfo['check_time'],
+//            'start_time' => date('Y-m-d H:i:s', $adminInfo['start_time']),
+//            'end_time' => date('Y-m-d H:i:s', $adminInfo['end_time']),
+//            'create_time' => date('Y-m-d H:i:s', $adminInfo['create_time']),
+//            'delete_time' => date('Y-m-d H:i:s', $adminInfo['delete_time']),
+//            'check_time' => date('Y-m-d H:i:s', $adminInfo['check_time']),
 //            'template_id' => $adminInfo['template_id'],
 
         ]);
@@ -197,7 +202,7 @@ class Contract extends BaseController
             [
                 ['page', 1],
                 ['uid',0],  //员工uid
-                ['nickname',''], //名
+                ['nickname',''], //员工
                 ['contract_id', ''], //签约id
                 ['time',[]],
             ], $request
@@ -273,8 +278,8 @@ class Contract extends BaseController
         $post = UtilService::getMore(
             [
                 ['page', 1],
-                ['uid',0],  //员工uid
-                ['to_uid',''], //名称
+                ['uid',0],  //甲方
+                ['to_uid',''], //乙方
                 ['contract_no', ''], //签约id
                 ['time',[]],
             ], $request

+ 2 - 0
app/system/route/contract.php

@@ -16,6 +16,8 @@ Route::group('contract', function () {
     Route::post('UserClockList', 'contract/UserClockList');
 //    合同列表
     Route::post('ContractRecordList', 'contract/ContractRecordList');
+    //    合同详情
+    Route::post('getContractInfo', 'contract/getContractInfo');
 //    评论列表
     Route::post('contractCommentList', 'contract/contractCommentList');