diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8026b99..1169203 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/expenses/ExpensesController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" afterDir="false" />
@@ -15,12 +13,14 @@
       <change beforePath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/SysOaExpenses.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/expenses/domain/SysOaExpenses.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/expenses/expenses/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/expenses/expenses/index.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -127,7 +127,8 @@
       <workItem from="1723420788933" duration="2164000" />
       <workItem from="1723422983942" duration="22325000" />
       <workItem from="1723507256466" duration="16854000" />
-      <workItem from="1723528634025" duration="9253000" />
+      <workItem from="1723528634025" duration="10204000" />
+      <workItem from="1723593971831" duration="3328000" />
     </task>
     <servers />
   </component>
@@ -175,65 +176,65 @@
     </state>
     <state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" />
     <state x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" />
-    <state width="1876" height="180" key="GridCell.Tab.0.bottom" timestamp="1723537799760">
+    <state width="1396" height="148" key="GridCell.Tab.0.bottom" timestamp="1723595815873">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
+    <state width="1396" height="148" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815873" />
+    <state width="1396" height="148" key="GridCell.Tab.0.center" timestamp="1723595815872">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
+    <state width="1396" height="148" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815872" />
+    <state width="1396" height="148" key="GridCell.Tab.0.left" timestamp="1723595815872">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
+    <state width="1396" height="148" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815872" />
+    <state width="1396" height="148" key="GridCell.Tab.0.right" timestamp="1723595815873">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595424919" />
+    <state width="1396" height="148" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815873" />
+    <state width="1396" height="148" key="GridCell.Tab.1.bottom" timestamp="1723595815874">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
+    <state width="1396" height="148" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815874" />
+    <state width="1396" height="148" key="GridCell.Tab.1.center" timestamp="1723595815874">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
+    <state width="1396" height="148" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815874" />
+    <state width="1396" height="148" key="GridCell.Tab.1.left" timestamp="1723595815873">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
+    <state width="1396" height="148" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815873" />
+    <state width="1396" height="148" key="GridCell.Tab.1.right" timestamp="1723595815874">
+      <screen x="1920" y="0" width="1440" height="900" />
+    </state>
+    <state width="1876" height="180" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723595409293" />
+    <state width="1396" height="148" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723595815874" />
+    <state width="1876" height="299" key="GridCell.Tab.2.bottom" timestamp="1723541157087">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="180" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
-    <state width="1396" height="314" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084092" />
-    <state width="1876" height="180" key="GridCell.Tab.0.center" timestamp="1723537799760">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="180" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
-    <state width="1396" height="314" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084091" />
-    <state width="1876" height="180" key="GridCell.Tab.0.left" timestamp="1723537799760">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="180" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
-    <state width="1396" height="314" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084091" />
-    <state width="1876" height="180" key="GridCell.Tab.0.right" timestamp="1723537799760">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="180" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537799760" />
-    <state width="1396" height="314" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723535084092" />
-    <state width="1876" height="299" key="GridCell.Tab.1.bottom" timestamp="1723537795081">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
-    <state width="1396" height="103" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
-    <state width="1876" height="299" key="GridCell.Tab.1.center" timestamp="1723537795081">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="299" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
-    <state width="1396" height="103" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
-    <state width="1876" height="299" key="GridCell.Tab.1.left" timestamp="1723537795081">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="299" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
-    <state width="1396" height="103" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
-    <state width="1876" height="299" key="GridCell.Tab.1.right" timestamp="1723537795081">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="299" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
-    <state width="1396" height="103" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723518150800" />
-    <state width="1876" height="299" key="GridCell.Tab.2.bottom" timestamp="1723537795081">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state width="1876" height="299" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
+    <state width="1876" height="299" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
     <state width="1396" height="250" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
-    <state width="1876" height="299" key="GridCell.Tab.2.center" timestamp="1723537795081">
+    <state width="1876" height="299" key="GridCell.Tab.2.center" timestamp="1723541157087">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="299" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
+    <state width="1876" height="299" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
     <state width="1396" height="250" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
-    <state width="1876" height="299" key="GridCell.Tab.2.left" timestamp="1723537795081">
+    <state width="1876" height="299" key="GridCell.Tab.2.left" timestamp="1723541157087">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="299" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
+    <state width="1876" height="299" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
     <state width="1396" height="250" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
