Skip to content

S
ShopERP
Commit be8dd901 by PC-20220610JUCQ\Administrator
Options

<develop>:(Web 端)<无> ShopERP 项目 WebAPI 接口代码提交。

parent 28339605
Showing with 188 additions and 362 deletions
CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
...@@ -485,16 +485,7 @@ namespace CoreCms.Net.Model.Entities ...@@ -485,16 +485,7 @@ namespace CoreCms.Net.Model.Entities
public System.Boolean isdel { get; set; } public System.Boolean isdel { get; set; }
/// <summary>
/// 关联营销类型对象序列
/// </summary>
[Display(Name = "关联营销类型对象序列")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 objectId { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
......
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
...@@ -198,8 +198,7 @@ namespace CoreCms.Net.Services ...@@ -198,8 +198,7 @@ namespace CoreCms.Net.Services
orderType = orderType, orderType = orderType,
point = point, point = point,
coupon = couponCode, coupon = couponCode,
receiptType = receiptType, receiptType = receiptType
objectId = objectId
}; };
//生成收货信息 //生成收货信息
...@@ -628,250 +627,208 @@ namespace CoreCms.Net.Services ...@@ -628,250 +627,208 @@ namespace CoreCms.Net.Services
public async Task<WebApiCallBack> GetOrderInfoByOrderId(string id, int userId = 0, int aftersaleLevel = 0) public async Task<WebApiCallBack> GetOrderInfoByOrderId(string id, int userId = 0, int aftersaleLevel = 0)
{ {
var jm = new WebApiCallBack(); var jm = new WebApiCallBack();
var order = new CoreCmsOrder(); var order = new CoreCmsOrder();
order = userId > 0
? await _dal.QueryByClauseAsync(p => p.orderId == id && p.userId == userId)
: await _dal.QueryByClauseAsync(p => p.orderId == id);
if (order == null)
{
jm.msg = "获取订单失败";
return jm;
}
//订单详情(子货品数据)
order.items = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (order.items.Any()) try
{ {
order.items.ForEach(p => order = await _dal.QueryByClauseAsync(p => p.orderId == id);
if (order == null)
{ {
if (!string.IsNullOrEmpty(p.promotionList)) jm.msg = "获取订单失败";
{ return jm;
var jobj = JObject.Parse(p.promotionList); }
if (jobj.Values().Any())
{
p.promotionObj = jobj.Values().FirstOrDefault();
}
}
});
}
//获取相关状态描述说明转换 //订单详情(子货品数据)
order.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderStatus>(order.status); order.items = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
order.payStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderPayStatus>(order.payStatus);
order.shipStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderShipStatus>(order.shipStatus);
order.sourceText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.Source>(order.source);
order.typeText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderType>(order.orderType);
order.confirmStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderConfirmStatus>(order.confirmStatus);
order.taxTypeText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderTaxType>(order.taxType);
order.paymentCodeText = EnumHelper.GetEnumDescriptionByKey<GlobalEnumVars.PaymentsTypes>(order.paymentCode);
//获取日志
order.orderLog = await _orderLogServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (order.orderLog.Any()) //获取相关状态描述说明转换
{ order.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderStatus>(order.status);
order.orderLog.ForEach(p => order.payStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderPayStatus>(order.payStatus);
order.shipStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderShipStatus>(order.shipStatus);
order.sourceText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.Source>(order.source);
order.typeText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderType>(order.orderType);
order.confirmStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderConfirmStatus>(order.confirmStatus);
order.taxTypeText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderTaxType>(order.taxType);
order.paymentCodeText = EnumHelper.GetEnumDescriptionByKey<GlobalEnumVars.PaymentsTypes>(order.paymentCode);
//获取日志
order.orderLog = await _orderLogServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (order.orderLog.Any())
{ {
p.typeText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderLogTypes>(p.type); order.orderLog.ForEach(p =>
}); {
} p.typeText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderLogTypes>(p.type);
});
}
//用户信息 //用户信息
order.user = await _userServices.QueryByIdAsync(order.userId); order.user = await _userServices.QueryByIdAsync(order.userId);
if (order.user != null) if (order.user != null)
{
order.user.passWord = "";
}
//支付单
order.paymentItem = await _billPaymentsServices.QueryListByClauseAsync(p => p.sourceId == order.orderId);
//退款单
order.refundItem = await _billRefundServices.QueryListByClauseAsync(p => p.sourceId == order.orderId);
//提货单
order.ladingItem = await _billLadingServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
//退货单
order.returnItem = await _billReshipServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
//售后单
order.aftersalesItem = await _billAftersalesServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
//发货单
order.delivery = await _billDeliveryServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (order.delivery != null && order.delivery.Any())
{
foreach (var item in order.delivery)
{ {
var outFirstAsync = await _logisticsServices.QueryByClauseAsync(p => p.logiCode == item.logiCode); order.user.passWord = "";
item.logiName = outFirstAsync != null ? outFirstAsync.logiName : item.logiCode;
} }
} //支付单
//获取提货门店 order.paymentItem = await _billPaymentsServices.QueryListByClauseAsync(p => p.sourceId == order.orderId);
if (order.storeId != 0) //退款单
{ order.refundItem = await _billRefundServices.QueryListByClauseAsync(p => p.sourceId == order.orderId);
order.store = await _storeServices.QueryByIdAsync(order.storeId); //提货单
if (order.store != null) order.ladingItem = await _billLadingServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
//退货单
order.returnItem = await _billReshipServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
//售后单
order.aftersalesItem = await _billAftersalesServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
//发货单
order.delivery = await _billDeliveryServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (order.delivery != null && order.delivery.Any())
{
foreach (var item in order.delivery)
{
var outFirstAsync = await _logisticsServices.QueryByClauseAsync(p => p.logiCode == item.logiCode);
item.logiName = outFirstAsync != null ? outFirstAsync.logiName : item.logiCode;
}
}
//获取配送方式
if (order.logisticsId > 0)
{ {
var areaBack = await _areaServices.GetAreaFullName(order.store.areaId); order.logistics = await _shipServices.QueryByIdAsync(order.logisticsId);
order.store.allAddress = areaBack.status ? areaBack.data + order.store.address : order.store.address;
} }
} //获取订单状态及中文描述
//获取配送方式 order.globalStatus = GetGlobalStatus(order);
if (order.logisticsId > 0)
{
order.logistics = await _shipServices.QueryByIdAsync(order.logisticsId);
}
//获取订单状态及中文描述
order.globalStatus = GetGlobalStatus(order);
order.globalStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderAllStatusType>(order.globalStatus); order.globalStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderAllStatusType>(order.globalStatus);
//收货地区三级地址 //收货地区三级地址
var shipAreaBack = await _areaServices.GetAreaFullName(order.shipAreaId); var shipAreaBack = await _areaServices.GetAreaFullName(order.shipAreaId);
order.shipAreaName = shipAreaBack.status ? shipAreaBack.data.ToString() : ""; order.shipAreaName = shipAreaBack.status ? shipAreaBack.data.ToString() : "";
//获取支付方式 //获取支付方式
var pm = await _paymentsServices.QueryByClauseAsync(p => p.code == order.paymentCode); var pm = await _paymentsServices.QueryByClauseAsync(p => p.code == order.paymentCode);
order.paymentName = pm != null ? pm.name : "未知支付方式"; order.paymentName = pm != null ? pm.name : "未知支付方式";
//优惠券 order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
//if (!string.IsNullOrEmpty(order.coupon))
//{
// order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
//}
order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
var allConfigs = await _settingServices.GetConfigDictionaries(); var allConfigs = await _settingServices.GetConfigDictionaries();
//获取该状态截止时间 //获取该状态截止时间
switch (order.globalStatus) switch (order.globalStatus)
{ {
case (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_PAYMENT: ////待付款 case (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_PAYMENT: ////待付款
var cancelTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderCancelTime).ObjectToInt(1) * 86400; var cancelTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderCancelTime).ObjectToInt(1) * 86400;
var dt = order.createTime.AddSeconds(cancelTime); var dt = order.createTime.AddSeconds(cancelTime);
order.remainingTime = dt; order.remainingTime = dt;
order.remaining = CommonHelper.GetRemainingTime(dt); order.remaining = CommonHelper.GetRemainingTime(dt);
break; break;
case (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_RECEIPT: //待收货 case (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_RECEIPT: //待收货
var autoSignTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderAutoSignTime).ObjectToInt(1) * 86400; var autoSignTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderAutoSignTime).ObjectToInt(1) * 86400;
var dtautoSignTime = order.createTime.AddSeconds(autoSignTime); var dtautoSignTime = order.createTime.AddSeconds(autoSignTime);
order.remainingTime = dtautoSignTime; order.remainingTime = dtautoSignTime;
order.remaining = CommonHelper.GetRemainingTime(dtautoSignTime); order.remaining = CommonHelper.GetRemainingTime(dtautoSignTime);
break; break;
case (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_EVALUATE: //待评价 case (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_EVALUATE: //待评价
var autoEvalTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderAutoEvalTime).ObjectToInt(1) * 86400; var autoEvalTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderAutoEvalTime).ObjectToInt(1) * 86400;
var dtautoEvalTime = order.createTime.AddSeconds(autoEvalTime); var dtautoEvalTime = order.createTime.AddSeconds(autoEvalTime);
order.remainingTime = dtautoEvalTime; order.remainingTime = dtautoEvalTime;
order.remaining = CommonHelper.GetRemainingTime(dtautoEvalTime); order.remaining = CommonHelper.GetRemainingTime(dtautoEvalTime);
break; break;
default: default:
order.remaining = string.Empty; order.remaining = string.Empty;
order.remainingTime = null; order.remainingTime = null;
break; break;
}
//支付单
if (order.paymentItem != null && order.paymentItem.Any())
{
foreach (var item in order.paymentItem)
{
item.paymentCodeName = EnumHelper.GetEnumDescriptionByKey<GlobalEnumVars.PaymentsTypes>(item.paymentCode);
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillPaymentsStatus>(item.status);
} }
} //支付单
//退款单 if (order.paymentItem != null && order.paymentItem.Any())
if (order.refundItem != null && order.refundItem.Any())
{
foreach (var item in order.refundItem)
{ {
item.paymentCodeName = EnumHelper.GetEnumDescriptionByKey<GlobalEnumVars.PaymentsTypes>(item.paymentCode); foreach (var item in order.paymentItem)
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillRefundStatus>(item.status); {
item.paymentCodeName = EnumHelper.GetEnumDescriptionByKey<GlobalEnumVars.PaymentsTypes>(item.paymentCode);
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillPaymentsStatus>(item.status);
}
} }
} //退款单
//发货单 if (order.refundItem != null && order.refundItem.Any())
if (order.delivery != null && order.delivery.Any())
{
foreach (var item in order.delivery)
{ {
var logisticsModel = await _logisticsServices.GetLogiInfo(item.logiCode); foreach (var item in order.refundItem)
if (logisticsModel.status)
{ {
var logisticsData = logisticsModel.data as CoreCmsLogistics; item.paymentCodeName = EnumHelper.GetEnumDescriptionByKey<GlobalEnumVars.PaymentsTypes>(item.paymentCode);
item.logiName = logisticsData.logiName; item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillRefundStatus>(item.status);
} }
var areaModel = await _areaServices.GetAreaFullName(item.shipAreaId); }
if (areaModel.status) //发货单
if (order.delivery != null && order.delivery.Any())
{
foreach (var item in order.delivery)
{ {
item.shipAreaIdName = areaModel.data as string; var logisticsModel = await _logisticsServices.GetLogiInfo(item.logiCode);
if (logisticsModel.status)
{
var logisticsData = logisticsModel.data as CoreCmsLogistics;
item.logiName = logisticsData.logiName;
}
var areaModel = await _areaServices.GetAreaFullName(item.shipAreaId);
if (areaModel.status)
{
item.shipAreaIdName = areaModel.data as string;
}
} }
} }
} //提货单
//提货单 if (order.ladingItem != null && order.ladingItem.Any())
if (order.ladingItem != null && order.ladingItem.Any())
{
foreach (var item in order.ladingItem)
{ {
var storeModel = await _storeServices.QueryByIdAsync(item.storeId); foreach (var item in order.ladingItem)
item.storeName = storeModel != null ? storeModel.storeName : "";
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillLadingStatus>(item.status ? 2 : 1);
if (item.clerkId != 0)
{ {
var userModel = await _userServices.QueryByIdAsync(item.clerkId); var storeModel = await _storeServices.QueryByIdAsync(item.storeId);
if (userModel != null) item.storeName = storeModel != null ? storeModel.storeName : "";
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillLadingStatus>(item.status ? 2 : 1);
if (item.clerkId != 0)
{ {
item.clerkIdName = !string.IsNullOrEmpty(userModel.nickName) ? userModel.nickName : userModel.mobile; var userModel = await _userServices.QueryByIdAsync(item.clerkId);
if (userModel != null)
{
item.clerkIdName = !string.IsNullOrEmpty(userModel.nickName) ? userModel.nickName : userModel.mobile;
}
} }
} }
} }
} //退货单
//退货单 if (order.returnItem != null && order.returnItem.Any())
if (order.returnItem != null && order.returnItem.Any())
{
foreach (var item in order.returnItem)
{ {
var logisticsModel = await _logisticsServices.GetLogiInfo(item.logiCode); foreach (var item in order.returnItem)
if (logisticsModel.status)
{ {
var logisticsData = logisticsModel.data as CoreCmsLogistics; var logisticsModel = await _logisticsServices.GetLogiInfo(item.logiCode);
item.logiName = logisticsData.logiName; if (logisticsModel.status)
{
var logisticsData = logisticsModel.data as CoreCmsLogistics;
item.logiName = logisticsData.logiName;
}
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillReshipStatus>(item.status);
} }
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillReshipStatus>(item.status);
} }
}
//售后单取当前活动的收货单 //售后单取当前活动的收货单
if (order.aftersalesItem != null && order.aftersalesItem.Any()) if (order.aftersalesItem != null && order.aftersalesItem.Any())
{
foreach (var item in order.aftersalesItem)
{ {
order.billAftersalesId = item.aftersalesId; foreach (var item in order.aftersalesItem)
//如果售后单里面有待审核的活动售后单，那就直接拿这条 {
if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break; order.billAftersalesId = item.aftersalesId;
//如果售后单里面有待审核的活动售后单，那就直接拿这条
if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break;
}
} }
}
//把退款金额和退货商品查出来
AfterSalesVal(order, aftersaleLevel);
//促销信息
if (!string.IsNullOrEmpty(order.promotionList))
{
order.promotionObj = JsonConvert.DeserializeObject(order.promotionList);
}
//发票信息 //把退款金额和退货商品查出来
var invoiceModel = await _invoiceServices.GetOrderInvoiceInfo(order.orderId); AfterSalesVal(order, aftersaleLevel);
if (invoiceModel != null && invoiceModel.status)
{ jm.status = true;
order.invoice = invoiceModel.data; jm.data = order;
jm.msg = GlobalConstVars.GetDataSuccess;
} }
else catch (Exception ex)
{ {
order.invoice = new jm.msg = ex.Message;
{ Console.WriteLine(ex.Message);
type = order.taxType,
title = order.taxTitle,
taxNumber = order.taxCode
};
} }
jm.status = true;
jm.data = order;
jm.msg = GlobalConstVars.GetDataSuccess;
return jm; return jm;
} }
......
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
...@@ -53,8 +53,7 @@ namespace CoreCms.Net.Web.Admin.Controllers ...@@ -53,8 +53,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
private readonly ICoreCmsOrderItemServices _orderItemServices; private readonly ICoreCmsOrderItemServices _orderItemServices;
#region 构造函数
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
///</summary> ///</summary>
...@@ -82,7 +81,8 @@ namespace CoreCms.Net.Web.Admin.Controllers ...@@ -82,7 +81,8 @@ namespace CoreCms.Net.Web.Admin.Controllers
_redisOperationRepository = redisOperationRepository; _redisOperationRepository = redisOperationRepository;
_billDeliveryServices = billDeliveryServices; _billDeliveryServices = billDeliveryServices;
_orderItemServices = orderItemServices; _orderItemServices = orderItemServices;
} }
#endregion
#region 获取列表============================================================ #region 获取列表============================================================
// POST: Api/CoreCmsOrder/GetPageList // POST: Api/CoreCmsOrder/GetPageList
......
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
...@@ -105,24 +105,6 @@ ...@@ -105,24 +105,6 @@
<div class="layui-input-inline layui-inline-3 layui-form-mid">￥{{d.params.data.payedAmount}}元</div> <div class="layui-input-inline layui-inline-3 layui-form-mid">￥{{d.params.data.payedAmount}}元</div>
</div> </div>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend style="font-size:14px;">发票信息</legend>
</fieldset>
<div class="layui-form-item">
<label class="layui-form-label">发票类型</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.taxTypeText}}</div>
<label class="layui-form-label">发票内容</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{# if (d.params.data.invoice.type != 1) { }}商品明细{{# } else{ }} 无 {{# } }}
</div>
<label class="layui-form-label">税号</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.invoice.taxNumber||'无'}}</div>
<label class="layui-form-label">发票抬头</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.invoice.title||'无'}}</div>
</div>
<!--收货人信息--> <!--收货人信息-->
{{# if (d.params.data.store) { }} {{# if (d.params.data.store) { }}
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
...@@ -183,26 +165,7 @@ ...@@ -183,26 +165,7 @@
<label class="layui-form-label">买家备注</label> <label class="layui-form-label">买家备注</label>
<div class="layui-input-inline layui-form-mid layui-inline-10">{{d.params.data.memo||'无'}}</div> <div class="layui-input-inline layui-form-mid layui-inline-10">{{d.params.data.memo||'无'}}</div>
</div> </div>
<!--下单用户-->
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend style="font-size:14px;">下单用户</legend>
</fieldset>
<div class="layui-form-item">
<label class="layui-form-label">用户编号</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.id}}
</div>
<label class="layui-form-label">用户手机</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.mobile}}
</div><label class="layui-form-label">用户昵称</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.nickName}}
</div><label class="layui-form-label">微信编号</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.userWx}}
</div>
</div>
</div> </div>
<!--商品详情--> <!--商品详情-->
......
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
...@@ -280,11 +280,7 @@ ...@@ -280,11 +280,7 @@
cols: [ cols: [
[ [
{ type: 'checkbox' }, { type: 'checkbox' },
{
field: 'operating', title: '操作', width: 90, align: 'center', templet: function (data) {
return data.operating;
}
},
{ {
field: 'orderId', field: 'orderId',
title: '订单号', title: '订单号',
...@@ -299,14 +295,9 @@ ...@@ -299,14 +295,9 @@
} }
}, },
{ field: 'orderAmount', title: '订单总额', width: 100, align: 'center', templet: '#orderAmount', totalRow: true }, { field: 'orderAmount', title: '订单总额', width: 100, align: 'center', templet: '#orderAmount', totalRow: true },
{ field: 'item', title: '货品', align: 'center', width: 330, templet: "#orderItems" },
{ {
field: 'item', title: '货品', align: 'center', width: 330, templet: "#orderItems" field: 'orderAmount', title: '类型', width: 60, align: 'center',
},
{
field: 'orderAmount',
title: '类型',
width: 60,
align: 'center',
templet: function (data) { templet: function (data) {
for (var i = 0; i < d.data.orderType.length; i++) { for (var i = 0; i < d.data.orderType.length; i++) {
if (data.orderType == d.data.orderType[i].value) { if (data.orderType == d.data.orderType[i].value) {
...@@ -316,26 +307,10 @@ ...@@ -316,26 +307,10 @@
return ""; return "";
} }
}, },
{
field: 'orderId',
title: '打印',
align: 'center',
width: 80,
templet: function (data) {
var html = '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="shoppingPrint" data-id="' + data.orderId + '" class="cursor">购物单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="distributionPrint" data-id="' + data.orderId + '" class="cursor">配送单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="unionPrint" data-id="' + data.orderId + '" class="cursor">联合单</a><br>';
return html;
}
},
{ field: 'createTime', title: '下单时间/支付时间', width: 150, align: 'center', templet: '#orderTime' }, { field: 'createTime', title: '下单时间/支付时间', width: 150, align: 'center', templet: '#orderTime' },
//{ field: 'paymentTime', title: '付款时间', width: 130, align: 'center' }, { field: 'paymentTime', title: '付款时间', width: 130, align: 'center' },
//{ field: 'paymentTime', title: '付款时间', width: 130, align: 'center' },
{ {
field: 'StatusText', field: 'StatusText',title: '订单状态',width: 80, align: 'center',
title: '订单状态',
width: 80,
align: 'center',
templet: function (data) { templet: function (data) {
var html = ''; var html = '';
for (var i = 0; i < d.data.orderStatus.length; i++) { for (var i = 0; i < d.data.orderStatus.length; i++) {
...@@ -349,39 +324,19 @@ ...@@ -349,39 +324,19 @@
return html; return html;
} }
}, },
//{
// field: 'payStatus',
// title: '支付状态',
// width: 65,
// align: 'center',
// templet: function (data) {
// for (var i = 0; i < d.data.payStatus.length; i++) {
// if (data.payStatus == d.data.payStatus[i].value) {
// return d.data.payStatus[i].description;
// }
// }
// return "";
// }
//},
{ {
field: 'paymentCode', field: 'payStatus',title: '支付状态',width: 65,align: 'center',
title: '支付方式',
width: 65,
align: 'center',
templet: function (data) { templet: function (data) {
for (var i = 0; i < d.data.paymentCode.length; i++) { for (var i = 0; i < d.data.payStatus.length; i++) {
if (data.paymentCode == d.data.paymentCode[i].title) { if (data.payStatus == d.data.payStatus[i].value) {
return d.data.paymentCode[i].description; return d.data.payStatus[i].description;
} }
} }
return ""; return "";
} }
}, },
{ {
field: 'shipStatus', field: 'shipStatus',title: '发货状态',width: 65,align: 'center',
title: '发货状态',
width: 65,
align: 'center',
templet: function (data) { templet: function (data) {
for (var i = 0; i < d.data.shipStatus.length; i++) { for (var i = 0; i < d.data.shipStatus.length; i++) {
if (data.shipStatus == d.data.shipStatus[i].value) { if (data.shipStatus == d.data.shipStatus[i].value) {
...@@ -390,68 +345,28 @@ ...@@ -390,68 +345,28 @@
} }
return ""; return "";
} }
}, {
field: 'confirmStatus',
title: '收货状态',
width: 80,
align: 'center',
templet: function (data) {
for (var i = 0; i < d.data.confirmStatus.length; i++) {
if (data.confirmStatus == d.data.confirmStatus[i].value) {
return d.data.confirmStatus[i].description;
}
}
return "";
}
}, },
{ {
field: 'storeId', field: 'afterSaleStatus', title: '售后状态', width: 75, align: 'center', templet: function (data)
title: '订单属性', {
width: 80, return '<a style="color:red">' + data.afterSaleStatus + '</a>';
align: 'center',
templet: function (data) {
for (var i = 0; i < d.data.receiptType.length; i++) {
if (data.receiptType == d.data.receiptType[i].value) {
return d.data.receiptType[i].description;
}
}
return "";
} }
}, },
{ field: 'shipMobile', title: '地址', align: 'left', templet: "#orderShip" },
{ {
field: 'afterSaleStatus', field: 'orderId', title: '打印', align: 'center', width: 100,
title: '售后状态',
width: 75,
align: 'center',
templet: function (data) { templet: function (data) {
return '<a style="color:red">' + data.afterSaleStatus + '</a>'; var html = '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="shoppingPrint" data-id="' + data.orderId + '" class="cursor">购物单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="distributionPrint" data-id="' + data.orderId + '" class="cursor">配送单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="unionPrint" data-id="' + data.orderId + '" class="cursor">联合单</a><br>';
return html;
} }
}, },
{ {
field: 'shipMobile', title: '地址', align: 'left', templet: "#orderShip" field: 'operating', title: '操作', width: 120, align: 'center', templet: function (data) {
}, return data.operating;
//{ }
// field: 'userNickName', }
// title: '来源',
// width: 120,
// align: 'left',
//},
//{
// field: 'source', title:
// '订单来源', width:
// 80, align:
// 'center', templet:
// function (data) {
// for (var i = 0; i < d.data.source.length; i++) {
// if (data.source == d.data.source[i].value) {
// return d.data.source[i].description;
// }
// }
// return "";
// }
//}
] ]
] ]
}); });
......
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