1

application/api_broker/controller/User.php

@@ -335,7 +335,6 @@ class User extends Basic
     /**
      * 客户详情上一页下一页接口
      * @return \think\Response
-     * 朱伟 2018-08-07
      */
     public function getLastOrNextUserID()
     {

application/index/controller/Broker.php

@@ -612,7 +612,6 @@ class Broker extends Basic
 
     /**
      * 经纪人列表计算-评价次数和分数
-     * 朱伟 2018年07月03日
      */
     public function agentEvaluateNumAndFraction()
     {

application/index/controller/CostDetail.php

@@ -264,4 +264,76 @@ class CostDetail extends Basic
         return $store_result;
     }
 
+
+    /**
+     * 明细详情
+     * @return \think\Response
+     */
+    public function getCostInfo()
+    {
+        $params = $this->params;
+        /*        $params        = array(
+
+                );*/
+        $checkResult = $this->validate($params, "CostDetailValidate.getCostInfo");
+        if (true !== $checkResult) {
+            return $this->response("101", $checkResult);
+        }
+
+        $conditions["a.id"] = $params["id"];
+
+        $type = $params['type'];
+        switch ($type) {
+            case 0 :
+                //办公室成本';
+                $field = 'c.id as apply_id,b.operator_name,a.create_time,a.total_fee,a.type,a.fee_item,
+                a.purpose,c.source,c.status,c.card_no,c.card_name,c.bank,b.setting_date,a.store_attendance_num,
+                a.id,b.operator_id,a.assume_fee';
+
+                break;
+            case 1 :
+                //上海总部成本';
+
+
+                break;
+            case 2 :
+                //分部成本';
+
+
+                break;
+            case 3 :
+                //同联发展基金';
+
+
+                break;
+            case 4 :
+                //门店单独成本';
+
+
+                break;
+            default :
+                //暂无';
+
+        }
+
+        $list = $this->storeCostExt->getCostInfo($field,$conditions);
+        if(!$list)
+            return $this->response("101", "不存在该记录", []);
+
+        $list['type_name'] = $this->getTypeName($list['type']);
+        $list['fee_item_name'] = $this->getFeeItemName($list['fee_item']);
+        $list['store_name'] = $this->getStoreName($list['store_id']);
+
+        $list['history_list'] = $this->getHistoryList($list['store_id']);
+
+        $result["list"] = $list;
+        return $this->response("200", "success", $result);
+
+    }
+
+    public function getHistoryList($apply_id)
+    {
+
+    }
+
 }
\ No newline at end of file

application/index/controller/Finance.php

