From cebf78599fd172f92df983b99ad9c0341ca04839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Fri, 14 Oct 2022 00:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=90=8E=E5=8F=B0=E6=9C=8D=E5=8A=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=90=E5=B7=B2=E6=94=AF=E4=BB=98=E3=80=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=8A=E6=A0=B8=E9=94=80=E7=A0=81=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E7=94=9F=E6=88=90=E5=92=8C=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=93=8D=E4=BD=9C=EF=BC=8C=E8=80=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=95=B0=E6=8D=AE=E6=B7=B7=E4=B9=B1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreCmsUserServicesOrderController.cs | 31 -- .../wwwroot/views/good/servicegoods/edit.html | 277 ------------- .../views/good/servicegoods/index.html | 390 ++++++------------ 3 files changed, 121 insertions(+), 577 deletions(-) delete mode 100644 CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/edit.html diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs index 8eb4e17b..418b9db1 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs @@ -682,37 +682,6 @@ namespace CoreCms.Net.Web.Admin.Controllers } #endregion - - #region 设置是否支付============================================================ - // POST: Api/CoreCmsUserServicesOrder/DoSetisPay/10 - /// - /// 设置是否支付 - /// - /// - /// - [HttpPost] - [Description("设置是否支付")] - public async Task DoSetisPay([FromBody] FMUpdateBoolDataByIntId entity) - { - var jm = new AdminUiCallBack(); - - var oldModel = await _coreCmsUserServicesOrderServices.QueryByIdAsync(entity.id, false); - if (oldModel == null) - { - jm.msg = "不存在此信息"; - return jm; - } - oldModel.isPay = (bool)entity.data; - - var bl = await _coreCmsUserServicesOrderServices.UpdateAsync(p => new CoreCmsUserServicesOrder() { isPay = oldModel.isPay }, p => p.id == oldModel.id); - jm.code = bl ? 0 : 1; - jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; - - return jm; - } - #endregion - - #region 获取核销码列表============================================================ // POST: Api/CoreCmsUserServicesTicket/GetPageList /// diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/edit.html deleted file mode 100644 index 852524bc..00000000 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/edit.html +++ /dev/null @@ -1,277 +0,0 @@ - - \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html index e087a6d9..a7db6eb2 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html @@ -1,4 +1,4 @@ -服务项目表 +服务购买表
@@ -10,70 +10,98 @@ -
-
+
- - - @@ -83,7 +111,7 @@ var debug = layui.setter.debug; layui.data.done = function (d) { //开启调试情况下获取接口赋值数据 - if (debug) { console.log(d.data); } + if (debug) { console.log(d); } indexData = d.data; layui.use(['index', 'table', 'laydate', 'util', 'coredropdown', 'coreHelper'], @@ -98,25 +126,22 @@ , util = layui.util , view = layui.view; - - //重载form - form.render(); var searchwhere; //监听搜索 - form.on('submit(LAY-app-CoreCmsServices-search)', + form.on('submit(LAY-app-CoreCmsUserServicesOrder-search)', function (data) { var field = data.field; searchwhere = field; //执行重载 - table.reloadData('LAY-app-CoreCmsServices-tableBox', { where: field }); + table.reloadData('LAY-app-CoreCmsUserServicesOrder-tableBox', { where: field }); }); //数据绑定 table.render({ - elem: '#LAY-app-CoreCmsServices-tableBox', - url: layui.setter.apiUrl + 'Api/CoreCmsServices/GetPageList', + elem: '#LAY-app-CoreCmsUserServicesOrder-tableBox', + url: layui.setter.apiUrl + 'Api/CoreCmsUserServicesOrder/GetPageList', method: 'POST', - toolbar: '#LAY-app-CoreCmsServices-toolbar', - pagebar: '#LAY-app-CoreCmsServices-pagebar', + toolbar: '#LAY-app-CoreCmsUserServicesOrder-toolbar', + pagebar: '#LAY-app-CoreCmsUserServicesOrder-pagebar', className: 'pagebarbox', defaultToolbar: ['filter', 'print', 'exports'], height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67 @@ -127,77 +152,36 @@ cols: [ [ { type: "checkbox", fixed: "left" }, - { field: 'id', title: '序列', width: 70, sort: false }, - { field: 'title', title: '项目名称', sort: false, width: 205 }, + { field: 'id', title: '序列', width: 50, sort: false }, + { field: 'serviceOrderId', title: '服务订单编号', sort: false, width: 125 }, { - field: 'thumbnail', title: '缩略图', sort: false, width: 85, - templet: function (d) { - if (d.thumbnail) { - return ''; - } else { - return ''; - } - }, width: 60 - }, - { field: 'money', title: '售价', sort: false, width: 80, templet: function (data) { return '￥' + data.money } }, - - //{ field: 'description', title: '项目概述', sort: false, width: 105 }, - //{ field: 'contentBody', title: '项目详细说明', sort: false, width: 105 }, - { - field: 'allowedMembership', title: '允许购买会员级别', sort: false, width: 305, templet: function (data) { - var arr = data.allowedMembership.split(','); - var outStr = ""; - for (var i = 0; i < arr.length; i++) { - for (var j = 0; j < d.data.userGrade.length; j++) { - if (d.data.userGrade[j].id == arr[i]) { - outStr += '' + d.data.userGrade[j].title + '  '; - } - } - } - return outStr; + field: 'userId', title: '关联用户', sort: false, width: 155, templet: function (d) { + return d.userId + '【' + d.userName + '】'; } }, + { field: 'serviceTitle', title: '关联服务', sort: false }, + { field: 'isPay', title: '是否支付', width: 95, templet: '#switch_isPay', sort: false, unresize: true }, + { field: 'payTime', title: '支付时间', width: 130, sort: false }, + { field: 'paymentId', title: '支付单号', sort: false, width: 125 }, { - field: 'status', - title: '项目状态', - sort: false, - width: 85, - templet: function (data) { - for (var j = 0; j < d.data.status.length; j++) { - if (d.data.status[j].value == data.status) { - return d.data.status[j].description; + field: 'status', title: '状态', sort: false, width: 80, templet: function (data) { + for (var i = 0; i < d.data.serviceOrderStatus.length; i++) { + if (data.status == d.data.serviceOrderStatus[i].value) { + return d.data.serviceOrderStatus[i].description; } } return ""; } }, - { field: 'maxBuyNumber', title: '项目重复购买次数', sort: false, width: 125 }, - { field: 'amount', title: '项目可销售数量', sort: false, width: 105 }, - { field: 'startTime', title: '项目开始时间', width: 130, sort: false }, - { field: 'endTime', title: '项目截止时间', width: 130, sort: false }, - { - field: 'validityType', title: '核销有效期类型', sort: false, width: 105, - templet: function (data) { - for (var j = 0; j < d.data.types.length; j++) { - if (d.data.types[j].value == data.validityType) { - return d.data.types[j].description; - } - } - return ""; - } - }, - { field: 'validityStartTime', title: '核销开始时间', width: 130, sort: false }, - { field: 'validityEndTime', title: '核销结束时间', width: 130, sort: false }, - { field: 'ticketNumber', title: '核销服务券数量', sort: false, width: 105 }, - { field: 'createTime', title: '项目创建时间', width: 130, sort: false }, - { field: 'updateTime', title: '项目更新时间', width: 130, sort: false }, - { width: 142, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsServices-tableBox-bar' } + { field: 'createTime', title: '订单创建时间', width: 130, sort: false }, + { field: 'servicesEndTime', title: '截止服务时间', width: 130, sort: false }, + { width: 122, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserServicesOrder-tableBox-bar' } ] ] }); //监听排序事件 - table.on('sort(LAY-app-CoreCmsServices-tableBox)', function (obj) { - table.reloadData('LAY-app-CoreCmsServices-tableBox', { + table.on('sort(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { + table.reloadData('LAY-app-CoreCmsUserServicesOrder-tableBox', { initSort: obj, //记录初始排序，如果不设的话，将无法标记表头的排序状态。 where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式） orderField: obj.field, //排序字段 @@ -206,20 +190,14 @@ }); }); //监听行双击事件 - table.on('rowDouble(LAY-app-CoreCmsServices-tableBox)', function (obj) { + table.on('rowDouble(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { //查看详情 doDetails(obj); }); //头工具栏事件 - table.on('pagebar(LAY-app-CoreCmsServices-tableBox)', function (obj) { + table.on('pagebar(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch (obj.event) { - case 'addData': - doCreate(); - break; - case 'batchDelete': - doBatchDelete(checkStatus); - break; case 'selectExportExcel': doSelectExportExcel(checkStatus); break; @@ -229,139 +207,26 @@ }; }); //监听工具条 - table.on('tool(LAY-app-CoreCmsServices-tableBox)', + table.on('tool(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { if (obj.event === 'detail') { doDetails(obj); - } else if (obj.event === 'del') { - doDelete(obj); - } else if (obj.event === 'edit') { - doEdit(obj) + } else if (obj.event === 'cancellation') { + doCancellation(obj); } }); - //执行创建操作 - function doCreate() { - coreHelper.Post("Api/CoreCmsServices/GetCreate", null, function (e) { - if (e.code === 0) { - admin.popup({ - shadeClose: false, - title: '创建数据', - area: ['1200px', '90%'], - id: 'LAY-popup-CoreCmsServices-create', - success: function (layero, index) { - view(this.id).render('good/servicegoods/create', { data: e.data }).done(function () { - //监听提交 - form.on('submit(LAY-app-CoreCmsServices-createForm-submit)', - function (data) { - var field = data.field; //获取提交的字段 - field.contentBody = window.editor.getData(); - if (!!!field.contentBody) { - layer.msg('文章详情内容不能为空', { icon: 5 }); - return false; - } - - if (field.validityType == 2) { - if (!field.validityStartTime || !field.validityStartTime) { - layer.msg('请设置【核销有效时段】', { icon: 5 }); - return false; - } - } - - if (debug) { console.log(field); } //开启调试返回数据 - //提交 Ajax 成功后，关闭当前弹层并重载表格 - coreHelper.Post("Api/CoreCmsServices/DoCreate", field, function (e) { - console.log(e) - if (e.code === 0) { - layui.table.reloadData('LAY-app-CoreCmsServices-tableBox'); //重载表格 - layer.close(index); //再执行关闭 - layer.msg(e.msg); - } else { - layer.msg(e.msg); - } - }); - }); - }); - // 禁止弹窗出现滚动条 - //$(layero).children('.layui-layer-content').css('overflow', 'visible'); - } - , btn: ['确定', '取消'] - , yes: function (index, layero) { - layero.contents().find("#LAY-app-CoreCmsServices-createForm-submit").click(); - } - }); - } else { - layer.msg(e.msg); - } - }); - } - //执行编辑操作 - function doEdit(obj) { - coreHelper.Post("Api/CoreCmsServices/GetEdit", { id: obj.data.id }, function (e) { - if (e.code === 0) { - admin.popup({ - shadeClose: false, - title: '编辑数据', - area: ['1200px', '90%'], - id: 'LAY-popup-CoreCmsServices-edit', - success: function (layero, index) { - view(this.id).render('good/servicegoods/edit', { data: e.data }).done(function () { - //监听提交 - form.on('submit(LAY-app-CoreCmsServices-editForm-submit)', - function (data) { - var field = data.field; //获取提交的字段 - - field.contentBody = window.editor.getData(); - if (!!!field.contentBody) { - layer.msg('文章详情内容不能为空', { icon: 5 }); - return false; - } - - if (field.validityType == 2) { - if (!field.validityStartTime || !field.validityStartTime) { - layer.msg('请设置【核销有效时段】', { icon: 5 }); - return false; - } - } - - if (debug) { console.log(field); } //开启调试返回数据 - //提交 Ajax 成功后，关闭当前弹层并重载表格 - coreHelper.Post("Api/CoreCmsServices/DoEdit", field, function (e) { - console.log(e) - if (e.code === 0) { - layui.table.reloadData('LAY-app-CoreCmsServices-tableBox'); //重载表格 - layer.close(index); //再执行关闭 - layer.msg(e.msg); - } else { - layer.msg(e.msg); - } - }); - }); - }) - // 禁止弹窗出现滚动条 - //$(layero).children('.layui-layer-content').css('overflow', 'visible'); - } - , btn: ['确定', '取消'] - , yes: function (index, layero) { - layero.contents().find("#LAY-app-CoreCmsServices-editForm-submit").click(); - } - }); - } else { - layer.msg(e.msg); - } - }); - } //执行预览操作 function doDetails(obj) { - coreHelper.Post("Api/CoreCmsServices/GetDetails", { id: obj.data.id }, function (e) { + coreHelper.Post("Api/CoreCmsUserServicesOrder/GetDetails", { id: obj.data.id }, function (e) { if (e.code === 0) { admin.popup({ shadeClose: false, title: '查看详情', area: ['1200px', '90%'], - id: 'LAY-popup-CoreCmsServices-details', + id: 'LAY-popup-CoreCmsUserServicesOrder-details', success: function (layero, index) { - view(this.id).render('good/servicegoods/details', { data: e.data }).done(function () { + view(this.id).render('order/servicesOrder/details', { data: e.data }).done(function () { form.render(); }); // 禁止弹窗出现滚动条 @@ -373,40 +238,20 @@ } }); } - //执行单个删除 - function doDelete(obj) { - coreHelper.Post("Api/CoreCmsServices/DoDelete", { id: obj.data.id }, function (e) { + //执行作废订单 + function doCancellation(obj) { + coreHelper.Post("Api/CoreCmsUserServicesOrder/DoCancellation", { id: obj.data.id }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 - table.reloadData('LAY-app-CoreCmsServices-tableBox'); + table.reloadData('LAY-app-CoreCmsUserServicesOrder-tableBox'); layer.msg(e.msg); }); } - //执行批量删除 - function doBatchDelete(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.id); - }); - coreHelper.Post("Api/CoreCmsServices/DoBatchDelete", { id: delidsStr }, function (e) { - if (debug) { console.log(e); } //开启调试返回数据 - table.reloadData('LAY-app-CoreCmsServices-tableBox'); - layer.msg(e.msg); - }); - }); - } //执行查询条件导出excel function doQueryExportexcel() { layer.confirm('确定根据当前的查询条件导出数据吗？', function (index) { var field = searchwhere; - coreHelper.PostForm("Api/CoreCmsServices/QueryExportExcel", field, function (e) { + coreHelper.PostForm("Api/CoreCmsUserServicesOrder/QueryExportExcel", field, function (e) { if (debug) { console.log(e); } //开启调试返回数据 if (e.code === 0) { window.open(e.data); @@ -430,7 +275,7 @@ delidsStr.push(item.id); }); layer.close(index); - coreHelper.Post("Api/CoreCmsServices/SelectExportExcel", { id: delidsStr }, function (e) { + coreHelper.Post("Api/CoreCmsUserServicesOrder/SelectExportExcel", { id: delidsStr }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 if (e.code === 0) { window.open(e.data); @@ -440,27 +285,34 @@ }); }); } + + + laydate.render({ + elem: '#searchTime-CoreCmsUserServicesOrder-payTime', + type: 'datetime', + range: '到', + }); + laydate.render({ + elem: '#searchTime-CoreCmsUserServicesOrder-createTime', + type: 'datetime', + range: '到', + }); + laydate.render({ + elem: '#searchTime-CoreCmsUserServicesOrder-servicesEndTime', + type: 'datetime', + range: '到', + }); + //监听 表格复选框操作 - laydate.render({ - elem: '#searchTime-CoreCmsServices-startTime', - type: 'datetime', - range: '到', - }); - laydate.render({ - elem: '#searchTime-CoreCmsServices-endTime', - type: 'datetime', - range: '到', - }); - laydate.render({ - elem: '#searchTime-CoreCmsServices-validityStartTime', - type: 'datetime', - range: '到', - }); - laydate.render({ - elem: '#searchTime-CoreCmsServices-validityEndTime', - type: 'datetime', - range: '到', - }); + + //重载form + form.render(); }); }; - \ No newline at end of file + + + + +