From 192c4fddc21fa4351b5c5d135f79af3968e831b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sun, 23 Apr 2023 13:10:00 +0800 Subject: [PATCH] 'commit' --- .../ypzs/component/lay-module/skuTable.js | 1488 ++++++++--------- .../FengHuang/Yp/Controller/YpController.java | 11 + .../dsideal/FengHuang/Yp/Model/YpModel.java | 6 + src/main/resource/Sql/yp.sql | 3 + .../YangPuZhaoShengExcel.json | 96 +- target/classes/Sql/yp.sql | 3 + 6 files changed, 815 insertions(+), 792 deletions(-) diff --git a/WebRoot/html/ypzs/component/lay-module/skuTable.js b/WebRoot/html/ypzs/component/lay-module/skuTable.js index c982124..fe08c98 100644 --- a/WebRoot/html/ypzs/component/lay-module/skuTable.js +++ b/WebRoot/html/ypzs/component/lay-module/skuTable.js @@ -1,744 +1,744 @@ -/* - * Name: skuTable - * Author: cshaptx4869 - * Project: https://github.com/cshaptx4869/skuTable - */ -layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (exports) { - "use strict"; - var $ = layui.jquery, - form = layui.form, - upload = layui.upload, - layer = layui.layer, - sortable = layui.sortable, - MOD_NAME = 'skuTable'; - - //工具类 - class Util { - - static config = { - shade: [0.02, '#000'], - time: 2000 - }; - - static msg = { - // 成功消息 - success: function (msg, callback = null) { - return layer.msg(msg, { - icon: 1, - shade: Util.config.shade, - scrollbar: false, - time: Util.config.time, - shadeClose: true - }, callback); - }, - // 失败消息 - error: function (msg, callback = null) { - return layer.msg(msg, { - icon: 2, - shade: Util.config.shade, - scrollbar: false, - time: Util.config.time, - shadeClose: true - }, callback); - }, - // 警告消息框 - alert: function (msg, callback = null) { - return layer.alert(msg, {end: callback, scrollbar: false}); - }, - // 对话框 - confirm: function (msg, ok, no) { - var index = layer.confirm(msg, {title: '操作确认', btn: ['确认', '取消']}, function () { - typeof ok === 'function' && ok.call(this); - }, function () { - typeof no === 'function' && no.call(this); - Util.msg.close(index); - }); - return index; - }, - // 消息提示 - tips: function (msg, callback = null) { - return layer.msg(msg, { - time: Util.config.time, - shade: Util.config.shade, - end: callback, - shadeClose: true - }); - }, - // 加载中提示 - loading: function (msg, callback = null) { - return msg ? layer.msg(msg, { - icon: 16, - scrollbar: false, - shade: Util.config.shade, - time: 0, - end: callback - }) : layer.load(2, {time: 0, scrollbar: false, shade: Util.config.shade, end: callback}); - }, - // 输入框 - prompt: function (option, callback = null) { - return layer.prompt(option, callback); - }, - // 关闭消息框 - close: function (index) { - return layer.close(index); - } - }; - - static request = { - post: function (option, ok, no, ex) { - return Util.request.ajax('post', option, ok, no, ex); - }, - get: function (option, ok, no, ex) { - return Util.request.ajax('get', option, ok, no, ex); - }, - ajax: function (type, option, ok, no, ex) { - type = type || 'get'; - option.url = option.url || ''; - option.data = option.data || {}; - option.statusName = option.statusName || 'code'; - option.statusCode = option.statusCode || 200; - ok = ok || function (res) { - }; - no = no || function (res) { - var msg = res.msg == undefined ? '返回数据格式有误' : res.msg; - Util.msg.error(msg); - return false; - }; - ex = ex || function (res) { - }; - if (option.url == '') { - Util.msg.error('请求地址不能为空'); - return false; - } - - var index = Util.msg.loading('加载中'); - $.ajax({ - url: option.url, - type: type, - contentType: "application/x-www-form-urlencoded; charset=UTF-8", - dataType: "json", - data: option.data, - timeout: 60000, - success: function (res) { - Util.msg.close(index); - if (res[option.statusName] == option.statusCode) { - return ok(res); - } else { - return no(res); - } - }, - error: function (xhr, textstatus, thrown) { - Util.msg.error('Status:' + xhr.status + '，' + xhr.statusText + '，请稍后再试！', function () { - ex(xhr); - }); - return false; - } - }); - } - }; - - static tool = { - uuid: function uuid(randomLength = 8) { - return Number(Math.random().toString().substr(2, randomLength) + Date.now()).toString(36) - } - } - } - - class SkuTable { - options = { - isAttributeValue: 0, //规格类型 0统一规格 1多规格 - isAttributeElemId: 'fairy-is-attribute', //规格类型容器id - specTableElemId: 'fairy-spec-table', //规格表容器id - skuTableElemId: 'fairy-sku-table', //SKU表容器id - rowspan: false, //是否开启SKU行合并, - sortable: false, //规格拖拽排序 - skuIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjczN0RFNzU1MTk1RTExRTlBMEQ5OEEwMEM5NDNFOEE4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjczN0RFNzU2MTk1RTExRTlBMEQ5OEEwMEM5NDNFOEE4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzM3REU3NTMxOTVFMTFFOUEwRDk4QTAwQzk0M0U4QTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzM3REU3NTQxOTVFMTFFOUEwRDk4QTAwQzk0M0U4QTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5NHmJUAAAA+0lEQVR42pySPwsBYRzH7zk3KIP34CVIKSOrELLJdpuymyzew90kIwMZvACDsCldWZTFn5WQpPN5rlPXlXJ39en7/J57fn+fR9i2rYT5NNM0B2gC3n/6qHBQDMOwZNYg4LOQ3vcQld40/w6lC13Xbd/eHElC3G1JqL4DFWSNprz7BMpAFJ6YkW+jThaosuxAD/rY6R9lCmeq8IAmtKBA1A1OW9YjtIS9QvPYRZkcXo43EzqjF/mDQ5an7ALShTFk4eQOsgFTWeoNKl4nt68J0oYc1LHLbmtDp1IyLgPe4QCuMkIsyAWSuYbs5HD29DML8OTkHR9F2Ef+EWAAdwmkvBAtw94AAAAASUVORK5CYII=', - uploadUrl: '', - requestSuccessCode: 1, //请求成功返回状态码值 - specDataDelete: false, //开启规格删除 - productId: '', //商品id 配合specDataUrl和skuDataUrl使用 - specData: [], //规格数据 - specDataUrl: '', //优先级大于specData - skuData: {}, //SKU数据 - skuDataUrl: '', //优先级大于skuDataUrl - skuNameType: 0, - skuNameDelimiter: '-', - //统一规格配置项 - singleSkuTableConfig: { - thead: [ - {title: '销售价(元)', icon: 'layui-icon-cols'}, - {title: '市场价(元)', icon: 'layui-icon-cols'}, - {title: '成本价(元)', icon: 'layui-icon-cols'}, - {title: '库存', icon: 'layui-icon-cols'}, - {title: '状态', icon: ''}, - ], - tbody: [ - {type: 'input', field: 'price', value: '', verify: 'required|number', reqtext: '销售价不能为空'}, - {type: 'input', field: 'market_price', value: '0', verify: 'required|number', reqtext: '市场价不能为空'}, - {type: 'input', field: 'cost_price', value: '0', verify: 'required|number', reqtext: '成本价不能为空'}, - {type: 'input', field: 'stock', value: '0', verify: 'required|number', reqtext: '库存不能为空'}, - {type: 'select', field: 'status', option: [{key: '启用', value: '1'}, {key: '禁用', value: '0'}], verify: 'required', reqtext: '状态不能为空'}, - ] - }, - //多规格配置项 - multipleSkuTableConfig: { - thead: [ - {title: '图片', icon: ''}, - {title: '销售价(元)', icon: 'layui-icon-cols'}, - {title: '市场价(元)', icon: 'layui-icon-cols'}, - {title: '成本价(元)', icon: 'layui-icon-cols'}, - {title: '库存', icon: 'layui-icon-cols'}, - {title: '状态', icon: ''}, - ], - tbody: [ - {type: 'image', field: 'picture', value: '', verify: '', reqtext: ''}, - {type: 'input', field: 'price', value: '', verify: 'required|number', reqtext: '销售价不能为空'}, - {type: 'input', field: 'market_price', value: '0', verify: 'required|number', reqtext: '市场价不能为空'}, - {type: 'input', field: 'cost_price', value: '0', verify: 'required|number', reqtext: '成本价不能为空'}, - {type: 'input', field: 'stock', value: '0', verify: 'required|number', reqtext: '库存不能为空'}, - { - type: 'select', - field: 'status', - option: [{key: '启用', value: '1'}, {key: '禁用', value: '0'}], - verify: '', - reqtext: '' - }, - ] - } - }; - - constructor(options) { - this.options = $.extend(this.options, options); - if (this.options.skuDataUrl && this.options.productId) { - Util.request.get({ - url: this.options.skuDataUrl, - data: { - product_id: this.options.productId - }, - statusCode: this.options.requestSuccessCode - }, (res) => { - this.options.skuData = res.data; - this.css(); - this.render(); - this.listen(); - }); - } else { - this.css(); - this.render(); - this.listen(); - } - } - - css() { - $('head').append(`` - ); - } - - listen() { - var that = this; - - /** - * 监听规格类型选择 - */ - form.on('radio(fairy-is-attribute)', function (data) { - that.options.isAttributeValue = data.value; - that.render(); - }); - - /** - * 监听所选规格值的变化 - */ - form.on('checkbox(fairy-spec-filter)', function (data) { - var specData = []; - $.each($(`#${that.options.specTableElemId} tbody tr`), function () { - var child = []; - $.each($(this).find('input[type=checkbox]'), function () { - child.push({id: $(this).val(), title: $(this).attr('title'), checked: $(this).is(':checked')}); - }); - var specItem = { - id: $(this).find('td').eq(0).data('spec-id'), - title: $(this).find('td').eq(0).text(), - child: child - }; - specData.push(specItem); - }); - that.options.specData = specData; - that.options.skuData = $.extend(that.options.skuData, that.getFormSkuData()); - that.resetRender(that.options.skuTableElemId); - that.renderMultipleSkuTable(); - }); - - /** - * 监听批量赋值 - */ - $(document).on('click', `#${this.options.skuTableElemId} thead tr th i`, function () { - var thisI = this; - Util.msg.prompt({title: $(thisI).parent().text().trim() + '批量赋值'}, function (value, index, elem) { - $.each($(`#${that.options.skuTableElemId} tbody tr`), function () { - var index = that.options.rowspan ? - $(thisI).parent().index() - ($(`#${that.options.skuTableElemId} thead th.fairy-spec-name`).length - $(this).children('td.fairy-spec-value').length) : - $(thisI).parent().index(); - $(this).find('td').eq(index).children('input').val(value); - }); - Util.msg.close(index); - }); - }); - - /** - * 监听添加规格 - */ - $(document).on('click', `#${this.options.specTableElemId} .fairy-spec-create`, function () { - layer.prompt({title: '规格'}, function (value, index, elem) { - var specTitleArr = []; - $.each(that.options.specData, function (k, v) { - specTitleArr.push(v.title) - }) - if (specTitleArr.includes(value)) { - Util.msg.error('规格名已存在'); - } else { - that.options.specData.push({id: Util.tool.uuid(), title: value, child: []}); - that.resetRender(that.options.specTableElemId); - that.renderSpecTable(); - } - Util.msg.close(index); - }); - }); - - /** - * 监听添加规格值 - */ - $(document).on('click', `#${this.options.specTableElemId} .fairy-spec-value-create`, function () { - var specId = $(this).parent('td').prev().data('spec-id'); - layer.prompt({title: '规格值'}, function (value, index, elem) { - that.options.specData.forEach(function (v, i) { - if (v.id == specId) { - v.child.push({id: Util.tool.uuid(), title: value, checked: false}); - } - }); - that.resetRender(that.options.specTableElemId); - that.renderSpecTable(); - Util.msg.close(index); - }); - }); - - /** - * 监听删除规格/规格值 - */ - $(document).on('click', `#${this.options.specTableElemId} i.layui-icon-delete`, function () { - if (typeof $(this).attr('data-spec-index') !== "undefined") { - that.options.specData.splice($(this).data('spec-index'), 1); - that.resetRender([that.options.specTableElemId, that.options.skuTableElemId]); - that.renderSpecTable(); - that.renderMultipleSkuTable(); - } else if (typeof $(this).attr('data-spec-value-index') !== "undefined") { - var [i, ii] = $(this).data('spec-value-index').split('-'); - that.options.specData[i].child.splice(ii, 1); - that.resetRender([that.options.specTableElemId, that.options.skuTableElemId]); - that.renderSpecTable(); - that.renderMultipleSkuTable(); - } - }); - - /** - * 监听规格表是否开启删除 - */ - form.on('checkbox(fairy-spec-delete-filter)', function (data) { - that.options.specDataDelete = data.elem.checked; - if (data.elem.checked) { - $(`#${that.options.specTableElemId} tbody tr i.layui-icon-delete`).removeClass('layui-hide'); - } else { - $(`#${that.options.specTableElemId} tbody tr i.layui-icon-delete`).addClass('layui-hide') - } - }); - - /** - * 图片移入放大/移出恢复 - */ - var imgLayerIndex = null; - $(document).on('mouseenter', '.fairy-sku-img', function () { - imgLayerIndex = layer.tips('', this, { - tips: [2, 'rgba(41,41,41,.5)'], - time: 0 - }); - }).on('mouseleave', '.fairy-sku-img', function () { - layer.close(imgLayerIndex); - }) - } - - /** - * 渲染 - */ - render() { - this.resetRender(); - this.renderIsAttribute(this.options.isAttributeValue); - if (this.options.isAttributeValue == '1') { - if (this.options.specDataUrl && this.options.productId) { - Util.request.get({ - url: this.options.specDataUrl, - productId: this.options.productId, - statusCode: this.options.requestSuccessCode - }, (res) => { - this.options.specData = res.data; - this.renderSpecTable(); - this.renderMultipleSkuTable(); - }); - } else { - this.renderSpecTable(); - this.renderMultipleSkuTable(); - } - } else { - this.renderSingleSkuTable(); - } - } - - /** - * 重新渲染 - * @param targets - */ - resetRender(targets) { - if (typeof targets === 'string') { - $(`#${targets}`).parents('.layui-form-item').replaceWith(`
`); - } else if ($.isArray(targets) && targets.length) { - targets.forEach((item) => { - $(`#${item}`).parents('.layui-form-item').replaceWith(`
`); - }) - } else { - $(`#${this.options.isAttributeElemId}`).parents('.layui-form-item').replaceWith(`
`); - $(`#${this.options.specTableElemId}`).parents('.layui-form-item').replaceWith(`
`); - $(`#${this.options.skuTableElemId}`).parents('.layui-form-item').replaceWith(`
`); - } - } - - /** - * 渲染规格类型 - * @param checkedValue - */ - renderIsAttribute(checkedValue) { - var html = ''; - html += ``; - html += ``; - this.renderFormItem('规格类型', html, this.options.isAttributeElemId); - } - - renderSingleSkuTable() { - var that = this, - table = ``; - table += ''; - table += ''; - this.options.singleSkuTableConfig.thead.forEach((item) => { - table += ``; - }); - table += ''; - table += ''; - - table += ''; - table += ''; - that.options.singleSkuTableConfig.tbody.forEach(function (item) { - switch (item.type) { - case "select": - table += ''; - break; - case "input": - default: - table += ''; - break; - } - }); - table += ''; - table += ''; - table += '
${item.title}
'; - table += `'; - table += ''; - table += ``; - table += '
'; - - this.renderFormItem('', table, this.options.skuTableElemId); - } - - /** - * 渲染规格表 - */ - renderSpecTable() { - var that = this, - table = ``; - $.each(this.options.specData, function (index, item) { - table += that.options.sortable ? `` : ''; - table += ``; - table += ''; - table += ''; - }); - table += ''; - - // table += ''; - table += '
${item.title}'; - $.each(item.child, function (key, value) { - table += ` `; - }); - // table += '
规格值
' - table += '
'; - // table += ``; - // table += `
规格
`; - // table += '
'; - - this.renderFormItem('', table, this.options.specTableElemId); - - if (this.options.sortable) { - /** - * 拖拽 - */ - var sortableObj = sortable.create($(`#${this.options.specTableElemId} tbody`)[0], { - animation: 1000, - onEnd: (evt) => { - //获取拖动后的排序 - var sortArr = sortableObj.toArray(), - sortSpecData = []; - this.options.specData.forEach((item) => { - sortSpecData[sortArr.indexOf(String(item.id))] = item; - }); - this.options.specData = sortSpecData; - this.resetRender(that.options.skuTableElemId); - this.renderMultipleSkuTable(); - }, - }); - } - } - - /** - * 渲染sku表 - */ - renderMultipleSkuTable() { - var that = this, table = ``; - - if ($(`#${this.options.specTableElemId} tbody input[type=checkbox]:checked`).length) { - var prependThead = [], prependTbody = []; - $.each(this.options.specData, function (index, item) { - var isShow = item.child.some(function (value, index, array) { - return value.checked; - }); - if (isShow) { - prependThead.push(item.title); - var prependTbodyItem = []; - $.each(item.child, function (key, value) { - if (value.checked) { - prependTbodyItem.push({id: value.id, title: value.title}); - } - }); - prependTbody.push(prependTbodyItem); - } - }); - - table += '' + ''.repeat(prependThead.length + 1) + ''; - - table += ''; - if (prependThead.length > 0) { - var theadTr = ''; - - theadTr += prependThead.map(function (t, i, a) { - return ''; - }).join(''); - - this.options.multipleSkuTableConfig.thead.forEach(function (item) { - theadTr += ''; - }); - - theadTr += ''; - - table += theadTr; - } - table += ''; - - if (this.options.rowspan) { - var skuRowspanArr = []; - prependTbody.forEach(function (v, i, a) { - var num = 1, index = i; - while (index < a.length - 1) { - num *= a[index + 1].length; - index++; - } - skuRowspanArr.push(num); - }); - } - - var prependTbodyTrs = []; - prependTbody.reduce(function (prev, cur, index, array) { - var tmp = []; - prev.forEach(function (a) { - cur.forEach(function (b) { - tmp.push({id: a.id + that.options.skuNameDelimiter + b.id, title: a.title + that.options.skuNameDelimiter + b.title}); - }) - }); - return tmp; - }).forEach(function (item, index, array) { - var tr = ''; - - tr += item.title.split(that.options.skuNameDelimiter).map(function (t, i, a) { - if (that.options.rowspan) { - if (index % skuRowspanArr[i] === 0 && skuRowspanArr[i] > 1) { - return ''; - } else if (skuRowspanArr[i] === 1) { - return ''; - } else { - return ''; - } - } else { - return ''; - } - }).join(''); - - that.options.multipleSkuTableConfig.tbody.forEach(function (c) { - switch (c.type) { - case "image": - tr += ''; - break; - case "select": - tr += ''; - break; - case "input": - default: - tr += ''; - break; - } - }); - tr += ''; - - tr && prependTbodyTrs.push(tr); - }); - - table += ''; - if (prependTbodyTrs.length > 0) { - table += prependTbodyTrs.join(''); - } - table += ''; - - } else { - table += ''; - } - - table += '
' + t + '' + item.title + (item.icon ? ' ' : '') + '
' + t + '' + t + '' + t + '' + c.field + '图片
请选择班型
'; - - this.renderFormItem('', table, this.options.skuTableElemId); - - //上传 - if (this.options.uploadUrl) { - upload.render({ - elem: '.fairy-sku-img', - url: this.options.uploadUrl, - exts: 'png|jpg|ico|jpeg|gif', - accept: 'images', - acceptMime: 'image/*', - multiple: false, - done: function (res) { - if (res.code === that.options.requestSuccessCode) { - var url = res.data.url; - $(this.item).attr('src', url).prev().val(url); - Util.msg.success(res.msg); - } else { - var msg = res.msg == undefined ? '返回数据格式有误' : res.msg; - Util.msg.error(msg); - } - return false; - } - }); - } - } - - /** - * 渲染表单项 - * @param label 标题 - * @param content 内容 - * @param target id - * @param isRequired - */ - renderFormItem(label, content, target, isRequired = true) { - var html = ''; - html += '
'; - // html += ``; - html += '
'; - html += content; - html += '
'; - html += '
'; - $(`#${target}`).replaceWith(html); - form.render(); - } - - makeSkuName(sku, conf) { - // return 'skus[' + (this.options.skuNameType === 0 ? sku.id : sku.title) + '][' + conf.field + ']'; - return sku.id; - } - - getSpecData() { - return this.options.specData; - } - - getFormFilter() { - var fariyForm = $('form.fairy-form'); - if (!fariyForm.attr('lay-filter')) { - fariyForm.attr('lay-filter', 'fairy-form-filter'); - } - return fariyForm.attr('lay-filter'); - } - - getFormSkuData() { - var skuData = {}; - $.each(form.val(this.getFormFilter()), function (key, value) { - if (key.startsWith('skus')) { - skuData[key] = value; - } - }); - - return skuData; - } - - } - - exports(MOD_NAME, { - render: function (options) { - return new SkuTable(options); - } - }) -}); +/* + * Name: skuTable + * Author: cshaptx4869 + * Project: https://github.com/cshaptx4869/skuTable + */ +layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (exports) { + "use strict"; + var $ = layui.jquery, + form = layui.form, + upload = layui.upload, + layer = layui.layer, + sortable = layui.sortable, + MOD_NAME = 'skuTable'; + + //工具类 + class Util { + + static config = { + shade: [0.02, '#000'], + time: 2000 + }; + + static msg = { + // 成功消息 + success: function (msg, callback = null) { + return layer.msg(msg, { + icon: 1, + shade: Util.config.shade, + scrollbar: false, + time: Util.config.time, + shadeClose: true + }, callback); + }, + // 失败消息 + error: function (msg, callback = null) { + return layer.msg(msg, { + icon: 2, + shade: Util.config.shade, + scrollbar: false, + time: Util.config.time, + shadeClose: true + }, callback); + }, + // 警告消息框 + alert: function (msg, callback = null) { + return layer.alert(msg, {end: callback, scrollbar: false}); + }, + // 对话框 + confirm: function (msg, ok, no) { + var index = layer.confirm(msg, {title: '操作确认', btn: ['确认', '取消']}, function () { + typeof ok === 'function' && ok.call(this); + }, function () { + typeof no === 'function' && no.call(this); + Util.msg.close(index); + }); + return index; + }, + // 消息提示 + tips: function (msg, callback = null) { + return layer.msg(msg, { + time: Util.config.time, + shade: Util.config.shade, + end: callback, + shadeClose: true + }); + }, + // 加载中提示 + loading: function (msg, callback = null) { + return msg ? layer.msg(msg, { + icon: 16, + scrollbar: false, + shade: Util.config.shade, + time: 0, + end: callback + }) : layer.load(2, {time: 0, scrollbar: false, shade: Util.config.shade, end: callback}); + }, + // 输入框 + prompt: function (option, callback = null) { + return layer.prompt(option, callback); + }, + // 关闭消息框 + close: function (index) { + return layer.close(index); + } + }; + + static request = { + post: function (option, ok, no, ex) { + return Util.request.ajax('post', option, ok, no, ex); + }, + get: function (option, ok, no, ex) { + return Util.request.ajax('get', option, ok, no, ex); + }, + ajax: function (type, option, ok, no, ex) { + type = type || 'get'; + option.url = option.url || ''; + option.data = option.data || {}; + option.statusName = option.statusName || 'code'; + option.statusCode = option.statusCode || 200; + ok = ok || function (res) { + }; + no = no || function (res) { + var msg = res.msg == undefined ? '返回数据格式有误' : res.msg; + Util.msg.error(msg); + return false; + }; + ex = ex || function (res) { + }; + if (option.url == '') { + Util.msg.error('请求地址不能为空'); + return false; + } + + var index = Util.msg.loading('加载中'); + $.ajax({ + url: option.url, + type: type, + contentType: "application/x-www-form-urlencoded; charset=UTF-8", + dataType: "json", + data: option.data, + timeout: 60000, + success: function (res) { + Util.msg.close(index); + if (res[option.statusName] == option.statusCode) { + return ok(res); + } else { + return no(res); + } + }, + error: function (xhr, textstatus, thrown) { + Util.msg.error('Status:' + xhr.status + '，' + xhr.statusText + '，请稍后再试！', function () { + ex(xhr); + }); + return false; + } + }); + } + }; + + static tool = { + uuid: function uuid(randomLength = 8) { + return Number(Math.random().toString().substr(2, randomLength) + Date.now()).toString(36) + } + } + } + + class SkuTable { + options = { + isAttributeValue: 0, //规格类型 0统一规格 1多规格 + isAttributeElemId: 'fairy-is-attribute', //规格类型容器id + specTableElemId: 'fairy-spec-table', //规格表容器id + skuTableElemId: 'fairy-sku-table', //SKU表容器id + rowspan: false, //是否开启SKU行合并, + sortable: false, //规格拖拽排序 + skuIcon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjczN0RFNzU1MTk1RTExRTlBMEQ5OEEwMEM5NDNFOEE4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjczN0RFNzU2MTk1RTExRTlBMEQ5OEEwMEM5NDNFOEE4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzM3REU3NTMxOTVFMTFFOUEwRDk4QTAwQzk0M0U4QTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzM3REU3NTQxOTVFMTFFOUEwRDk4QTAwQzk0M0U4QTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5NHmJUAAAA+0lEQVR42pySPwsBYRzH7zk3KIP34CVIKSOrELLJdpuymyzew90kIwMZvACDsCldWZTFn5WQpPN5rlPXlXJ39en7/J57fn+fR9i2rYT5NNM0B2gC3n/6qHBQDMOwZNYg4LOQ3vcQld40/w6lC13Xbd/eHElC3G1JqL4DFWSNprz7BMpAFJ6YkW+jThaosuxAD/rY6R9lCmeq8IAmtKBA1A1OW9YjtIS9QvPYRZkcXo43EzqjF/mDQ5an7ALShTFk4eQOsgFTWeoNKl4nt68J0oYc1LHLbmtDp1IyLgPe4QCuMkIsyAWSuYbs5HD29DML8OTkHR9F2Ef+EWAAdwmkvBAtw94AAAAASUVORK5CYII=', + uploadUrl: '', + requestSuccessCode: 1, //请求成功返回状态码值 + specDataDelete: false, //开启规格删除 + productId: '', //商品id 配合specDataUrl和skuDataUrl使用 + specData: [], //规格数据 + specDataUrl: '', //优先级大于specData + skuData: {}, //SKU数据 + skuDataUrl: '', //优先级大于skuDataUrl + skuNameType: 0, + skuNameDelimiter: '-', + //统一规格配置项 + singleSkuTableConfig: { + thead: [ + {title: '销售价(元)', icon: 'layui-icon-cols'}, + {title: '市场价(元)', icon: 'layui-icon-cols'}, + {title: '成本价(元)', icon: 'layui-icon-cols'}, + {title: '库存', icon: 'layui-icon-cols'}, + {title: '状态', icon: ''}, + ], + tbody: [ + {type: 'input', field: 'price', value: '', verify: 'required|number', reqtext: '销售价不能为空'}, + {type: 'input', field: 'market_price', value: '0', verify: 'required|number', reqtext: '市场价不能为空'}, + {type: 'input', field: 'cost_price', value: '0', verify: 'required|number', reqtext: '成本价不能为空'}, + {type: 'input', field: 'stock', value: '0', verify: 'required|number', reqtext: '库存不能为空'}, + {type: 'select', field: 'status', option: [{key: '启用', value: '1'}, {key: '禁用', value: '0'}], verify: 'required', reqtext: '状态不能为空'}, + ] + }, + //多规格配置项 + multipleSkuTableConfig: { + thead: [ + {title: '图片', icon: ''}, + {title: '销售价(元)', icon: 'layui-icon-cols'}, + {title: '市场价(元)', icon: 'layui-icon-cols'}, + {title: '成本价(元)', icon: 'layui-icon-cols'}, + {title: '库存', icon: 'layui-icon-cols'}, + {title: '状态', icon: ''}, + ], + tbody: [ + {type: 'image', field: 'picture', value: '', verify: '', reqtext: ''}, + {type: 'input', field: 'price', value: '', verify: 'required|number', reqtext: '销售价不能为空'}, + {type: 'input', field: 'market_price', value: '0', verify: 'required|number', reqtext: '市场价不能为空'}, + {type: 'input', field: 'cost_price', value: '0', verify: 'required|number', reqtext: '成本价不能为空'}, + {type: 'input', field: 'stock', value: '0', verify: 'required|number', reqtext: '库存不能为空'}, + { + type: 'select', + field: 'status', + option: [{key: '启用', value: '1'}, {key: '禁用', value: '0'}], + verify: '', + reqtext: '' + }, + ] + } + }; + + constructor(options) { + this.options = $.extend(this.options, options); + if (this.options.skuDataUrl && this.options.productId) { + Util.request.get({ + url: this.options.skuDataUrl, + data: { + product_id: this.options.productId + }, + statusCode: this.options.requestSuccessCode + }, (res) => { + this.options.skuData = res.data; + this.css(); + this.render(); + this.listen(); + }); + } else { + this.css(); + this.render(); + this.listen(); + } + } + + css() { + $('head').append(`` + ); + } + + listen() { + var that = this; + + /** + * 监听规格类型选择 + */ + form.on('radio(fairy-is-attribute)', function (data) { + that.options.isAttributeValue = data.value; + that.render(); + }); + + /** + * 监听所选规格值的变化 + */ + form.on('checkbox(fairy-spec-filter)', function (data) { + var specData = []; + $.each($(`#${that.options.specTableElemId} tbody tr`), function () { + var child = []; + $.each($(this).find('input[type=checkbox]'), function () { + child.push({id: $(this).val(), title: $(this).attr('title'), checked: $(this).is(':checked')}); + }); + var specItem = { + id: $(this).find('td').eq(0).data('spec-id'), + title: $(this).find('td').eq(0).text(), + child: child + }; + specData.push(specItem); + }); + that.options.specData = specData; + that.options.skuData = $.extend(that.options.skuData, that.getFormSkuData()); + that.resetRender(that.options.skuTableElemId); + that.renderMultipleSkuTable(); + }); + + /** + * 监听批量赋值 + */ + $(document).on('click', `#${this.options.skuTableElemId} thead tr th i`, function () { + var thisI = this; + Util.msg.prompt({title: $(thisI).parent().text().trim() + '批量赋值'}, function (value, index, elem) { + $.each($(`#${that.options.skuTableElemId} tbody tr`), function () { + var index = that.options.rowspan ? + $(thisI).parent().index() - ($(`#${that.options.skuTableElemId} thead th.fairy-spec-name`).length - $(this).children('td.fairy-spec-value').length) : + $(thisI).parent().index(); + $(this).find('td').eq(index).children('input').val(value); + }); + Util.msg.close(index); + }); + }); + + /** + * 监听添加规格 + */ + $(document).on('click', `#${this.options.specTableElemId} .fairy-spec-create`, function () { + layer.prompt({title: '规格'}, function (value, index, elem) { + var specTitleArr = []; + $.each(that.options.specData, function (k, v) { + specTitleArr.push(v.title) + }) + if (specTitleArr.includes(value)) { + Util.msg.error('规格名已存在'); + } else { + that.options.specData.push({id: Util.tool.uuid(), title: value, child: []}); + that.resetRender(that.options.specTableElemId); + that.renderSpecTable(); + } + Util.msg.close(index); + }); + }); + + /** + * 监听添加规格值 + */ + $(document).on('click', `#${this.options.specTableElemId} .fairy-spec-value-create`, function () { + var specId = $(this).parent('td').prev().data('spec-id'); + layer.prompt({title: '规格值'}, function (value, index, elem) { + that.options.specData.forEach(function (v, i) { + if (v.id == specId) { + v.child.push({id: Util.tool.uuid(), title: value, checked: false}); + } + }); + that.resetRender(that.options.specTableElemId); + that.renderSpecTable(); + Util.msg.close(index); + }); + }); + + /** + * 监听删除规格/规格值 + */ + $(document).on('click', `#${this.options.specTableElemId} i.layui-icon-delete`, function () { + if (typeof $(this).attr('data-spec-index') !== "undefined") { + that.options.specData.splice($(this).data('spec-index'), 1); + that.resetRender([that.options.specTableElemId, that.options.skuTableElemId]); + that.renderSpecTable(); + that.renderMultipleSkuTable(); + } else if (typeof $(this).attr('data-spec-value-index') !== "undefined") { + var [i, ii] = $(this).data('spec-value-index').split('-'); + that.options.specData[i].child.splice(ii, 1); + that.resetRender([that.options.specTableElemId, that.options.skuTableElemId]); + that.renderSpecTable(); + that.renderMultipleSkuTable(); + } + }); + + /** + * 监听规格表是否开启删除 + */ + form.on('checkbox(fairy-spec-delete-filter)', function (data) { + that.options.specDataDelete = data.elem.checked; + if (data.elem.checked) { + $(`#${that.options.specTableElemId} tbody tr i.layui-icon-delete`).removeClass('layui-hide'); + } else { + $(`#${that.options.specTableElemId} tbody tr i.layui-icon-delete`).addClass('layui-hide') + } + }); + + /** + * 图片移入放大/移出恢复 + */ + var imgLayerIndex = null; + $(document).on('mouseenter', '.fairy-sku-img', function () { + imgLayerIndex = layer.tips('', this, { + tips: [2, 'rgba(41,41,41,.5)'], + time: 0 + }); + }).on('mouseleave', '.fairy-sku-img', function () { + layer.close(imgLayerIndex); + }) + } + + /** + * 渲染 + */ + render() { + this.resetRender(); + this.renderIsAttribute(this.options.isAttributeValue); + if (this.options.isAttributeValue == '1') { + if (this.options.specDataUrl && this.options.productId) { + Util.request.get({ + url: this.options.specDataUrl, + productId: this.options.productId, + statusCode: this.options.requestSuccessCode + }, (res) => { + this.options.specData = res.data; + this.renderSpecTable(); + this.renderMultipleSkuTable(); + }); + } else { + this.renderSpecTable(); + this.renderMultipleSkuTable(); + } + } else { + this.renderSingleSkuTable(); + } + } + + /** + * 重新渲染 + * @param targets + */ + resetRender(targets) { + if (typeof targets === 'string') { + $(`#${targets}`).parents('.layui-form-item').replaceWith(`
`); + } else if ($.isArray(targets) && targets.length) { + targets.forEach((item) => { + $(`#${item}`).parents('.layui-form-item').replaceWith(`
`); + }) + } else { + $(`#${this.options.isAttributeElemId}`).parents('.layui-form-item').replaceWith(`
`); + $(`#${this.options.specTableElemId}`).parents('.layui-form-item').replaceWith(`
`); + $(`#${this.options.skuTableElemId}`).parents('.layui-form-item').replaceWith(`
`); + } + } + + /** + * 渲染规格类型 + * @param checkedValue + */ + renderIsAttribute(checkedValue) { + var html = ''; + html += ``; + html += ``; + this.renderFormItem('规格类型', html, this.options.isAttributeElemId); + } + + renderSingleSkuTable() { + var that = this, + table = ``; + table += ''; + table += ''; + this.options.singleSkuTableConfig.thead.forEach((item) => { + table += ``; + }); + table += ''; + table += ''; + + table += ''; + table += ''; + that.options.singleSkuTableConfig.tbody.forEach(function (item) { + switch (item.type) { + case "select": + table += ''; + break; + case "input": + default: + table += ''; + break; + } + }); + table += ''; + table += ''; + table += '
${item.title}
'; + table += `'; + table += ''; + table += ``; + table += '
'; + + this.renderFormItem('', table, this.options.skuTableElemId); + } + + /** + * 渲染规格表 + */ + renderSpecTable() { + var that = this, + table = ``; + $.each(this.options.specData, function (index, item) { + table += that.options.sortable ? `` : ''; + table += ``; + table += ''; + table += ''; + }); + table += ''; + + // table += ''; + table += '
${item.title}'; + $.each(item.child, function (key, value) { + table += ` `; + }); + // table += '
规格值
' + table += '
'; + // table += ``; + // table += `
规格
`; + // table += '
'; + + this.renderFormItem('', table, this.options.specTableElemId); + + if (this.options.sortable) { + /** + * 拖拽 + */ + var sortableObj = sortable.create($(`#${this.options.specTableElemId} tbody`)[0], { + animation: 1000, + onEnd: (evt) => { + //获取拖动后的排序 + var sortArr = sortableObj.toArray(), + sortSpecData = []; + this.options.specData.forEach((item) => { + sortSpecData[sortArr.indexOf(String(item.id))] = item; + }); + this.options.specData = sortSpecData; + this.resetRender(that.options.skuTableElemId); + this.renderMultipleSkuTable(); + }, + }); + } + } + + /** + * 渲染sku表 + */ + renderMultipleSkuTable() { + var that = this, table = ``; + + if ($(`#${this.options.specTableElemId} tbody input[type=checkbox]:checked`).length) { + var prependThead = [], prependTbody = []; + $.each(this.options.specData, function (index, item) { + var isShow = item.child.some(function (value, index, array) { + return value.checked; + }); + if (isShow) { + prependThead.push(item.title); + var prependTbodyItem = []; + $.each(item.child, function (key, value) { + if (value.checked) { + prependTbodyItem.push({id: value.id, title: value.title}); + } + }); + prependTbody.push(prependTbodyItem); + } + }); + + table += '' + ''.repeat(prependThead.length + 1) + ''; + + table += ''; + if (prependThead.length > 0) { + var theadTr = ''; + + theadTr += prependThead.map(function (t, i, a) { + return ''; + }).join(''); + + this.options.multipleSkuTableConfig.thead.forEach(function (item) { + theadTr += ''; + }); + + theadTr += ''; + + table += theadTr; + } + table += ''; + + if (this.options.rowspan) { + var skuRowspanArr = []; + prependTbody.forEach(function (v, i, a) { + var num = 1, index = i; + while (index < a.length - 1) { + num *= a[index + 1].length; + index++; + } + skuRowspanArr.push(num); + }); + } + + var prependTbodyTrs = []; + prependTbody.reduce(function (prev, cur, index, array) { + var tmp = []; + prev.forEach(function (a) { + cur.forEach(function (b) { + tmp.push({id: a.id + that.options.skuNameDelimiter + b.id, title: a.title + that.options.skuNameDelimiter + b.title}); + }) + }); + return tmp; + }).forEach(function (item, index, array) { + var tr = ''; + + tr += item.title.split(that.options.skuNameDelimiter).map(function (t, i, a) { + if (that.options.rowspan) { + if (index % skuRowspanArr[i] === 0 && skuRowspanArr[i] > 1) { + return ''; + } else if (skuRowspanArr[i] === 1) { + return ''; + } else { + return ''; + } + } else { + return ''; + } + }).join(''); + + that.options.multipleSkuTableConfig.tbody.forEach(function (c) { + switch (c.type) { + case "image": + tr += ''; + break; + case "select": + tr += ''; + break; + case "input": + default: + tr += ''; + break; + } + }); + tr += ''; + + tr && prependTbodyTrs.push(tr); + }); + + table += ''; + if (prependTbodyTrs.length > 0) { + table += prependTbodyTrs.join(''); + } + table += ''; + + } else { + table += ''; + } + + table += '
' + t + '' + item.title + (item.icon ? ' ' : '') + '
' + t + '' + t + '' + t + '' + c.field + '图片
请选择班型
'; + + this.renderFormItem('', table, this.options.skuTableElemId); + + //上传 + if (this.options.uploadUrl) { + upload.render({ + elem: '.fairy-sku-img', + url: this.options.uploadUrl, + exts: 'png|jpg|ico|jpeg|gif', + accept: 'images', + acceptMime: 'image/*', + multiple: false, + done: function (res) { + if (res.code === that.options.requestSuccessCode) { + var url = res.data.url; + $(this.item).attr('src', url).prev().val(url); + Util.msg.success(res.msg); + } else { + var msg = res.msg == undefined ? '返回数据格式有误' : res.msg; + Util.msg.error(msg); + } + return false; + } + }); + } + } + + /** + * 渲染表单项 + * @param label 标题 + * @param content 内容 + * @param target id + * @param isRequired + */ + renderFormItem(label, content, target, isRequired = true) { + var html = ''; + html += '
'; + // html += ``; + html += '
'; + html += content; + html += '
'; + html += '
'; + $(`#${target}`).replaceWith(html); + form.render(); + } + + makeSkuName(sku, conf) { + // return 'skus[' + (this.options.skuNameType === 0 ? sku.id : sku.title) + '][' + conf.field + ']'; + return sku.id; + } + + getSpecData() { + return this.options.specData; + } + + getFormFilter() { + var fariyForm = $('form.fairy-form'); + if (!fariyForm.attr('lay-filter')) { + fariyForm.attr('lay-filter', 'fairy-form-filter'); + } + return fariyForm.attr('lay-filter'); + } + + getFormSkuData() { + var skuData = {}; + $.each(form.val(this.getFormFilter()), function (key, value) { + if (key.startsWith('skus')) { + skuData[key] = value; + } + }); + + return skuData; + } + + } + + exports(MOD_NAME, { + render: function (options) { + return new SkuTable(options); + } + }) +}); diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java index 82efaf5..667849f 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java @@ -59,6 +59,17 @@ public class YpController extends Controller { renderJson(list); } + /** + * 功能：任务列表 + * http://10.10.21.20:9000/FengHuang/yp/listTask + */ + @Before(GET.class) + @IsNumericInterface({"page", "limit"}) + public void listTask(int page, int limit) { + Page list = model.listTask(page, limit); + renderJson(CommonUtil.renderJsonForLayUI(list)); + } + /** * 功能：增加任务 */ diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java index a52af68..d2ec11d 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java @@ -285,4 +285,10 @@ public class YpModel { } return all; } + + public Page listTask(int page, int limit) { + SqlPara sqlPara = Db.getSqlPara("yp.listTask"); + Page pageRecord = Db.paginate(page, limit, sqlPara); + return pageRecord; + } } \ No newline at end of file diff --git a/src/main/resource/Sql/yp.sql b/src/main/resource/Sql/yp.sql index 8f63b02..c8998b0 100644 --- a/src/main/resource/Sql/yp.sql +++ b/src/main/resource/Sql/yp.sql @@ -9,4 +9,7 @@ order by t1.bx_id #end + #sql("listTask") + select * from t_yp_task where b_use=1 order by task_id desc + #end #end \ No newline at end of file diff --git a/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json b/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json index b0b4960..ba5cce4 100644 --- a/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json +++ b/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json @@ -1,49 +1,49 @@ -{ - "title": "招生结果", - "sheetName": "结果", - "titleHeight": 30, - "rowHeight": 30, - "showNumber": true, - "colInfo": [ - { - "show_column_name": "姓名", - "list_column_name": "name", - "width": 40 - }, - { - "show_column_name": "性别", - "list_column_name": "xb", - "width": 20 - }, - { - "show_column_name": "家庭住址", - "list_column_name": "address", - "width": 50 - }, - { - "show_column_name": "父亲姓名", - "list_column_name": "address", - "width": 40 - }, - { - "show_column_name": "母亲姓名", - "list_column_name": "address", - "width": 40 - }, - { - "show_column_name": "身份证号", - "list_column_name": "sfzh", - "width": 40 - }, - { - "show_column_name": "联系电话", - "list_column_name": "tel", - "width": 40 - }, - { - "show_column_name": "申报时间", - "list_column_name": "create_time", - "width": 40 - } - ] +{ + "title": "招生结果", + "sheetName": "结果", + "titleHeight": 30, + "rowHeight": 30, + "showNumber": true, + "colInfo": [ + { + "show_column_name": "姓名", + "list_column_name": "name", + "width": 40 + }, + { + "show_column_name": "性别", + "list_column_name": "xb", + "width": 20 + }, + { + "show_column_name": "家庭住址", + "list_column_name": "address", + "width": 50 + }, + { + "show_column_name": "父亲姓名", + "list_column_name": "address", + "width": 40 + }, + { + "show_column_name": "母亲姓名", + "list_column_name": "address", + "width": 40 + }, + { + "show_column_name": "身份证号", + "list_column_name": "sfzh", + "width": 40 + }, + { + "show_column_name": "联系电话", + "list_column_name": "tel", + "width": 40 + }, + { + "show_column_name": "申报时间", + "list_column_name": "create_time", + "width": 40 + } + ] } \ No newline at end of file diff --git a/target/classes/Sql/yp.sql b/target/classes/Sql/yp.sql index 8f63b02..c8998b0 100644 --- a/target/classes/Sql/yp.sql +++ b/target/classes/Sql/yp.sql @@ -9,4 +9,7 @@ order by t1.bx_id #end + #sql("listTask") + select * from t_yp_task where b_use=1 order by task_id desc + #end #end \ No newline at end of file