Skip to content

C
chinafrica
提交 ee98bc1f authored 作者: luojie's avatar luojie
浏览文件
操作

订单修改完成

上级 5b840a11
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 85 行增加 和 350 行删除
platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java
浏览文件 @ ee98bc1f
...@@ -70,4 +70,5 @@ public interface TbCfUserInfoService { ...@@ -70,4 +70,5 @@ public interface TbCfUserInfoService {
int deleteBatch(String[] userIds); int deleteBatch(String[] userIds);
String queryById(String account); String queryById(String account);
} }
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ ee98bc1f
...@@ -68,10 +68,6 @@ ...@@ -68,10 +68,6 @@
margin-top: 5px; margin-top: 5px;
display: contents; display: contents;
} }
:after, :before {
box-sizing: border-box;
width: 200px;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -266,7 +262,7 @@ ...@@ -266,7 +262,7 @@
<td>{{item.orderNo}}</td> <td>{{item.orderNo}}</td>
<td>{{item.itemTitle}}</td> <td>{{item.itemTitle}}</td>
<td> <td>
<img :src="item.itemImg" height="100px" width="100px" alt="item.itemTitle"/> <img :src="item.itemImg" height="100px" width="100px" alt="" onerror="showDefaultImg(this)"/>
</td> </td>
<td>{{item.itemSku}}</td> <td>{{item.itemSku}}</td>
<td>$ {{item.itemPrice}}</td> <td>$ {{item.itemPrice}}</td>
...@@ -291,7 +287,7 @@ ...@@ -291,7 +287,7 @@
<!--子订单列表(代购) --> <!--子订单列表(代购) -->
<div v-show="showLists" style="height: 100%;"> <div v-show="showLists" style="height: 100%;">
<p style="margin-left: 10px;font-size: 15px">收件人信息：</p> <p style="margin-left: 10px;font-size: 15px">收件人信息：</p>
<table class="table" id ="tableId" style="align:center" > <table class="table" style="align:center" >
<thread> <thread>
<tr style="background-color: mistyrose"> <tr style="background-color: mistyrose">
<th>收件人</th> <th>收件人</th>
...@@ -305,7 +301,10 @@ ...@@ -305,7 +301,10 @@
<td>{{deliveryAddress}}</td> <td>{{deliveryAddress}}</td>
</tr> </tr>
</table> </table>
<p style="margin-left: 10px;font-size: 15px">子订单信息：</p> <p style="margin-left: 10px;font-size: 15px">子订单信息：</p>
<div align="right" style="border: whitesmoke">
<i-Button type="primary" @click="reloadOrder" style="margin-bottom: 10px;">返回</i-Button>
</div>
<table class="table" id="showLists" width="1680px" > <table class="table" id="showLists" width="1680px" >
<thread> <thread>
<tr style="background-color: mistyrose"> <tr style="background-color: mistyrose">
...@@ -327,7 +326,7 @@ ...@@ -327,7 +326,7 @@
<td>{{item.orderNo}}</td> <td>{{item.orderNo}}</td>
<td>{{item.itemTitle}}</td> <td>{{item.itemTitle}}</td>
<td> <td>
<img :src="item.itemImg" height="100px" width="100px" alt="item.itemTitle"/> <img :src="item.itemImg" height="100px" width="100px" alt="" onerror="showDefaultImg(this)"/>
</td> </td>
<td>{{item.itemSku}}</td> <td>{{item.itemSku}}</td>
<td>$ {{item.itemPrice}}</td> <td>$ {{item.itemPrice}}</td>
...@@ -340,9 +339,6 @@ ...@@ -340,9 +339,6 @@
<td><i-button @click="showAgent(item.ordersId)">代购</i-button></td> <td><i-button @click="showAgent(item.ordersId)">代购</i-button></td>
</tr> </tr>
</table> </table>
<div>
<i-button type="warning" @click="reloadThisOrder(orderIdData)" style="margin-left: 8px">返回</i-button>
</div>
</div> </div>
<!--备注订单--> <!--备注订单-->
<el-dialog title="备注订单" :visible.sync="memoOrderVisible"> <el-dialog title="备注订单" :visible.sync="memoOrderVisible">
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ ee98bc1f
...@@ -494,9 +494,11 @@ let vm = new Vue({ ...@@ -494,9 +494,11 @@ let vm = new Vue({
alert('click on item ' + value); alert('click on item ' + value);
}, },
getDelivery: function (e) { getDelivery: function (e) {
let orderId=e;
vm.showList = false; vm.showList = false;
vm.showOrderDesc = false;
vm.showLists = true; vm.showLists = true;
vm.getInfo(e); vm.getInfo(orderId);
}, },
getDeliverys: function (orderId) { getDeliverys: function (orderId) {
vm.showList = false; vm.showList = false;
...@@ -504,12 +506,16 @@ let vm = new Vue({ ...@@ -504,12 +506,16 @@ let vm = new Vue({
vm.showLists = true; vm.showLists = true;
vm.getInfo(orderId); vm.getInfo(orderId);
}, },
//获取代购订单信息
getInfo: function (orderId) { getInfo: function (orderId) {
Ajax.request({ Ajax.request({
url: "../tbcforder/orderDeliveryList/" + orderId, url: "../tbcforder/orderDeliveryList/" + orderId,
async: true, async: true,
successCallback: function (r) { successCallback: function (r) {
vm.tbCfOrderLists = r.page.list; vm.tbCfOrderLists = r.page.list;
vm.deliveryName=r.page.list[0].deliveryName;
vm.deliveryPhone=r.page.list[0].deliveryPhone;
vm.deliveryAddress=r.page.list[0].deliveryAddress;
vm.tbCfOrderLists.map(item=>{ vm.tbCfOrderLists.map(item=>{
if(item.deliveryFlag===0){ if(item.deliveryFlag===0){
vm.$set(item,'deliveryFlag','未发货(未代购)') vm.$set(item,'deliveryFlag','未发货(未代购)')
...@@ -633,6 +639,7 @@ let vm = new Vue({ ...@@ -633,6 +639,7 @@ let vm = new Vue({
vm.memoOrder.orderId = orderId; vm.memoOrder.orderId = orderId;
vm.getMemoOrder(orderId); vm.getMemoOrder(orderId);
}, },
//获取订单备注信息
getMemoOrder:function(orderId){ getMemoOrder:function(orderId){
Ajax.request({ Ajax.request({
url: "../tbcforder/memoOrder/" + orderId, url: "../tbcforder/memoOrder/" + orderId,
...@@ -651,6 +658,7 @@ let vm = new Vue({ ...@@ -651,6 +658,7 @@ let vm = new Vue({
} }
}); });
}, },
//修改或新增订单备注
saveOrUpdatemMemoOrder: function(){ saveOrUpdatemMemoOrder: function(){
let that=this ; let that=this ;
Ajax.request({ Ajax.request({
...@@ -694,14 +702,14 @@ let vm = new Vue({ ...@@ -694,14 +702,14 @@ let vm = new Vue({
}); });
}, },
//订单详情 //订单详情
orderDesc: function (e,orderStatus) { orderDesc: function (e) {
vm.showList = false; vm.showList = false;
vm.showOrderDesc=true; vm.showOrderDesc=true;
let orderId=e; let orderId=e;
vm.getOderDescInfo(orderId) vm.getOderDescInfo(orderId)
}, },
//根据订单ID获取订单详情
getOderDescInfo: function(orderId){ getOderDescInfo: function(orderId){
Ajax.request({ Ajax.request({
url: "../tbcforder/orderBasic/" + orderId, url: "../tbcforder/orderBasic/" + orderId,
async: true, async: true,
...@@ -787,20 +795,21 @@ let vm = new Vue({ ...@@ -787,20 +795,21 @@ let vm = new Vue({
} }
}); });
}, },
//重新加载订单详情
reloadOrder: function (event) { reloadOrder: function (event) {
vm.showList = true; vm.showList = true;
vm.showOrderDesc=false; vm.showOrderDesc=false;
vm.handleReset('formValidate'); vm.handleReset('formValidate');
}, },
reloadThisOrder: function (orderId) { //弃用
/* reloadThisOrder: function (orderId) {
let e=orderId; let e=orderId;
// let orderId=e;
vm.showOrderDesc = true; vm.showOrderDesc = true;
vm.showLists=false; vm.showLists=false;
vm.orderDesc(e); vm.orderDesc(e);
vm.handleReset('formValidate'); vm.handleReset('formValidate');
}, },*/
//重新加载备注信息
reloadMemoOrder: function (orderId) { reloadMemoOrder: function (orderId) {
if (orderId == null) { if (orderId == null) {
return; return;
...@@ -808,6 +817,7 @@ let vm = new Vue({ ...@@ -808,6 +817,7 @@ let vm = new Vue({
vm.getOderDescInfo(orderId); vm.getOderDescInfo(orderId);
vm.handleReset('formValidate'); vm.handleReset('formValidate');
}, },
//重新加载代购订单
reloadDelivery: function (orderId) { reloadDelivery: function (orderId) {
vm.getDeliverys(orderId); vm.getDeliverys(orderId);
vm.handleReset('formValidate'); vm.handleReset('formValidate');
...@@ -858,5 +868,11 @@ let vm = new Vue({ ...@@ -858,5 +868,11 @@ let vm = new Vue({
handleReset: function (name) { handleReset: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
} }
}, }
}); });
function showDefaultImg(img){
img.src = "http://www.luolj.club/images/afrishop20190103.png";
//不循环执行
img.onerror = null;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论