'123'
This commit is contained in:
parent
e4eef5fb98
commit
f918e50f7c
|
|
@ -2,12 +2,10 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/domain/QuotSecDiff.java" 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-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.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" />
|
||||
|
|
@ -21,24 +19,32 @@
|
|||
<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/authorize/domain/Authorize.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/domain/SysOaQuot.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java" 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-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/Zgys.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/quot/QuotMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/SysOaAuthorize.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/authorize/domain/SysOaAuthorize.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/domain/Quot.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/domain/Quot.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/domain/SysOaQuot.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/domain/SysOaQuot.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/domain/SysOaZgys.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/domain/SysOaZgys.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/zgys/domain/Zgys.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/quot/QuotMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.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/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" 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/api/authorize/authorize.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/authorize/authorize.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/zgys/zgys.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/zgys/zgys.js" 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$/ruoyi-ui/src/views/quot/quot/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/quot/quot/index.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue" 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/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" />
|
||||
|
|
@ -130,6 +136,7 @@
|
|||
<workItem from="1723017804486" duration="1336000" />
|
||||
<workItem from="1723075283080" duration="10029000" />
|
||||
<workItem from="1723086697484" duration="197000" />
|
||||
<workItem from="1723087435797" duration="8128000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
@ -141,85 +148,85 @@
|
|||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state x="2120" y="23" key="#Project_Structure/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590259734" />
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1723082505585">
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser" timestamp="1723097725468">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723082505585" />
|
||||
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723097725468" />
|
||||
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017851339" />
|
||||
<state x="393" y="12" width="1379" height="879" key="CommitChangelistDialog2" timestamp="1723075441179">
|
||||
<state x="393" y="12" width="1379" height="879" key="CommitChangelistDialog2" timestamp="1723087474665">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</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="1723075441179" />
|
||||
<state x="393" y="12" width="1379" height="879" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723087474665" />
|
||||
<state x="2215" y="10" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722590562023" />
|
||||
<state width="1090" height="539" key="DebuggerActiveHint" timestamp="1722997368961">
|
||||
<state width="1090" height="539" key="DebuggerActiveHint" timestamp="1723100577304">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997368961" />
|
||||
<state width="1090" height="539" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100577304" />
|
||||
<state width="360" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722820599424" />
|
||||
<state x="2475" y="237" key="FileChooserDialogImpl" timestamp="1723017044285">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</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="1396" height="208" key="GridCell.Tab.0.bottom" timestamp="1723086215553">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.bottom" timestamp="1723100609396">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083651597" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100609396" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215553" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.center" timestamp="1723086215553">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.center" timestamp="1723100609396">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083651597" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100609396" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215553" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.left" timestamp="1723086215552">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.left" timestamp="1723100609396">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083651597" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100609396" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215552" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.right" timestamp="1723086215553">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.right" timestamp="1723100609396">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083651597" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100609396" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215553" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.bottom" timestamp="1723086215554">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.bottom" timestamp="1723100560699">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083321607" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100560699" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.center" timestamp="1723086215554">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.center" timestamp="1723100560699">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083321607" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100560699" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.left" timestamp="1723086215554">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.left" timestamp="1723100560699">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083321607" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100560699" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.right" timestamp="1723086215554">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.right" timestamp="1723100560699">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="305" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723083321607" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100560699" />
|
||||
<state width="1396" height="208" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1723017774091">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom" timestamp="1723100513864">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386056" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100513864" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center" timestamp="1723017774091">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center" timestamp="1723100513864">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386055" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100513864" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left" timestamp="1723017774091">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left" timestamp="1723100513864">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386055" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100513864" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right" timestamp="1723017774091">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right" timestamp="1723100513864">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722997386056" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100513864" />
|
||||
<state width="1876" height="288" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||
<state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
|
|
@ -241,23 +248,39 @@
|
|||
<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="1926" y="0" width="1348" height="962" maximized="true" key="dock-window-1" timestamp="1723082762683">
|
||||
<state x="1305" y="146" width="1456" height="989" key="dock-window-1" timestamp="1723094183714">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state x="1926" y="0" width="1348" height="962" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723082762683" />
|
||||
<state x="1305" y="146" width="1456" height="989" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723094183714" />
|
||||
<state x="295" y="0" width="965" height="875" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017838407" />
|
||||
<state x="222" y="0" width="1213" height="875" maximized="true" key="dock-window-2" timestamp="1723018653242">
|
||||
<state x="310" y="-23" width="1456" height="989" key="dock-window-2" timestamp="1723098525712">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
</state>
|
||||
<state x="1920" y="0" width="1319" height="713" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722926898762" />
|
||||
<state x="310" y="-23" width="1456" height="989" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723098525712" />
|
||||
<state x="222" y="0" width="1213" height="875" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723018653242" />
|
||||
<state x="597" y="332" width="1083" height="875" key="dock-window-3" timestamp="1723017774201">
|
||||
<screen x="0" y="0" width="1920" height="1040" />
|
||||
<state x="1920" y="0" width="1456" height="989" key="dock-window-3" timestamp="1723100033361">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state x="1920" y="0" width="1456" height="989" key="dock-window-3/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723100033361" />
|
||||
<state x="597" y="332" width="1083" height="875" key="dock-window-3/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774201" />
|
||||
<state x="2342" y="158" width="596" height="584" key="find.popup" timestamp="1722992434648">
|
||||
<screen x="1920" y="0" width="1440" height="900" />
|
||||
</state>
|
||||
<state x="2342" y="158" width="596" height="584" key="find.popup/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722992434648" />
|
||||
<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-admin/src/main/java/com/ruoyi/web/controller/zgys/ZgysController.java</url>
|
||||
<line>226</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
#for tests only !
|
||||
#Thu Aug 08 14:57:29 CST 2024
|
||||
jco.client.lang=ZH
|
||||
jco.client.passwd=fE;w~oY[RV}$Hq`k8+X*q%@jQBYm^Qo.).998p..HvCkC+6i
|
||||
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
|
||||
|
|
@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import com.ruoyi.authorize.domain.AuthorizeFile;
|
||||
import com.ruoyi.authorize.domain.SysOaAuthorize;
|
||||
import com.ruoyi.authorize.service.IAuthorizeFileService;
|
||||
import com.ruoyi.bid.domain.Bid;
|
||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
|
|
@ -101,8 +100,8 @@ public class AuthorizeController extends BaseController
|
|||
authorize.setDoaCode(doaCode);
|
||||
|
||||
// 获取用户角色 --判断是否有新建权限
|
||||
Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(bidJlRoleFlag){
|
||||
Boolean doaJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(doaJlRoleFlag){
|
||||
Long deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId();
|
||||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
|
@ -128,8 +127,8 @@ public class AuthorizeController extends BaseController
|
|||
public AjaxResult edit(@RequestBody Authorize authorize)
|
||||
{
|
||||
// 获取用户角色 --判断是否有新建权限
|
||||
Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(bidJlRoleFlag){
|
||||
Boolean doaJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(doaJlRoleFlag){
|
||||
Long deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId();
|
||||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
|
@ -174,10 +173,11 @@ public class AuthorizeController extends BaseController
|
|||
public AjaxResult commitAuthorize(@RequestBody Authorize authorize)
|
||||
{
|
||||
try{
|
||||
authorize.setDoaApprovalStatus("1");
|
||||
Long deptId = getLoginUser().getUser().getDeptId();
|
||||
// 获取用户角色 --判断是否有新建权限
|
||||
Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(bidJlRoleFlag){
|
||||
Boolean doaJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(doaJlRoleFlag){
|
||||
deptId = userService.selectUserByUserName(authorize.getDoaSalesmanCode()).getDeptId();
|
||||
}
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
|
@ -189,7 +189,7 @@ public class AuthorizeController extends BaseController
|
|||
String doaNumber = authorizeService.getCodeAT("S");
|
||||
authorize.setDoaNumber(doaNumber);
|
||||
|
||||
if(bidJlRoleFlag){
|
||||
if(doaJlRoleFlag){
|
||||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
authorize.setDoaSalesmanDeptName(sysDept.getDeptName());
|
||||
authorize.setCreateBy(authorize.getDoaSalesmanCode());
|
||||
|
|
@ -201,7 +201,7 @@ public class AuthorizeController extends BaseController
|
|||
}else{
|
||||
String doaNumber = authorizeService.getCodeAT("S");
|
||||
authorize.setDoaNumber(doaNumber);
|
||||
if(bidJlRoleFlag){
|
||||
if(doaJlRoleFlag){
|
||||
authorize.setDoaSalesmanDeptId(String.valueOf(deptId));
|
||||
authorize.setDoaSalesmanDeptName(sysDept.getDeptName());
|
||||
authorize.setCreateBy(authorize.getDoaSalesmanCode());
|
||||
|
|
@ -209,7 +209,7 @@ public class AuthorizeController extends BaseController
|
|||
}else{
|
||||
authorize.setUpdateBy(getUsername());
|
||||
}
|
||||
authorize.setDoaApprovalStatus("1");
|
||||
|
||||
authorize.setDoaRejectionReasons("");//驳回后再次提交清除驳回原因
|
||||
authorizeService.updateAuthorize(authorize);
|
||||
return success();
|
||||
|
|
@ -247,42 +247,19 @@ public class AuthorizeController extends BaseController
|
|||
sysOaAuthorize.setSubmissionTime(DateUtils.getDate());
|
||||
|
||||
sysOaAuthorize.setDoaId(authorize.getDoaId());
|
||||
sysOaAuthorize.setDoaCode(authorize.getDoaCode());
|
||||
sysOaAuthorize.setDoaNumber(authorize.getDoaNumber());
|
||||
sysOaAuthorize.setDoaSalesmanName((authorize.getDoaSalesmanName()));
|
||||
sysOaAuthorize.setDoaSalesmanPhone((authorize.getDoaSalesmanPhone()));
|
||||
sysOaAuthorize.setDoaProject(authorize.getDoaProject());
|
||||
sysOaAuthorize.setDoaCustomerName(authorize.getDoaCustomerName());
|
||||
sysOaAuthorize.setDoaOwnerUnit(authorize.getDoaOwnerUnit());
|
||||
sysOaAuthorize.setDoaGeneralcontractUnit(authorize.getDoaGeneralcontractUnit());
|
||||
sysOaAuthorize.setDoaSubcontractUnit(authorize.getDoaSubcontractUnit());
|
||||
sysOaAuthorize.setDoaAuthorizer(authorize.getDoaAuthorizer());
|
||||
sysOaAuthorize.setDoaAuthorizerPhone(authorize.getDoaAuthorizerPhone());
|
||||
sysOaAuthorize.setDoaAuthorizerIdentificationNumber(authorize.getDoaAuthorizerIdentificationNumber());
|
||||
sysOaAuthorize.setDoaAuthorizationDuration(authorize.getDoaAuthorizationDuration());
|
||||
sysOaAuthorize.setDoaPowerAttorneyPurpose(authorize.getDoaPowerAttorneyPurpose());
|
||||
sysOaAuthorize.setDoaFormat(authorize.getDoaFormat());
|
||||
sysOaAuthorize.setDoaRemark(authorize.getDoaRemark());
|
||||
sysOaAuthorize.setDoaStandardizer(authorize.getDoaStandardizer());
|
||||
sysOaAuthorize.setDoaArchiving(authorize.getDoaArchiving());
|
||||
sysOaAuthorize.setDoaVicePresidentApproved(authorize.getDoaVicePresidentApproved());
|
||||
|
||||
// 上传反馈清单
|
||||
AuthorizeFile authorizeFile = new AuthorizeFile();
|
||||
authorizeFile.setRelationId(authorize.getDoaId());
|
||||
authorizeFile.setFileType("authorizeYwyFile");
|
||||
List<AuthorizeFile> fileList = authorizeFileService.selectAuthorizeFileList(authorizeFile);
|
||||
String fileString = "";
|
||||
if(fileList!=null&&fileList.size()>0){
|
||||
for(AuthorizeFile f:fileList){
|
||||
String fileUrl = f.getFileUrl();
|
||||
if(StringUtils.isEmpty(fileString)){
|
||||
fileString = fileString+fileUrl;
|
||||
}else{
|
||||
fileString = fileString+","+fileUrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
sysOaAuthorize.setFileAddress(fileString);
|
||||
sysOaAuthorize.setCreateTime(DateUtils.getNowDate());
|
||||
sysOaAuthorize.setIsFinish("0");// 授权备案已提交OA审批中
|
||||
authorizeService.insertSysOAAuthorize(sysOaAuthorize);
|
||||
|
|
@ -302,8 +279,8 @@ public class AuthorizeController extends BaseController
|
|||
@ChangeRecordLog(serviceImplclass = "com.ruoyi.authorize.service.impl.AuthorizeServiceImpl",
|
||||
serviceImplMethod="selectAuthorizeByDoaId",
|
||||
tableId = "doaId",codeName = "doaCode",title = "投标办驳回")
|
||||
@PostMapping("/rejectBid")
|
||||
public AjaxResult rejectBid(@RequestBody Authorize authorize)
|
||||
@PostMapping("/rejectAuthorize")
|
||||
public AjaxResult rejectAuthorize(@RequestBody Authorize authorize)
|
||||
{
|
||||
String doa_rejection_reasons = authorize.getDoaRejectionReasons();
|
||||
if(StringUtils.isEmpty(doa_rejection_reasons)){
|
||||
|
|
|
|||
|
|
@ -107,8 +107,8 @@ public class ZgysController extends BaseController
|
|||
zgys.setPqCode(zgysCode);
|
||||
|
||||
// 获取用户角色 --判断是否有新建权限
|
||||
Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(bidJlRoleFlag){
|
||||
Boolean pqJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(pqJlRoleFlag){
|
||||
Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId();
|
||||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
|
@ -134,8 +134,8 @@ public class ZgysController extends BaseController
|
|||
public AjaxResult edit(@RequestBody Zgys zgys)
|
||||
{
|
||||
// 获取用户角色 --判断是否有新建权限
|
||||
Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(bidJlRoleFlag){
|
||||
Boolean pqJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(pqJlRoleFlag){
|
||||
Long deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId();
|
||||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
|
@ -159,10 +159,11 @@ public class ZgysController extends BaseController
|
|||
public AjaxResult commitZgys(@RequestBody Zgys zgys)
|
||||
{
|
||||
try{
|
||||
zgys.setPqApprovalStatus("1");
|
||||
Long deptId = getLoginUser().getUser().getDeptId();
|
||||
// 获取用户角色 --判断是否有新建权限
|
||||
Boolean bidJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(bidJlRoleFlag){
|
||||
Boolean pqJlRoleFlag = SecurityUtils.hasRole("BID")||SecurityUtils.hasRole("BID_BSZZY")||SecurityUtils.hasRole("BID_ZHGLY");
|
||||
if(pqJlRoleFlag){
|
||||
deptId = userService.selectUserByUserName(zgys.getPqSalesmanCode()).getDeptId();
|
||||
}
|
||||
SysDept sysDept = deptService.selectDeptById(deptId);
|
||||
|
|
@ -175,7 +176,7 @@ public class ZgysController extends BaseController
|
|||
String pqNumber = zgysService.getCodePQ("Z");
|
||||
zgys.setPqNumber(pqNumber);
|
||||
|
||||
if(bidJlRoleFlag){
|
||||
if(pqJlRoleFlag){
|
||||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
zgys.setPqSalesmanDeptName(sysDept.getDeptName());
|
||||
zgys.setCreateBy(zgys.getPqSalesmanCode());
|
||||
|
|
@ -185,9 +186,7 @@ public class ZgysController extends BaseController
|
|||
zgysService.insertZgys(zgys);
|
||||
return success();
|
||||
}else{
|
||||
String pqNumber = zgysService.getCodePQ("Z");
|
||||
zgys.setPqNumber(pqNumber);
|
||||
if(bidJlRoleFlag){
|
||||
if(pqJlRoleFlag){
|
||||
zgys.setPqSalesmanDeptId(String.valueOf(deptId));
|
||||
zgys.setPqSalesmanDeptName(sysDept.getDeptName());
|
||||
zgys.setCreateBy(zgys.getPqSalesmanCode());
|
||||
|
|
@ -195,7 +194,7 @@ public class ZgysController extends BaseController
|
|||
}else{
|
||||
zgys.setUpdateBy(getUsername());
|
||||
}
|
||||
zgys.setPqApprovalStatus("1");
|
||||
|
||||
zgys.setPqReturnRemark("");//驳回后再次提交清除驳回原因
|
||||
zgysService.updateZgys(zgys);
|
||||
return success();
|
||||
|
|
@ -218,6 +217,12 @@ public class ZgysController extends BaseController
|
|||
public AjaxResult commitZgysOA(@RequestBody Zgys zgys)
|
||||
{
|
||||
|
||||
try{
|
||||
String pq_oa_approval_status = zgys.getPqOaApprovalStatus();
|
||||
if("1".equals(pq_oa_approval_status)){
|
||||
return error("已提交OA审批中,请勿重复操作");
|
||||
}
|
||||
|
||||
// 资格预审提交OA,插入中间表 sys_oa_zgys
|
||||
SysOaZgys sysOaZgys = new SysOaZgys();
|
||||
SysOaZgys oauser = zgysService.selectOAUserByUserName(getUsername());// 查询OA用户
|
||||
|
|
@ -229,33 +234,16 @@ public class ZgysController extends BaseController
|
|||
sysOaZgys.setDepartmentId(oauser.getDepartmentId());
|
||||
sysOaZgys.setSubmissionTime(DateUtils.getDate());
|
||||
sysOaZgys.setPqId(UUID.fastUUID().toString());
|
||||
sysOaZgys.setPqCode(zgys.getPqCode());
|
||||
sysOaZgys.setPqNumber(zgys.getPqNumber());
|
||||
sysOaZgys.setPqSalesmanName(zgys.getPqSalesmanName());
|
||||
sysOaZgys.setPqCustomerName(zgys.getPqCustomerName());
|
||||
sysOaZgys.setPqProject(zgys.getPqProject());
|
||||
sysOaZgys.setPqAuthorizedRepresentative(zgys.getPqAuthorizedRepresentative());
|
||||
sysOaZgys.setPqAgency(zgys.getPqAgency());
|
||||
sysOaZgys.setPqBidDate(zgys.getPqBidDate());
|
||||
sysOaZgys.setPqZbr(zgys.getPqZbr());
|
||||
sysOaZgys.setPqBidWinningStatus(zgys.getPqBidWinningStatus());
|
||||
sysOaZgys.setPqIllustrate(zgys.getPqIllustrate());
|
||||
|
||||
// 上传反馈清单
|
||||
ZgysFile zgysFile = new ZgysFile();
|
||||
zgysFile.setRelationId(zgys.getPqId());
|
||||
zgysFile.setFileType("zgysYwyFile");
|
||||
List<ZgysFile> fileList = zgysFileService.selectZgysFileList(zgysFile);
|
||||
String fileString = "";
|
||||
if(fileList!=null&&fileList.size()>0){
|
||||
for(ZgysFile f:fileList){
|
||||
String fileUrl = f.getFileUrl();
|
||||
if(StringUtils.isEmpty(fileString)){
|
||||
fileString = fileString+fileUrl;
|
||||
}else{
|
||||
fileString = fileString+","+fileUrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
sysOaZgys.setPqYwyFile(fileString);
|
||||
sysOaZgys.setCreateTime(DateUtils.getNowDate());
|
||||
sysOaZgys.setIsFinish("0");// 资格预审已提交OA审批中
|
||||
zgysService.insertSysOAZgys(sysOaZgys);
|
||||
|
|
@ -263,6 +251,9 @@ public class ZgysController extends BaseController
|
|||
zgys.setPqOaApprovalStatus("1");// 更新OA提交状态为 审批中
|
||||
zgysService.updateZgys(zgys);
|
||||
return success();
|
||||
}catch (Exception e){
|
||||
return error("系统异常");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -272,8 +263,8 @@ public class ZgysController extends BaseController
|
|||
@ChangeRecordLog(serviceImplclass = "com.ruoyi.zgys.service.impl.ZgysServiceImpl",
|
||||
serviceImplMethod="selectZgysByPqId",
|
||||
tableId = "pqId",codeName = "pqCode",title = "投标办驳回")
|
||||
@PostMapping("/rejectBid")
|
||||
public AjaxResult rejectBid(@RequestBody Zgys zgys)
|
||||
@PostMapping("/rejectZgys")
|
||||
public AjaxResult rejectZgys(@RequestBody Zgys zgys)
|
||||
{
|
||||
String pq_returnRemark = zgys.getPqReturnRemark();
|
||||
if(StringUtils.isEmpty(pq_returnRemark)){
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 10:18:08 CST 2024
|
||||
#Thu Aug 08 15:05:33 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
|
||||
#Thu Aug 08 10:17:35 CST 2024
|
||||
#Thu Aug 08 15:05:20 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-common
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 10:17:52 CST 2024
|
||||
#Thu Aug 08 15:05:26 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-framework
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 10:17:58 CST 2024
|
||||
#Thu Aug 08 15:05:28 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-generator
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 10:17:56 CST 2024
|
||||
#Thu Aug 08 15:05:28 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-quartz
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -44,7 +44,7 @@ public class Authorize extends BaseEntity
|
|||
private String doaSalesmanDeptId;
|
||||
|
||||
/** 部门名 */
|
||||
@DataName(name = "部门名")
|
||||
@DataName(name = "部门")
|
||||
private String doaSalesmanDeptName;
|
||||
|
||||
/** 业务员电话 */
|
||||
|
|
@ -132,8 +132,8 @@ public class Authorize extends BaseEntity
|
|||
@Excel(name = "提交状态",dictType = "doa_approval_status")
|
||||
private String doaApprovalStatus;
|
||||
|
||||
/** 副总审批状态(0-待提交 1-审批中 2-已完成 3-已驳回) */
|
||||
@DataName(name = "副总审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回")
|
||||
/** OA审批状态(0-待提交 1-审批中 2-已完成 3-已驳回) */
|
||||
@DataName(name = "OA审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回")
|
||||
private String doaOaApprovalStatus;
|
||||
|
||||
/** OA反馈说明 */
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ public class SysOaAuthorize extends Authorize {
|
|||
private Integer departmentId;
|
||||
/** 提交oa时间 */
|
||||
private String submissionTime;
|
||||
/** 业务员附件*/
|
||||
private String fileAddress;
|
||||
/** 授权备案完成状态*/
|
||||
private String isFinish;
|
||||
|
||||
|
|
@ -46,14 +44,6 @@ public class SysOaAuthorize extends Authorize {
|
|||
this.submissionTime = submissionTime;
|
||||
}
|
||||
|
||||
public String getFileAddress() {
|
||||
return fileAddress;
|
||||
}
|
||||
|
||||
public void setFileAddress(String fileAddress) {
|
||||
this.fileAddress = fileAddress;
|
||||
}
|
||||
|
||||
public String getIsFinish() {
|
||||
return isFinish;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ public class Bid extends BaseEntity
|
|||
private String bidSalesmanDeptId;
|
||||
|
||||
/** 部门名称 */
|
||||
@DataName(name = "部门")
|
||||
private String bidSalesmanDeptName;
|
||||
|
||||
/** 是否报名 */
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ public class SysOaZgys extends Zgys {
|
|||
private Integer departmentId;
|
||||
/** 提交oa时间 */
|
||||
private String submissionTime;
|
||||
/** 业务员附件*/
|
||||
private String pqYwyFile;
|
||||
/** 资格预审完成状态*/
|
||||
private String isFinish;
|
||||
|
||||
|
|
@ -44,14 +42,6 @@ public class SysOaZgys extends Zgys {
|
|||
this.submissionTime = submissionTime;
|
||||
}
|
||||
|
||||
public String getPqYwyFile() {
|
||||
return pqYwyFile;
|
||||
}
|
||||
|
||||
public void setPqYwyFile(String pqYwyFile) {
|
||||
this.pqYwyFile = pqYwyFile;
|
||||
}
|
||||
|
||||
public String getIsFinish() {
|
||||
return isFinish;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,8 @@ public class Zgys extends BaseEntity
|
|||
private String pqSalesmanDeptId;
|
||||
|
||||
/** 部门名 */
|
||||
@Excel(name = "部门名")
|
||||
@Excel(name = "部门")
|
||||
@DataName(name = "部门")
|
||||
private String pqSalesmanDeptName;
|
||||
|
||||
/** 客户编码 */
|
||||
|
|
@ -83,8 +84,8 @@ public class Zgys extends BaseEntity
|
|||
@DataName(name = "中标状态",readConverterExp="0=是,1=否")
|
||||
private String pqBidWinningStatus;
|
||||
|
||||
/** 说明 */
|
||||
@DataName(name = "类别",readConverterExp="1=报名,2=供方调查表,3=资格预审,4=其他资料,5=网站注册")
|
||||
/** 类别 */
|
||||
@DataName(name = "类别",readConverterExp="1=报名,2=调查表,3=资格预审,4=其他,5=注册网址")
|
||||
private String pqIllustrate;
|
||||
|
||||
/** 公告链接网址 */
|
||||
|
|
@ -113,10 +114,14 @@ public class Zgys extends BaseEntity
|
|||
@DataName(name = "提交状态",readConverterExp="0=待提交,1=协助中,2=已完成,3=已驳回")
|
||||
private String pqApprovalStatus;
|
||||
|
||||
/** OA提交状态 */
|
||||
@DataName(name = "OA提交状态",readConverterExp="0=待提交,1=审批中,2=已通过,3=已驳回")
|
||||
/** OA审批状态 */
|
||||
@DataName(name = "OA审批状态",readConverterExp="0=待提交,1=审批中,2=已通过,3=已驳回")
|
||||
private String pqOaApprovalStatus;
|
||||
|
||||
/** OA反馈说明 */
|
||||
@DataName(name = "OA反馈说明")
|
||||
private String pqOaRemark;
|
||||
|
||||
@DataName(name = "副总审批")
|
||||
private String pqVpApproval;
|
||||
|
||||
|
|
@ -321,6 +326,9 @@ public class Zgys extends BaseEntity
|
|||
public String getPqOaApprovalStatus() { return pqOaApprovalStatus; }
|
||||
|
||||
public void setPqOaApprovalStatus(String pqOaApprovalStatus) { this.pqOaApprovalStatus = pqOaApprovalStatus; }
|
||||
public String getPqOaRemark() { return pqOaRemark; }
|
||||
|
||||
public void setPqOaRemark(String pqOaRemark) { this.pqOaRemark = pqOaRemark; }
|
||||
public String getPqVpApproval() { return pqVpApproval; }
|
||||
|
||||
public void setPqVpApproval(String pqVpApproval) { this.pqVpApproval = pqVpApproval; }
|
||||
|
|
|
|||
|
|
@ -164,26 +164,19 @@
|
|||
<if test="departmentId != null">department_id,</if>
|
||||
<if test="submissionTime != null">submission_time,</if>
|
||||
<if test="doaId != null">doa_id,</if>
|
||||
<if test="doaCode != null">doa_code,</if>
|
||||
<if test="doaNumber != null">doa_number,</if>
|
||||
<if test="doaSalesmanName != null">doa_salesman_name,</if>
|
||||
<if test="doaSalesmanPhone != null">doa_salesman_phone,</if>
|
||||
<if test="doaProject != null">doa_project,</if>
|
||||
<if test="doaCustomerName != null">doa_customer_name,</if>
|
||||
<if test="doaOwnerUnit != null">doa_owner_unit,</if>
|
||||
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if>
|
||||
<if test="doaSubcontractUnit != null">doa_subcontract_unit,</if>
|
||||
<if test="doaAuthorizer != null">doa_authorizer,</if>
|
||||
<if test="doaAuthorizerPhone != null">doa_authorizer_phone,</if>
|
||||
<if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number,</if>
|
||||
<if test="doaAuthorizationDuration != null">doa_authorization_duration,</if>
|
||||
<if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose,</if>
|
||||
<if test="doaFormat != null">doa_format,</if>
|
||||
<if test="doaRemark != null">doa_remark,</if>
|
||||
<if test="doaStandardizer != null">doa_standardizer,</if>
|
||||
<if test="doaArchiving != null">doa_archiving,</if>
|
||||
<if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="fileAddress != null">file_address,</if>
|
||||
<if test="isFinish != null">isFinish,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
|
|
@ -191,26 +184,19 @@
|
|||
<if test="departmentId != null">#{departmentId},</if>
|
||||
<if test="submissionTime != null">#{submissionTime},</if>
|
||||
<if test="doaId != null">#{doaId},</if>
|
||||
<if test="doaCode != null">#{doaCode},</if>
|
||||
<if test="doaNumber != null">#{doaNumber},</if>
|
||||
<if test="doaSalesmanName != null">#{doaSalesmanName},</if>
|
||||
<if test="doaSalesmanPhone != null">#{doaSalesmanPhone},</if>
|
||||
<if test="doaProject != null">#{doaProject},</if>
|
||||
<if test="doaCustomerName != null">#{doaCustomerName},</if>
|
||||
<if test="doaOwnerUnit != null">#{doaOwnerUnit},</if>
|
||||
<if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if>
|
||||
<if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if>
|
||||
<if test="doaAuthorizer != null">#{doaAuthorizer},</if>
|
||||
<if test="doaAuthorizerPhone != null">#{doaAuthorizerPhone},</if>
|
||||
<if test="doaAuthorizerIdentificationNumber != null">#{doaAuthorizerIdentificationNumber},</if>
|
||||
<if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if>
|
||||
<if test="doaPowerAttorneyPurpose != null">#{doaPowerAttorneyPurpose},</if>
|
||||
<if test="doaFormat != null">#{doaFormat},</if>
|
||||
<if test="doaRemark != null">#{doaRemark},</if>
|
||||
<if test="doaStandardizer != null">#{doaStandardizer},</if>
|
||||
<if test="doaArchiving != null">#{doaArchiving},</if>
|
||||
<if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="fileAddress != null">#{fileAddress},</if>
|
||||
<if test="isFinish != null">#{isFinish},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<result property="pqRemark" column="pq_remark" />
|
||||
<result property="pqApprovalStatus" column="pq_approval_status" />
|
||||
<result property="pqOaApprovalStatus" column="pq_oa_approval_status" />
|
||||
<result property="pqOaRemark" column="pq_oa_remark" />
|
||||
<result property="pqReturnRemark" column="pq_returnRemark" />
|
||||
<result property="pqArchiving" column="pq_archiving" />
|
||||
<result property="pqVpApproval" column="pq_vp_approval" />
|
||||
|
|
@ -50,7 +51,7 @@
|
|||
a.pq_customer_name, a.pq_project, a.pq_bid_winning_remark, a.pq_authorized_representative,
|
||||
a.pq_bid_date, a.pq_zbr, a.pq_bid_winning_status, a.pq_illustrate,
|
||||
a.pq_announcement_link_website, a.pq_phone, a.pq_agency, a.pq_remark,
|
||||
a.pq_approval_status,a.pq_oa_approval_status,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval,
|
||||
a.pq_approval_status,a.pq_oa_approval_status,a.pq_oa_remark,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval,
|
||||
a.create_by, u.nick_name create_name,a.create_time, a.update_by, a.update_time
|
||||
from zgys a
|
||||
<include refid="pqJoins"/>
|
||||
|
|
@ -82,28 +83,29 @@
|
|||
insert into zgys
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="pqId != null">pq_id,</if>
|
||||
<if test="pqCode != null and pqCode != ''">pq_code,</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">pq_number,</if>
|
||||
<if test="pqCode != null">pq_code,</if>
|
||||
<if test="pqNumber != null">pq_number,</if>
|
||||
<if test="pqSalesmanCode != null">pq_salesman_code,</if>
|
||||
<if test="pqSalesmanBm != null">pq_salesman_bm,</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">pq_salesman_name,</if>
|
||||
<if test="pqSalesmanName != null">pq_salesman_name,</if>
|
||||
<if test="pqSalesmanDeptId != null">pq_salesman_dept_id,</if>
|
||||
<if test="pqSalesmanDeptName != null and pqSalesmanDeptName != ''">pq_salesman_dept_name,</if>
|
||||
<if test="pqSalesmanDeptName != null">pq_salesman_dept_name,</if>
|
||||
<if test="pqCustomerBm != null">pq_customer_bm,</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">pq_customer_name,</if>
|
||||
<if test="pqProject != null and pqProject != ''">pq_project,</if>
|
||||
<if test="pqCustomerName != null">pq_customer_name,</if>
|
||||
<if test="pqProject != null">pq_project,</if>
|
||||
<if test="pqBidWinningRemark != null">pq_bid_winning_remark,</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">pq_authorized_representative,</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">pq_bid_date,</if>
|
||||
<if test="pqAuthorizedRepresentative != null">pq_authorized_representative,</if>
|
||||
<if test="pqBidDate != null">pq_bid_date,</if>
|
||||
<if test="pqZbr != null">pq_zbr,</if>
|
||||
<if test="pqBidWinningStatus != null">pq_bid_winning_status,</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">pq_illustrate,</if>
|
||||
<if test="pqIllustrate != null">pq_illustrate,</if>
|
||||
<if test="pqAnnouncementLinkWebsite != null">pq_announcement_link_website,</if>
|
||||
<if test="pqPhone != null and pqPhone != ''">pq_phone,</if>
|
||||
<if test="pqPhone != null">pq_phone,</if>
|
||||
<if test="pqAgency != null">pq_agency,</if>
|
||||
<if test="pqRemark != null">pq_remark,</if>
|
||||
<if test="pqApprovalStatus != null">pq_approval_status,</if>
|
||||
<if test="pqOaApprovalStatus != null">pq_oa_approval_status,</if>
|
||||
<if test="pqOaRemark != null">pq_oa_remark,</if>
|
||||
<if test="pqReturnRemark != null">pq_returnRemark,</if>
|
||||
<if test="pqArchiving != null">pq_archiving,</if>
|
||||
<if test="pqVpApproval != null">pq_vp_approval,</if>
|
||||
|
|
@ -114,28 +116,29 @@
|
|||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="pqId != null">#{pqId},</if>
|
||||
<if test="pqCode != null and pqCode != ''">#{pqCode},</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">#{pqNumber},</if>
|
||||
<if test="pqCode != null">#{pqCode},</if>
|
||||
<if test="pqNumber != null">#{pqNumber},</if>
|
||||
<if test="pqSalesmanCode != null">#{pqSalesmanCode},</if>
|
||||
<if test="pqSalesmanBm != null">#{pqSalesmanBm},</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">#{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanName != null">#{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanDeptId != null">#{pqSalesmanDeptId},</if>
|
||||
<if test="pqSalesmanDeptName != null and pqSalesmanDeptName != ''">#{pqSalesmanDeptName},</if>
|
||||
<if test="pqSalesmanDeptName != null">#{pqSalesmanDeptName},</if>
|
||||
<if test="pqCustomerBm != null">#{pqCustomerBm},</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null and pqProject != ''">#{pqProject},</if>
|
||||
<if test="pqCustomerName != null">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null">#{pqProject},</if>
|
||||
<if test="pqBidWinningRemark != null">#{pqBidWinningRemark},</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">#{pqBidDate},</if>
|
||||
<if test="pqAuthorizedRepresentative != null">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null">#{pqBidDate},</if>
|
||||
<if test="pqZbr != null">#{pqZbr},</if>
|
||||
<if test="pqBidWinningStatus != null">#{pqBidWinningStatus},</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">#{pqIllustrate},</if>
|
||||
<if test="pqIllustrate != null">#{pqIllustrate},</if>
|
||||
<if test="pqAnnouncementLinkWebsite != null">#{pqAnnouncementLinkWebsite},</if>
|
||||
<if test="pqPhone != null and pqPhone != ''">#{pqPhone},</if>
|
||||
<if test="pqAgency != null">#{pqAgency},</if>
|
||||
<if test="pqRemark != null">#{pqRemark},</if>
|
||||
<if test="pqApprovalStatus != null">#{pqApprovalStatus},</if>
|
||||
<if test="pqOaApprovalStatus != null">#{pqOaApprovalStatus},</if>
|
||||
<if test="pqOaRemark != null">#{pqOaRemark},</if>
|
||||
<if test="pqReturnRemark != null">#{pqReturnRemark},</if>
|
||||
<if test="pqArchiving != null">#{pqArchiving},</if>
|
||||
<if test="pqVpApproval != null">#{pqVpApproval},</if>
|
||||
|
|
@ -149,72 +152,67 @@
|
|||
<insert id="insertSysOAZgys" parameterType="SysOaZgys">
|
||||
insert into sys_oa_zgys
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null and userId != ''">user_id,</if>
|
||||
<if test="departmentId != null and departmentId != ''">department_id,</if>
|
||||
<if test="submissionTime != null and submissionTime != ''">submission_time,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="departmentId != null">department_id,</if>
|
||||
<if test="submissionTime != null">submission_time,</if>
|
||||
<if test="pqId != null">pq_id,</if>
|
||||
<if test="pqCode != null and pqCode != ''">pq_code,</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">pq_number,</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">pq_salesman_name,</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">pq_customer_name,</if>
|
||||
<if test="pqProject != null and pqProject != ''">pq_project,</if>
|
||||
<if test="pqBidWinningRemark != null">pq_bid_winning_remark,</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">pq_authorized_representative,</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">pq_bid_date,</if>
|
||||
<if test="pqNumber != null">pq_number,</if>
|
||||
<if test="pqSalesmanName != null">pq_salesman_name,</if>
|
||||
<if test="pqCustomerName != null">pq_customer_name,</if>
|
||||
<if test="pqProject != null">pq_project,</if>
|
||||
<if test="pqAuthorizedRepresentative != null">pq_authorized_representative,</if>
|
||||
<if test="pqAgency != null">pq_agency,</if>
|
||||
<if test="pqBidDate != null">pq_bid_date,</if>
|
||||
<if test="pqZbr != null">pq_zbr,</if>
|
||||
<if test="pqBidWinningStatus != null">pq_bid_winning_status,</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">pq_illustrate,</if>
|
||||
<if test="pqIllustrate != null">pq_illustrate,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="pqYwyFile != null and pqYwyFile != ''">pq_ywy_file,</if>
|
||||
<if test="isFinish != null and isFinish != ''">isFinish,</if>
|
||||
<if test="isFinish != null">isFinish,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null and userId != ''">#{userId},</if>
|
||||
<if test="departmentId != null and departmentId != ''">#{departmentId},</if>
|
||||
<if test="submissionTime != null and submissionTime != ''">#{submissionTime},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="departmentId != null">#{departmentId},</if>
|
||||
<if test="submissionTime != null">#{submissionTime},</if>
|
||||
<if test="pqId != null">#{pqId},</if>
|
||||
<if test="pqCode != null and pqCode != ''">#{pqCode},</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">#{pqNumber},</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">#{pqSalesmanName},</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null and pqProject != ''">#{pqProject},</if>
|
||||
<if test="pqBidWinningRemark != null">#{pqBidWinningRemark},</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">#{pqBidDate},</if>
|
||||
<if test="pqNumber != null">#{pqNumber},</if>
|
||||
<if test="pqSalesmanName != null">#{pqSalesmanName},</if>
|
||||
<if test="pqCustomerName != null">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null">#{pqProject},</if>
|
||||
<if test="pqAuthorizedRepresentative != null">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqAgency != null">#{pqAgency},</if>
|
||||
<if test="pqBidDate != null">#{pqBidDate},</if>
|
||||
<if test="pqZbr != null">#{pqZbr},</if>
|
||||
<if test="pqBidWinningStatus != null">#{pqBidWinningStatus},</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">#{pqIllustrate},</if>
|
||||
<if test="pqIllustrate != null">#{pqIllustrate},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="pqYwyFile != null and pqYwyFile != ''">#{pqYwyFile},</if>
|
||||
<if test="isFinish != null and isFinish != ''">#{isFinish},</if>
|
||||
<if test="isFinish != null">#{isFinish},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateZgys" parameterType="Zgys">
|
||||
update zgys
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="pqCode != null and pqCode != ''">pq_code = #{pqCode},</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">pq_number = #{pqNumber},</if>
|
||||
<if test="pqCode != null">pq_code = #{pqCode},</if>
|
||||
<if test="pqNumber != null">pq_number = #{pqNumber},</if>
|
||||
<if test="pqSalesmanCode != null">pq_salesman_code = #{pqSalesmanCode},</if>
|
||||
<if test="pqSalesmanBm != null">pq_salesman_bm = #{pqSalesmanBm},</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">pq_salesman_name = #{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanName != null">pq_salesman_name = #{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanDeptId != null">pq_salesman_dept_id = #{pqSalesmanDeptId},</if>
|
||||
<if test="pqSalesmanDeptName != null and pqSalesmanDeptName != ''">pq_salesman_dept_name = #{pqSalesmanDeptName},</if>
|
||||
<if test="pqSalesmanDeptName != null">pq_salesman_dept_name = #{pqSalesmanDeptName},</if>
|
||||
<if test="pqCustomerBm != null">pq_customer_bm = #{pqCustomerBm},</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">pq_customer_name = #{pqCustomerName},</if>
|
||||
<if test="pqProject != null and pqProject != ''">pq_project = #{pqProject},</if>
|
||||
<if test="pqCustomerName != null">pq_customer_name = #{pqCustomerName},</if>
|
||||
<if test="pqProject != null">pq_project = #{pqProject},</if>
|
||||
<if test="pqBidWinningRemark != null">pq_bid_winning_remark = #{pqBidWinningRemark},</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">pq_authorized_representative = #{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">pq_bid_date = #{pqBidDate},</if>
|
||||
<if test="pqAuthorizedRepresentative != null">pq_authorized_representative = #{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null">pq_bid_date = #{pqBidDate},</if>
|
||||
<if test="pqZbr != null">pq_zbr = #{pqZbr},</if>
|
||||
<if test="pqBidWinningStatus != null">pq_bid_winning_status = #{pqBidWinningStatus},</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">pq_illustrate = #{pqIllustrate},</if>
|
||||
<if test="pqIllustrate != null">pq_illustrate = #{pqIllustrate},</if>
|
||||
<if test="pqAnnouncementLinkWebsite != null">pq_announcement_link_website = #{pqAnnouncementLinkWebsite},</if>
|
||||
<if test="pqPhone != null and pqPhone != ''">pq_phone = #{pqPhone},</if>
|
||||
<if test="pqPhone != null">pq_phone = #{pqPhone},</if>
|
||||
<if test="pqAgency != null">pq_agency = #{pqAgency},</if>
|
||||
<if test="pqRemark != null">pq_remark = #{pqRemark},</if>
|
||||
<if test="pqApprovalStatus != null">pq_approval_status = #{pqApprovalStatus},</if>
|
||||
<if test="pqOaApprovalStatus != null">pq_oa_approval_status = #{pqOaApprovalStatus},</if>
|
||||
<if test="pqOaRemark != null">pq_oa_remark = #{pqOaRemark},</if>
|
||||
<if test="pqReturnRemark != null">pq_returnRemark = #{pqReturnRemark},</if>
|
||||
<if test="pqArchiving != null">pq_archiving = #{pqArchiving},</if>
|
||||
<if test="pqVpApproval != null">pq_vp_approval = #{pqVpApproval},</if>
|
||||
|
|
@ -245,7 +243,7 @@
|
|||
{call GetSerialNo_Business(#{type,mode=IN,jdbcType=VARCHAR})}
|
||||
</select>
|
||||
|
||||
<select id="selectOAUserByUserName" resultType="SysOaAuthorize">
|
||||
<select id="selectOAUserByUserName" resultType="SysOaZgys">
|
||||
select top 1 id as userId,departmentid as departmentId from HrmResource where loginid = #{loginid}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -164,26 +164,19 @@
|
|||
<if test="departmentId != null">department_id,</if>
|
||||
<if test="submissionTime != null">submission_time,</if>
|
||||
<if test="doaId != null">doa_id,</if>
|
||||
<if test="doaCode != null">doa_code,</if>
|
||||
<if test="doaNumber != null">doa_number,</if>
|
||||
<if test="doaSalesmanName != null">doa_salesman_name,</if>
|
||||
<if test="doaSalesmanPhone != null">doa_salesman_phone,</if>
|
||||
<if test="doaProject != null">doa_project,</if>
|
||||
<if test="doaCustomerName != null">doa_customer_name,</if>
|
||||
<if test="doaOwnerUnit != null">doa_owner_unit,</if>
|
||||
<if test="doaGeneralcontractUnit != null">doa_generalcontract_unit,</if>
|
||||
<if test="doaSubcontractUnit != null">doa_subcontract_unit,</if>
|
||||
<if test="doaAuthorizer != null">doa_authorizer,</if>
|
||||
<if test="doaAuthorizerPhone != null">doa_authorizer_phone,</if>
|
||||
<if test="doaAuthorizerIdentificationNumber != null">doa_authorizer_identification_number,</if>
|
||||
<if test="doaAuthorizationDuration != null">doa_authorization_duration,</if>
|
||||
<if test="doaPowerAttorneyPurpose != null">doa_power_attorney_purpose,</if>
|
||||
<if test="doaFormat != null">doa_format,</if>
|
||||
<if test="doaRemark != null">doa_remark,</if>
|
||||
<if test="doaStandardizer != null">doa_standardizer,</if>
|
||||
<if test="doaArchiving != null">doa_archiving,</if>
|
||||
<if test="doaVicePresidentApproved != null">doa_vice_president_approved,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="fileAddress != null">file_address,</if>
|
||||
<if test="isFinish != null">isFinish,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
|
|
@ -191,26 +184,19 @@
|
|||
<if test="departmentId != null">#{departmentId},</if>
|
||||
<if test="submissionTime != null">#{submissionTime},</if>
|
||||
<if test="doaId != null">#{doaId},</if>
|
||||
<if test="doaCode != null">#{doaCode},</if>
|
||||
<if test="doaNumber != null">#{doaNumber},</if>
|
||||
<if test="doaSalesmanName != null">#{doaSalesmanName},</if>
|
||||
<if test="doaSalesmanPhone != null">#{doaSalesmanPhone},</if>
|
||||
<if test="doaProject != null">#{doaProject},</if>
|
||||
<if test="doaCustomerName != null">#{doaCustomerName},</if>
|
||||
<if test="doaOwnerUnit != null">#{doaOwnerUnit},</if>
|
||||
<if test="doaGeneralcontractUnit != null">#{doaGeneralcontractUnit},</if>
|
||||
<if test="doaSubcontractUnit != null">#{doaSubcontractUnit},</if>
|
||||
<if test="doaAuthorizer != null">#{doaAuthorizer},</if>
|
||||
<if test="doaAuthorizerPhone != null">#{doaAuthorizerPhone},</if>
|
||||
<if test="doaAuthorizerIdentificationNumber != null">#{doaAuthorizerIdentificationNumber},</if>
|
||||
<if test="doaAuthorizationDuration != null">#{doaAuthorizationDuration},</if>
|
||||
<if test="doaPowerAttorneyPurpose != null">#{doaPowerAttorneyPurpose},</if>
|
||||
<if test="doaFormat != null">#{doaFormat},</if>
|
||||
<if test="doaRemark != null">#{doaRemark},</if>
|
||||
<if test="doaStandardizer != null">#{doaStandardizer},</if>
|
||||
<if test="doaArchiving != null">#{doaArchiving},</if>
|
||||
<if test="doaVicePresidentApproved != null">#{doaVicePresidentApproved},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="fileAddress != null">#{fileAddress},</if>
|
||||
<if test="isFinish != null">#{isFinish},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateTime" column="update_time" />
|
||||
<result property="quotHandle" column="quot_handle" />
|
||||
<result property="quotDistinguish" column="quot_distinguish" />
|
||||
<result property="quotBjyRemark" column="quot_bjy_remark" />
|
||||
|
||||
<result property="quotJsxzStandard" column="quot_jsxz_standard" />
|
||||
<result property="quotJsxzApprovalStatus" column="quot_jsxz_approval_status" />
|
||||
|
|
@ -122,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price,
|
||||
a.quot_check_user_name, u2.nick_name quot_check_user_nickname,a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname, a.quot_approval_status,a.quot_materials_count,a.quot_rbDateUid,
|
||||
a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
|
||||
a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle,a.quot_distinguish,
|
||||
a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle,a.quot_distinguish,a.quot_bjy_remark,
|
||||
|
||||
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
|
||||
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
||||
|
|
@ -260,6 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotPrint != null and quotPrint != ''">quot_print,</if>
|
||||
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name,</if>
|
||||
<if test="quotDistinguish != null and quotDistinguish != ''">quot_distinguish,</if>
|
||||
<if test="quotBjyRemark != null and quotBjyRemark != ''">quot_bjy_remark,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
||||
|
|
@ -311,6 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotPrint != null and quotPrint != ''">#{quotPrint},</if>
|
||||
<if test="quotPrintUserName != null and quotPrintUserName != ''">#{quotPrintUserName},</if>
|
||||
<if test="quotDistinguish != null and quotDistinguish != ''">#{quotDistinguish},</if>
|
||||
<if test="quotBjyRemark != null and quotBjyRemark != ''">#{quotBjyRemark},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
||||
|
|
@ -356,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">quot_matprice_diff2,</if>
|
||||
<if test="quotFkFile != null and quotFkFile != ''">quot_fk_file,</if>
|
||||
<if test="quotTotalPrice != null and quotTotalPrice != ''">quot_total_price,</if>
|
||||
<if test="quotBjyRemark != null and quotBjyRemark != ''">quot_bjy_remark,</if>
|
||||
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="isFinish != null and isFinish != ''">isFinish,</if>
|
||||
|
|
@ -379,6 +383,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">#{quotMatpriceDiff2},</if>
|
||||
<if test="quotFkFile != null and quotFkFile != ''">#{quotFkFile},</if>
|
||||
<if test="quotTotalPrice != null and quotTotalPrice != ''">#{quotTotalPrice},</if>
|
||||
<if test="quotBjyRemark != null and quotBjyRemark != ''">#{quotBjyRemark},</if>
|
||||
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="isFinish != null and isFinish != ''">#{isFinish},</if>
|
||||
|
|
@ -420,6 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name = #{quotPrintUserName},</if>
|
||||
<if test="quotJswCheckUserNickname != null and quotJswCheckUserNickname != ''">quot_jsw_check_user_nickname = #{quotJswCheckUserNickname},</if>
|
||||
<if test="quotBzrUserNickname != null and quotBzrUserNickname != ''">quot_bzr_user_nickname = #{quotBzrUserNickname},</if>
|
||||
<if test="quotBjyRemark != null and quotBjyRemark != ''">quot_bjy_remark = #{quotBjyRemark},</if>
|
||||
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<result property="pqRemark" column="pq_remark" />
|
||||
<result property="pqApprovalStatus" column="pq_approval_status" />
|
||||
<result property="pqOaApprovalStatus" column="pq_oa_approval_status" />
|
||||
<result property="pqOaRemark" column="pq_oa_remark" />
|
||||
<result property="pqReturnRemark" column="pq_returnRemark" />
|
||||
<result property="pqArchiving" column="pq_archiving" />
|
||||
<result property="pqVpApproval" column="pq_vp_approval" />
|
||||
|
|
@ -50,7 +51,7 @@
|
|||
a.pq_customer_name, a.pq_project, a.pq_bid_winning_remark, a.pq_authorized_representative,
|
||||
a.pq_bid_date, a.pq_zbr, a.pq_bid_winning_status, a.pq_illustrate,
|
||||
a.pq_announcement_link_website, a.pq_phone, a.pq_agency, a.pq_remark,
|
||||
a.pq_approval_status,a.pq_oa_approval_status,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval,
|
||||
a.pq_approval_status,a.pq_oa_approval_status,a.pq_oa_remark,a.pq_returnRemark, a.pq_archiving, a.pq_vp_approval,
|
||||
a.create_by, u.nick_name create_name,a.create_time, a.update_by, a.update_time
|
||||
from zgys a
|
||||
<include refid="pqJoins"/>
|
||||
|
|
@ -82,28 +83,29 @@
|
|||
insert into zgys
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="pqId != null">pq_id,</if>
|
||||
<if test="pqCode != null and pqCode != ''">pq_code,</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">pq_number,</if>
|
||||
<if test="pqCode != null">pq_code,</if>
|
||||
<if test="pqNumber != null">pq_number,</if>
|
||||
<if test="pqSalesmanCode != null">pq_salesman_code,</if>
|
||||
<if test="pqSalesmanBm != null">pq_salesman_bm,</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">pq_salesman_name,</if>
|
||||
<if test="pqSalesmanName != null">pq_salesman_name,</if>
|
||||
<if test="pqSalesmanDeptId != null">pq_salesman_dept_id,</if>
|
||||
<if test="pqSalesmanDeptName != null and pqSalesmanDeptName != ''">pq_salesman_dept_name,</if>
|
||||
<if test="pqSalesmanDeptName != null">pq_salesman_dept_name,</if>
|
||||
<if test="pqCustomerBm != null">pq_customer_bm,</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">pq_customer_name,</if>
|
||||
<if test="pqProject != null and pqProject != ''">pq_project,</if>
|
||||
<if test="pqCustomerName != null">pq_customer_name,</if>
|
||||
<if test="pqProject != null">pq_project,</if>
|
||||
<if test="pqBidWinningRemark != null">pq_bid_winning_remark,</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">pq_authorized_representative,</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">pq_bid_date,</if>
|
||||
<if test="pqAuthorizedRepresentative != null">pq_authorized_representative,</if>
|
||||
<if test="pqBidDate != null">pq_bid_date,</if>
|
||||
<if test="pqZbr != null">pq_zbr,</if>
|
||||
<if test="pqBidWinningStatus != null">pq_bid_winning_status,</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">pq_illustrate,</if>
|
||||
<if test="pqIllustrate != null">pq_illustrate,</if>
|
||||
<if test="pqAnnouncementLinkWebsite != null">pq_announcement_link_website,</if>
|
||||
<if test="pqPhone != null and pqPhone != ''">pq_phone,</if>
|
||||
<if test="pqPhone != null">pq_phone,</if>
|
||||
<if test="pqAgency != null">pq_agency,</if>
|
||||
<if test="pqRemark != null">pq_remark,</if>
|
||||
<if test="pqApprovalStatus != null">pq_approval_status,</if>
|
||||
<if test="pqOaApprovalStatus != null">pq_oa_approval_status,</if>
|
||||
<if test="pqOaRemark != null">pq_oa_remark,</if>
|
||||
<if test="pqReturnRemark != null">pq_returnRemark,</if>
|
||||
<if test="pqArchiving != null">pq_archiving,</if>
|
||||
<if test="pqVpApproval != null">pq_vp_approval,</if>
|
||||
|
|
@ -114,28 +116,29 @@
|
|||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="pqId != null">#{pqId},</if>
|
||||
<if test="pqCode != null and pqCode != ''">#{pqCode},</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">#{pqNumber},</if>
|
||||
<if test="pqCode != null">#{pqCode},</if>
|
||||
<if test="pqNumber != null">#{pqNumber},</if>
|
||||
<if test="pqSalesmanCode != null">#{pqSalesmanCode},</if>
|
||||
<if test="pqSalesmanBm != null">#{pqSalesmanBm},</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">#{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanName != null">#{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanDeptId != null">#{pqSalesmanDeptId},</if>
|
||||
<if test="pqSalesmanDeptName != null and pqSalesmanDeptName != ''">#{pqSalesmanDeptName},</if>
|
||||
<if test="pqSalesmanDeptName != null">#{pqSalesmanDeptName},</if>
|
||||
<if test="pqCustomerBm != null">#{pqCustomerBm},</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null and pqProject != ''">#{pqProject},</if>
|
||||
<if test="pqCustomerName != null">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null">#{pqProject},</if>
|
||||
<if test="pqBidWinningRemark != null">#{pqBidWinningRemark},</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">#{pqBidDate},</if>
|
||||
<if test="pqAuthorizedRepresentative != null">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null">#{pqBidDate},</if>
|
||||
<if test="pqZbr != null">#{pqZbr},</if>
|
||||
<if test="pqBidWinningStatus != null">#{pqBidWinningStatus},</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">#{pqIllustrate},</if>
|
||||
<if test="pqIllustrate != null">#{pqIllustrate},</if>
|
||||
<if test="pqAnnouncementLinkWebsite != null">#{pqAnnouncementLinkWebsite},</if>
|
||||
<if test="pqPhone != null and pqPhone != ''">#{pqPhone},</if>
|
||||
<if test="pqAgency != null">#{pqAgency},</if>
|
||||
<if test="pqRemark != null">#{pqRemark},</if>
|
||||
<if test="pqApprovalStatus != null">#{pqApprovalStatus},</if>
|
||||
<if test="pqOaApprovalStatus != null">#{pqOaApprovalStatus},</if>
|
||||
<if test="pqOaRemark != null">#{pqOaRemark},</if>
|
||||
<if test="pqReturnRemark != null">#{pqReturnRemark},</if>
|
||||
<if test="pqArchiving != null">#{pqArchiving},</if>
|
||||
<if test="pqVpApproval != null">#{pqVpApproval},</if>
|
||||
|
|
@ -149,72 +152,67 @@
|
|||
<insert id="insertSysOAZgys" parameterType="SysOaZgys">
|
||||
insert into sys_oa_zgys
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null and userId != ''">user_id,</if>
|
||||
<if test="departmentId != null and departmentId != ''">department_id,</if>
|
||||
<if test="submissionTime != null and submissionTime != ''">submission_time,</if>
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="departmentId != null">department_id,</if>
|
||||
<if test="submissionTime != null">submission_time,</if>
|
||||
<if test="pqId != null">pq_id,</if>
|
||||
<if test="pqCode != null and pqCode != ''">pq_code,</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">pq_number,</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">pq_salesman_name,</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">pq_customer_name,</if>
|
||||
<if test="pqProject != null and pqProject != ''">pq_project,</if>
|
||||
<if test="pqBidWinningRemark != null">pq_bid_winning_remark,</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">pq_authorized_representative,</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">pq_bid_date,</if>
|
||||
<if test="pqNumber != null">pq_number,</if>
|
||||
<if test="pqSalesmanName != null">pq_salesman_name,</if>
|
||||
<if test="pqCustomerName != null">pq_customer_name,</if>
|
||||
<if test="pqProject != null">pq_project,</if>
|
||||
<if test="pqAuthorizedRepresentative != null">pq_authorized_representative,</if>
|
||||
<if test="pqAgency != null">pq_agency,</if>
|
||||
<if test="pqBidDate != null">pq_bid_date,</if>
|
||||
<if test="pqZbr != null">pq_zbr,</if>
|
||||
<if test="pqBidWinningStatus != null">pq_bid_winning_status,</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">pq_illustrate,</if>
|
||||
<if test="pqIllustrate != null">pq_illustrate,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="pqYwyFile != null and pqYwyFile != ''">pq_ywy_file,</if>
|
||||
<if test="isFinish != null and isFinish != ''">isFinish,</if>
|
||||
<if test="isFinish != null">isFinish,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null and userId != ''">#{userId},</if>
|
||||
<if test="departmentId != null and departmentId != ''">#{departmentId},</if>
|
||||
<if test="submissionTime != null and submissionTime != ''">#{submissionTime},</if>
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="departmentId != null">#{departmentId},</if>
|
||||
<if test="submissionTime != null">#{submissionTime},</if>
|
||||
<if test="pqId != null">#{pqId},</if>
|
||||
<if test="pqCode != null and pqCode != ''">#{pqCode},</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">#{pqNumber},</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">#{pqSalesmanName},</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null and pqProject != ''">#{pqProject},</if>
|
||||
<if test="pqBidWinningRemark != null">#{pqBidWinningRemark},</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">#{pqBidDate},</if>
|
||||
<if test="pqNumber != null">#{pqNumber},</if>
|
||||
<if test="pqSalesmanName != null">#{pqSalesmanName},</if>
|
||||
<if test="pqCustomerName != null">#{pqCustomerName},</if>
|
||||
<if test="pqProject != null">#{pqProject},</if>
|
||||
<if test="pqAuthorizedRepresentative != null">#{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqAgency != null">#{pqAgency},</if>
|
||||
<if test="pqBidDate != null">#{pqBidDate},</if>
|
||||
<if test="pqZbr != null">#{pqZbr},</if>
|
||||
<if test="pqBidWinningStatus != null">#{pqBidWinningStatus},</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">#{pqIllustrate},</if>
|
||||
<if test="pqIllustrate != null">#{pqIllustrate},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="pqYwyFile != null and pqYwyFile != ''">#{pqYwyFile},</if>
|
||||
<if test="isFinish != null and isFinish != ''">#{isFinish},</if>
|
||||
<if test="isFinish != null">#{isFinish},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateZgys" parameterType="Zgys">
|
||||
update zgys
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="pqCode != null and pqCode != ''">pq_code = #{pqCode},</if>
|
||||
<if test="pqNumber != null and pqNumber != ''">pq_number = #{pqNumber},</if>
|
||||
<if test="pqCode != null">pq_code = #{pqCode},</if>
|
||||
<if test="pqNumber != null">pq_number = #{pqNumber},</if>
|
||||
<if test="pqSalesmanCode != null">pq_salesman_code = #{pqSalesmanCode},</if>
|
||||
<if test="pqSalesmanBm != null">pq_salesman_bm = #{pqSalesmanBm},</if>
|
||||
<if test="pqSalesmanName != null and pqSalesmanName != ''">pq_salesman_name = #{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanName != null">pq_salesman_name = #{pqSalesmanName},</if>
|
||||
<if test="pqSalesmanDeptId != null">pq_salesman_dept_id = #{pqSalesmanDeptId},</if>
|
||||
<if test="pqSalesmanDeptName != null and pqSalesmanDeptName != ''">pq_salesman_dept_name = #{pqSalesmanDeptName},</if>
|
||||
<if test="pqSalesmanDeptName != null">pq_salesman_dept_name = #{pqSalesmanDeptName},</if>
|
||||
<if test="pqCustomerBm != null">pq_customer_bm = #{pqCustomerBm},</if>
|
||||
<if test="pqCustomerName != null and pqCustomerName != ''">pq_customer_name = #{pqCustomerName},</if>
|
||||
<if test="pqProject != null and pqProject != ''">pq_project = #{pqProject},</if>
|
||||
<if test="pqCustomerName != null">pq_customer_name = #{pqCustomerName},</if>
|
||||
<if test="pqProject != null">pq_project = #{pqProject},</if>
|
||||
<if test="pqBidWinningRemark != null">pq_bid_winning_remark = #{pqBidWinningRemark},</if>
|
||||
<if test="pqAuthorizedRepresentative != null and pqAuthorizedRepresentative != ''">pq_authorized_representative = #{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null and pqBidDate != ''">pq_bid_date = #{pqBidDate},</if>
|
||||
<if test="pqAuthorizedRepresentative != null">pq_authorized_representative = #{pqAuthorizedRepresentative},</if>
|
||||
<if test="pqBidDate != null">pq_bid_date = #{pqBidDate},</if>
|
||||
<if test="pqZbr != null">pq_zbr = #{pqZbr},</if>
|
||||
<if test="pqBidWinningStatus != null">pq_bid_winning_status = #{pqBidWinningStatus},</if>
|
||||
<if test="pqIllustrate != null and pqIllustrate != ''">pq_illustrate = #{pqIllustrate},</if>
|
||||
<if test="pqIllustrate != null">pq_illustrate = #{pqIllustrate},</if>
|
||||
<if test="pqAnnouncementLinkWebsite != null">pq_announcement_link_website = #{pqAnnouncementLinkWebsite},</if>
|
||||
<if test="pqPhone != null and pqPhone != ''">pq_phone = #{pqPhone},</if>
|
||||
<if test="pqPhone != null">pq_phone = #{pqPhone},</if>
|
||||
<if test="pqAgency != null">pq_agency = #{pqAgency},</if>
|
||||
<if test="pqRemark != null">pq_remark = #{pqRemark},</if>
|
||||
<if test="pqApprovalStatus != null">pq_approval_status = #{pqApprovalStatus},</if>
|
||||
<if test="pqOaApprovalStatus != null">pq_oa_approval_status = #{pqOaApprovalStatus},</if>
|
||||
<if test="pqOaRemark != null">pq_oa_remark = #{pqOaRemark},</if>
|
||||
<if test="pqReturnRemark != null">pq_returnRemark = #{pqReturnRemark},</if>
|
||||
<if test="pqArchiving != null">pq_archiving = #{pqArchiving},</if>
|
||||
<if test="pqVpApproval != null">pq_vp_approval = #{pqVpApproval},</if>
|
||||
|
|
@ -245,7 +243,7 @@
|
|||
{call GetSerialNo_Business(#{type,mode=IN,jdbcType=VARCHAR})}
|
||||
</select>
|
||||
|
||||
<select id="selectOAUserByUserName" resultType="SysOaAuthorize">
|
||||
<select id="selectOAUserByUserName" resultType="SysOaZgys">
|
||||
select top 1 id as userId,departmentid as departmentId from HrmResource where loginid = #{loginid}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#Generated by Maven
|
||||
#Thu Aug 08 10:17:39 CST 2024
|
||||
#Thu Aug 08 15:05:23 CST 2024
|
||||
version=3.8.7
|
||||
groupId=com.ruoyi
|
||||
artifactId=ruoyi-system
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -79,9 +79,9 @@ export function commitAuthorizeOA(data) {
|
|||
})
|
||||
}
|
||||
//驳回按钮
|
||||
export function rejectForm(data) {
|
||||
export function rejectAuthorize(data) {
|
||||
return request({
|
||||
url: '/authorize/authorize/rejectForm',
|
||||
url: '/authorize/authorize/rejectAuthorize',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
|
|
|
|||
|
|
@ -79,9 +79,9 @@ export function commitZgysOA(data) {
|
|||
})
|
||||
}
|
||||
//驳回按钮
|
||||
export function rejectForm(data) {
|
||||
export function rejectZgys(data) {
|
||||
return request({
|
||||
url: '/zgys/zgys/rejectForm',
|
||||
url: '/zgys/zgys/rejectZgys',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
|
|
|
|||
|
|
@ -216,7 +216,9 @@
|
|||
<el-input v-model="form.doaSalesmanCode" v-if="false"/>
|
||||
<el-input v-model="form.doaSalesmanBm" v-if="false"/>
|
||||
<el-input v-model="form.doaSalesmanName" :disabled="true" style="width: 60%"/>
|
||||
<el-button v-if="checkRole(['BID','BID_ZHGLY'])" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="openPeopleSelectYwy" size="mini"></el-button>
|
||||
<span v-if="checkRole(['BID','BID_ZHGLY'])">
|
||||
<el-button type="primary" icon="el-icon-search" style="margin-left: 10px" @click="openPeopleSelectYwy" size="mini" v-if="!ywyDis&&!tbDis"></el-button>
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -229,7 +231,7 @@
|
|||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="类别" prop="doaPowerAttorneyPurpose">
|
||||
<el-select v-model="form.doaPowerAttorneyPurpose" placeholder="请选择类别" :disabled="ywyDis">
|
||||
<el-select v-model="form.doaPowerAttorneyPurpose" placeholder="请选择类别" :disabled="ywyDis||tbDis">
|
||||
<el-option
|
||||
v-for="dict in dict.type.doa_power_attorney_purpose"
|
||||
:key="dict.value"
|
||||
|
|
@ -241,7 +243,7 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权格式" prop="doaFormat">
|
||||
<el-select v-model="form.doaFormat" placeholder="请选择有无格式" :disabled="ywyDis">
|
||||
<el-select v-model="form.doaFormat" placeholder="请选择有无格式" :disabled="ywyDis||tbDis">
|
||||
<el-option
|
||||
v-for="dict in dict.type.doa_format"
|
||||
:key="dict.value"
|
||||
|
|
@ -255,12 +257,12 @@
|
|||
<el-row :gutter="8">
|
||||
<el-col :span="16">
|
||||
<el-form-item label="项目名称" prop="doaProject">
|
||||
<el-input type="textarea" autosize v-model="form.doaProject" placeholder="请输入项目名称" :disabled="ywyDis"/>
|
||||
<el-input type="textarea" autosize v-model="form.doaProject" placeholder="请输入项目名称" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务员电话" prop="doaSalesmanPhone">
|
||||
<el-input v-model="form.doaSalesmanPhone" placeholder="请输入业务员电话" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaSalesmanPhone" placeholder="请输入业务员电话" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -269,42 +271,42 @@
|
|||
<el-form-item label="客户名称" prop="doaCustomerName">
|
||||
<el-input v-model="form.doaCustomerBm" v-if="false"/>
|
||||
<el-input v-model="form.doaCustomerName" placeholder="请输入客户名称" :disabled="true">
|
||||
<el-button slot="append" icon="el-icon-search" @click="openCustomer" v-if="!ywyDis"/>
|
||||
<el-button slot="append" icon="el-icon-search" @click="openCustomer" v-if="!ywyDis&&!tbDis"/>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业主单位" prop="doaOwnerUnit">
|
||||
<el-input v-model="form.doaOwnerUnit" placeholder="请输入业主单位" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaOwnerUnit" placeholder="请输入业主单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人" prop="doaAuthorizer">
|
||||
<el-input v-model="form.doaAuthorizer" placeholder="请输入授权人" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaAuthorizer" placeholder="请输入授权人" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人电话" prop="doaAuthorizerPhone">
|
||||
<el-input v-model="form.doaAuthorizerPhone" placeholder="请输入授权人电话" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaAuthorizerPhone" placeholder="请输入授权人电话" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="总包单位" prop="doaGeneralcontractUnit">
|
||||
<el-input v-model="form.doaGeneralcontractUnit" placeholder="请输入总包单位" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaGeneralcontractUnit" placeholder="请输入总包单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="分包单位" prop="doaSubcontractUnit">
|
||||
<el-input v-model="form.doaSubcontractUnit" placeholder="请输入分包单位" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaSubcontractUnit" placeholder="请输入分包单位" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人身份证号" prop="doaAuthorizerIdentificationNumber">
|
||||
<el-input v-model="form.doaAuthorizerIdentificationNumber" placeholder="请输入授权人身份证号" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.doaAuthorizerIdentificationNumber" placeholder="请输入授权人身份证号" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -314,7 +316,7 @@
|
|||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择授权期限"
|
||||
:disabled="ywyDis">
|
||||
:disabled="ywyDis||tbDis">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -322,14 +324,14 @@
|
|||
<el-row :gutter="8">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="doaRemark">
|
||||
<el-input type="textarea" autosize v-model="form.doaRemark" placeholder="请输入备注" :disabled="ywyDis"/>
|
||||
<el-input type="textarea" autosize v-model="form.doaRemark" placeholder="请输入备注" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="24" v-if="this.form.doaApprovalStatus != '0' && this.form.doaApprovalStatus != null">
|
||||
<el-form-item label="驳回原因" prop="doaRejectionReasons">
|
||||
<el-input type="textarea" autosize v-model="form.doaRejectionReasons" placeholder="投标办填写" :disabled="checkRole(['SALES_MAN']) || (this.form.bidApprovalStatus == '2' || this.form.bidApprovalStatus == '3')"/>
|
||||
<el-input type="textarea" autosize v-model="form.doaRejectionReasons" placeholder="投标办填写" :disabled="checkRole(['SALES_MAN']) || (this.form.doaApprovalStatus == '2' || this.form.doaApprovalStatus == '3')"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -343,12 +345,12 @@
|
|||
<el-row :gutter="8" v-if="checkRole(['BID','BID_ZHGLY'])">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="制标员" prop="doaStandardizer">
|
||||
<el-input v-model="form.doaStandardizer" placeholder="请输入制标员" />
|
||||
<el-input v-model="form.doaStandardizer" placeholder="请输入制标员" :disabled="tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否存档" prop="doaArchiving">
|
||||
<el-select v-model="form.doaArchiving" placeholder="请选择是否存档">
|
||||
<el-select v-model="form.doaArchiving" placeholder="请选择是否存档" :disabled="tbDis">
|
||||
<el-option
|
||||
v-for="dict in dict.type.doa_archiving"
|
||||
:key="dict.value"
|
||||
|
|
@ -409,7 +411,7 @@
|
|||
|
||||
<!-- 投标提交OA、驳回-->
|
||||
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:commitOA']"><el-button type="primary" plain @click="commitFormOA" v-if="this.form.doaApprovalStatus == '1'&&this.form.doaOaApprovalStatus == '0'">提交至OA</el-button></span>
|
||||
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:reject']"><el-button type="danger" plain @click="rejectForm" v-if="this.form.bidApprovalStatus == '1'">驳回</el-button></span>
|
||||
<span style="margin-left: 10px" v-hasPermi="['authorize:authorize:reject']"><el-button type="danger" plain @click="rejectForm" v-if="this.form.doaApprovalStatus == '1'&&this.form.doaOaApprovalStatus != '1'">驳回</el-button></span>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -444,7 +446,7 @@
|
|||
<script>
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
|
||||
import { listAuthorize, getAuthorize, delAuthorize, addAuthorize, updateAuthorize,commitAuthorize,commitAuthorizeJl,commitAuthorizeOA,rejectForm, authorizeFileList, authorizeFileDelete } from "@/api/authorize/authorize";
|
||||
import { listAuthorize, getAuthorize, delAuthorize, addAuthorize, updateAuthorize,commitAuthorize,commitAuthorizeOA,rejectAuthorize, authorizeFileList, authorizeFileDelete } from "@/api/authorize/authorize";
|
||||
/** 弹窗放大、拖拽 */
|
||||
import elDragDialog from "@/directive/dialog/dragDialog";
|
||||
/** 导入客户选择组件 */
|
||||
|
|
@ -555,7 +557,9 @@ export default {
|
|||
codeProp: "",
|
||||
|
||||
//业务员编辑状态
|
||||
ywyDis: false
|
||||
ywyDis: false,
|
||||
//投标办编辑状态
|
||||
tbDis: false,
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
|
@ -640,6 +644,11 @@ export default {
|
|||
updateTime: null
|
||||
};
|
||||
|
||||
//业务员编辑状态
|
||||
this.ywyDis = false;
|
||||
//投标办编辑状态
|
||||
this.tbDis = false;
|
||||
|
||||
this.authorizeYwyFileList = [],
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
|
@ -684,14 +693,21 @@ export default {
|
|||
this.title = "授权备案";
|
||||
|
||||
const doaApprovalStatus = this.form.doaApprovalStatus;
|
||||
if(checkRole(['SALES_MAN'])&&("1"==doaApprovalStatus||"2"==doaApprovalStatus)){
|
||||
const doaOaApprovalStatus = this.form.doaOaApprovalStatus;
|
||||
//业务员角色 并且是协助中或者已完成、已驳回 时 不可编辑
|
||||
if(checkRole(['SALES_MAN']) && doaApprovalStatus!='0'){
|
||||
this.ywyDis = true;
|
||||
}
|
||||
|
||||
//投标办所有人 并且是OA审批中 时 不可编辑
|
||||
if(checkRole(['BID','BID_ZHGLY'])&&"1"==doaOaApprovalStatus){
|
||||
this.tbDis = true;
|
||||
}
|
||||
|
||||
this.getDoaYwyFileList();
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
/** 保存修改按钮 */
|
||||
saveForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
|
|
@ -715,19 +731,14 @@ export default {
|
|||
commitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
commitAuthorize(this.form).then(response => {
|
||||
this.$modal.msgSuccess("提交成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
const doaFormat = this.form.doaFormat;
|
||||
if("0"==doaFormat){// 有授权格式则业务员附件则必须上传
|
||||
if(this.authorizeYwyFileList.length==0){
|
||||
this.$modal.msgError("如有授权格式,请上传业务员附件");
|
||||
return;
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 投标办提交经理按钮 */
|
||||
commitFormJl() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
commitAuthorizeJl(this.form).then(response => {
|
||||
}
|
||||
commitAuthorize(this.form).then(response => {
|
||||
this.$modal.msgSuccess("提交成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
|
|
@ -749,7 +760,7 @@ export default {
|
|||
},
|
||||
/** 投标驳回按钮 */
|
||||
rejectForm() {
|
||||
rejectForm(this.form).then(response => {
|
||||
rejectAuthorize(this.form).then(response => {
|
||||
this.$modal.msgSuccess("驳回成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
|
|
@ -775,10 +786,10 @@ export default {
|
|||
|
||||
/** 打开变更记录 */
|
||||
handleChangeRecord(){
|
||||
const bidIds = this.ids;
|
||||
const doaIds = this.ids;
|
||||
this.openChangeRecord=true;
|
||||
this.changeRecordTitle="变更记录";
|
||||
this.codeProp = bidIds[0];
|
||||
this.codeProp = doaIds[0];
|
||||
},
|
||||
/*********************************打开选客户弹窗*****************************************/
|
||||
/** 打开客户选择弹窗 */
|
||||
|
|
|
|||
|
|
@ -382,7 +382,9 @@
|
|||
<el-input v-model="form.bidSalesmanName" :disabled="true" style="width: 60%"/>
|
||||
<el-input v-model="form.bidSalesmanBm" v-if="false"/>
|
||||
<el-input v-model="form.bidSalesmanCode" v-if="false"/>
|
||||
<el-button v-if="checkRole(['BID'])" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="openPeopleSelectYwy" size="mini"></el-button>
|
||||
<span v-if="checkRole(['BID'])">
|
||||
<el-button type="primary" icon="el-icon-search" style="margin-left: 10px" @click="openPeopleSelectYwy" size="mini" v-if="!ywyDis&&!tbDis"></el-button>
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8" v-if="false">
|
||||
|
|
@ -1151,7 +1153,7 @@
|
|||
|
||||
<!-- 投标提交OA、驳回-->
|
||||
<span style="margin-left: 10px;float:left" v-hasPermi="['bid:bid:commitOA']"><el-button type="warning" plain @click="commitOA" v-if="this.form.bidApprovalStatus != '0' && this.form.bidOaApprovalStatus != '1'">提交OA</el-button></span>
|
||||
<span style="margin-left: 10px" v-hasPermi="['bid:bid:reject']"><el-button type="danger" plain @click="rejectBidForm" v-if="this.form.bidApprovalStatus == '1'&&this.form.bidJsxzApprovalStatus != '1'&&this.form.bidHjApprovalStatus != '1'">驳回</el-button></span>
|
||||
<span style="margin-left: 10px" v-hasPermi="['bid:bid:reject']"><el-button type="danger" plain @click="rejectBidForm" v-if="this.form.bidApprovalStatus == '1'&&this.form.bidJsxzApprovalStatus != '1'&&this.form.bidHjApprovalStatus != '1'&&this.form.bidOaApprovalStatus != '1'">驳回</el-button></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -153,6 +153,11 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed label="资格预审编号" align="center" prop="pqNumber" width="100px" />
|
||||
<el-table-column fixed label="提交状态" align="center" prop="pqApprovalStatus">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.pq_approval_status" :value="scope.row.pqApprovalStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类别" align="center" prop="pqIllustrate">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.pq_illustrate" :value="scope.row.pqIllustrate"/>
|
||||
|
|
@ -200,7 +205,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="OA提交状态" prop="pqOaApprovalStatus">
|
||||
<el-form-item label="OA审批状态" prop="pqOaApprovalStatus">
|
||||
<dict-tag :options="dict.type.pq_oa_approval_status" :value="this.form.pqOaApprovalStatus"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -217,7 +222,9 @@
|
|||
<el-input v-model="form.pqSalesmanCode" v-if="false"/>
|
||||
<el-input v-model="form.pqSalesmanBm" v-if="false"/>
|
||||
<el-input v-model="form.pqSalesmanName" :disabled="true" style="width: 60%"/>
|
||||
<el-button v-if="checkRole(['BID','BID_BSZZY','BID_ZHGLY'])" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="openPeopleSelectYwy" size="mini"></el-button>
|
||||
<span v-if="checkRole(['BID','BID_BSZZY','BID_ZHGLY'])">
|
||||
<el-button type="primary" icon="el-icon-search" style="margin-left: 10px" @click="openPeopleSelectYwy" size="mini" v-if="!ywyDis&&!tbDis"></el-button>
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -232,20 +239,20 @@
|
|||
<el-form-item label="客户名称" prop="pqCustomerName">
|
||||
<el-input v-model="form.pqCustomerBm" v-if="false"/>
|
||||
<el-input v-model="form.pqCustomerName" placeholder="请输入客户名称" :disabled="true">
|
||||
<el-button slot="append" icon="el-icon-search" @click="openCustomer" v-if="!ywyDis"/>
|
||||
<el-button slot="append" icon="el-icon-search" @click="openCustomer" v-if="!ywyDis&&!tbDis"/>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="招标代理" prop="pqAgency">
|
||||
<el-input v-model="form.pqAgency" placeholder="请输入招标代理" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.pqAgency" placeholder="请输入招标代理" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="项目" prop="pqProject">
|
||||
<el-input type="textarea" autosize v-model="form.pqProject" placeholder="请输入项目" :disabled="ywyDis" />
|
||||
<el-input type="textarea" autosize v-model="form.pqProject" placeholder="请输入项目" :disabled="ywyDis||tbDis" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -256,25 +263,25 @@
|
|||
v-model="form.pqBidDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择资审、报名截止日期" :disabled="ywyDis">
|
||||
placeholder="请选择资审、报名截止日期" :disabled="ywyDis||tbDis">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人" prop="pqAuthorizedRepresentative">
|
||||
<el-input v-model="form.pqAuthorizedRepresentative" placeholder="请输入授权人" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.pqAuthorizedRepresentative" placeholder="请输入授权人" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="授权人电话" prop="pqPhone">
|
||||
<el-input v-model="form.pqPhone" placeholder="请输入授权人电话" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.pqPhone" placeholder="请输入授权人电话" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="类别" prop="pqIllustrate">
|
||||
<el-select v-model="form.pqIllustrate" placeholder="请选择类别" :disabled="ywyDis">
|
||||
<el-select v-model="form.pqIllustrate" placeholder="请选择类别" :disabled="ywyDis||tbDis">
|
||||
<el-option
|
||||
v-for="dict in dict.type.pq_illustrate"
|
||||
:key="dict.value"
|
||||
|
|
@ -286,19 +293,19 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="平台网址" prop="pqAnnouncementLinkWebsite">
|
||||
<el-input v-model="form.pqAnnouncementLinkWebsite" placeholder="请输入平台网址" :disabled="ywyDis"/>
|
||||
<el-input v-model="form.pqAnnouncementLinkWebsite" placeholder="请输入平台网址" :disabled="ywyDis||tbDis"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8" v-if="checkRole(['BID','BID_BSZZY','BID_ZHGLY'])" >
|
||||
<el-col :span="8">
|
||||
<el-form-item label="制标人" prop="pqZbr">
|
||||
<el-input v-model="form.pqZbr" placeholder="请输入制标人" />
|
||||
<el-input v-model="form.pqZbr" placeholder="请输入制标人" :disabled="tbDis" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否存档" prop="pqArchiving">
|
||||
<el-select v-model="form.pqArchiving" placeholder="请选择是否存档">
|
||||
<el-select v-model="form.pqArchiving" placeholder="请选择是否存档" :disabled="tbDis">
|
||||
<el-option
|
||||
v-for="dict in dict.type.pq_archiving"
|
||||
:key="dict.value"
|
||||
|
|
@ -328,6 +335,13 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8">
|
||||
<el-col :span="24" v-if="this.form.pqApprovalStatus != '0' && this.form.pqApprovalStatus != null">
|
||||
<el-form-item label="OA反馈说明" prop="pqOaRemark">
|
||||
<el-input type="textarea" autosize v-model="form.pqOaRemark" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider content-position="left" class="customer_divider_text">业务员附件(先保存再上传)</el-divider>
|
||||
<div v-hasPermi="['zgys:zgys:zgysYwyFile']">
|
||||
<el-upload class="upload-demo"
|
||||
|
|
@ -372,7 +386,7 @@
|
|||
|
||||
<!-- 投标提交OA、驳回-->
|
||||
<span style="margin-left: 10px" v-hasPermi="['zgys:zgys:commitOA']"><el-button type="primary" plain @click="commitOAForm" v-if="this.form.pqOaApprovalStatus == '0'">提 交OA</el-button></span>
|
||||
<span style="margin-left: 10px" v-hasPermi="['zgys:zgys:reject']"><el-button type="danger" plain @click="rejectForm" v-if="this.form.bidApprovalStatus == '1'">驳回</el-button></span>
|
||||
<span style="margin-left: 10px" v-hasPermi="['zgys:zgys:reject']"><el-button type="danger" plain @click="rejectForm" v-if="this.form.pqApprovalStatus == '1'&&this.form.pqOaApprovalStatus != '1'">驳回</el-button></span>
|
||||
|
||||
</div>
|
||||
<PeopleSelect v-if="checkRole(['BID','BID_BSZZY','BID_ZHGLY'])" ref="peopleSelect" :type="'single'" :isCheck="true" :open="peopleOpenSelectYwy" @cancel="peopleOpenSelectYwy=false" @submit="submitPeopleSelectYwy"></PeopleSelect>
|
||||
|
|
@ -406,7 +420,7 @@
|
|||
<script>
|
||||
import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { listZgys, getZgys, delZgys, addZgys, updateZgys, zgysFileList, zgysFileDelete, commitZgys, commitZgysOA,rejectForm } from "@/api/zgys/zgys";
|
||||
import { listZgys, getZgys, delZgys, addZgys, updateZgys, zgysFileList, zgysFileDelete, commitZgys, commitZgysOA,rejectZgys } from "@/api/zgys/zgys";
|
||||
/** 弹窗放大、拖拽 */
|
||||
import elDragDialog from "@/directive/dialog/dragDialog";
|
||||
/** 导入客户选择组件 */
|
||||
|
|
@ -512,10 +526,23 @@ export default {
|
|||
codeProp: "",
|
||||
|
||||
//业务员编辑状态
|
||||
ywyDis: false
|
||||
ywyDis: false,
|
||||
//投标办编辑状态
|
||||
tbDis: false,
|
||||
};
|
||||
},
|
||||
created() {
|
||||
const roles = this.$store.state.user.roles;
|
||||
if(roles.indexOf('SALES_MAN') == -1 && roles.indexOf('admin') == -1){//除业务员默认查看待审核 单据
|
||||
this.queryParams.pqApprovalStatus = '1';
|
||||
this.queryParams.orderByColumn = "a.pq_number";//查询字段是表格中字段名字
|
||||
this.queryParams.isAsc = "desc";//动态取值排序顺序
|
||||
}
|
||||
if(roles.indexOf('SALES_MAN') != -1|| roles.indexOf('admin') !== -1){//业务员默认查看所有 单据 且按授权编号排序
|
||||
this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字
|
||||
this.queryParams.isAsc = "desc";//动态取值排序顺序
|
||||
}
|
||||
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -567,6 +594,7 @@ export default {
|
|||
pqArchiving: null,
|
||||
pqApprovalStatus: null,
|
||||
pqOaApprovalStatus: null,
|
||||
pqOaRemark: null,
|
||||
pqReturnRemark: null,
|
||||
pqVpApproval: null,
|
||||
createBy: null,
|
||||
|
|
@ -574,6 +602,12 @@ export default {
|
|||
updateBy: null,
|
||||
updateTime: null
|
||||
};
|
||||
|
||||
//业务员编辑状态
|
||||
this.ywyDis = false;
|
||||
//投标办编辑状态
|
||||
this.tbDis = false;
|
||||
|
||||
this.zgysYwyFileList = [],
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
|
@ -615,10 +649,17 @@ export default {
|
|||
this.title = "资格预审";
|
||||
|
||||
const pqApprovalStatus = this.form.pqApprovalStatus;
|
||||
const pqOaApprovalStatus = this.form.pqOaApprovalStatus;
|
||||
//业务员角色 并且是协助中或者已完成 时 不可编辑
|
||||
if(checkRole(['SALES_MAN'])&&("1"==pqApprovalStatus||"2"==pqApprovalStatus)){
|
||||
this.ywyDis = true;
|
||||
}
|
||||
|
||||
//投标办所有人 并且是OA审批中 时 不可编辑
|
||||
if(checkRole(['BID','BID_ZHGLY'])&&"1"==pqOaApprovalStatus){
|
||||
this.tbDis = true;
|
||||
}
|
||||
|
||||
//获取资格预审信息-附件列表
|
||||
this.getZgysYwyFileList();
|
||||
});
|
||||
|
|
@ -669,7 +710,7 @@ export default {
|
|||
},
|
||||
/** 投标驳回按钮 */
|
||||
rejectForm() {
|
||||
rejectForm(this.form).then(response => {
|
||||
rejectZgys(this.form).then(response => {
|
||||
this.$modal.msgSuccess("驳回成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
|
|
|
|||
Loading…
Reference in New Issue