Commit 0fff9cca authored by clone's avatar clone

1

parent 6401a0c2
...@@ -34,11 +34,11 @@ class StoreFee extends Basic ...@@ -34,11 +34,11 @@ class StoreFee extends Basic
public function creationStoreFee() public function creationStoreFee()
{ {
$params = $this->params; $params = $this->params;
$params = array( /* $params = array(
"setting_date" => "2019-06-01", "setting_date" => "2019-06-01",
"agent_id" => 1, "agent_id" => 1,
); );*/
if (!$params["setting_date"] || !$params["agent_id"]) { if (!$params["setting_date"] || !$params["agent_id"]) {
return $this->response("101", "请求参数错误 "); return $this->response("101", "请求参数错误 ");
} }
......
...@@ -87,12 +87,14 @@ class FApplyForFee extends BaseModel ...@@ -87,12 +87,14 @@ class FApplyForFee extends BaseModel
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getApplyForFeeList($field,$params){ public function getApplyForFeeList($field,$params){
return $this->db_ $result = $this->db_
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("a_store b","a.store_id = b.id","left") ->join("a_store b","a.store_id = b.id","left")
->where($params) ->where($params)
->select(); ->select();
// echo $this->db_->getLastSql();
return $result;
} }
/** /**
......
...@@ -24,6 +24,7 @@ class FStoreCostExt extends BaseModel ...@@ -24,6 +24,7 @@ class FStoreCostExt extends BaseModel
Db::commit(); Db::commit();
return 1; return 1;
} catch (\Exception $e) { } catch (\Exception $e) {
dump($e);
Db::rollback(); Db::rollback();
return 0; return 0;
} }
......
...@@ -550,6 +550,7 @@ Route::group('index', [ ...@@ -550,6 +550,7 @@ Route::group('index', [
'getApplyForFeeStore' => ['index/StoreFee/getApplyForFeeStore', ['method' => 'GET']],//获取费用承担办公室 'getApplyForFeeStore' => ['index/StoreFee/getApplyForFeeStore', ['method' => 'GET']],//获取费用承担办公室
'addFeeImage' => ['index/StoreFee/addFeeImage', ['method' => 'POST']],//新增报销申请图片 'addFeeImage' => ['index/StoreFee/addFeeImage', ['method' => 'POST']],//新增报销申请图片
'getStoreOffice' => ['index/Store/getStoreOffice', ['method' => 'GET']],//获取费用承担办公室 'getStoreOffice' => ['index/Store/getStoreOffice', ['method' => 'GET']],//获取费用承担办公室
'creationStoreFee' => [ 'index/StoreFee/creationStoreFee', [ 'method' => 'POST|GET' ] ],
'getStoreCostParameterList' => [ 'index/CostParameter/getStoreCostParameterList', [ 'method' => 'POST|GET' ] ], 'getStoreCostParameterList' => [ 'index/CostParameter/getStoreCostParameterList', [ 'method' => 'POST|GET' ] ],
'editCostParameter' => [ 'index/CostParameter/editCostParameter', [ 'method' => 'POST|GET' ] ], 'editCostParameter' => [ 'index/CostParameter/editCostParameter', [ 'method' => 'POST|GET' ] ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment