commit

src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditQueryController.java

@@ -37,7 +37,7 @@ public class preAuditQueryController {
     @At
     @ViReturn
     @RequiresPermissions("reimbursementPreAudit.manage")
-    public Object pageData(PageForm pageForm, String startDate, String endDate, String notes) {
+    public Object pageData(PageForm pageForm, String startDate, String endDate, String notes,String unitId,String unionId) {
         Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT * FROM `reimbursement_pre_audit` $condition
@@ -46,6 +46,8 @@ public class preAuditQueryController {
         cnd.andEX("applyDate", "<=", endDate);
         cnd.andEX("userId", "=", ShiroUtil.getUserId());
         cnd.andEX("auditState", "=", 3);
+        cnd.andEX("unitId", "=", unitId);
+        cnd.andEX("unionId", "=", unionId);
         cnd.desc("applyDate").desc("opAt");
         if (StrUtil.isNotEmpty(notes)) {
             cnd.andEX("notes", "like", "%" + notes + "%");

src/main/resources/views/platform/member/info/GroupInfo.html

@@ -191,7 +191,7 @@ layout("/layouts/platform.html"){
                     <el-col class="query-row-title">入会时间：</el-col>
                     <el-col class="query-row-content">
                         <el-date-picker
-                                style="width: 100%"
+                                style="width: 400px"
                                 v-model="pageForm.memberJoinTime"
                                 type="daterange"
                                 range-separator="至"