diff --git a/WebRoot/html/ypzs/component/lay-module/skuTable.js b/WebRoot/html/ypzs/component/lay-module/skuTable.js index 3dbeb76..c982124 100644 --- a/WebRoot/html/ypzs/component/lay-module/skuTable.js +++ b/WebRoot/html/ypzs/component/lay-module/skuTable.js @@ -707,8 +707,8 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export } makeSkuName(sku, conf) { - return 'skus[' + (this.options.skuNameType === 0 ? sku.id : sku.title) + '][' + conf.field + ']'; - //return sku.id; + // return 'skus[' + (this.options.skuNameType === 0 ? sku.id : sku.title) + '][' + conf.field + ']'; + return sku.id; } getSpecData() { diff --git a/WebRoot/html/ypzs/view/taskManageEdit.html b/WebRoot/html/ypzs/view/taskManageEdit.html index eb22102..264cc50 100644 --- a/WebRoot/html/ypzs/view/taskManageEdit.html +++ b/WebRoot/html/ypzs/view/taskManageEdit.html @@ -86,7 +86,7 @@ obj.checked = item.selected; childs.push(obj); if (item.selected) { - objResData["skus[" + item.bx_id + "][limit]"] = item.limit; + objResData[item.bx_id] = item.limit; } }); objSpecData = [ @@ -143,8 +143,8 @@ $.ajax({ - url: "/FengHuang/yp/addTask", - data: { "task_name": taskName, "bx_ids": bxids.substr(0, bxids.length - 1), "limits": limits.substr(0, limits.length - 1) }, + url: "/FengHuang/yp/updateTask", + data: { "task_id": 2, "task_name": taskName, "bx_ids": bxids.substr(0, bxids.length - 1), "limits": limits.substr(0, limits.length - 1) }, type: 'POST', success: function (result) { console.log(result); diff --git a/YangPuBaoMing.iml b/YangPuBaoMing.iml index 97714ab..0396488 100644 --- a/YangPuBaoMing.iml +++ b/YangPuBaoMing.iml @@ -1,8 +1,163 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json b/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json index ba5cce4..b0b4960 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