费用报销-删除列表

application/index/controller/Cost.php

@@ -499,7 +499,7 @@ class Cost extends Basic
     }
 
     /**
-     * 删除费用报销列表
+     * 费用报销-删除列表
      *
      * @return \think\Response
      */
@@ -517,13 +517,13 @@ class Cost extends Basic
         $field .= 'b.name as agent_name,a.site_id';
         $where['is_del'] = 1;
         $list = $this->fee_model->getJoinAgentList($pageNo, $pageSize, 'a.id desc', $field, $where);
-        $data = [];
-        foreach($list as $v) {
-            $key = $fee_id[] = $v['id'];
-            $data[$key] = $v;
-            $data[$key]['type_name'] = $cost_service->getFeeType($v['type']);
-            $data[$key]['fee_item_name'] = $cost_service->getFeeItem($v['fee_item']);
-            $data[$key]['del_name'] = '';
+        $total = $this->fee_model->getJoinAgentListTotal($where);
+
+        foreach ($list as $k => $v) {
+            $fee_id[] = $v['id'];
+            $list[$k]['type_name'] = $cost_service->getFeeType($v['type']);
+            $list[$k]['fee_item_name'] = $cost_service->getFeeItem($v['fee_item']);
+            $list[$k]['del_name'] = '';
         }
 
         if (isset($fee_id)) {
@@ -531,10 +531,10 @@ class Cost extends Basic
             $log_where['apply_id'] = ['in', $fee_id];
             $log_where['type'] = 1;
             $log_data = $m_log->findColumn('apply_id,name', $log_where);
-            foreach($data as $k=>$v) {
-                $data[$k]['del_name'] = $log_data[$v['id']];
+            foreach ($list as $k => $v) {
+                $list[$k]['del_name'] = $log_data[$v['id']];
             }
         }
-        return $this->response(200, '', $data);
+        return $this->response(200, '', ['list' => $list, 'total' => $total]);
     }
 }
\ No newline at end of file

public/resource/js/delCost.js

@@ -16,7 +16,7 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 			var params = {};
 			params.pageNo = that.pageNo;
 			params.pageSize = that.pageSize ;
-			$.get("/index/getCostList",params,function(data){
+			$.get("/index/delCostList",params,function(data){
 				if(typeof data === 'object') {
 					if(data.code == 200) {
 						that.listData = data.data.list;

public/resource/template/cost_check_template_tpl.html

@@ -164,7 +164,7 @@
         [% } else { %]
         	<td>--</td>
         [% } %]
-        <td>[%= it[item]['payee_agent_name'] %]</td>
+        <td>[%= it[item]['del_name'] %]</td>
     </tr>
     [% } %]
     [% }else{ %]