修复已知bug
This commit is contained in:
parent
649b4c201a
commit
74d981c5bd
|
@ -88,7 +88,7 @@ defineExpose({
|
|||
</div>
|
||||
<div class="flex-between">
|
||||
<div class="mr-2">手机号: {{ item.mobile || item.account }}</div>
|
||||
<el-tag type="primary" v-if="item.user_ship != 1">{{ item.user_ship_name }}</el-tag>
|
||||
<el-tag type="primary" v-if="item.user_ship == 0 || item.user_ship == 4">{{ item.user_ship_name }}</el-tag>
|
||||
<el-tag type="success" v-else>{{ item.user_ship_name }}</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -117,7 +117,9 @@ export const printTicket = (obj = {}, test = false) => {
|
|||
str += Esc.Size2(2) + Esc.Center() + Esc.boldFontOn() + obj.system_store_name + Esc.Size1() + "\n";
|
||||
str += Esc.fillLine(" ") + Esc.boldFontOff() + "\n";
|
||||
if (obj.shipping_type) {
|
||||
str += Esc.Left() + "核销码: " + Esc.boldFontOn() + obj.verify_code + Esc.boldFontOff() + (obj.reservation ? " (次日提)" : " ") + "\n";
|
||||
if(obj.is_writeoff == 1) str += Esc.Left() + "核销码: " + Esc.boldFontOn() + obj.verify_code + Esc.boldFontOff() + " (已核销)" + "\n";
|
||||
else if(obj.reservation == 1) str += Esc.Left() + "核销码: " + Esc.boldFontOn() + obj.verify_code + Esc.boldFontOff() + " (次日提)" + "\n";
|
||||
else str += Esc.Left() + "核销码: " + Esc.boldFontOn() + obj.verify_code + Esc.boldFontOff() + "\n";
|
||||
}
|
||||
str += Esc.Left() + "单号: " + obj.order_id + "\n";
|
||||
str += Esc.Left() + "下单时间: " + obj.create_time + "\n";
|
||||
|
|
|
@ -64,6 +64,9 @@ const getOrderList = (reload = false) => {
|
|||
})
|
||||
.catch((err) => {
|
||||
loading.value = false;
|
||||
ElMessage.error(err.msg||'没有找到该订单')
|
||||
orderList.value = [];
|
||||
mitt.emit("set-sale-order-detail", {});
|
||||
});
|
||||
} else {
|
||||
cashierinfoWriteoffListApi(where.value)
|
||||
|
|
|
@ -300,7 +300,7 @@ onUnmounted(() => {
|
|||
align-items: center;
|
||||
|
||||
div {
|
||||
background-color: rgba($color: #E6A23C, $alpha: 0.8);
|
||||
background-color: rgba($color: #1890FF, $alpha: 0.8);
|
||||
color: #fff;
|
||||
border-radius: 50%;
|
||||
width: 5rem;
|
||||
|
|
|
@ -106,10 +106,33 @@ const getAddress = () => {
|
|||
userAddressDetailApi({
|
||||
uid: formData.value.id
|
||||
}).then(res => {
|
||||
if (res.data.village) {
|
||||
if (res.data?.village) {
|
||||
selectedValues.value = [res.data.city, res.data.area, res.data.street, res.data.village, +res.data.brigade];
|
||||
selectedEd.value = JSON.parse(JSON.stringify(selectedValues.value));
|
||||
addressInfo.value = Object.assign(addressInfo.value, res.data);
|
||||
addressInfo.value = res.data;
|
||||
}
|
||||
else {
|
||||
selectedValues.value = [];
|
||||
selectedEd.value = [];
|
||||
addressInfo.value = {
|
||||
id: '',
|
||||
province: '',
|
||||
city: '',
|
||||
area: '',
|
||||
street: '',
|
||||
brigade: ''
|
||||
}
|
||||
}
|
||||
}).catch(err=>{
|
||||
selectedValues.value = [];
|
||||
selectedEd.value = [];
|
||||
addressInfo.value = {
|
||||
id: '',
|
||||
province: '',
|
||||
city: '',
|
||||
area: '',
|
||||
street: '',
|
||||
brigade: ''
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue