'123'
This commit is contained in:
parent
faaf6a4c73
commit
1fb80891e0
|
@ -2,14 +2,10 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" afterPath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.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-ui/src/views/authorize/authorize/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/authorize/authorize/index.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" 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" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
@ -117,7 +113,8 @@
|
|||
<workItem from="1723422983942" duration="22325000" />
|
||||
<workItem from="1723507256466" duration="16854000" />
|
||||
<workItem from="1723528634025" duration="10204000" />
|
||||
<workItem from="1723593971831" duration="13763000" />
|
||||
<workItem from="1723593971831" duration="16747000" />
|
||||
<workItem from="1723619606185" duration="3268000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
@ -150,11 +147,11 @@
|
|||
</state>
|
||||
<state x="393" y="12" width="1379" height="879" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723105028964" />
|
||||
<state x="2215" y="10" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723422366837" />
|
||||
<state width="1090" height="539" key="DebuggerActiveHint" timestamp="1723603228064">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="421" height="466" key="DebuggerActiveHint" timestamp="1723622801134">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723603228064" />
|
||||
<state width="410" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723446271190" />
|
||||
<state width="421" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622801134" />
|
||||
<state x="1989" y="80" width="1302" height="741" key="DiffContextDialog" timestamp="1723514986784">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
|
@ -165,66 +162,66 @@
|
|||
</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="260" key="GridCell.Tab.0.bottom" timestamp="1723605277968">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.bottom" timestamp="1723622095600">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
|
||||
<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="1876" height="260" key="GridCell.Tab.0.center" timestamp="1723605277968">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753557" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622095600" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.center" timestamp="1723622095600">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
|
||||
<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="1876" height="260" key="GridCell.Tab.0.left" timestamp="1723605277968">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753557" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622095600" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.left" timestamp="1723622095600">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
|
||||
<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="1876" height="260" key="GridCell.Tab.0.right" timestamp="1723605277968">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753556" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622095600" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.right" timestamp="1723622095600">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
|
||||
<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="1876" height="260" key="GridCell.Tab.1.bottom" timestamp="1723605277969">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753557" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622095600" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.bottom" timestamp="1723622096413">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277969" />
|
||||
<state width="1396" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.center" timestamp="1723605277969">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753558" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622096413" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.center" timestamp="1723622096413">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277969" />
|
||||
<state width="1396" height="299" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.left" timestamp="1723605277968">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753557" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622096413" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.left" timestamp="1723622096413">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277968" />
|
||||
<state width="1396" height="299" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.right" timestamp="1723605277969">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753557" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622096413" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.right" timestamp="1723622096413">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="260" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723605277969" />
|
||||
<state width="1396" height="299" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723603626058" />
|
||||
<state width="1876" height="130" key="GridCell.Tab.2.bottom" timestamp="1723604249317">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753557" />
|
||||
<state width="1396" height="233" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622096413" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.bottom" timestamp="1723622048204">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="130" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
|
||||
<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="130" key="GridCell.Tab.2.center" timestamp="1723604249317">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753558" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622048204" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.center" timestamp="1723622048204">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="130" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
|
||||
<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="130" key="GridCell.Tab.2.left" timestamp="1723604249317">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753558" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622048204" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.left" timestamp="1723622048204">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="130" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
|
||||
<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="130" key="GridCell.Tab.2.right" timestamp="1723604249317">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753558" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622048204" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.right" timestamp="1723622048204">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state width="1876" height="130" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723604249317" />
|
||||
<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 width="1876" height="280" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620753558" />
|
||||
<state width="1876" height="280" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723622048204" />
|
||||
<state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
|
@ -264,13 +261,25 @@
|
|||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="715" y="0" width="1093" height="875" maximized="true" key="dock-window-4/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723450569564" />
|
||||
<state x="2342" y="158" width="596" height="608" key="find.popup" timestamp="1723516672733">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state x="563" y="183" width="795" height="703" key="find.popup" timestamp="1723620137378">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="563" y="183" width="795" height="703" key="find.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723620137378" />
|
||||
<state x="2342" y="158" width="596" height="608" key="find.popup/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723516672733" />
|
||||
<state x="616" y="235" key="run.anything.popup" timestamp="1723094236509">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="616" y="235" key="run.anything.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723094236509" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java</url>
|
||||
<line>54</line>
|
||||
<option name="timeStamp" value="13" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
|
@ -1,11 +0,0 @@
|
|||
#for tests only !
|
||||
#Wed Aug 14 13:16:40 CST 2024
|
||||
jco.client.lang=ZH
|
||||
jco.client.passwd=654321
|
||||
jco.client.sysnr=00
|
||||
jco.destination.pool_capacity=10
|
||||
jco.client.client=800
|
||||
jco.destination.peak_limit=10
|
||||
jco.client.user=RFC
|
||||
jco.client.saprouter=
|
||||
jco.client.ashost=172.19.0.125
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Aug 14 10:59:04 CST 2024
|
||||
#Wed Aug 14 16:08:35 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-admin
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Aug 14 10:58:49 CST 2024
|
||||
#Wed Aug 14 16:08:21 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-common
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Aug 14 10:58:56 CST 2024
|
||||
#Wed Aug 14 16:08:28 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-framework
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Aug 14 10:58:58 CST 2024
|
||||
#Wed Aug 14 16:08:31 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-generator
|
||||
|
|
Binary file not shown.
|
@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<update id="updateBidOAApprovalStatus">
|
||||
update bid set bid_approval_status = #{state},bid_returnRemark = #{remark}
|
||||
update bid set bid_approval_status = #{state},bid_oa_remark = #{remark}
|
||||
where bid_id = #{bidId}
|
||||
</update>
|
||||
|
||||
|
@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<update id="updateBidOAApprovalStatusTb">
|
||||
update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = {bidVicePresidentApproved}
|
||||
update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = #{bidVicePresidentApproved}
|
||||
where bid_id = #{bidId}
|
||||
</update>
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<update id="updateBidOAApprovalStatus">
|
||||
update bid set bid_approval_status = #{state},bid_returnRemark = #{remark}
|
||||
update bid set bid_approval_status = #{state},bid_oa_remark = #{remark}
|
||||
where bid_id = #{bidId}
|
||||
</update>
|
||||
|
||||
|
@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<update id="updateBidOAApprovalStatusTb">
|
||||
update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = {bidVicePresidentApproved}
|
||||
update bid set bid_approval_status = #{state},bid_oa_approval_status = #{state}, bid_oa_remark = #{remark},bid_vice_president_approved = #{bidVicePresidentApproved}
|
||||
where bid_id = #{bidId}
|
||||
</update>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Aug 14 10:58:58 CST 2024
|
||||
#Wed Aug 14 16:08:30 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-quartz
|
||||
|
|
Binary file not shown.
|
@ -225,14 +225,14 @@ public class Bid extends BaseEntity
|
|||
@DataName(name = "制标员")
|
||||
private String bidZbr;
|
||||
|
||||
/** 校对人 */
|
||||
@Excel(name = "校对人")
|
||||
@DataName(name = "校对人")
|
||||
/** 校对员 */
|
||||
@Excel(name = "校对员")
|
||||
@DataName(name = "校对员")
|
||||
private String bidJdr;
|
||||
|
||||
/** 审核人 */
|
||||
@Excel(name = "审核人")
|
||||
@DataName(name = "审核人")
|
||||
/** 审核员 */
|
||||
@Excel(name = "审核员")
|
||||
@DataName(name = "审核员")
|
||||
private String bidShr;
|
||||
|
||||
/** 投标经理确认 */
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Wed Aug 14 10:58:53 CST 2024
|
||||
#Wed Aug 14 16:08:24 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-system
|
||||
|
|
Binary file not shown.
|
@ -182,7 +182,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed label="标书编号" align="center" prop="bidNumber" width="100px" />
|
||||
<el-table-column fixed label="提交状态" align="center" prop="bidApprovalStatus">
|
||||
<el-table-column fixed label="提交状态" align="center" prop="bidApprovalStatus" width="100px">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.bid_approval_status" :value="scope.row.bidApprovalStatus"/>
|
||||
</template>
|
||||
|
@ -358,7 +358,7 @@
|
|||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="标书编号" prop="bidNumber">
|
||||
<el-input v-model="form.bidNumber" placeholder="系统自动生成" :disabled="true"/>
|
||||
<el-input v-model="form.bidNumber" placeholder="投标办确认后自动生成" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
@ -1024,13 +1024,13 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="校对人" prop="bidJdr">
|
||||
<el-input v-model="form.bidJdr" placeholder="请输入校对人" :disabled="tbDis"/>
|
||||
<el-form-item label="校对员" prop="bidJdr">
|
||||
<el-input v-model="form.bidJdr" placeholder="请输入校对员" :disabled="tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="审核人" prop="bidShr">
|
||||
<el-input v-model="form.bidShr" placeholder="请输入审核人" :disabled="tbDis"/>
|
||||
<el-form-item label="审核员" prop="bidShr">
|
||||
<el-input v-model="form.bidShr" placeholder="请输入审核员" :disabled="tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
Loading…
Reference in New Issue