修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -87,7 +87,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
     private ExcelExportService excelExportService;
     @Resource
     private ExpenseMainTypeService expenseMainTypeService;
-    public static final String[] sheetTypes = {"一般费用","差旅费","外包费用"};
+
     @Override
     public HttpRespMsg add(ExpenseSheet sheet, String items, String userId) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -140,6 +140,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     List<User> targetUserList = userMapper.selectList(new QueryWrapper<User>().in("role_id", targetRoleIds));
                     String corpUserString = targetUserList.stream().map(tl -> tl.getCorpwxUserid()).collect(Collectors.joining("|"));
                     User targetUser = userMapper.selectById(sheet.getOwnerId());
+                    ExpenseMainType mainType = expenseMainTypeService.getById(sheet.getType());
                     //推送到企业微信
                     JSONObject json=new JSONObject();
                     JSONArray dataJson=new JSONArray();
@@ -151,7 +152,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     jsonObj1.put("value",sheet.getCreateDate());
                     JSONObject jsonObj2=new JSONObject();
                     jsonObj2.put("key", "票据类型");
-                    jsonObj2.put("value",sheetTypes[sheet.getType()]);
+                    jsonObj2.put("value",mainType.getName());
                     JSONObject jsonObj3=new JSONObject();
                     jsonObj3.put("key", "金额");
                     jsonObj3.put("value",sheet.getTotalAmount());

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

@@ -84,7 +84,7 @@
             <el-form-item :label="$t('invoicenumber')">
               <el-input v-model="addForm.ticketNum" style="width: 150px"></el-input>
             </el-form-item>
-            <!-- 费用类型 -->
+            <!-- 费用主类型 -->
             <el-form-item :label="'费用主类型'">
               <el-select v-model="expenseMainTypeValue"  style="width: 150px" @change="this.getExpList">
                 <el-option
@@ -221,7 +221,7 @@
             <el-form-item :label="$t('receiptnumber')" >
               <el-input v-model="code" size="small" :placeholder="$t('receiptnumber')" clearable="true" style="width: 120px"></el-input>
             </el-form-item>
-            <!-- 费用类型 -->
+            <!-- 费用主类型 -->
             <el-form-item :label="'费用主类型'">
               <el-select size="small" v-model="expenseMainTypeValue"  style="width: 150px">
                 <el-option
@@ -733,8 +733,9 @@ export default {
     this.getUsers() // 获取人员信息
     this.getList() // 获取单据列表
     this.getProjectList();
-    this.getExpList();
     this.getExpensMainTypes();
+    this.getExpList();
+    
   },
   filters: {
       numberToCurrency(value) {
@@ -1050,6 +1051,7 @@ export default {
                 this.customTypeList = res.data
                 this.addForm.type=this.expenseMainTypeValue
                 this.expenseTypeList = this.allExpList.filter(a=>a.mainType == this.expenseMainTypeValue);
+                this.invoiceList=[]
                 if(!res.data != res.data.length == 0){
                   this.http.post('/company/settingExpenseType',{},res => {
                     if(res.code == 'ok'){}else{this.$message({message: res.msg,type: 'error'})}
@@ -1079,6 +1081,7 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.expenseMainTypes=res.data
+                this.expenseMainTypeValue=this.expenseMainTypes[0].id
             } else {
                 this.$message({
                 message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -216,20 +216,6 @@
                             <!-- <div style="display: inline-block;margin: 0 10px 0 20px" v-if="timeType.alertTime">周末节假日提醒</div> -->
                             <!-- <el-switch v-if="timeType.alertTime" v-model="timeType.alertNonWorkday" active-color="#13ce66" inactive-color="#ff4949"></el-switch> -->
                     </el-form-item>
-
-                    <el-form-item :label="$t('checkRemindertime') " prop="waitCheckAlertTime" style="width:100%">
-                        <el-time-picker 
-                                v-model="timeType.waitCheckAlertTime"
-                                :placeholder="$t('checkRemindertime')"
-                                style="width:150px;"
-                                format="HH:mm"
-                                value-format="HH:mm"
-                                :picker-options="{
-                                start: '08:00',
-                                end: '23:30'
-                                }">
-                            </el-time-picker>
-                    </el-form-item>
                     
                     </el-form>
                     <div class="underpanel">
@@ -245,6 +231,20 @@
                             </el-tag>
                         </div>
                     </div>
+                    <div style="width:100%">
+                        <span style="color: #606266;margin-right: 5px">审核提醒时间</span>
+                        <el-time-picker 
+                                v-model="timeType.waitCheckAlertTime"
+                                :placeholder="$t('checkRemindertime')"
+                                style="width:150px;"
+                                format="HH:mm"
+                                value-format="HH:mm"
+                                :picker-options="{
+                                start: '08:00',
+                                end: '23:30'
+                                }">
+                            </el-time-picker>
+                    </div>
                 </div>
             </el-col>
         </el-row>