From ec5ee0b6e00514af75b0dd97e4ebb6fa9a97692a Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Mon, 29 Jul 2024 10:47:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E5=91=8A=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/js/samples/samplesMge.js | 53 +++++++++++-------- .../static/js/system/child/sysOrgFormAjax.js | 1 - src/main/resources/static/js/system/role.js | 23 +++++--- .../resources/static/pages/role/roleList.html | 8 +++ .../static/pages/samples/samplesMge.html | 8 +++ 5 files changed, 63 insertions(+), 30 deletions(-) diff --git a/src/main/resources/static/js/samples/samplesMge.js b/src/main/resources/static/js/samples/samplesMge.js index 58ff5e5..0f6c2d2 100644 --- a/src/main/resources/static/js/samples/samplesMge.js +++ b/src/main/resources/static/js/samples/samplesMge.js @@ -91,41 +91,48 @@ function initTable(dataList, limit, page) { fixed: 'left', align: "center" }, - //表头 + // 表头 {title: "序号", width: 80, unresize: true, align: "center", templet: function (d) { return (page - 1) * limit + d.LAY_INDEX; } }, - {field: "customName", width:260,title: "送样单位", unresize: true, align: "center"}, - {field: "sampleUser", width:150,title: "送样人", unresize: true, align: "center"}, - {field: "sampleTime", width:210,title: "送样时间", unresize: true, align: "center"}, - {field: "sampleTools", width:280,title: "送样设备", unresize: true, align: "center"}, - {field: "collectSamplesUser", width:140,title: "收样人", unresize: true, align: "center"}, - {field: "collectSamplesTime", width:210,title: "收样时间", unresize: true, align: "center"}, + {field: "customName", width:260,title: "送样单位", unresize: true, align: "center", templet: function (d) { + return `
${d.customName}
`; + }}, + {field: "sampleUser", width:150,title: "送样人", unresize: true, align: "center", templet: function (d) { + return `
${d.sampleUser}
`; + }}, + {field: "sampleTime", width:210,title: "送样时间", unresize: true, align: "center", templet: function (d) { + return `
${d.sampleTime}
`; + }}, + {field: "sampleTools", width:280,title: "送样设备", unresize: true, align: "center", templet: function (d) { + return `
${d.sampleTools}
`; + }}, + {field: "collectSamplesUser", width:140,title: "收样人", unresize: true, align: "center", templet: function (d) { + return `
${d.collectSamplesUser}
`; + }}, + {field: "collectSamplesTime", width:210,title: "收样时间", unresize: true, align: "center", templet: function (d) { + return `
${d.collectSamplesTime}
`; + }}, { field: "teamName", width:210,title: "试验班组", unresize: true, align: "center", templet: function (d) { - let html = ''; - let view =''; + let view = ''; if (d.teamName == null) { - view="未派工"; + view = "未派工"; } else { - view="" + d.teamName + ""; + view = `${d.teamName}`; } - html=view; - return html; + return view; } }, {title: "操作", unresize: true, width: 80, align: "center", templet: function (d) { - - let html = ''; - let view="详情"; - html=view; - if(d.delFlag==1){ + let view = `详情`; + if(d.delFlag == 1){ return ''; } - return html; + return view; } }, ], @@ -135,13 +142,13 @@ function initTable(dataList, limit, page) { table.resize("table_data"); count || this.elem.next(".layui-table-view").find(".layui-table-header").css("display", "inline-block"); count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto"); - var suborders_data_arr=res.data; + var suborders_data_arr = res.data; for (let suborders_key in suborders_data_arr) { - if (suborders_data_arr[suborders_key]['teamName']!=null&&suborders_data_arr[suborders_key]['teamName']!="") { + if (suborders_data_arr[suborders_key]['teamName'] != null && suborders_data_arr[suborders_key]['teamName'] != "") { let index = suborders_data_arr[suborders_key]['LAY_TABLE_INDEX']; - $('tr[data-index=' + index + '] input[type="checkbox"]').prop('disabled', true).attr("name","layTableCheckboxDisabled"); // 禁止部分选择 + $('tr[data-index=' + index + '] input[type="checkbox"]').prop('disabled', true).attr("name", "layTableCheckboxDisabled"); // 禁止部分选择 } - }; + } form.render('checkbox'); }, }); diff --git a/src/main/resources/static/js/system/child/sysOrgFormAjax.js b/src/main/resources/static/js/system/child/sysOrgFormAjax.js index c66c97e..a9e773b 100644 --- a/src/main/resources/static/js/system/child/sysOrgFormAjax.js +++ b/src/main/resources/static/js/system/child/sysOrgFormAjax.js @@ -68,7 +68,6 @@ function saveData(data) { if (!selectNodeId) { return layer.msg('请选择上级组织', {icon: 7}); } - alert(data.field.phone) console.log(data.field) if (data.field.phone != "" && data.field.phone != '') { if (!(/^1[3456789]\d{9}$/.test(data.field.phone))) { diff --git a/src/main/resources/static/js/system/role.js b/src/main/resources/static/js/system/role.js index 5bafae7..c861647 100644 --- a/src/main/resources/static/js/system/role.js +++ b/src/main/resources/static/js/system/role.js @@ -87,7 +87,6 @@ function initTable(dataList, limit, page) { limit: limit, cols: [ [ - //表头 { title: "序号", width: '10%', @@ -101,25 +100,37 @@ function initTable(dataList, limit, page) { field: "name", title: "角色名称", unresize: true, - align: "center" + align: "center", + templet: function(d) { + return '
' + d.name + '
'; + } }, { field: "roleCode", title: "角色编码", unresize: true, - align: "center" + align: "center", + templet: function(d) { + return '
' + d.roleCode + '
'; + } }, { field: "remarks", title: "角色描述", unresize: true, - align: "center" + align: "center", + templet: function(d) { + return '
' + d.remarks + '
'; + } }, { field: "orgName", title: "上级组织", unresize: true, - align: "center" + align: "center", + templet: function(d) { + return '
' + d.orgName + '
'; + } }, { field: "createTime", @@ -127,7 +138,7 @@ function initTable(dataList, limit, page) { unresize: true, align: "center" }, - {field: "state", title: "状态", align: "center",templet: '#is-state'}, + {field: "state", title: "状态", align: "center", templet: '#is-state'}, { title: "操作", unresize: true, diff --git a/src/main/resources/static/pages/role/roleList.html b/src/main/resources/static/pages/role/roleList.html index 0db8ed4..4bb450d 100644 --- a/src/main/resources/static/pages/role/roleList.html +++ b/src/main/resources/static/pages/role/roleList.html @@ -46,6 +46,14 @@ .layui-table-init { background-color: transparent !important; } + + .ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 150px; /* 根据需要调整宽度 */ + display: block; + } diff --git a/src/main/resources/static/pages/samples/samplesMge.html b/src/main/resources/static/pages/samples/samplesMge.html index db4fbe8..9bb711a 100644 --- a/src/main/resources/static/pages/samples/samplesMge.html +++ b/src/main/resources/static/pages/samples/samplesMge.html @@ -71,6 +71,14 @@ .layui-form-selected dl { height: 150px !important; } + + .ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 150px; /* 根据需要调整宽度 */ + display: block; + }