cqp il y a 2 mois
Parent
commit
e9c0a5fbf8

+ 2 - 2
app/Service/ExpenseClaimsService.php

@@ -135,7 +135,7 @@ class ExpenseClaimsService extends Service
         $monthStart = $data['month'];
         // 获取该月最后一秒:下个月 1 号减去 1 秒
         $monthEnd = strtotime('+1 month', $monthStart) - 1;
-        if(empty($data['details'])) return [false, '项目费用报销单详情不能为空'];
+        if(empty($data['details'])) return [false, '费用项目单详情不能为空'];
         foreach ($data['details'] as $index => $item) {
             if(empty($item['item_id'])) return [false, "第" . ($index + 1) . "行项目不能为空"];
             if(empty($item['fee_id'])) return [false, "第" . ($index + 1) . "行费用类型不能为空"];
@@ -160,7 +160,7 @@ class ExpenseClaimsService extends Service
             $query->where('id', '<>', $data['id']);
         }
 
-        if ($query->exists())  return [false, date("Y-m", $monthStart) . '已存在项目费用报销单'];
+        if ($query->exists())  return [false, date("Y-m", $monthStart) . '已存在费用项目单'];
 
         return [true,""];
     }

+ 2 - 2
app/Service/ImportService.php

@@ -42,7 +42,7 @@ class ImportService extends Service
         'dailyDwOrder', // 设备日工时单
         'leaveOrder', // 请假单
         'overtimeOrder', // 加班单
-        'feeOrder', // 项目费用报销
+        'feeOrder', // 费用项目
         'RDOrder', // 研发支出辅助帐
     ];
 
@@ -3601,7 +3601,7 @@ class ImportService extends Service
         return [!empty($errors) ? implode('|', $errors) : "", $update_map, $dbEmps];
     }
 
-    // 项目费用报销单月度导入 ------------------------------
+    // 费用项目单月度导入 ------------------------------
     public function feeOrderImport($array, $user, $other_param)
     {
         $upload = $array[0];

+ 1 - 1
config/excel/feeOrder.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    "name" => "项目费用报销单",
+    "name" => "费用项目单",
     "array" => [
         [
             'key' =>'code',