@@ -3647,7 +3647,6 @@ class Finance extends Basic
 
     /**
      * 收款列表-收款图片列表
-     * 朱伟 2018-07-04
      */
     public function receiptImgList(){
         $params = $this->params;
@@ -3724,7 +3723,6 @@ class Finance extends Basic
 
     /**
      * 收款列表-删除上传图片
-     * 朱伟 2018-07-04
      */
     public function deleteReceiptImg(){
         $params = $this->params;

application/index/controller/OfficePayLog.php

@@ -1068,7 +1068,6 @@ class OfficePayLog extends Basic
 
     /**
      * 收款列表记录上传图片
-     * 朱伟 2018-07-04
      */
     public function addReceiptOfficeImg(){
         $params = $this->params;
@@ -1406,7 +1405,6 @@ class OfficePayLog extends Basic
 
     /**
      * 收款列表-删除上传图片
-     * 朱伟 2018-07-04
      */
     public function deleteReceiptImg(){
         $params = $this->params;

application/index/controller/StoreFee.php

@@ -310,4 +310,7 @@ class StoreFee extends Basic
     }
 
 
+
+
+
 }
\ No newline at end of file

application/index/validate/CostDetailValidate.php

+<?php
+namespace app\index\validate;
+
+use think\Validate;
+
+class CostDetailValidate extends Validate {
+
+
+    protected $rule = [
+        'id'        => 'require|number|gt:0',
+        'type' => 'require|number|in:0,1,2',
+    ];
+
+    protected $message = [
+        'id.require'     => 'id为必填字段',
+        'id.number'      => 'id只能为数字',
+        'id.gt'          => 'id必须大于0',
+
+        'type.require'     => 'type为必填字段',
+        'type.number'      => 'type只能为数字',
+        'type.in'          => 'type范围错误',
+    ];
+
+    protected $scene = [
+        'getCostInfo'    => [ 'id', 'type'],
+    ];
+
+}
\ No newline at end of file

application/model/ACollectHouse.php

@@ -21,7 +21,6 @@ class ACollectHouse extends Model
 
     /**
      * 查询数据
-     * 朱伟 2018-07-04
      */
     public function getCollectHouse($field,$params)
     {
@@ -49,7 +48,6 @@ class ACollectHouse extends Model
 
     /**
      * 查询收藏数据
-     * 朱伟 2018-07-04
      */
     public function getCollectList($pageNo,$pageSize,$field,$params)
     {
@@ -88,7 +86,6 @@ class ACollectHouse extends Model
 
     /**
      * 更新数据
-     * 朱伟 2018-08-08
      */
     public function delCollectHouse($id)
     {

application/model/ACollectUser.php

@@ -20,7 +20,6 @@ class ACollectUser extends Model
 
     /**
      * 查询数据
-     * 朱伟 2018-07-04
      */
     public function getCollectUser($field,$params)
     {
@@ -47,7 +46,6 @@ class ACollectUser extends Model
 
     /**
      * 查询收藏数据
-     * 朱伟 2018-07-04
      */
     public function getCollectList($pageNo,$pageSize,$field,$params)
     {

application/model/ASite.php

@@ -10,7 +10,6 @@ class ASite extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function findByOne($field,$params) {
         $result = $this
@@ -37,7 +36,6 @@ class ASite extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function getSite($field,$params)
     {

application/model/Evaluate.php

@@ -168,7 +168,6 @@ class Evaluate extends Model
 
     /**
      * 经纪人列表计算-评价次数
-     * 朱伟 2018年07月03日
      */
     public function getAgentEvaluateNum($params = '')
     {

application/model/FApplyForFee.php

@@ -41,7 +41,6 @@ class FApplyForFee extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function findByOne($field,$params) {
         $result = $this->db_

application/model/FApplyForFeeCheck.php

@@ -32,7 +32,9 @@ class FApplyForFeeCheck extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
+     * @param $field
+     * @param $params
+     * @return array|false|\PDOStatement|string|Model
      */
     public function findByOne($field,$params) {
         $result = $this->db_

application/model/FCompanyData.php

@@ -32,7 +32,6 @@ class FCompanyData extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function findByOne($field,$params) {
         $result = $this->db_

application/model/FImg.php

@@ -81,7 +81,6 @@ class FImg extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function findByOne($field,$params) {
         $result = $this->db_

application/model/FSettingLog.php

@@ -32,7 +32,6 @@ class FSettingLog extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function findByOne($field,$params) {
         $result = $this->db_

application/model/FStoreCostExt.php

@@ -61,6 +61,25 @@ class FStoreCostExt extends BaseModel
         return $result;
     }
 
+    /**
+     * 成本详情
+     * @param $field
+     * @param $params
+     * @return array|false|\PDOStatement|string|Model
+     */
+    public function getCostInfo($field,$params)
+    {
+        $params["b.status"] = 0;
+        $result = $this->db_
+            ->field($field)
+            ->alias('a')
+            ->join('f_store_cost b', 'a.cost_id = b.id', 'left')
+            ->join('f_apply_for_fee c', 'a.apply_for_id = c.id', 'left')
+            ->where($params)
+            ->find();
+        return $result;
+    }
+
 
 
 

application/model/FStoreData.php

@@ -32,7 +32,6 @@ class FStoreData extends BaseModel
 
     /**
      * 查询单条数据
-     * 朱伟 2018-10-18 10:41:10
      */
     public function findByOne($field,$params) {
         $result = $this->db_

application/model/GBusinessDistrict.php

@@ -10,7 +10,6 @@ class GBusinessDistrict extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-10-17 14:58:36
      */
     public function getBusinessDistrict($field,$params)
     {

application/model/GOperatingRecords.php

@@ -97,7 +97,6 @@ class GOperatingRecords extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-11-22 14:56:47
      */
     public function getRecordsList($pageNo,$pageSize,$field,$params)
     {

application/model/OPayLogModel.php

@@ -409,7 +409,6 @@ class OPayLogModel extends Model
 
     /**
      * 收款列表-查询收款数据
-     * 朱伟 2018-07-04
      */
     public function selectReceiptImgList($filed, $params)
     {

application/model/OfficeACollectHouse.php

@@ -21,7 +21,6 @@ class OfficeACollectHouse extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-07-04
      */
     public function getCollectHouse($field,$params)
     {
@@ -49,7 +48,6 @@ class OfficeACollectHouse extends BaseModel
 
     /**
      * 查询收藏数据
-     * 朱伟 2018-07-04
      */
     public function getCollectList($pageNo,$pageSize,$field,$params)
     {
@@ -88,7 +86,6 @@ class OfficeACollectHouse extends BaseModel
 
     /**
      * 更新数据
-     * 朱伟 2018-08-08
      */
     public function delCollectHouse($id)
     {

application/model/OfficeOPayLogModel.php

@@ -413,7 +413,6 @@ class OfficeOPayLogModel extends Model
 
     /**
      * 收款列表-查询收款数据
-     * 朱伟 2018-07-04
      */
     public function selectReceiptImgList($filed, $params)
     {

application/model/OfficePhoneFollowUp.php

@@ -315,7 +315,6 @@ class OfficePhoneFollowUp extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-10-24
      */
     public function getPhoneFollowData($field,$params,$order)
     {

application/model/OfficeUPhoneFollowUp.php

@@ -182,7 +182,6 @@ class OfficeUPhoneFollowUp extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-10-24
      */
     public function getPhoneFollowData($field,$params,$order)
     {

application/model/RAgentReport.php

@@ -14,7 +14,6 @@ class RAgentReport extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-09-28
      */
     public function getPerformanceReportList($pageNo,$pageSize,$field,$params,$order)
     {

application/model/UPhoneFollowUp.php

@@ -312,7 +312,6 @@ class UPhoneFollowUp extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-10-24
      */
     public function getPhoneFollowData($field,$params,$order)
     {

application/model/UPhoneFollowUpTemporary.php

@@ -211,7 +211,6 @@ class UPhoneFollowUpTemporary extends BaseModel
 
     /**
      * 查询数据
-     * 朱伟 2018-10-24
      */
     public function getPhoneFollowData($field,$params,$order)
     {

application/route.php

@@ -334,9 +334,9 @@ Route::group('index', [
     'getPayLogData'     => ['index/Finance/getPayLogData', ['method' => 'GET']], //收款各种详情
     'getActivityCoupon' => ['index/Finance/getActivityCoupon', ['method' => 'GET']], //收款各种详情
 
-    'evaluationList'  => ['index/Evaluation/evaluationList', ['method' => 'POST|GET']], //评价列表 朱伟 2018-06-13
-    'marchInList'     => ['index/MarchIn/marchInList', ['method' => 'POST|GET']], //进场记录列表 朱伟 2018-06-13
-    'superviseList'   => ['index/Supervise/superviseList', ['method' => 'POST|GET']], //监督执行列表 朱伟 2018-06-14
+    'evaluationList'  => ['index/Evaluation/evaluationList', ['method' => 'POST|GET']], //评价列表 2018-06-13
+    'marchInList'     => ['index/MarchIn/marchInList', ['method' => 'POST|GET']], //进场记录列表2018-06-13
+    'superviseList'   => ['index/Supervise/superviseList', ['method' => 'POST|GET']], //监督执行列表2018-06-14
     'business_school' => ['index/news/index', ['method' => 'GET']], //商学院资讯列表
     'addNews'         => ['index/news/addNews', ['method' => 'POST']], //新增商学院资讯
     'getNewsInfo'     => ['index/news/getNewsInfo', ['method' => 'GET']], //商学院资讯详情
@@ -540,6 +540,7 @@ Route::group('index', [
 
     'getCostDetailList'      => [ 'index/CostDetail/getCostDetailList', [ 'method' => 'POST|GET' ] ],
     'getCostDetailListExcel' => [ 'index/CostDetail/getCostDetailListExcel', [ 'method' => 'POST|GET' ] ],
+    'getCostInfo'            => [ 'index/CostDetail/getCostInfo', [ 'method' => 'POST|GET' ] ],
 
 ]);