weipengfei
/
cashier-mer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
weipengfei 2024-07-02 13:39:05 +08:00
parent 2fa53da4e2
commit 9b481ea9d0
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/order/component/order.vue
View File

@ -124,10 +124,6 @@ onUnmounted(() => {
<el-date-picker v-model="date" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" <el-date-picker v-model="date" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间"
size="small" value-format="YYYY/MM/DD" :disabled-date="disabledDate" @change="changeDate" size="small" value-format="YYYY/MM/DD" :disabled-date="disabledDate" @change="changeDate"
:clearable="false" style="width: 10rem; margin: 0 0 0 1rem" /> :clearable="false" style="width: 10rem; margin: 0 0 0 1rem" />
<<<<<<< HEAD
=======
<!-- <el-button size="small">重置</el-button> -->
>>>>>>> f5171c94984b274604989664d68b9df6dd1febf2
</div> </div>
</div> </div>
<div class="header-input"> <div class="header-input">