问题解决

app/Service/DeviceService.php

@@ -148,7 +148,7 @@ class DeviceService extends Service
             if(! $res['valid']) return [false,'原始价值：' . $res['error']];
         }
         $res = $this->checkNumber($data['initial_value'],0,'positive');
-        if(! $res['valid']) return [false,'期初价值：' . $res['error']];
+        if(! $res['valid']) return [false,'期初原值：' . $res['error']];
         $data['top_depart_id'] = $user['top_depart_id'];
 
         if($is_add){

app/Service/EmployeeService.php

@@ -646,8 +646,8 @@ class EmployeeService extends Service
             if(mb_strlen($data['password']) < 6) return [false, '密码长度不得小于6位长度'];
             if(empty($data['role'])) return [false, '角色不能为空'];
         }
-        if(empty($data['man_type'])) return [false,'是否为技术研究人员不能为空'];
-        if(! isset(Employee::Man_Type[$data['man_type']])) return [false,'是否为技术研究人员不存在'];
+        if(empty($data['man_type'])) return [false,'是否技术人员不能为空'];
+        if(! isset(Employee::Man_Type[$data['man_type']])) return [false,'是否技术人员不存在'];
         if(! isset($data['entrust_type'])) return [false,'委托方式不能为空'];
         if(! isset(Employee::WT_Type[$data['entrust_type']])) return [false,'委托方式不存在'];
         $data['top_depart_id'] = $user['top_depart_id'];
@@ -854,7 +854,10 @@ class EmployeeService extends Service
 
         $update = $msg['data'][0];
         $model = new Depart();
-        $model->where('id',$data['id'])->update($update);
+        $model->where('id',$data['id'])->update([
+            'title' => $update['title'],
+            'code' => $update['code'],
+        ]);
 
         return [true, ''];
     }
@@ -989,7 +992,6 @@ class EmployeeService extends Service
 
         foreach ($data['data'] as $key => $value){
             $top_depart_id = $user['top_depart_id'];
-            $parent_id = $value['parent_id'];
             if(empty($value['parent_id'])) {
                 $parent_id = $top_depart_id;
                 $data['data'][$key]['parent_id'] = $parent_id;

app/Service/ItemService.php

@@ -413,11 +413,11 @@ class ItemService extends Service
             if ($item->type == ItemDetails::type_one) {
                 $emp = $empMap[$item->data_id] ?? null;
                 $detailRow['code_2'] = $emp ? $emp->number : '';
-                $detailRow['title']  = $emp ? $emp->title : '';
+                $detailRow['title_2']  = $emp ? $emp->title : '';
             } else {
                 $dev = $devMap[$item->data_id] ?? null;
                 $detailRow['code_2'] = $dev ? $dev->code : '';
-                $detailRow['title']  = $dev ? $dev->title : '';
+                $detailRow['title_2']  = $dev ? $dev->title : '';
             }
 
             // 归档到对应的主表 ID 下

config/excel/RDOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',

config/excel/dailyDwOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'order_time',

config/excel/dailyPwOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'order_time',

config/excel/depart.php

@@ -5,7 +5,7 @@ return [
         [
             'key' =>'code',
             'export' =>'code',
-            'value' => '编码',
+            'value' => '部门编码',
             'required' => true,
             'is_main' => true,
             'default' => "",
@@ -16,7 +16,7 @@ return [
         [
             'key' =>'title',
             'export' =>'title',
-            'value' => '名称',
+            'value' => '部门名称',
             'required' => true,
             'is_main' => true,
             'default' => "",

config/excel/device.php

@@ -5,7 +5,7 @@ return [
         [
             'key' =>'code',
             'export' =>'code',
-            'value' => '固定资产编码',
+            'value' => '资产编码',
             'required' => true,
             'is_main' => true,
             'default' => "",
@@ -27,7 +27,7 @@ return [
         [
             'key' =>'type',
             'export' =>'type_title',
-            'value' => '固定资产类别',
+            'value' => '类别',
             'required' => true,
             'is_main' => true,
             'default' => 0,
@@ -47,7 +47,7 @@ return [
         [
             'key' =>'size',
             'export' =>'size',
-            'value' => '规格型号',
+            'value' => '设备型号',
             'required' => false,
             'is_main' => true,
             'unique' => false,
@@ -56,7 +56,7 @@ return [
         [
             'key' =>'position',
             'export' =>'position',
-            'value' => '位置',
+            'value' => '设备位置',
             'required' => false,
             'is_main' => true,
             'unique' => false,
@@ -83,7 +83,7 @@ return [
         [
             'key' =>'initial_value',
             'export' =>'initial_value',
-            'value' => '期初价值',
+            'value' => '期初原值',
             'required' => true,
             'default' => 0,
             'unique' => false,

config/excel/employee.php

@@ -104,7 +104,7 @@ return [
         [
             'key' =>'man_type',
             'export' =>'man_type_title',
-            'value' => '是否为技术研究人员',
+            'value' => '是否技术人员',
             'required' => true,
             'is_main' => true,
             'unique' => false,

config/excel/fee.php

@@ -5,7 +5,7 @@ return [
         [
             'key' =>'code',
             'export' =>'code',
-            'value' => '编码',
+            'value' => '费用类型编码',
             'required' => true,
             'is_main' => true,
             'default' => "",
@@ -16,7 +16,7 @@ return [
         [
             'key' =>'title',
             'export' =>'title',
-            'value' => '名称',
+            'value' => '费用类型名称',
             'required' => true,
             'is_main' => true,
             'default' => "",

config/excel/feeOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',

config/excel/item.php

@@ -115,7 +115,7 @@ return [
         [
             'key' =>'mark',
             'export' =>'mark',
-            'value' => '项目说明',
+            'value' => '项目备注',
             'required' => false,
             'is_main' => true,
             'unique' => false,
@@ -146,8 +146,8 @@ return [
             'comments' => '必填（人员的工号或设备的资产编码）'
         ],
         [
-            'key' =>'title',
-            'export' =>'title',
+            'key' =>'title_2',
+            'export' =>'title_2',
             'value' => '名称',
             'required' => false,
             'is_main' => false,

config/excel/leaveOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'order_time',

config/excel/monthDdOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',

config/excel/monthDwOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',

config/excel/monthPsOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',

config/excel/monthPwOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',

config/excel/overtimeOrder.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'order_time',

config/excel/ruleSet.php

@@ -11,7 +11,7 @@ return [
             'default' => "",
             'unique' => false,
             'enums' => [],
-            'comments' => '（如果填写则是编辑）'
+            'comments' => '新增则不需要填写，如果填写则是编辑'
         ],
         [
             'key' =>'month',