Merge branch 'zth' into dev

szh-new
张同海 3 months ago
commit ff671db152

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;}
.st1{fill:#33383D;}
.st2{fill:#D17B1E;}
</style>
<path class="st0" d="M15.5,4.6c0-0.2-0.1-0.4-0.2-0.6l-1.9-2.1l0,0c0,0,0,0,0.1,0.1L14,3.4l0.3,5.1l-2.4,2.1c0,0-8.3-0.7-8.3-0.8
s0-7,0-7l1-1.2H3.3C2.9,1.6,2.5,2,2.5,2.4v13.2c0,0.5,0.4,0.8,0.8,0.8h11.5c0.4,0,0.8-0.4,0.8-0.8l0,0V4.6z"/>
<path class="st1" d="M16.3,2.9l-2-2.2c-0.4-0.4-1-0.7-1.5-0.7H3.3C2,0,1.1,1.1,1.1,2.4v13.2c0,1.3,1,2.4,2.2,2.4h11.5
c1.2,0,2.2-1.1,2.2-2.4v-11C16.9,3.9,16.7,3.3,16.3,2.9z M14.7,16.4H3.3c-0.4,0-0.8-0.4-0.8-0.8V2.4c0-0.4,0.4-0.8,0.8-0.8h1.3h0.2
h1.4H12h0.8c0,0,0.4,0,0.7,0.3l0,0L15.3,4c0.2,0.2,0.2,0.4,0.2,0.6v11l0,0C15.5,16,15.1,16.4,14.7,16.4z"/>
<path class="st2" d="M6.6,8.7h5c1,0,1.8-0.9,1.8-2V1.9c-0.3-0.3-0.7-0.3-0.7-0.3h-0.9v5.2c0,0.2-0.2,0.4-0.4,0.4H6.6
C6.4,7.1,6.2,7,6.2,6.7V1.6H4.8v5.2C4.8,7.8,5.6,8.7,6.6,8.7z"/>
<path class="st2" d="M9.2,5.9h1.1c0.4,0,0.8-0.4,0.8-0.8s-0.3-0.8-0.8-0.8H9.2c-0.4,0-0.8,0.4-0.8,0.8S8.8,5.9,9.2,5.9z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#33383D;}
.st1{fill:#B3C3C9;}
.st2{fill:#D34C4C;}
</style>
<path class="st0" d="M17,0.5c-0.6-0.6-1.4-0.6-1.9-0.3L1,6.6C0.7,6.8,0.6,7.1,0.6,7.3S0.7,7.9,1,8l2.9,1.7c0.4,0.1,0.8,0,1-0.3
c0.1-0.4,0-0.8-0.3-1l-1.8-1l12.8-5.9c0.3-0.1,0.4,0,0.4,0s0.1,0.1,0.1,0.4l-3.4,12.1L10,12.6c-0.3-0.1-0.7,0-1,0.1L7.3,15v2.3
l2.5-3.3l3,1.7H13c0.4,0.1,0.8-0.1,0.8-0.6l3.6-12.9C17.7,1.7,17.5,0.9,17,0.5z"/>
<polygon class="st0" points="7.3,14.8 7.3,15 7.3,15 7.3,13.8 7.3,13.8 "/>
<rect x="7.3" y="13.3" class="st0" width="0" height="0.6"/>
<path class="st1" d="M7.3,13.8v-0.6v-2.2l5.5-4.4c0.3-0.3,0.3-0.7,0.1-1c-0.3-0.4-0.7-0.4-1-0.1l-5.8,4.7c-0.1,0-0.1,0.3-0.1,0.4
v2.6v1.7v2.3c0,0.4,0.3,0.7,0.7,0.7c0.3,0,0.4-0.1,0.6-0.3l0.1-0.1v-2.3l0,0v-0.3L7.3,13.8L7.3,13.8z"/>
<path class="st2" d="M15.6,17.8L1.8,1.6c-0.3-0.3-0.3-0.8,0-1.1H2c0.3-0.4,0.8-0.3,1.1,0l13.8,16.2c0.3,0.3,0.3,0.8-0.1,1.1h-0.1
C16.3,18.1,15.9,18.1,15.6,17.8z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#272EC1;}
.st1{fill:#33383D;}
</style>
<path class="st0" d="M17.1,8l-3.5-3.7c-0.3-0.3-0.8-0.3-1.2,0c-0.3,0.3-0.3,0.8,0,1.2L15,8.2h-8c-0.2,0-0.4,0.1-0.6,0.2
C6.3,8.5,6.2,8.7,6.2,8.9s0.1,0.4,0.2,0.6C6.6,9.7,6.8,9.8,7,9.8c0,0,0.1,0,0.1,0h8l-2.6,2.7c-0.2,0.2-0.2,0.4-0.2,0.6
c0,0.4,0.4,0.8,0.8,0.8c0.2,0,0.4-0.1,0.6-0.3l3.5-3.7C17.7,9.4,17.7,8.6,17.1,8z"/>
<path class="st1" d="M12.9,0H4.2C2.5,0,1.1,1.4,1.1,3.2v11.6c0,1.8,1.4,3.2,3.1,3.2h8.7c0.9,0,1.7-0.5,2.3-1.2
c0.5-0.7,0.8-1.5,0.8-2.4c0-0.4-0.3-0.7-0.7-0.7c-0.4,0-0.7,0.3-0.7,0.7l0,0c0,0.5-0.2,1.1-0.5,1.5c-0.3,0.4-0.7,0.6-1.1,0.6H4.2
c-0.9,0-1.7-0.8-1.6-1.7V3.2c0-0.9,0.7-1.7,1.6-1.7h8.7c0.9,0,1.6,0.7,1.6,1.6c0,0,0,0,0,0.1l0,0.5l1.5,0V3.2c0-0.8-0.3-1.6-0.9-2.3
C14.5,0.3,13.7,0,12.9,0z"/>
<circle class="st1" cx="15.2" cy="3.6" r="0.7"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#2B992E;}
.st1{fill:#33383D;}
</style>
<path class="st0" d="M12.1,8L8.5,4.3C8.2,4,7.7,4,7.4,4.3C7.1,4.6,7,5.1,7.4,5.4L10,8.2H2c-0.2,0-0.4,0.1-0.6,0.2
C1.2,8.5,1.1,8.7,1.1,8.9s0.1,0.4,0.2,0.6c0.1,0.2,0.3,0.3,0.6,0.3c0,0,0.1,0,0.1,0h8l-2.6,2.7c-0.2,0.2-0.2,0.4-0.2,0.6
c0,0.4,0.4,0.8,0.8,0.8c0.2,0,0.4-0.1,0.6-0.3l3.5-3.7C12.6,9.4,12.6,8.6,12.1,8z"/>
<path class="st1" d="M3.6,0.9C3,1.6,2.7,2.4,2.7,3.2v0.4l1.5,0l0-0.5c0,0,0,0,0-0.1c0-0.9,0.7-1.6,1.6-1.6h8.7
c0.9,0,1.6,0.8,1.6,1.7v11.6c0,0.9-0.7,1.7-1.6,1.7H5.8c-0.4,0-0.8-0.2-1.1-0.6c-0.3-0.4-0.5-1-0.5-1.5l0,0c0-0.4-0.3-0.7-0.7-0.7
c-0.4,0-0.7,0.3-0.7,0.7c0,0.9,0.3,1.7,0.8,2.4C4.1,17.5,4.9,18,5.8,18h8.7c1.7,0,3.1-1.4,3.1-3.2V3.2c0-1.7-1.4-3.2-3.1-3.2L5.8,0
C4.9,0,4.1,0.3,3.6,0.9z"/>
<circle class="st1" cx="3.4" cy="3.6" r="0.7"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;}
.st1{fill:#33383D;}
.st2{fill:#5319A5;}
</style>
<g>
<path class="st0" d="M12.3,1.4H5.7c-0.3,0-0.6,0.1-0.6,0.4v1.3h7.8V1.8C12.8,1.5,12.6,1.4,12.3,1.4z"/>
<path class="st0" d="M12.3,9.1H5.7c-0.6,0-0.8,0.4-0.8,0.8v5.9c0,0.6,0.4,0.8,0.8,0.8h6.7c0.6,0,0.8-0.4,0.8-0.8V9.9
C13.3,9.5,12.9,9.1,12.3,9.1z M9.7,14.7H6.3c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.1-0.6,0.6-0.6h3.3c0.3,0,0.6,0.3,0.6,0.6
C10.3,14.4,10,14.7,9.7,14.7z M11.5,11.9H6.3c-0.3,0-0.6-0.3-0.6-0.6c0-0.3,0.1-0.6,0.6-0.6h5.2c0.3,0,0.6,0.3,0.6,0.6
C12.1,11.6,11.8,11.9,11.5,11.9z"/>
<path class="st0" d="M5.7,7.7h6.7c1.1,0,2,0.7,2.2,1.8H16c0.3,0,0.4-0.1,0.4-0.4V5c0-0.3-0.1-0.4-0.4-0.4H1.9
C1.6,4.6,1.5,4.7,1.5,5v4c0,0.3,0.1,0.4,0.4,0.4h1.4C3.6,8.5,4.4,7.7,5.7,7.7z"/>
<path class="st1" d="M16.1,3.2h-1.8V1.8c0-1-0.8-1.8-1.8-1.8H5.7c-1,0-1.8,0.8-1.8,1.8v1.4h-2C0.9,3.2,0.1,4,0.1,5v4
c0,1,0.8,1.8,1.8,1.8h1.4V10c0-0.1,0-0.3,0-0.4H1.9c-0.1,0-0.3-0.3-0.3-0.6V5c0-0.3,0.1-0.4,0.4-0.4h14.1c0.3,0,0.4,0.1,0.4,0.4v4
c0,0.3-0.1,0.4-0.4,0.4h-1.4c0,0.1,0,0.3,0,0.4v0.8h1.4c1,0,1.8-0.8,1.8-1.8V5C17.8,3.9,17.1,3.2,16.1,3.2z M5.1,1.8
c0-0.3,0.1-0.4,0.4-0.4h6.8c0.3,0,0.4,0.1,0.4,0.4v1.3H5.1V1.8L5.1,1.8z"/>
<g>
<path class="st2" d="M14.6,9.5c-0.1-1-1.1-1.8-2.2-1.8H5.7c-1.1,0-2,0.7-2.2,1.8c0,0.1,0,0.3,0,0.4v0.8v5c0,1.3,1,2.2,2.2,2.2h6.7
c1.3,0,2.2-1,2.2-2.2v-4.9v-1C14.7,9.8,14.7,9.8,14.6,9.5z M13.3,15.9c0,0.6-0.4,0.8-0.8,0.8H5.7c-0.6,0-0.8-0.4-0.8-0.8v-6
c0-0.6,0.4-0.8,0.8-0.8h6.7c0.6,0,0.8,0.4,0.8,0.8C13.3,9.9,13.3,15.9,13.3,15.9z"/>
<path class="st2" d="M11.5,10.7H6.3c-0.4,0-0.7,0.3-0.7,0.6c0,0.3,0.3,0.6,0.6,0.6h5.2c0.3,0,0.6-0.3,0.6-0.6
C11.9,11,11.8,10.7,11.5,10.7z"/>
<path class="st2" d="M9.7,13.5H6.3c-0.3,0-0.6,0.3-0.6,0.6c0,0.3,0.3,0.6,0.6,0.6h3.3c0.3,0,0.6-0.3,0.6-0.6
C10.3,13.8,10,13.5,9.7,13.5z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;}
.st1{fill:#85912D;}
.st2{fill:#33383D;}
</style>
<path class="st0" d="M11.9,4H3.3C2.6,4,2.2,4.4,2.2,5.1v10.4c0,0.7,0.6,1.1,1.1,1.1h8.6c0.7,0,1.1-0.6,1.1-1.1V5.1
C13,4.4,12.5,4,11.9,4z M10.5,13H4.7C4.3,13,4,12.7,4,12.3c0-0.4,0.3-0.7,0.7-0.7h5.8c0.4,0,0.7,0.3,0.7,0.7
C11.2,12.6,10.9,13,10.5,13z M10.5,8.9H4.7C4.3,8.9,4,8.6,4,8.2c0-0.4,0.3-0.7,0.7-0.7h5.8c0.4,0,0.7,0.3,0.7,0.7
C11.2,8.6,10.9,8.9,10.5,8.9z"/>
<path class="st0" d="M14.7,1.2L14.7,1.2H6.1C5.5,1.2,5,1.7,4.8,2.3l0,0v0.3h6.9c1.4,0,2.5,1.1,2.5,2.5v8.7h0.3
c0.6,0,1.1-0.4,1.1-1.1l0,0V2.3C15.6,1.8,15.2,1.2,14.7,1.2z"/>
<path class="st1" d="M10.5,11.6H4.7c-0.4,0-0.7,0.3-0.7,0.7C4,12.7,4.3,13,4.7,13h5.8c0.4,0,0.7-0.3,0.7-0.7
C11.2,11.9,10.9,11.6,10.5,11.6z"/>
<path class="st1" d="M10.5,7.6H4.7C4.3,7.6,4,7.9,4,8.3C4,8.7,4.3,9,4.7,9h5.8c0.4,0,0.7-0.3,0.7-0.7C11.2,7.9,10.9,7.6,10.5,7.6z"
/>
<path class="st2" d="M17,2.3C17,1,15.9,0,14.5,0H6.1H6C4.6,0,3.6,1.1,3.6,2.5v0.3H3.3c-1.4,0-2.5,1-2.5,2.4v10.4
c0,1.4,1.1,2.5,2.5,2.5h8.6c1.4,0,2.5-1.1,2.5-2.5v-0.3h0.3h0.1c1.4,0,2.4-1.1,2.4-2.5L17,2.3L17,2.3z M13,15.5
c0,0.7-0.6,1.1-1.1,1.1H3.3c-0.7,0-1.1-0.6-1.1-1.1V5.1C2.2,4.4,2.8,4,3.3,4h8.6C12.6,4,13,4.6,13,5.1C13,5.1,13,15.5,13,15.5z
M15.6,12.7L15.6,12.7c0,0.7-0.6,1.1-1.1,1.1h-0.3V5.1c0-1.4-1.1-2.5-2.5-2.5H4.8V2.3l0,0c0-0.6,0.6-1.1,1.1-1.1h8.6l0,0
c0.7,0,1.1,0.6,1.1,1.1V12.7z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#33383D;}
.st1{fill:#BA3849;}
</style>
<path class="st0" d="M5.8,2.3c0-0.5,0.4-1,1.1-1h4.2c0.7,0,1.2,0.5,1.2,1v0.8h1.4V2.3C13.7,1,12.6,0,11.2,0H6.9C5.5,0,4.4,1,4.4,2.3
v0.8h1.4V2.3z"/>
<path class="st0" d="M15.4,4.7c-0.4,0-0.8,0.3-0.8,0.7v10.2c0,0.5-0.5,1.1-1.2,1.1h-9c-0.5,0-1.2-0.5-1.2-1.1V5.4
C3.3,5,3,4.7,2.6,4.7S1.8,5,1.8,5.4v10.2C1.8,16.9,3,18,4.5,18h9.1c1.5,0,2.7-1.1,2.7-2.5V5.4C16.2,5,15.7,4.7,15.4,4.7z"/>
<g>
<path class="st1" d="M7.8,13.7V7.2c0-0.5-0.4-0.9-0.8-0.9c-0.4,0-0.8,0.4-0.8,0.9v6.5c0,0.5,0.3,0.9,0.8,0.9
C7.4,14.6,7.8,14.3,7.8,13.7z"/>
<path class="st1" d="M11.8,14V7.2c0-0.5-0.3-0.9-0.8-0.9c-0.3,0-0.8,0.4-0.8,0.9v6.5c0,0.5,0.3,0.9,0.8,0.9S11.8,14.3,11.8,14z"/>
</g>
<path class="st0" d="M16.8,4H1.3C0.9,4,0.5,3.7,0.5,3.2v0c0-0.4,0.4-0.8,0.8-0.8h15.5c0.4,0,0.8,0.4,0.8,0.8v0
C17.6,3.7,17.2,4,16.8,4z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#33383D;}
.st1{fill:#39DAE2;}
</style>
<g>
<path class="st0" d="M8.8,1.5c0.3,0,0.5,0.2,0.6,0.3L16,8.4c0.3,0.3,0.3,0.9,0,1.4l-6.5,6.5c-0.3,0.3-0.9,0.3-1.4,0
c-0.3-0.3-0.3-0.9,0-1.4l6-6l-6-6C7.9,2.7,7.9,2.4,8,2C8.2,1.7,8.5,1.5,8.8,1.5z"/>
<path class="st1" d="M2.7,1.5c0.3,0,0.5,0.2,0.6,0.3L10,8.4c0.3,0.3,0.3,0.9,0,1.4l-6.6,6.5c-0.3,0.3-0.9,0.3-1.4,0
c-0.3-0.3-0.3-0.9,0.2-1.4l6-6l-6-6C1.8,2.7,1.7,2.4,1.8,2C2,1.7,2.3,1.5,2.7,1.5z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 833 B

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#33383D;}
.st1{fill:#257AFA;}
</style>
<path class="st0" d="M16.9,0.5c-0.6-0.6-1.4-0.6-1.9-0.3L1,6.7C0.7,6.8,0.5,7.1,0.5,7.4S0.7,7.9,1,8.1l2.9,1.7c0.4,0.1,0.8,0,1-0.3
c0.1-0.4,0-0.8-0.3-1l-1.8-1l12.8-5.9c0.3-0.1,0.4,0,0.4,0s0.1,0.1,0.1,0.4l-3.4,12.1l-2.8-1.5c-0.3-0.1-0.7,0-1,0.1L7.2,15v2.3
L9.7,14l3,1.7h0.1c0.4,0.1,0.8-0.1,0.8-0.6l3.6-12.9C17.6,1.7,17.5,0.9,16.9,0.5z"/>
<polygon class="st0" points="7.3,14.8 7.3,15.1 7.3,15.1 7.3,13.8 7.3,13.8 "/>
<rect x="7.3" y="13.3" class="st0" width="0" height="0.6"/>
<path class="st1" d="M7.3,13.8v-0.6V11l5.5-4.4c0.3-0.3,0.3-0.7,0.1-1c-0.3-0.4-0.7-0.4-1-0.1l-5.8,4.7C6,10.3,6,10.5,6,10.7v2.6V15
v2.3C6,17.7,6.3,18,6.7,18c0.3,0,0.4-0.1,0.6-0.3l0.1-0.1v-2.3l0,0V15L7.3,13.8L7.3,13.8z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
<style type="text/css">
.st0{fill:#33383D;}
.st1{fill:#17A6A3;}
</style>
<g>
<path class="st0" d="M16.7,3.9l-3.6-3.8C12.9,0,12.8,0,12.5,0H3.2l0,0C1.9,0,1.1,1,1.1,2.1v13.8l0,0c0,1.3,1,2.1,2.1,2.1h11.6
c1.3,0,2.1-1,2.1-2.1V4.3C17,4.2,16.9,4,16.7,3.9z M15.5,16c0,0.4-0.3,0.7-0.7,0.7H3.2l0,0c-0.4,0-0.7-0.3-0.7-0.7V2
c0-0.4,0.3-0.7,0.7-0.7h9.2l3.2,3.2L15.5,16L15.5,16z"/>
<path class="st1" d="M12,8.2H9.8V6c0-0.4-0.4-0.8-0.8-0.8S8.2,5.6,8.2,6v2.2H6C5.6,8.2,5.2,8.6,5.2,9S5.6,9.8,6,9.8h2.2V12
c0,0.4,0.4,0.8,0.8,0.8s0.8-0.4,0.8-0.8V9.8H12c0.4,0,0.8-0.4,0.8-0.8C12.8,8.6,12.4,8.2,12,8.2z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 953 B

@ -10,9 +10,11 @@
import { useRuleFormItem } from '/@/hooks/component/useFormItem' import { useRuleFormItem } from '/@/hooks/component/useFormItem'
import { useAttrs } from '/@/hooks/core/useAttrs' import { useAttrs } from '/@/hooks/core/useAttrs'
import { useI18n } from '/@/hooks/web/useI18n' import { useI18n } from '/@/hooks/web/useI18n'
import { useAppStore } from '/@/store/modules/app'
const appStore = useAppStore()
type OptionsItem = { label: string; value: string; disabled?: boolean } type OptionsItem = { label: string; value: string; disabled?: boolean }
export default defineComponent({ export default defineComponent({
name: 'InputTextArea', name: 'DEdit',
inheritAttrs: false, inheritAttrs: false,
props: { props: {
value: [Array, Object, String, Number], value: [Array, Object, String, Number],
@ -78,8 +80,14 @@
}) })
} else { } else {
if (props.label == '来源明细') { if (props.label == '来源明细') {
appStore.getSourceData.forEach((item) => {
item.children.forEach((item2) => {
if (item2.id == state.value) {
RData = item2.detailName
}
})
})
// RData = props.ShowName // RData = props.ShowName
console.log(props.formModel, 111111111111)
} else { } else {
RData = state.value ? state.value.replace(/\"/g, '') : '' RData = state.value ? state.value.replace(/\"/g, '') : ''
} }
@ -95,8 +103,6 @@
// }, // },
// ) // )
function CilckEdit() { function CilckEdit() {
console.log(props.options, props.label, '????????????')
emit('edit') emit('edit')
} }
return { attrs, t, showTooltip, props, state, CilckEdit, GetState } return { attrs, t, showTooltip, props, state, CilckEdit, GetState }

@ -47,7 +47,8 @@ interface AppState {
hasbookingDetail: boolean hasbookingDetail: boolean
agentFilter: any agentFilter: any
slotShow: boolean, slotShow: boolean,
ids: any ids: any,
SourceData:any
} }
let timeId: TimeoutHandle let timeId: TimeoutHandle
export const useAppStore = defineStore({ export const useAppStore = defineStore({
@ -80,9 +81,14 @@ export const useAppStore = defineStore({
FlowInstanceHistory:[], FlowInstanceHistory:[],
FlowInstancesDetailsType:'', FlowInstancesDetailsType:'',
// 存储列表id集合上下票使用 // 存储列表id集合上下票使用
ids: {} ids: {},
// 业务来源>业务明细 缓存
SourceData:[]
}), }),
getters: { getters: {
getSourceData(): any {
return this.SourceData
},
getIds(): any { getIds(): any {
return this.ids return this.ids
}, },
@ -181,6 +187,9 @@ export const useAppStore = defineStore({
}, },
}, },
actions: { actions: {
setSourceData(data): void {
this.SourceData = data
},
setIds(data, key): void { setIds(data, key): void {
this.ids[key] = data this.ids[key] = data
}, },

@ -660,15 +660,42 @@ export const EditformSchema: FormSchema[] = [
defaultValue: '', defaultValue: '',
show: false, show: false,
}, },
// {
// label: '来源明细',
// field: 'sourceDetailId',
// component: 'DEdit',
// required: false,
// colProps: { span: 4 },
// dynamicDisabled: ({ values }) => {
// return !values.sourceId
// },
// componentProps: async (e) => {
// const { formModel } = e
// console.log(formModel, 2222)
// return {
// formModel: formModel,
// onEdit: () => {
// const { formActionType } = e
// formActionType ? formActionType.linkageForm(e) : null
// },
// }
// },
// },
{ {
label: '来源明细', label: '来源明细',
field: 'sourceDetailId', field: 'sourceDetailId',
component: 'DEdit', component: 'DEdit',
required: false,
dynamicDisabled: ({ values }) => {
return !values.sourceId
},
colProps: { span: 4 }, colProps: { span: 4 },
componentProps: (e) => {
return {
allowClear: true,
onEdit: () => {
const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null
},
}
},
}, },
{ {
field: 'unitPrice', field: 'unitPrice',

@ -1,132 +1,144 @@
<template> <template>
<div class="ds-detail-box sea-export-detail"> <div>
<div :style="{ display: 'flex' }"> <div class="infoclientBox">
<ActionBar <a-tooltip placement="top" :mouseEnterDelay="0.5">
:id="route.query.id" <template #title>
name="wldw" <span>保存</span>
:save="handleSave" </template>
lasttext="下一条" <span class="ds-action-svg-btn" @click="copyHandle">
nexttext="上一条" <img src="../../../assets/svg/infoclient/baocun.svg" class="SvgImg" />
></ActionBar> </span>
<!-- 合同管理 --> </a-tooltip>
<!-- <a-tab-pane key="6" tab="合同管理"> </div>
<div class="ds-detail-box sea-export-detail">
<div :style="{ display: 'flex' }">
<ActionBar
:id="route.query.id"
name="wldw"
:save="handleSave"
lasttext="下一条"
nexttext="上一条"
></ActionBar>
<!-- 合同管理 -->
<!-- <a-tab-pane key="6" tab="合同管理">
<Menus4 :client-id="clientId" class="RUnit" /> <Menus4 :client-id="clientId" class="RUnit" />
</a-tab-pane> --> </a-tab-pane> -->
<!-- 基本信息 --> <!-- 基本信息 -->
<a-tabs v-model:activeKey="activeKey" class="RUnit"> <a-tabs v-model:activeKey="activeKey" class="RUnit">
<a-tab-pane key="1" tab="基本信息"> <a-tab-pane key="1" tab="基本信息">
<BasicForm @register="registerForm1" @linkageForm="linkageForm" class="ds-form-detail" <BasicForm @register="registerForm1" @linkageForm="linkageForm" class="ds-form-detail"
/></a-tab-pane> /></a-tab-pane>
<a-tab-pane key="2" tab="财务账期信息"> <a-tab-pane key="2" tab="财务账期信息">
<div> <div>
<p class="title">财务信息</p> <p class="title">财务信息</p>
<BasicForm @register="registerForm2" /> <BasicForm @register="registerForm2" />
<div class="FlexTable"> <div class="FlexTable">
<div class="HotTable"> <div class="HotTable">
<div> <div>
<span class="title Fapiao">发票信息</span> <span class="title Fapiao">发票信息</span>
<a-button type="link" @click="TableAdd" class="pl0"> <a-button type="link" @click="TableAdd" class="pl0">
<span class="iconfont icon-new_document"></span>
新增
</a-button>
<a-popconfirm
title="确定要删除所选数据?"
ok-text="确定"
cancel-text="取消"
@confirm="FnClickDel"
>
<a-button type="link" class="pl0">
<span class="iconfont icon-shanchu21"></span>
删除
</a-button>
</a-popconfirm>
</div>
<div style="position: relative">
<input
class="ds-tb-check"
type="checkbox"
v-model="allCheck"
:indeterminate="someCheck"
/>
<hot-table ref="hotTb" :data="list" :settings="settings">
<img
v-show="!list.length"
class="hot-tb-no-data"
src="../../../assets/images/nodata.png"
alt=""
/>
</hot-table>
</div>
</div>
<div class="BTable">
<BasicTable @register="registerTable" @row-dbClick="EditRow" :maxHeight="140">
<template #toolbar>
<a-button
type="link"
@click="addboxLine({ id: rowId })"
:disabled="Fndisabled()"
>
<span class="iconfont icon-new_document"></span> <span class="iconfont icon-new_document"></span>
添加 新增
</a-button> </a-button>
<a-popconfirm <a-popconfirm
title="确定删除当前选中数据?" title="确定要删除所选数据?"
ok-text="" ok-text="确定"
cancel-text="" cancel-text="取消"
@confirm="delboxLine" @confirm="FnClickDel"
> >
<a-button type="link" :disabled="Fndisabled()"> <a-button type="link" class="pl0">
<span class="iconfont icon-shanchu21"></span> <span class="iconfont icon-shanchu21"></span>
删除 删除
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
</template> </div>
<template #bodyCell="{ column, record }"> <div style="position: relative">
<template v-if="column.key === 'action'"> <input
<TableAction class="ds-tb-check"
:actions="[ type="checkbox"
{ v-model="allCheck"
icon: 'clarity:note-edit-line', :indeterminate="someCheck"
tooltip: '编辑', />
onClick: editboxLine.bind(null, record), <hot-table ref="hotTb" :data="list" :settings="settings">
}, <img
]" v-show="!list.length"
class="hot-tb-no-data"
src="../../../assets/images/nodata.png"
alt=""
/> />
</hot-table>
</div>
</div>
<div class="BTable">
<BasicTable @register="registerTable" @row-dbClick="EditRow" :maxHeight="140">
<template #toolbar>
<a-button
type="link"
@click="addboxLine({ id: rowId })"
:disabled="Fndisabled()"
>
<span class="iconfont icon-new_document"></span>
添加
</a-button>
<a-popconfirm
title="确定删除当前选中数据?"
ok-text="是"
cancel-text="否"
@confirm="delboxLine"
>
<a-button type="link" :disabled="Fndisabled()">
<span class="iconfont icon-shanchu21"></span>
删除
</a-button>
</a-popconfirm>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
icon: 'clarity:note-edit-line',
tooltip: '编辑',
onClick: editboxLine.bind(null, record),
},
]"
/>
</template>
</template> </template>
</template> </BasicTable>
</BasicTable> </div>
</div> </div>
</div> </div>
</div> <div>
<div> <Tabs3 :client-id="clientId" />
<Tabs3 :client-id="clientId" /> </div>
</div> </a-tab-pane>
</a-tab-pane> <!-- <a-tab-pane key="3" tab="账期信息">
<!-- <a-tab-pane key="3" tab="账期信息">
<Tabs3 :client-id="clientId" /> <Tabs3 :client-id="clientId" />
</a-tab-pane> --> </a-tab-pane> -->
<!-- 联系人信息 --> <!-- 联系人信息 -->
<a-tab-pane key="4" tab="联系人信息"> <a-tab-pane key="4" tab="联系人信息">
<Menus2 :client-id="clientId" class="RUnit" /> <Menus2 :client-id="clientId" class="RUnit" />
</a-tab-pane> </a-tab-pane>
<!-- 收发货人信息维护 --> <!-- 收发货人信息维护 -->
<a-tab-pane key="5" tab="收发货人信息维护"> <a-tab-pane key="5" tab="收发货人信息维护">
<Menus3 :client-id="clientId" class="RUnit" /> <Menus3 :client-id="clientId" class="RUnit" />
</a-tab-pane> </a-tab-pane>
<!-- 合同管理 --> <!-- 合同管理 -->
<a-tab-pane key="7" tab="固定费用"> <a-tab-pane key="7" tab="固定费用">
<CustTemplateDetail :client-id="clientId" :customer-name="customerName" class="RUnit" /> <CustTemplateDetail :client-id="clientId" :customer-name="customerName" class="RUnit" />
</a-tab-pane> </a-tab-pane>
<!-- 客户参数表格 --> <!-- 客户参数表格 -->
<a-tab-pane key="8" tab="客户参数"> <a-tab-pane key="8" tab="客户参数">
<CustomerParams :client-id="clientId" :customer-name="customerName"></CustomerParams> <CustomerParams :client-id="clientId" :customer-name="customerName"></CustomerParams>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
<!-- 图片管理 --> <!-- 图片管理 -->
<!-- <Menus5 v-show="selectedKeys[0] == 'menu5'" class="RUnit" /> --> <!-- <Menus5 v-show="selectedKeys[0] == 'menu5'" class="RUnit" /> -->
</div>
<ClientAccountDateModal @register="CADModal" @success="handleSuccess" />
</div> </div>
<ClientAccountDateModal @register="CADModal" @success="handleSuccess" />
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -383,61 +395,61 @@
Arr.push({ label: item.detailName, value: item.id }) Arr.push({ label: item.detailName, value: item.id })
}) })
}) })
updateSchema( // updateSchema(
rowId.value // rowId.value
? { // ? {
label: '来源明细', // label: '',
field: 'sourceDetailId', // field: 'sourceDetailId',
component: 'DEdit', // component: 'DEdit',
required: false, // required: false,
dynamicDisabled: ({ values }) => { // dynamicDisabled: ({ values }) => {
return !values.sourceId // return !values.sourceId
}, // },
colProps: { span: 4 }, // colProps: { span: 4 },
componentProps: async (e) => { // componentProps: async (e) => {
const { formModel } = e // const { formModel } = e
console.log(formModel, 2222) // console.log(formModel, 2222)
return { // return {
formModel: formModel, // formModel: formModel,
onEdit: () => { // onEdit: () => {
const { formActionType } = e // const { formActionType } = e
formActionType ? formActionType.linkageForm(e) : null // formActionType ? formActionType.linkageForm(e) : null
}, // },
} // }
}, // },
} // }
: { // : {
label: '来源明细', // label: '',
field: 'sourceDetailId', // field: 'sourceDetailId',
component: 'Select', // component: 'Select',
required: false, // required: false,
dynamicDisabled: ({ values }) => { // dynamicDisabled: ({ values }) => {
return !values.sourceId // return !values.sourceId
}, // },
colProps: { span: 4 }, // colProps: { span: 4 },
componentProps: ({ formModel }) => { // componentProps: ({ formModel }) => {
return { // return {
allowClear: true, // allowClear: true,
options: Arr, // options: Arr,
showSearch: true, // showSearch: true,
filterOption: (input: string, option: any) => { // filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
}, // },
onChange: (e, obj) => { // onChange: (e, obj) => {
if (e && obj) { // if (e && obj) {
formModel.sourceDetailId = obj.value // formModel.sourceDetailId = obj.value
formModel.sourceDetailName = obj.label // formModel.sourceDetailName = obj.label
} // }
if (!e && !obj) { // if (!e && !obj) {
formModel.sourceDetailId = '' // formModel.sourceDetailId = ''
formModel.sourceDetailName = '' // formModel.sourceDetailName = ''
} // }
}, // },
} // }
}, // },
}, // },
) // )
activeKey.value = '2' activeKey.value = '2'
await setFieldsValue1({ await setFieldsValue1({
...res.data, ...res.data,
@ -780,6 +792,18 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.infoclientBox {
background: rgba(245, 249, 252, 1);
padding: 15px 20px;
.SvgImg {
width: 12px;
// &:hover {
// background: #257afa;
// }
}
}
:deep(.infoclientDivider) { :deep(.infoclientDivider) {
margin: 12px 0 8px 0; margin: 12px 0 8px 0;
} }

@ -905,14 +905,21 @@ export const formSchema: FormSchema[] = [
defaultValue: '', defaultValue: '',
show: false, show: false,
}, },
// {
// label: '来源明细',
// field: 'sourceDetailId',
// component: 'Select',
// required: false,
// dynamicDisabled: ({ values }) => {
// return !values.sourceId
// },
// colProps: { span: 4 },
// },
{ {
label: '来源明细',
field: 'sourceDetailId', field: 'sourceDetailId',
label: '来源明细',
component: 'Select', component: 'Select',
required: false, defaultValue: '',
dynamicDisabled: ({ values }) => {
return !values.sourceId
},
colProps: { span: 4 }, colProps: { span: 4 },
}, },
{ {

@ -65,6 +65,7 @@
}) })
}, },
beforeFetch: (p) => { beforeFetch: (p) => {
p['customerId'] = props.clientId
return formatParams(p) return formatParams(p)
}, },
columns, columns,

@ -9,7 +9,7 @@
@click="handleCreate" @click="handleCreate"
:disabled="checkPermissions('op:infoclient:add')" :disabled="checkPermissions('op:infoclient:add')"
> >
<span class="iconfont icon-new_document"></span> <img src="../../../assets/svg/infoclient/xinjian.svg" class="SvgImg" />
</a-button> </a-button>
<a-popconfirm <a-popconfirm
title="确定删除当前选中数据?" title="确定删除当前选中数据?"
@ -18,7 +18,7 @@
@confirm="handleDel" @confirm="handleDel"
> >
<a-button v-repeat type="link"> <a-button v-repeat type="link">
<span class="iconfont icon-shanchu21"></span> <img src="../../../assets/svg/infoclient/shanchu.svg" class="SvgImg" />
</a-button> </a-button>
</a-popconfirm> </a-popconfirm>
</div> </div>
@ -58,6 +58,10 @@
import { checkPermissions } from '/@/hooks/Permissions/index' import { checkPermissions } from '/@/hooks/Permissions/index'
import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table' import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
import { getCodeGoodsTypeList, Delete } from './api' import { getCodeGoodsTypeList, Delete } from './api'
import {
GetClientSourceSelectList,
GetClientSourceDetailSelectList,
} from '/@/views/operation/seaexport/api/BookingLedger'
import { useModal } from '/@/components/Modal' import { useModal } from '/@/components/Modal'
import TenantAuditStepModal from './TenantAuditStepModal.vue' import TenantAuditStepModal from './TenantAuditStepModal.vue'
import { columns, searchFormSchema, formSchema } from './columns' import { columns, searchFormSchema, formSchema } from './columns'
@ -73,12 +77,24 @@
title: '', title: '',
api: async (p) => { api: async (p) => {
const res: API.DataResult = await getCodeGoodsTypeList(p) const res: API.DataResult = await getCodeGoodsTypeList(p)
return new Promise((resolve) => { return new Promise(async (resolve) => {
let SourceData: any = []
if (res?.data) { if (res?.data) {
const ids = res.data.map((item) => { const ids = res.data.map((item) => {
return item.id return item.id
}) })
appStore.setIds(ids, 'wldw') appStore.setIds(ids, 'wldw')
let Sourceres = await GetClientSourceSelectList()
if (Sourceres.succeeded && Sourceres?.data) {
Sourceres.data.forEach(async (item) => {
SourceData.push(item)
let Sourceres2 = await GetClientSourceDetailSelectList({ id: item.id })
if (Sourceres2.succeeded && Sourceres2?.data) {
item.children = Sourceres2.data
}
})
}
appStore.setSourceData(SourceData)
} }
resolve({ data: [...res.data], total: res.count }) resolve({ data: [...res.data], total: res.count })
}) })
@ -228,11 +244,18 @@
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.SvgImg {
width: 12px;
// &:hover {
// background: #257afa;
// }
}
.tableTitleBox { .tableTitleBox {
.ant-btn-link { .ant-btn-link {
border-radius: 2px; border-radius: 2px;
background: rgba(245, 249, 252, 1); background: rgba(245, 249, 252, 1);
margin-right: 8px; margin-left: 13px;
color: #000; color: #000;
font-size: 16px; font-size: 16px;
} }

Loading…
Cancel
Save