From 1428284ade391f33c6fea64d87b2366af5c50aee Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 25 六月 2024 09:05:32 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs | 45 +++++++++++++++
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs | 12 ++--
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/create.html | 6 +-
CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html | 66 +++++++++++++++++++--
4 files changed, 112 insertions(+), 17 deletions(-)
diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
index 4eb4577..0ee675d 100644
--- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
+++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
@@ -527,12 +527,12 @@
jm.msg = "璁″垝璁㈠崟鑾峰彇澶辫触";
return jm;
}
- if (planOrder.status != 2)
- {
- _unitOfWork.RollbackTran();
- jm.msg = "璁″垝璁㈠崟娌℃湁閿佸崟";
- return jm;
- }
+ //if (planOrder.status != 2)
+ //{
+ // _unitOfWork.RollbackTran();
+ // jm.msg = "璁″垝璁㈠崟娌℃湁閿佸崟";
+ // return jm;
+ //}
if ((planOrder.keYongAmount - planOrder.huaFeiAmount - order.orderAmount)<0)
{
diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
index 829d941..46617dc 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs
@@ -512,6 +512,31 @@
return jm;
}
+
+ // POST: Api/CoreCmsPlanOrder/DoDelete/10
+ /// <summary>
+ /// 鍗曢�夊垹闄�
+ /// </summary>
+ /// <param name="entity"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Description("鍗曢�夊垹闄�")]
+ public async Task<AdminUiCallBack> DoDeletedel([FromBody] FMStringId entity)
+ {
+ var jm = new AdminUiCallBack();
+
+ var model = await _CoreCmsPlanOrderServices.QueryByIdAsync(entity.id);
+ if (model == null)
+ {
+ jm.msg = GlobalConstVars.DataisNo;
+ return jm;
+ }
+
+ var bl = await _CoreCmsPlanOrderServices.DeleteByIdAsync(entity.id);
+ jm.code = bl ? 0 : 1;
+ jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+ return jm;
+ }
#endregion
#region 鎵归噺鍒犻櫎============================================================
@@ -529,6 +554,26 @@
return jm;
}
+
+ // POST: Api/CoreCmsPlanOrder/DoBatchDelete/10,11,20
+ /// <summary>
+ /// 鎵归噺鍒犻櫎
+ /// </summary>
+ /// <param name="entity"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Description("鎵归噺鍒犻櫎")]
+ public async Task<AdminUiCallBack> DoBatchDeletedel([FromBody] FMArrayStringIds entity)
+ {
+ var jm = new AdminUiCallBack();
+
+ var bl = await _CoreCmsPlanOrderServices.DeleteByIdsAsync(entity.id);
+ jm.code = bl ? 0 : 1;
+ jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+ return jm;
+ }
+
#endregion
#region 棰勮鏁版嵁============================================================
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/create.html
index d7b3375..23e5b53 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/create.html
@@ -59,7 +59,7 @@
<div class="layui-form-item">
<label for="distributionId" class="layui-form-label layui-form-required">缁忛攢鍟�</label>
<div class="layui-input-block">
- <select name="distributionId" id="distributionId">
+ <select name="distributionId" id="distributionId" lay-search>
<option value="0">璇烽�夋嫨</option>
{{# layui.each(d.data.distributions, function(index, item){ }}
<option value="{{ item.id }}">{{ item.name }}</option>
@@ -90,7 +90,7 @@
<div class="layui-input-block">
- <select name="goodsName" id="goodsName" lay-filter="searchSelectgoodsName">
+ <select name="goodsName" id="goodsName" lay-filter="searchSelectgoodsName" lay-search>
<option value="0">璇烽�夋嫨</option>
</select>
@@ -100,7 +100,7 @@
<label for="productsId" class="layui-form-label layui-form-required">璐у搧</label>
<div class="layui-input-block">
<!--<input type="number" min="0" max="999999" name="productsId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="1" placeholder="璇疯緭鍏ヨ揣鍝乮d" lay-reqText="璇疯緭鍏ヨ揣鍝乮d骞朵负鏁板瓧" />-->
- <select name="productsId" id="productsId">
+ <select name="productsId" id="productsId" lay-search>
<option value="0">璇烽�夋嫨</option>
</select>
</div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
index 8a99b17..d80091b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
@@ -144,13 +144,15 @@
</select>
</div>
</div>-->
- <div class="layui-inline" >
+ <div class="layui-inline">
<button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsPlanOrder-search"><i class="layui-icon layui-icon-search"></i>绛涢��</button>
<button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-doBatchDelete"><i class="layui-icon layui-icon-add-circle"></i>鎵归噺閿佸崟</button>
<button type="button" class="layui-btn layui-btn-sm" id="upIndexPopupWindowImageUrlBtn">涓婁紶璁″垝璁㈠崟</button>
<button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>閫夋嫨瀵煎嚭</button>
<button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>鏌ヨ瀵煎嚭</button>
<a class="layui-btn layui-btn-sm" href="/static/jihuageshi/涓婁紶璁″垝璁㈠崟.xlsx">涓婁紶妯℃澘</a>
+
+ <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-DeldoBatchDelete"><i class="layui-icon layui-icon-delete"></i>鎵归噺鍒犻櫎</button>
</div>
</div>
</div>
@@ -172,7 +174,8 @@
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">鏌ョ湅</a>
<a class="layui-btn layui-btn-xs" lay-event="edit">淇敼</a>
<a class="layui-btn layui-btn-xs" lay-event="del">閿佸崟</a>
- <!--<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#CoreCmsPlanOrderTbDelDrop{{d.LAY_INDEX}}" no-shade="true">鍒犻櫎</a>-->
+ <a class="layui-btn layui-btn-xs" lay-event="deldel">鍒犻櫎</a>
+ <!--<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#CoreCmsPlanOrderTbDelDrop{{d.LAY_INDEX}}" no-shade="true">鍒犻櫎</a>
<div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="CoreCmsPlanOrderTbDelDrop{{d.LAY_INDEX}}"
style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;">
<div class="dropdown-anchor"></div>
@@ -184,7 +187,7 @@
<a class="layui-btn layui-btn-primary cursor" btn-cancel>鍙栨秷</a>
<a class="layui-btn layui-btn-normal cursor" lay-event="del">纭畾</a>
</div>
- </div>
+ </div>-->
</script>
<script>
@@ -230,6 +233,14 @@
function (data) {
var checkStatus = table.checkStatus("LAY-app-CoreCmsPlanOrder-tableBox");
doBatchDelete(checkStatus);
+ });
+
+
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-DeldoBatchDelete)',
+ function (data) {
+ var checkStatus = table.checkStatus("LAY-app-CoreCmsPlanOrder-tableBox");
+ doBatchDeleteDel(checkStatus);
});
@@ -305,7 +316,7 @@
//{ field: 'upDataBy', title: '淇敼浜�', sort: false,width: 105 },
//{ field: 'isdelete', title: '鍒犻櫎鏍囧織', width: 95, templet: '#switch_isdelete', sort: false , unresize: true},
{ field: 'statusText', title: '璁㈠崟鐘舵��', sort: false, width: 65 },
- { width: 172, align: 'center', title:'鎿嶄綔', fixed: 'right', toolbar: '#LAY-app-CoreCmsPlanOrder-tableBox-bar' }
+ { width: 222, align: 'center', title:'鎿嶄綔', fixed: 'right', toolbar: '#LAY-app-CoreCmsPlanOrder-tableBox-bar' }
]
]
});
@@ -351,7 +362,9 @@
doDelete(obj);
} else if (obj.event === 'edit') {
doEdit(obj)
- }
+ } else if (obj.event === 'deldel') {
+ doDeletedel(obj);
+ }
});
//鎵ц鍒涘缓鎿嶄綔
function doCreate(){
@@ -483,7 +496,7 @@
}
//鎵ц鍗曚釜鍒犻櫎
function doDelete(obj) {
- layer.confirm('纭畾閿佸崟鍚楋紵鍒犻櫎鍚庡皢鏃犳硶淇敼銆�',
+ layer.confirm('纭畾閿佸崟鍚楋紵',
function (index) {
coreHelper.Post("Api/CoreCmsPlanOrder/DoDelete", { id: obj.data.orderId }, function (e) {
if (debug) { console.log(e); } //寮�鍚皟璇曡繑鍥炴暟鎹�
@@ -492,7 +505,22 @@
});
});
- }
+ }
+ //鎵ц鍗曚釜鍒犻櫎
+ function doDeletedel(obj) {
+ layer.confirm('纭畾鍒犻櫎鍚楋紵',
+ function (index) {
+ coreHelper.Post("Api/CoreCmsPlanOrder/DoDeletedel", { id: obj.data.orderId }, function (e) {
+ if (debug) { console.log(e); } //寮�鍚皟璇曡繑鍥炴暟鎹�
+ table.reloadData('LAY-app-CoreCmsPlanOrder-tableBox');
+ layer.msg(e.msg);
+ });
+ });
+
+ }
+
+
+
//鎵ц鎵归噺鍒犻櫎
function doBatchDelete(checkStatus){
var checkData = checkStatus.data;
@@ -512,7 +540,29 @@
layer.msg(e.msg);
});
});
- }
+ }
+
+ //鎵ц鎵归噺鍒犻櫎
+ function doBatchDeleteDel(checkStatus) {
+ var checkData = checkStatus.data;
+ if (checkData.length === 0) {
+ return layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁');
+ }
+ layer.confirm('纭畾鍒犻櫎鍚楋紵',
+ function (index) {
+ var delidsStr = [];
+ layui.each(checkData,
+ function (index, item) {
+ delidsStr.push(item.orderId);
+ });
+ coreHelper.Post("Api/CoreCmsPlanOrder/DoBatchDeletedel", { id: delidsStr }, function (e) {
+ if (debug) { console.log(e); } //寮�鍚皟璇曡繑鍥炴暟鎹�
+ table.reloadData('LAY-app-CoreCmsPlanOrder-tableBox');
+ layer.msg(e.msg);
+ });
+ });
+ }
+
//鎵ц鏌ヨ鏉′欢瀵煎嚭excel
function doQueryExportexcel(){
layer.confirm('纭畾鏍规嵁褰撳墠鐨勬煡璇㈡潯浠跺鍑烘暟鎹悧锛�',
--
Gitblit v1.9.1