github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

Browse Source
This commit is contained in:
liaofei 2023-06-26 12:31:04 +08:00
commit fb4d7b1666
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/admin/src/components/uploadImg/index.vue
View File

@ -344,7 +344,7 @@ export default {
position: absolute;
z-index: 1;
font-size: 18px;
left: 50px;
right: -5px;
top: -5px;
color #999
}

39
template/admin/src/pages/order/orderList/handle/orderSend.vue
View File

@ -23,15 +23,17 @@
<Radio label="2">电子面单打印</Radio>
</RadioGroup>
</FormItem>
<FormItem label="寄件人姓名：">
<Input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></Input>
</FormItem>
<FormItem label="寄件人电话：">
<Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></Input>
</FormItem>
<FormItem label="寄件人地址：">
<Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></Input>
</FormItem>
<template v-if="['2', '3'].includes(formItem.express_record_type) && formItem.type == 1">
<FormItem label="寄件人姓名：">
<Input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></Input>
</FormItem>
<FormItem label="寄件人电话：">
<Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></Input>
</FormItem>
<FormItem label="寄件人地址：">
<Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></Input>
</FormItem>
</template>
<div>
<FormItem label="快递公司：" v-if="formItem.type == 1">
<Select
@ -170,7 +172,7 @@
<!-- <viewer @inited="inited">
<img :src="temp.pic" style="display:none" />
</viewer> -->
<div ref="viewer" v-viewer v-show="temp">
<div ref="viewer" v-viewer>
<img :src="temp.pic" style="display: none" />
</div>
</Modal>
@ -384,17 +386,17 @@ export default {
},
changeExpress(j) {
switch (j) {
case '1':
this.formItem.delivery_name = '';
this.formItem.delivery_id = '';
this.getList(1);
break;
case '2':
this.formItem.delivery_name = '';
this.formItem.express_temp_id = '';
this.expressTemp = [];
this.getList(2);
break;
case '1':
this.formItem.delivery_name = '';
this.formItem.delivery_id = '';
this.getList(1);
break;
case '3':
this.formItem.delivery_name = '';
this.formItem.delivery_id = '';
@ -567,7 +569,11 @@ export default {
});
} else if (this.formItem.express_record_type == '3') {
this.expressTemp = expressItem.list;
this.formItem.express_temp_id = expressItem.list.length ? expressItem.list[0].temp_id : '';
if (expressItem.list.length) {
this.formItem.express_temp_id = expressItem.list[0].temp_id;
this.temp = expressItem.list[0];
console.log(expressItem.list[0], 'expressItem.list[0]');
}
}
},
getCartInfo(data, orderid) {
@ -624,6 +630,7 @@ export default {
if (this.temp === undefined) {
this.temp = {};
}
console.log(this.temp);
},
// inited (viewer) {
// this.$viewer = viewer;