-    <state width="1876" height="299" key="GridCell.Tab.2.right" timestamp="1723537795081">
+    <state width="1876" height="299" key="GridCell.Tab.2.right" timestamp="1723541157087">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="299" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723537795081" />
+    <state width="1876" height="299" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723541157087" />
     <state width="1396" height="250" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446476877" />
     <state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
       <screen x="1920" y="0" width="1440" height="900" />
@@ -255,11 +256,11 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722823330683" />
-    <state x="1920" y="0" width="1456" height="873" key="dock-window-1" timestamp="1723509444822">
-      <screen x="1920" y="0" width="1440" height="900" />
+    <state x="0" y="0" width="1238" height="875" maximized="true" key="dock-window-1" timestamp="1723596922438">
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="1920" y="0" width="1456" height="873" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723509444822" />
-    <state x="0" y="0" width="1132" height="875" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723423062840" />
+    <state x="0" y="0" width="1238" height="875" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723596922438" />
     <state x="1920" y="0" width="1456" height="989" key="dock-window-2" timestamp="1723528803283">
       <screen x="1920" y="0" width="1440" height="900" />
     </state>
diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties
index 1e9073b..b7a47f7 100644
--- a/ruoyi-admin/target/maven-archiver/pom.properties
+++ b/ruoyi-admin/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 13 16:30:12 CST 2024
+#Wed Aug 14 08:35:46 CST 2024
 version=3.8.7
 groupId=com.ruoyi
 artifactId=ruoyi-admin
diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar
index 37c691b..5e64c9d 100644
Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ
diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original
index 5497cd2..b2ede6d 100644
Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ
diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties
index 3d9f30d..d9cd07b 100644
--- a/ruoyi-common/target/maven-archiver/pom.properties
+++ b/ruoyi-common/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 13 16:27:01 CST 2024
+#Wed Aug 14 08:35:29 CST 2024
 version=3.8.7
 groupId=com.ruoyi
 artifactId=ruoyi-common
diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar
index 1125430..51d9453 100644
Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ
diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties
index 0b2f606..06f0bf6 100644
--- a/ruoyi-framework/target/maven-archiver/pom.properties
+++ b/ruoyi-framework/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 13 16:27:08 CST 2024
+#Wed Aug 14 08:35:38 CST 2024
 version=3.8.7
 groupId=com.ruoyi
 artifactId=ruoyi-framework
diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar
index 3956770..b00f913 100644
Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ
diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties
index 8e3d2a0..7822861 100644
--- a/ruoyi-generator/target/maven-archiver/pom.properties
+++ b/ruoyi-generator/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 13 16:27:11 CST 2024
+#Wed Aug 14 08:35:40 CST 2024
 version=3.8.7
 groupId=com.ruoyi
 artifactId=ruoyi-generator
diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar
index 1d9510f..7362fcf 100644
Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ
diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties
index a37920f..e88b28e 100644
--- a/ruoyi-quartz/target/maven-archiver/pom.properties
+++ b/ruoyi-quartz/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 13 16:27:10 CST 2024
+#Wed Aug 14 08:35:39 CST 2024
 version=3.8.7
 groupId=com.ruoyi
 artifactId=ruoyi-quartz
diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar
index e9f9560..e12db94 100644
Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ
diff --git a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml
index 8bbe912..a978cb8 100644
--- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml
@@ -63,7 +63,7 @@
         <include refid="selectAuthorizeVo"/>
         <where>
             <if test="doaNumber != null  and doaNumber != ''"> and doa_number like concat('%', #{doaNumber}, '%')</if>
-            <if test="doaSalesmanName != null  and doaSalesmanName != ''"> and doa_salesman_name like concat('%', #{doaSalesmanName}, '%')</if>
+            <if test="doaSalesmanName != null  and doaSalesmanName != ''"> and u.nick_name like concat('%', #{doaSalesmanName}, '%')</if>
             <if test="doaProject != null  and doaProject != ''"> and doa_project like concat('%', #{doaProject}, '%')</if>
             <if test="doaCustomerName != null  and doaCustomerName != ''"> and doa_customer_name like concat('%', #{doaCustomerName}, '%')</if>
             <if test="doaAuthorizer != null  and doaAuthorizer != ''"> and doa_authorizer like concat('%', #{doaAuthorizer}, '%')</if>
diff --git a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml
index 4a26459..58fa59e 100644
--- a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml
@@ -82,7 +82,7 @@
             <if test="expExpenditureType != null  and expExpenditureType != ''"> and exp_expenditure_type = #{expExpenditureType}</if>
             <if test="expExpenditureAmount != null "> and exp_expenditure_amount like concat('%', #{expExpenditureAmount}, '%')</if>
             <if test="params.beginExpExpenditureDate != null and params.beginExpExpenditureDate != '' and params.endExpExpenditureDate != null and params.endExpExpenditureDate != ''"> and exp_expenditure_date between #{params.beginExpExpenditureDate} and #{params.endExpExpenditureDate}</if>
-            <if test="expSalesmanName != null  and expSalesmanName != ''"> and exp_salesman_name like concat('%', #{expSalesmanName}, '%')</if>
+            <if test="expSalesmanName != null  and expSalesmanName != ''"> and u.nick_name like concat('%', #{expSalesmanName}, '%')</if>
             <if test="expRequestRemark != null  and expRequestRemark != ''"> and exp_request_remark like concat('%', #{expRequestRemark}, '%')</if>
             <if test="expApprovalStatus != null  and expApprovalStatus != ''"> and exp_approval_status = #{expApprovalStatus}</if>
 
diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml
index 8bbe912..a978cb8 100644
--- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml
+++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml
@@ -63,7 +63,7 @@
         <include refid="selectAuthorizeVo"/>
         <where>
             <if test="doaNumber != null  and doaNumber != ''"> and doa_number like concat('%', #{doaNumber}, '%')</if>
-            <if test="doaSalesmanName != null  and doaSalesmanName != ''"> and doa_salesman_name like concat('%', #{doaSalesmanName}, '%')</if>
+            <if test="doaSalesmanName != null  and doaSalesmanName != ''"> and u.nick_name like concat('%', #{doaSalesmanName}, '%')</if>
             <if test="doaProject != null  and doaProject != ''"> and doa_project like concat('%', #{doaProject}, '%')</if>
             <if test="doaCustomerName != null  and doaCustomerName != ''"> and doa_customer_name like concat('%', #{doaCustomerName}, '%')</if>
             <if test="doaAuthorizer != null  and doaAuthorizer != ''"> and doa_authorizer like concat('%', #{doaAuthorizer}, '%')</if>
diff --git a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml
index 4a26459..58fa59e 100644
--- a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml
+++ b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml
@@ -82,7 +82,7 @@
             <if test="expExpenditureType != null  and expExpenditureType != ''"> and exp_expenditure_type = #{expExpenditureType}</if>
             <if test="expExpenditureAmount != null "> and exp_expenditure_amount like concat('%', #{expExpenditureAmount}, '%')</if>
             <if test="params.beginExpExpenditureDate != null and params.beginExpExpenditureDate != '' and params.endExpExpenditureDate != null and params.endExpExpenditureDate != ''"> and exp_expenditure_date between #{params.beginExpExpenditureDate} and #{params.endExpExpenditureDate}</if>
-            <if test="expSalesmanName != null  and expSalesmanName != ''"> and exp_salesman_name like concat('%', #{expSalesmanName}, '%')</if>
+            <if test="expSalesmanName != null  and expSalesmanName != ''"> and u.nick_name like concat('%', #{expSalesmanName}, '%')</if>
             <if test="expRequestRemark != null  and expRequestRemark != ''"> and exp_request_remark like concat('%', #{expRequestRemark}, '%')</if>
             <if test="expApprovalStatus != null  and expApprovalStatus != ''"> and exp_approval_status = #{expApprovalStatus}</if>
 
diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties
index d488ff5..79dc9a1 100644
--- a/ruoyi-system/target/maven-archiver/pom.properties
+++ b/ruoyi-system/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Aug 13 16:27:05 CST 2024
+#Wed Aug 14 08:35:33 CST 2024
 version=3.8.7
 groupId=com.ruoyi
 artifactId=ruoyi-system
diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar
index 24c47d8..60d823a 100644
Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ
diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue
index 8325fd2..d29c707 100644
--- a/ruoyi-ui/src/views/bid/bid/index.vue
+++ b/ruoyi-ui/src/views/bid/bid/index.vue
@@ -187,6 +187,11 @@
             <dict-tag :options="dict.type.bid_approval_status" :value="scope.row.bidApprovalStatus"/>
           </template>
         </el-table-column>
+        <el-table-column fixed label="OA审批状态" align="center" prop="bidOaApprovalStatus">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.bid_oa_approval_status" :value="scope.row.bidOaApprovalStatus"/>
+          </template>
+        </el-table-column>
         <el-table-column label="网上报价" align="center" prop="bidOnlineQuotation" width="150px">
           <template slot-scope="scope">
             <span v-if="scope.row.index === tabClickIndex && tabClickLabel === '网上报价' && checkPermi(['bid:bid:updateListBid'])">
@@ -369,7 +374,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="原报名编号" prop="bidRegistrationNumber">
+            <el-form-item label="原报名编号" prop="bidRegistrationNumber" :rules="[{required:bidRegistrationNumberRequire,message:'原报名编号不能为空',trigger:'blur'}]">
               <el-input v-model="form.bidRegistrationNumber" placeholder="请输入原报名编号" :disabled="true">
                 <el-button slot="append" icon="el-icon-search" @click="openZgys" v-if="(!ywyDis&&!tbDis) && this.form.bidHasRegistration==0"/>
               </el-input>
@@ -483,8 +488,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="16">
-            <el-form-item label="价格联动方式" prop="bidPriceLinkageMethod">
-              <el-input type="textarea" autosize v-model="form.bidPriceLinkageMethod" placeholder="请输入价格联动方式" :disabled="ywyDis||tbDis" />
+            <el-form-item label="价格联动方式" prop="bidPriceLinkageMethod" :rules="[{required:bidPriceLinkageMethodRequire,message:'价格联动方式不能为空',trigger:'blur'}]">
+              <el-input type="textarea" autosize v-model="form.bidPriceLinkageMethod" placeholder="请输入价格联动方式" :disabled="ywyDis||tbDis||this.form.bidCopperPriceLinkage!='0'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -1354,12 +1359,7 @@ export default {
         ],
         bidPaymentDeviation: [
           { required: true, message: "投标付款偏差不能为空", trigger: "blur" }
-        ],
-      },
-
-      bidOtherRule: {
-        bidRegistrationNumber: [{ required: true, message: '原报名编号不能为空', trigger: 'blur' }],
-        bidPriceLinkageMethod: [{ required: true, message: '价格联动方式不能为空', trigger: 'blur' }],
+        ]
       },
 
       // 技术协助反馈附件显示弹窗
@@ -1429,6 +1429,11 @@ export default {
 
       //提交OA流程类型选择
       bidOAOpen: false,
+
+      // 原报名编号必填控制
+      bidRegistrationNumberRequire: false,
+      // 价格联动方式必填控制
+      bidPriceLinkageMethodRequire: false,
     };
   },
   created() {
@@ -1810,22 +1815,22 @@ export default {
     /** 是否报名事件 */
     bidHasRegistrationChange(val) {
       this.form.bidRegistrationNumber = '';
-      if (val == '0') {
-        this.rules = { ...this.rules, bidRegistrationNumber: this.bidOtherRule.bidRegistrationNumber };
-      } else {
-        this.$refs["form"].clearValidate(["bidRegistrationNumber"]);
-        this.$delete(this.rules, 'bidRegistrationNumber');
+
+      this.bidRegistrationNumberRequire = val == '0'?true:false;
+
+      if (val == '1') {
+        this.$refs['form'].clearValidate(['bidRegistrationNumber']);
       }
     },
 
     /** 是否价格联动事件 */
      bidCopperPriceLinkageChange(val) {
       this.form.bidPriceLinkageMethod = '';
-      if (val == '0') {
-        this.rules = { ...this.rules, bidPriceLinkageMethod: this.bidOtherRule.bidPriceLinkageMethod };
-      } else {
-        this.$refs["form"].clearValidate(["bidPriceLinkageMethod"]);
-        this.$delete(this.rules, 'bidPriceLinkageMethod');
+
+      this.bidPriceLinkageMethodRequire = val == '0'?true:false;
+
+      if (val == '1') {
+        this.$refs['form'].clearValidate(['bidPriceLinkageMethod']);
       }
     },
 
diff --git a/ruoyi-ui/src/views/expenses/expenses/index.vue b/ruoyi-ui/src/views/expenses/expenses/index.vue
index e3cc391..6eb7c7f 100644
--- a/ruoyi-ui/src/views/expenses/expenses/index.vue
+++ b/ruoyi-ui/src/views/expenses/expenses/index.vue
@@ -204,12 +204,17 @@
           <span>{{ parseTime(scope.row.expExpenditureDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="分派状态" align="center" prop="expDispatchStatus" width="100px" v-if="checkRole(['BID','BID_BSZZY','BID_ZHGLY'])">
+      <el-table-column label="预计归还日期" align="center" prop="expReturnDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.expReturnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+      <el-table-column label="分派状态" align="center" prop="expDispatchStatus" width="100px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.exp_dispatch_status" :value="scope.row.expDispatchStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="分派接收人" align="center" prop="expReceiveUserNickName" width="100px" v-if="checkRole(['BID','BID_BSZZY','BID_ZHGLY'])"/>
+      <el-table-column label="分派接收人" align="center" prop="expReceiveUserNickName" width="100px"/>
       <el-table-column label="OA审批状态" align="center" prop="expOaApprovalStatus" width="100px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.exp_oa_approval_status" :value="scope.row.expOaApprovalStatus"/>
@@ -405,7 +410,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="选择内勤" prop="expBackOffice">
+            <el-form-item label="选择内勤" prop="expBackOfficeId" :rules="[{required:expBackOfficeIdRequire,message:'选择内勤不能为空',trigger:'change'}]">
               <el-input v-model="form.expBackOffice" v-if="false"/>
               <el-select v-model="form.expBackOfficeId" placeholder="请选择内勤" :disabled="ywyDis||tbDis||this.form.expStaffTureorfales!='0'">
                 <el-option
@@ -789,11 +794,11 @@ export default {
         ],
         expDepositBank: [
           { required: true, message: "开户银行不能为空", trigger: "blur" }
-        ],
+        ]
       },
-      expOtherRule: {
+      /*expOtherRule: {
         expBackOffice: [{ required: true, message: '选择内勤不能为空', trigger: 'blur' }],
-      },
+      },*/
 
       //是否打开变更记录组件
       changeRecordTitle: "",
@@ -839,6 +844,9 @@ export default {
 
       //OA内勤人员
       oaOfficeStaff: [], // OA内勤人员数据列表
+
+      // 选择内勤必填控制
+      expBackOfficeIdRequire:false,
     };
   },
 
@@ -950,6 +958,8 @@ export default {
       this.open = true;
       this.title = "费用支出";
 
+      this.oaOfficeStaffs();//获取OA内勤人员数据
+
       this.form.expSalesmanName = this.$store.state.user.nickName;
       this.form.expSalesmanBm = this.$store.state.user.sapBm;
       this.form.expSalesmanCode = this.$store.state.user.name;
@@ -962,14 +972,14 @@ export default {
     handleUpdate(row) {
       this.reset();
 
-      this.oaOfficeStaffs();//获取OA内勤人员数据
-
       const expId = row.expId || this.ids
       getExpenses(expId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "费用支出";
 
+        this.oaOfficeStaffs();//获取OA内勤人员数据
+
         const expApprovalStatus = this.form.expApprovalStatus;
         const expOaApprovalStatus = this.form.expOaApprovalStatus;
         //业务员角色 并且是协助中或者已完成 时 不可编辑
@@ -1016,14 +1026,6 @@ export default {
     commitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          /*const expStaffTureorfales = this.form.expStaffTureorfales;
-          if(expStaffTureorfales=='0'){
-            if(!this.from.expBackOfficeId){
-              this.$modal.msgError("如有内勤,请选择内勤");
-              return;
-            }
-          }*/
-
           commitExp(this.form).then(response => {
             this.$modal.msgSuccess("提交成功");
             this.open = false;
@@ -1082,11 +1084,11 @@ export default {
     expStaffTureorfalesChange(val) {
       this.form.expBackOfficeId = '';
       this.form.expBackOffice = '';
-      if (val == '0') {
-        this.rules = { ...this.rules, expBackOffice: this.expOtherRule.expBackOffice };
-      } else {
-        this.$refs['form'].clearValidate(['expBackOffice']);
-        this.$delete(this.rules, 'expBackOffice');
+
+      this.expBackOfficeIdRequire = val == '0'?true:false;
+
+      if (val == '1') {
+        this.$refs['form'].clearValidate(['expBackOfficeId']);
       }
     },