Commit 8661825d by linjinhong

Merge remote-tracking branch 'origin/dev'

parents 5c237889 ddd9c535
...@@ -260,14 +260,17 @@ ...@@ -260,14 +260,17 @@
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<span> <span>
<ElButton type="primary" @click="search">查询</ElButton> <ElButton link @click="resetSearchForm" style="font-size: 12px"
><span title="重置查询条件">重置</span></ElButton
>
</span> </span>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<span> <span>
<ElButton type="danger" @click="resetSearchForm">清空</ElButton> <ElButton type="primary" @click="search">查询</ElButton>
</span> </span>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<span v-if="status === 'PICKING'" class="item"> <span v-if="status === 'PICKING'" class="item">
<ElButton <ElButton
...@@ -3857,7 +3860,7 @@ function getPlatformImg(code: string) { ...@@ -3857,7 +3860,7 @@ function getPlatformImg(code: string) {
.tabs-node { .tabs-node {
padding: 10px; padding: 10px;
font-size: 14px; font-size: 16px;
color: #000; color: #000;
cursor: pointer; cursor: pointer;
height: 40px; height: 40px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment