费用报销补充提交

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseMainTypeController.java

@@ -132,20 +132,48 @@ public class ExpenseMainTypeController {
             expenseMainTypes.add(expenseMainType1);
             expenseMainTypes.add(expenseMainType2);
             expenseMainTypeService.saveBatch(expenseMainTypes);
-            List<ExpenseType> expenseTypeList = expenseTypeMapper.selectList(new QueryWrapper<ExpenseType>().eq("company_id", company.getId()).eq("main_type", 10));
+            List<ExpenseType> expenseTypeList = expenseTypeMapper.selectList(new QueryWrapper<ExpenseType>().eq("company_id", company.getId()).eq("main_type",1111111 ));
             expenseTypeList.forEach(et->{
                 et.setMainType(expenseMainType.getId());
             });
-            List<ExpenseSheet> expenseSheetList = expenseSheetMapper.selectList(new QueryWrapper<ExpenseSheet>().eq("company_id", company.getId()).eq("type", 10));
+            List<ExpenseSheet> expenseSheetList = expenseSheetMapper.selectList(new QueryWrapper<ExpenseSheet>().eq("company_id", company.getId()).eq("type",1111111 ));
             expenseSheetList.forEach(es->{
                 es.setType(expenseMainType.getId());
             });
+            List<ExpenseType> expenseTypeList1 = expenseTypeMapper.selectList(new QueryWrapper<ExpenseType>().eq("company_id", company.getId()).eq("main_type",2222222 ));
+            expenseTypeList1.forEach(et->{
+                et.setMainType(expenseMainType1.getId());
+            });
+            List<ExpenseSheet> expenseSheetList1 = expenseSheetMapper.selectList(new QueryWrapper<ExpenseSheet>().eq("company_id", company.getId()).eq("type",2222222 ));
+            expenseSheetList1.forEach(es->{
+                es.setType(expenseMainType1.getId());
+            });
+            List<ExpenseType> expenseTypeList2 = expenseTypeMapper.selectList(new QueryWrapper<ExpenseType>().eq("company_id", company.getId()).eq("main_type",3333333 ));
+            expenseTypeList2.forEach(et->{
+                et.setMainType(expenseMainType2.getId());
+            });
+            List<ExpenseSheet> expenseSheetList2 = expenseSheetMapper.selectList(new QueryWrapper<ExpenseSheet>().eq("company_id", company.getId()).eq("type",4444444 ));
+            expenseSheetList2.forEach(es->{
+                es.setType(expenseMainType2.getId());
+            });
             if(expenseSheetList.size()>0){
                 expenseSheetService.updateBatchById(expenseSheetList);
             }
             if(expenseTypeList.size()>0){
                 expenseTypeService.updateBatchById(expenseTypeList);
             }
+            if(expenseSheetList1.size()>0){
+                expenseSheetService.updateBatchById(expenseSheetList1);
+            }
+            if(expenseTypeList1.size()>0){
+                expenseTypeService.updateBatchById(expenseTypeList1);
+            }
+            if(expenseSheetList2.size()>0){
+                expenseSheetService.updateBatchById(expenseSheetList2);
+            }
+            if(expenseTypeList2.size()>0){
+                expenseTypeService.updateBatchById(expenseTypeList2);
+            }
         }
         return new HttpRespMsg();
     }

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -206,7 +206,7 @@
       <div v-if="displayTable">
         <div style="padding-left:10px;padding-right:10px;">
           <div>
-          <el-form label-width="70px" inline >
+          <el-form label-width="100px" inline >
             <!-- 报销人 -->
             <el-form-item :label="$t('peopleconcerned')">
               <el-select v-if="user.userNameNeedTranslate != '1'" v-model="ownerId" size="small" clearable :placeholder="$t('selecttheapplicant')" style="width: 120px" :disabled="!permissions.costAudit" filterable="true">