update

app/adminapi/lists/financial/FinancialExpenseReimbursementDetailLists.php

@@ -12,21 +12,22 @@
 // | author: likeadminTeam
 // +----------------------------------------------------------------------
 	
-namespace app\adminapi\lists\financial;
+	namespace app\adminapi\lists\financial;
 	
 	
-use app\adminapi\lists\BaseAdminDataLists;
+	use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\financial\FinancialExpenseReimbursementDetail;
+	use app\common\lists\ListsSearchInterface;
-use app\common\lists\ListsSearchInterface;
+	use app\common\model\dept\Dept;
+	use app\common\model\financial\FinancialExpenseReimbursementDetail;
 	
 	
-/**
+	/**
 	 * 财务管理--费用报销单--报销明细列表
 	 * Class FinancialExpenseReimbursementDetailLists
 	 * @package app\adminapi\listsfinancial
 	 */
-class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implements ListsSearchInterface
+	class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implements ListsSearchInterface
-{
+	{
 		
 		
 		/**
@@ -39,6 +40,7 @@ class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implem
 		{
 			return [
 				'=' => ['expense_reimbursement_id'],
+			
 			];
 		}
 		
@@ -58,7 +60,11 @@ class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implem
 				->field(['id', 'expense_reimbursement_id', 'dept_id', 'date', 'subject_name', 'amount', 'abstract'])
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
-            ->select()
+				->select()->each(function ($data) {
+					$dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
+					$data['dept_name'] = $dept['name'];
+					$data['subject_name_text'] = $data->subject_name_text;
+				})
 				->toArray();
 		}
 		
@@ -74,4 +80,4 @@ class FinancialExpenseReimbursementDetailLists extends BaseAdminDataLists implem
 			return FinancialExpenseReimbursementDetail::where($this->searchWhere)->count();
 		}
 		
-}
+	}

app/adminapi/logic/financial/FinancialExpenseReimbursementDetailLogic.php

@@ -16,6 +16,7 @@
 	
 	
 	use app\common\logic\BaseLogic;
+	use app\common\model\dept\Dept;
 	use app\common\model\financial\FinancialExpenseReimbursementDetail;
 	use think\facade\Db;
 	
@@ -46,9 +47,8 @@
 					'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
 					'subject_name' => $params['subject_name'],
 					'amount' => $params['amount'],
-					'abstract' => $params['abstract'],
+					'abstract' => $params['abstract'] ?? '',
 				]);
-				
 				Db::commit();
 				return true;
 			} catch (\Exception $e) {
@@ -73,12 +73,12 @@
 				FinancialExpenseReimbursementDetail::where('id', $params['id'])->update([
 					'expense_reimbursement_id' => $params['expense_reimbursement_id'],
 					'dept_id' => $params['dept_id'],
-					'date' => $params['date'],
+					'date' => !empty($params['date']) ? strtotime($params['date']) : 0,
 					'subject_name' => $params['subject_name'],
 					'amount' => $params['amount'],
-					'abstract' => $params['abstract'],
+					'abstract' => $params['abstract'] ?? '',
+					'update_time' => time(),
 				]);
-				
 				Db::commit();
 				return true;
 			} catch (\Exception $e) {
@@ -111,6 +111,10 @@
 		 */
 		public static function detail($params): array
 		{
-			return FinancialExpenseReimbursementDetail::findOrEmpty($params['id'])->toArray();
+			$data = FinancialExpenseReimbursementDetail::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']);
+			$dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
+			$data['dept_name'] = $dept['name'];
+			$data['subject_name_text'] = $data->subject_name_text;
+			return $data->toArray();
 		}
 	}

app/common/model/financial/FinancialExpenseReimbursementDetail.php

@@ -12,23 +12,34 @@
 // | author: likeadminTeam
 // +----------------------------------------------------------------------
 	
-namespace app\common\model\financial;
+	namespace app\common\model\financial;
 	
 	
-use app\common\model\BaseModel;
+	use app\common\model\BaseModel;
-use think\model\concern\SoftDelete;
+	use app\common\model\dict\DictData;
+	use think\model\concern\SoftDelete;
 	
 	
-/**
+	/**
 	 * 财务管理--费用报销单--报销明细模型
 	 * Class FinancialExpenseReimbursementDetail
 	 * @package app\common\model\financial
 	 */
-class FinancialExpenseReimbursementDetail extends BaseModel
+	class FinancialExpenseReimbursementDetail extends BaseModel
-{
+	{
 		use SoftDelete;
+		
 		protected $name = 'financial_expense_reimbursement_detail';
 		protected $deleteTime = 'delete_time';
 		
+		public function getDateAttr($value): string
+		{
+			return !empty($value) ? date('Y-m-d', $value) : '';
+		}
 		
-}
+		public function getSubjectNameTextAttr($value, $data)
+		{
+			$dict = DictData::where('type_value', 'subject_category')->column('name', 'value');
+			return !empty($data['subject_name']) ? $dict[$data['subject_name']] : '';
+		}
+	}