'123'
This commit is contained in:
parent
03bd64a8bd
commit
fe549410a1
|
|
@ -2,86 +2,13 @@
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
<list default="true" id="1ea72584-8a6e-4fb7-9928-17671c0b6e92" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" afterPath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-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/priceVerification/BidHjController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/priceVerification/BidHjController.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/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/technicalConfirm/BidJsqrController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.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/priceVerification/BidHjController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/priceVerification/BidHjController.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/technicalConfirm/BidJsqrController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/technicalConfirm/BidJsqrController.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" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysAuthorize.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysBid.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAAuthorizeMapper.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OABidMapper.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAAuthorizeService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OABidService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OABidServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AuthorizeTask.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/BidTask.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAAuthorizeMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OABidMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysAuthorize.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysBid.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/domain/OASysZgys.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAAuthorizeServiceImpl.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OABidServiceImpl.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAAuthorizeMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OABidMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/OAZgysMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/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/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/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/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/registeredCompany/domain/RegisteredCompany.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.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/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.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/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/registeredCompany/RegisteredCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/registeredCompany/RegisteredCompanyMapper.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/quot/quot.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/quot/quot.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/technicalConfirm/BidJsqrMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/technicalConfirm/BidJsqrMapper.xml" 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-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/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/registeredCompany/domain/RegisteredCompany.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/registeredCompany/domain/RegisteredCompany.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/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/bid/BidMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/priceVerification/BidHjMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/priceVerification/BidHjMapper.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/registeredCompany/RegisteredCompanyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/registeredCompany/RegisteredCompanyMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/technicalConfirm/BidJsqrMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/technicalConfirm/BidJsqrMapper.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/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/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/registeredCompany/registeredCompany/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/registeredCompany/registeredCompany/index.vue" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|
@ -174,7 +101,9 @@
|
||||||
<workItem from="1723075283080" duration="10029000" />
|
<workItem from="1723075283080" duration="10029000" />
|
||||||
<workItem from="1723086697484" duration="197000" />
|
<workItem from="1723086697484" duration="197000" />
|
||||||
<workItem from="1723087435797" duration="15421000" />
|
<workItem from="1723087435797" duration="15421000" />
|
||||||
<workItem from="1723161740119" duration="15138000" />
|
<workItem from="1723161740119" duration="15882000" />
|
||||||
|
<workItem from="1723186498493" duration="62000" />
|
||||||
|
<workItem from="1723188538030" duration="229000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -207,65 +136,65 @@
|
||||||
</state>
|
</state>
|
||||||
<state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722996900988" />
|
<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 x="2475" y="237" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017044285" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.bottom" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.0.bottom" timestamp="1723185397662">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397662" />
|
||||||
<state width="1396" height="250" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
<state width="1396" height="250" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.center" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.0.center" timestamp="1723185397662">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397662" />
|
||||||
<state width="1396" height="250" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
<state width="1396" height="250" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.left" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.0.left" timestamp="1723185397662">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397662" />
|
||||||
<state width="1396" height="250" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
<state width="1396" height="250" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.right" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.0.right" timestamp="1723185397662">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397662" />
|
||||||
<state width="1396" height="250" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
<state width="1396" height="250" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723167132395" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.bottom" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.1.bottom" timestamp="1723185397663">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397663" />
|
||||||
<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.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.center" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.1.center" timestamp="1723185397662">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397662" />
|
||||||
<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.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.left" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.1.left" timestamp="1723185397662">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397662" />
|
||||||
<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.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723086215554" />
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.right" timestamp="1723184484893">
|
<state width="1876" height="39" key="GridCell.Tab.1.right" timestamp="1723185397663">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="299" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723184484893" />
|
<state width="1876" height="39" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397663" />
|
||||||
<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="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="39" key="GridCell.Tab.2.bottom" timestamp="1723166255833">
|
<state width="1876" height="39" key="GridCell.Tab.2.bottom" timestamp="1723185397663">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
<state width="1876" height="39" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397663" />
|
||||||
<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.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.center" timestamp="1723166255833">
|
<state width="1876" height="39" key="GridCell.Tab.2.center" timestamp="1723185397663">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
<state width="1876" height="39" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397663" />
|
||||||
<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.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.left" timestamp="1723166255833">
|
<state width="1876" height="39" key="GridCell.Tab.2.left" timestamp="1723185397663">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
<state width="1876" height="39" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397663" />
|
||||||
<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.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723017774091" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.right" timestamp="1723166255833">
|
<state width="1876" height="39" key="GridCell.Tab.2.right" timestamp="1723185397663">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="0" y="0" width="1920" height="1040" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723166255833" />
|
<state width="1876" height="39" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1723185397663" />
|
||||||
<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 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">
|
<state x="2203" y="104" key="Maven.ArtifactSearchDialog" timestamp="1722820075785">
|
||||||
<screen x="1920" y="0" width="1440" height="900" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
|
|
|
||||||
|
|
@ -944,6 +944,16 @@ public class QuotController extends BaseController
|
||||||
quotService.saveQuotFeedbackExplanation(quot);
|
quotService.saveQuotFeedbackExplanation(quot);
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 保存报价员备注
|
||||||
|
*/
|
||||||
|
@Log(title = "报价组-保存报价员备注", businessType = BusinessType.OTHER)
|
||||||
|
@PostMapping("/saveQuotBjyRemark")
|
||||||
|
public AjaxResult saveQuotBjyRemark(@RequestBody Quot quot)
|
||||||
|
{
|
||||||
|
quotService.saveQuotBjyRemark(quot);
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 14:20:44 CST 2024
|
#Fri Aug 09 15:34:59 CST 2024
|
||||||
version=3.8.7
|
version=3.8.7
|
||||||
groupId=com.ruoyi
|
groupId=com.ruoyi
|
||||||
artifactId=ruoyi-admin
|
artifactId=ruoyi-admin
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 14:20:29 CST 2024
|
#Fri Aug 09 15:34:09 CST 2024
|
||||||
version=3.8.7
|
version=3.8.7
|
||||||
groupId=com.ruoyi
|
groupId=com.ruoyi
|
||||||
artifactId=ruoyi-common
|
artifactId=ruoyi-common
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 14:20:36 CST 2024
|
#Fri Aug 09 15:34:31 CST 2024
|
||||||
version=3.8.7
|
version=3.8.7
|
||||||
groupId=com.ruoyi
|
groupId=com.ruoyi
|
||||||
artifactId=ruoyi-framework
|
artifactId=ruoyi-framework
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 14:20:38 CST 2024
|
#Fri Aug 09 15:34:43 CST 2024
|
||||||
version=3.8.7
|
version=3.8.7
|
||||||
groupId=com.ruoyi
|
groupId=com.ruoyi
|
||||||
artifactId=ruoyi-generator
|
artifactId=ruoyi-generator
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 14:20:38 CST 2024
|
#Fri Aug 09 15:34:37 CST 2024
|
||||||
version=3.8.7
|
version=3.8.7
|
||||||
groupId=com.ruoyi
|
groupId=com.ruoyi
|
||||||
artifactId=ruoyi-quartz
|
artifactId=ruoyi-quartz
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -159,6 +159,12 @@ public interface QuotMapper
|
||||||
*/
|
*/
|
||||||
void saveQuotFeedbackExplanation(Quot quot);
|
void saveQuotFeedbackExplanation(Quot quot);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 报价组-保存报价员备注
|
||||||
|
* @param quot
|
||||||
|
*/
|
||||||
|
void saveQuotBjyRemark(Quot quot);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||||
* @param tax
|
* @param tax
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,12 @@ public interface IQuotService
|
||||||
*/
|
*/
|
||||||
void saveQuotFeedbackExplanation(Quot quot);
|
void saveQuotFeedbackExplanation(Quot quot);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 报价组-报价员备注
|
||||||
|
* @param quot
|
||||||
|
*/
|
||||||
|
void saveQuotBjyRemark(Quot quot);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||||
* @param tax
|
* @param tax
|
||||||
|
|
|
||||||
|
|
@ -324,6 +324,15 @@ public class QuotServiceImpl implements IQuotService
|
||||||
quotMapper.saveQuotFeedbackExplanation(quot);
|
quotMapper.saveQuotFeedbackExplanation(quot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 报价组-保存报价员备注
|
||||||
|
* @param quot
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void saveQuotBjyRemark(Quot quot) {
|
||||||
|
quotMapper.saveQuotBjyRemark(quot);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
* 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
|
||||||
* @param tax
|
* @param tax
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname,
|
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_rbDateUid,
|
a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname,a.quot_approval_status,a.quot_rbDateUid,
|
||||||
a.quot_materials_count,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.quot_materials_count,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,a.quot_handle,a.quot_distinguish,
|
a.create_by, a.create_time, a.update_by, a.update_time,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_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,
|
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
||||||
|
|
@ -554,7 +554,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<update id="saveQuotFeedbackExplanation" parameterType="Quot">
|
<update id="saveQuotFeedbackExplanation" parameterType="Quot">
|
||||||
update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId}
|
update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId}
|
||||||
</update>
|
</update>
|
||||||
|
<update id="saveQuotBjyRemark" parameterType="Quot">
|
||||||
|
update quot set quot_bjy_remark = #{quotBjyRemark} where quot_id = #{quotId}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<select id="selectStatisticsQuotList" parameterType="Quot" resultType="QuotSecDiff">
|
<select id="selectStatisticsQuotList" parameterType="Quot" resultType="QuotSecDiff">
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname,
|
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_rbDateUid,
|
a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname,a.quot_approval_status,a.quot_rbDateUid,
|
||||||
a.quot_materials_count,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.quot_materials_count,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,a.quot_handle,a.quot_distinguish,
|
a.create_by, a.create_time, a.update_by, a.update_time,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_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,
|
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
||||||
|
|
@ -554,7 +554,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<update id="saveQuotFeedbackExplanation" parameterType="Quot">
|
<update id="saveQuotFeedbackExplanation" parameterType="Quot">
|
||||||
update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId}
|
update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId}
|
||||||
</update>
|
</update>
|
||||||
|
<update id="saveQuotBjyRemark" parameterType="Quot">
|
||||||
|
update quot set quot_bjy_remark = #{quotBjyRemark} where quot_id = #{quotId}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
|
||||||
<select id="selectStatisticsQuotList" parameterType="Quot" resultType="QuotSecDiff">
|
<select id="selectStatisticsQuotList" parameterType="Quot" resultType="QuotSecDiff">
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 14:20:32 CST 2024
|
#Fri Aug 09 15:34:17 CST 2024
|
||||||
version=3.8.7
|
version=3.8.7
|
||||||
groupId=com.ruoyi
|
groupId=com.ruoyi
|
||||||
artifactId=ruoyi-system
|
artifactId=ruoyi-system
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -172,6 +172,15 @@ export function saveQuotFeedbackExplanation(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//保存报价员备注
|
||||||
|
export function saveQuotBjyRemark(data) {
|
||||||
|
return request({
|
||||||
|
url: '/quot/quot/saveQuotBjyRemark',
|
||||||
|
method: 'post',
|
||||||
|
data: data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
//生成报价单-PC
|
//生成报价单-PC
|
||||||
export function madeQuot(data) {
|
export function madeQuot(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|
|
||||||
|
|
@ -429,7 +429,8 @@
|
||||||
<el-row :gutter="8" v-if="checkRole(['QUOT','PRICE_VERIFICATION','HTB_QUOT','admin'])">
|
<el-row :gutter="8" v-if="checkRole(['QUOT','PRICE_VERIFICATION','HTB_QUOT','admin'])">
|
||||||
<el-col :span="24" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
<el-col :span="24" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
||||||
<el-form-item label="报价员备注" prop="quotBjyRemark">
|
<el-form-item label="报价员备注" prop="quotBjyRemark">
|
||||||
<el-input type="textarea" autosize v-model="form.quotBjyRemark" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2 || this.form.quotApprovalStatus == 3"/>
|
<el-input type="textarea" style="width:80%" autosize v-model="form.quotBjyRemark" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2 || this.form.quotApprovalStatus == 3"/>
|
||||||
|
<el-button type="primary" icon="el-icon-folder" style="margin-left: 10px" @click="saveQuotBjyRemark" size="mini" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"></el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -1082,7 +1083,7 @@
|
||||||
import { NumberAdd } from '@/utils/number';// 数值计算
|
import { NumberAdd } from '@/utils/number';// 数值计算
|
||||||
import { toDecimal,versionList } from "@/api/redBook/redBook";
|
import { toDecimal,versionList } from "@/api/redBook/redBook";
|
||||||
|
|
||||||
import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, checkCustom, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle,saveQuotFeedbackExplanation } from "@/api/quot/quot";
|
import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, checkCustom, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle,saveQuotFeedbackExplanation, saveQuotBjyRemark } from "@/api/quot/quot";
|
||||||
import { getToken } from "@/utils/auth";
|
import { getToken } from "@/utils/auth";
|
||||||
import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
|
import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
|
||||||
import { getDicts } from "@/api/system/dict/data";
|
import { getDicts } from "@/api/system/dict/data";
|
||||||
|
|
@ -1660,6 +1661,14 @@ export default {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// 保存报价员备注
|
||||||
|
saveQuotBjyRemark(){
|
||||||
|
const param = {'quotId':this.form.quotId,'quotBjyRemark':this.form.quotBjyRemark}
|
||||||
|
saveQuotBjyRemark(param).then(response => {
|
||||||
|
this.$modal.msgSuccess("保存成功");
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
/** 报价组生成报价单按钮 */
|
/** 报价组生成报价单按钮 */
|
||||||
madeQuot(){
|
madeQuot(){
|
||||||
const roles = this.$store.state.user.roles;
|
const roles = this.$store.state.user.roles;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue