页面不对，待调试

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

@@ -0,0 +1,63 @@
+package com.management.platform.controller;
+
+
+import com.management.platform.entity.ExpenseAuditSetting;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.ExpenseAuditSettingService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-20
+ */
+@RestController
+@RequestMapping("/expense-audit-setting")
+public class ExpenseAuditSettingController {
+
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    private ExpenseAuditSettingService expenseAuditSettingService;
+    @Resource
+    private UserMapper userMapper;
+
+    @RequestMapping("get")
+    public HttpRespMsg get() {
+        HttpRespMsg msg = new HttpRespMsg();
+        String token = request.getHeader("Token");
+        User user = userMapper.selectById(token);
+        Integer companyId = user.getCompanyId();
+        ExpenseAuditSetting byId = expenseAuditSettingService.getById(companyId);
+        if (byId == null) {
+            //给默认值
+            byId = new ExpenseAuditSetting();
+            byId.setCompanyId(companyId);
+            byId.setAuditType(0);
+        }
+        msg.data = byId;
+        return msg;
+    }
+
+    @RequestMapping("update")
+    public HttpRespMsg update(ExpenseAuditSetting setting) {
+        HttpRespMsg msg = new HttpRespMsg();
+        String token = request.getHeader("Token");
+        User user = userMapper.selectById(token);
+        Integer companyId = user.getCompanyId();
+        setting.setCompanyId(companyId);
+        expenseAuditSettingService.saveOrUpdate(setting);
+        return msg;
+    }
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ExpenseAuditSetting.java

@@ -0,0 +1,44 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ExpenseAuditSetting extends Model<ExpenseAuditSetting> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 公司id
+     */
+    @TableId("company_id")
+    private Integer companyId;
+
+    /**
+     * 0-统一审核人（由权限模块控制）， 1-项目经理审核
+     */
+    @TableField("audit_type")
+    private Integer auditType;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.companyId;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ExpenseAuditSettingMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ExpenseAuditSetting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-20
+ */
+public interface ExpenseAuditSettingMapper extends BaseMapper<ExpenseAuditSetting> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ExpenseAuditSetting;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-20
+ */
+public interface ExpenseAuditSettingService extends IService<ExpenseAuditSetting> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ExpenseAuditSetting;
+import com.management.platform.mapper.ExpenseAuditSettingMapper;
+import com.management.platform.service.ExpenseAuditSettingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2023-07-20
+ */
+@Service
+public class ExpenseAuditSettingServiceImpl extends ServiceImpl<ExpenseAuditSettingMapper, ExpenseAuditSetting> implements ExpenseAuditSettingService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ExpenseAuditSettingMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ExpenseAuditSettingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ExpenseAuditSetting">
+        <id column="company_id" property="companyId" />
+        <result column="audit_type" property="auditType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        company_id, audit_type
+    </sql>
+
+</mapper>

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

@@ -93,9 +93,6 @@
                 :label="item.name"
                 :value="item.id"
                 ></el-option>
-                <!-- <el-option :label="$t('yi-ban')" :value="0"></el-option>
-                <el-option :label="$t('cha-lv')" :value="1"></el-option>
-                <el-option :label="$t('wai-bao')" :value="2"></el-option> -->
               </el-select>
             </el-form-item>
             
@@ -223,7 +220,7 @@
             </el-form-item>
             <!-- 费用主类型 -->
             <el-form-item :label="'费用主类型'">
-              <el-select size="small" v-model="expenseMainTypeValue"  style="width: 150px">
+              <el-select size="small" v-model="queryExpenseMainType"  style="width: 150px" clearable placeholder="全部类型">
                 <el-option
                 v-for="item in expenseMainTypes"
                 :key="item.id"
@@ -321,11 +318,12 @@
 
           <!--工具条-->
           <el-col :span="24" class="toolbar">
-              <el-pagination
+              <el-pagination key="expenseListTblPager"
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :page-sizes="[20 , 50 , 80 , 100]"
                   :page-size="20"
+                  :current-page.sync="page"
                   layout="total, sizes, prev, pager, next"
                   :total="total"
                   style="float:right;"
@@ -519,7 +517,7 @@
 
 
         <!-- 主费用类型自定义 -->
-        <el-dialog :title="费用类型大类管理" v-if="expenseTypeDialog" :visible.sync="expenseTypeDialog" customClass="customWidth" width="600px">
+        <el-dialog title="费用类型大类管理" v-if="expenseTypeDialog" :visible.sync="expenseTypeDialog" customClass="customWidth" width="600px">
           <el-table :data="expenseMainTypes" style="width:100%" height="400" :loading="expenseTypeListLoading">
             <el-table-column :label="'类型名称'" min-width="150">
               <template slot-scope="scope">
@@ -821,6 +819,7 @@ export default {
   props: {},
   data() {
     return {
+      queryExpenseMainType: null,
       denyReasonDialog: false,
       denyForm:{
         reason: '',
@@ -1348,7 +1347,6 @@ export default {
     },
     bills(audit) { // 控制
       this.isAuditList = audit;
-      this.getList();
       this.displayTable = true;
     },
     present(){
@@ -1531,7 +1529,7 @@ export default {
                     startDate: stat,
                     endDate: end,
                     ownerId:this.ownerId,
-                    type:this.expenseMainTypeValue,
+                    type:this.queryExpenseMainType,
                     };
       if (this.isAuditList) {
         param.status = 1;
@@ -1685,6 +1683,7 @@ export default {
     //分页
     handleCurrentChange(val) {
         this.page = val;
+        console.log('page=======',this.page);
         this.getList();
     },
 
@@ -1914,7 +1913,7 @@ export default {
         const sums = [];
         columns.forEach((column, index) => {
           if (index === 0) {
-            sums[index] = this.$t('other.totals');
+            sums[index] = '本页金额合计';//this.$t('other.totals');
             return;
           }
           if(index === 1) {
@@ -1931,6 +1930,7 @@ export default {
               var zhi = +sums[index] + 0
               var sl = zhi.toFixed(2)
               sl += this.$t('yuan');
+              sums[index] = sl;
             } else {
               sums[index] = '';
             }