| CoreCms.Net.Services/Order/CoreCmsOrderServices.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsPlanOrderController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/puhuo/create.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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) { 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 预览数据============================================================ 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="请输入货品id" lay-reqText="请输入货品id并为数字" />--> <select name="productsId" id="productsId"> <select name="productsId" id="productsId" lay-search> <option value="0">请选择</option> </select> </div> CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
@@ -151,6 +151,8 @@ <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,6 +362,8 @@ doDelete(obj); } else if (obj.event === 'edit') { doEdit(obj) } else if (obj.event === 'deldel') { doDeletedel(obj); } }); //执行创建操作 @@ -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); } //开启调试返回数据 @@ -493,6 +506,21 @@ }); } //执行单个删除 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; @@ -513,6 +541,28 @@ }); }); } //执行批量删除 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('确定根据当前的查询条件导出数据吗？',
