'123'
This commit is contained in:
parent
fe549410a1
commit
79daa7b591
|
|
@ -2,13 +2,22 @@
|
||||||
<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$/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/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-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-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-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-admin/target/ruoyi-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" 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-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-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-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-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-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-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-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/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/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/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" afterDir="false" />
|
||||||
</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" />
|
||||||
|
|
@ -103,7 +112,9 @@
|
||||||
<workItem from="1723087435797" duration="15421000" />
|
<workItem from="1723087435797" duration="15421000" />
|
||||||
<workItem from="1723161740119" duration="15882000" />
|
<workItem from="1723161740119" duration="15882000" />
|
||||||
<workItem from="1723186498493" duration="62000" />
|
<workItem from="1723186498493" duration="62000" />
|
||||||
<workItem from="1723188538030" duration="229000" />
|
<workItem from="1723188538030" duration="717000" />
|
||||||
|
<workItem from="1723192814263" duration="1896000" />
|
||||||
|
<workItem from="1723420788933" duration="419000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -136,46 +147,46 @@
|
||||||
</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="39" key="GridCell.Tab.0.bottom" timestamp="1723185397662">
|
<state width="1396" height="249" key="GridCell.Tab.0.bottom" timestamp="1723195614379">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614379" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.0.center" timestamp="1723185397662">
|
<state width="1396" height="249" key="GridCell.Tab.0.center" timestamp="1723195614379">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614379" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.0.left" timestamp="1723185397662">
|
<state width="1396" height="249" key="GridCell.Tab.0.left" timestamp="1723195614379">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614379" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.0.right" timestamp="1723185397662">
|
<state width="1396" height="249" key="GridCell.Tab.0.right" timestamp="1723195614379">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614379" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.1.bottom" timestamp="1723185397663">
|
<state width="1396" height="249" key="GridCell.Tab.1.bottom" timestamp="1723195614380">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614380" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.1.center" timestamp="1723185397662">
|
<state width="1396" height="249" key="GridCell.Tab.1.center" timestamp="1723195614380">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614380" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.1.left" timestamp="1723185397662">
|
<state width="1396" height="249" key="GridCell.Tab.1.left" timestamp="1723195614380">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614380" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.1.right" timestamp="1723185397663">
|
<state width="1396" height="249" key="GridCell.Tab.1.right" timestamp="1723195614380">
|
||||||
<screen x="0" y="0" width="1920" height="1040" />
|
<screen x="1920" y="0" width="1440" height="900" />
|
||||||
</state>
|
</state>
|
||||||
<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="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="249" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1723195614380" />
|
||||||
<state width="1876" height="39" key="GridCell.Tab.2.bottom" timestamp="1723185397663">
|
<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>
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 15:34:59 CST 2024
|
#Mon Aug 12 08:02:54 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 15:34:09 CST 2024
|
#Mon Aug 12 08:02:41 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 15:34:31 CST 2024
|
#Mon Aug 12 08:02:48 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 15:34:43 CST 2024
|
#Mon Aug 12 08:02:49 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 15:34:37 CST 2024
|
#Mon Aug 12 08:02:49 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.
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
||||||
#Generated by Maven
|
#Generated by Maven
|
||||||
#Fri Aug 09 15:34:17 CST 2024
|
#Mon Aug 12 08:02:44 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.
|
|
@ -1168,10 +1168,10 @@
|
||||||
<!--投标信息历史记录-->
|
<!--投标信息历史记录-->
|
||||||
<el-dialog :title="bidHistoryTitle" :visible.sync="bidHistoryOpen" width="1000px" append-to-body>
|
<el-dialog :title="bidHistoryTitle" :visible.sync="bidHistoryOpen" width="1000px" append-to-body>
|
||||||
<el-descriptions :title="item.createTime" :style="index==0?'': 'margin-top :25px'" v-for="(item,index) in this.bidHistoryList" :key="item.createTime" :column="3" border size="mini">
|
<el-descriptions :title="item.createTime" :style="index==0?'': 'margin-top :25px'" v-for="(item,index) in this.bidHistoryList" :key="item.createTime" :column="3" border size="mini">
|
||||||
<el-descriptions-item label="开闭口"><dict-tag :options="dict.type.bid_open_close" :value="item.bidOpenClose"/></el-descriptions-item>
|
|
||||||
<el-descriptions-item label="调价通知">{{item.bidPriceAdjustmentNotice}}</el-descriptions-item>
|
<el-descriptions-item label="调价通知">{{item.bidPriceAdjustmentNotice}}</el-descriptions-item>
|
||||||
<el-descriptions-item label="铜价">{{item.bidTongPrice}}</el-descriptions-item>
|
<el-descriptions-item label="铜价">{{item.bidTongPrice}}</el-descriptions-item>
|
||||||
<el-descriptions-item label="铝价">{{item.bidLvPrice}}</el-descriptions-item>
|
<el-descriptions-item label="铝价">{{item.bidLvPrice}}</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="开闭口"><dict-tag :options="dict.type.bid_open_close" :value="item.bidOpenClose"/></el-descriptions-item>
|
||||||
<el-descriptions-item label="毛利率">{{item.bidMatpriceDiff}}</el-descriptions-item>
|
<el-descriptions-item label="毛利率">{{item.bidMatpriceDiff}}</el-descriptions-item>
|
||||||
<el-descriptions-item label="厂价">{{item.bidFactoryPrice}}</el-descriptions-item>
|
<el-descriptions-item label="厂价">{{item.bidFactoryPrice}}</el-descriptions-item>
|
||||||
<el-descriptions-item label="投标价">{{item.bidPrice}}</el-descriptions-item>
|
<el-descriptions-item label="投标价">{{item.bidPrice}}</el-descriptions-item>
|
||||||
|
|
@ -1853,7 +1853,7 @@ export default {
|
||||||
).label;
|
).label;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.bidHistoryList = response.data
|
this.bidHistoryList = bidHistoryList
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue