|
|
@@ -373,7 +373,7 @@
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">打印小票</view>
|
|
|
- <button @click="form.needPrint = 1" class="admin-button-com big" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
|
|
|
+ <button @click="form.needPrint = 1" class="admin-button-com big" :class="form.needPrint == 1 ? 'blue' : 'default'" style="width:150upx;">打印</button>
|
|
|
<button @tap="form.needPrint = 2" class="admin-button-com big" :class="form.needPrint == 2 ? 'blue' : 'default'">不打印</button>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
@@ -381,7 +381,7 @@
|
|
|
<view class="tui-title">
|
|
|
<text>合计金额</text>
|
|
|
</view>
|
|
|
- <text style="color: #3385ff; width: 140upx">¥{{ parseFloat(finalPrice) }}</text>
|
|
|
+ <text style="color: #3385ff; width: 180upx">¥{{ parseFloat(finalPrice) }}</text>
|
|
|
<button @tap="showDiscount()" class="admin-button-com middle default" style="margin-left: 0upx">点击打折</button>
|
|
|
<text v-if="discountValue > 0 && discountValue < 1">{{ Number(discountValue) * 10 }}折</text>
|
|
|
</tui-list-cell>
|
|
|
@@ -523,18 +523,7 @@
|
|
|
<uni-popup ref="staffRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
|
|
|
<view style="max-height: 80vh; overflow: scroll">
|
|
|
<view style="margin-left: 30upx; margin-top: 19upx; font-size: 27upx; font-weight: bold">请选择：</view>
|
|
|
- <view
|
|
|
- style="
|
|
|
- display: flex;
|
|
|
- padding: 20upx;
|
|
|
- height: auto;
|
|
|
- justify-content: flex-start;
|
|
|
- align-items: center;
|
|
|
- flex-wrap: wrap;
|
|
|
- max-height: 100vh;
|
|
|
- overflow: auto;
|
|
|
- "
|
|
|
- >
|
|
|
+ <view style=" display: flex; padding: 20upx; height: auto; justify-content: flex-start; align-items: center; flex-wrap: wrap; max-height: 100vh; overflow: auto; " >
|
|
|
<view v-for="(item, index) in staffList" :key="index" style="margin-bottom: 20upx; margin-left: 3upx">
|
|
|
<button class="admin-button-com staff-btn" @click.stop="getCurrentStaff(item)" :class="{ selected: form.getStaffId === item.id }" >
|
|
|
{{ item.name }}
|
|
|
@@ -542,7 +531,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view style="text-align: center; padding: 10upx 0 10upx 0">
|
|
|
- <button class="admin-button-com big blue" @click="cancelCurrentStaff()">取消</button>
|
|
|
+ <button class="admin-button-com big blue" style="width:180upx;" @click="cancelCurrentStaff()">取消</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</uni-popup>
|
|
|
@@ -550,31 +539,16 @@
|
|
|
<uni-popup ref="wlRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
|
|
|
<view style="max-height: 80vh; overflow: scroll">
|
|
|
<view style="margin-left: 30upx; margin-top: 19upx; font-size: 27upx; font-weight: bold">请选择物流：</view>
|
|
|
- <view
|
|
|
- style="
|
|
|
- display: flex;
|
|
|
- padding: 20upx;
|
|
|
- height: auto;
|
|
|
- justify-content: flex-start;
|
|
|
- align-items: center;
|
|
|
- flex-wrap: wrap;
|
|
|
- max-height: 100vh;
|
|
|
- overflow: auto;
|
|
|
- "
|
|
|
- >
|
|
|
+ <view style=" display: flex; padding: 20upx; height: auto; justify-content: flex-start; align-items: center; flex-wrap: wrap; max-height: 100vh; overflow: auto; " >
|
|
|
<view v-for="(item, index) in wlList" :key="index" style="margin-bottom: 20upx; margin-left: 3upx">
|
|
|
- <button
|
|
|
- class="admin-button-com staff-btn"
|
|
|
- @click.stop="selectWl(item)"
|
|
|
- :class="{ selected: form.wlName === item.name }"
|
|
|
- >
|
|
|
+ <button class="admin-button-com staff-btn" @click.stop="selectWl(item)" :class="{ selected: form.wlName === item.name }" >
|
|
|
{{ item.name }}
|
|
|
</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view style="text-align: center; padding: 10upx 0 10upx 0">
|
|
|
- <button class="admin-button-com big blue" @click="addWlItem()">新增</button>
|
|
|
- <button class="admin-button-com big blue" @click="cancelWlSelect()">取消</button>
|
|
|
+ <button class="admin-button-com big blue" style="width:180upx;" @click="addWlItem()">新增</button>
|
|
|
+ <button class="admin-button-com big blue" style="width:180upx;" @click="cancelWlSelect()">取消</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</uni-popup>
|
|
|
@@ -582,15 +556,7 @@
|
|
|
<!-- 蒙板 -->
|
|
|
<view v-if="showPicker" class="date-picker-mask" @click="showPicker = false"></view>
|
|
|
|
|
|
- <mx-date-picker
|
|
|
- :show="showPicker"
|
|
|
- format="yyyy-mm-dd"
|
|
|
- type="date"
|
|
|
- :value="defaultPickerDate"
|
|
|
- :show-tips="true"
|
|
|
- @confirm="confirmPicker"
|
|
|
- @cancel="showPicker = false"
|
|
|
- />
|
|
|
+ <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
|
|
|
|
|
|
<!-- 取件时间选择器 -->
|
|
|
<TimePicker ref="timePicker" :bottomOffset="80" @confirm="handleTimeConfirm" />
|
