Commit d3524daf authored by 黄奎's avatar 黄奎

冲突修改

parents 7c63fbad b821b3d9
...@@ -55,16 +55,16 @@ ...@@ -55,16 +55,16 @@
</template> </template>
</q-select> </q-select>
<div class="col-3"> <div class="col-3">
<q-input filled v-model="msg.ActivityName" @keyup.enter.native="resetSearch()" label="活动名称" /> <q-input filled v-model="msg.ActivityName" @keyup.enter.native="resetSearch()" label="活动名称" clearable/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled v-model="msg.OrderId" @keyup.enter.native="resetSearch()" label="订单号" /> <q-input filled v-model="msg.OrderId" @keyup.enter.native="resetSearch()" label="订单号" clearable/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled v-model="msg.DSUserId" @keyup.enter.native="resetSearch()" label="电商用户ID" /> <q-input filled v-model="msg.DSUserId" @keyup.enter.native="resetSearch()" label="电商用户ID" clearable/>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input filled v-model="msg.DSUserName" @keyup.enter.native="resetSearch()" label="报名用户名称" /> <q-input filled v-model="msg.DSUserName" @keyup.enter.native="resetSearch()" label="报名用户名称" clearable/>
</div> </div>
</div> </div>
</div> </div>
......
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