diff --git a/src/main/resources/static/js/samples/samplesMge.js b/src/main/resources/static/js/samples/samplesMge.js
index c59b79f..11a1d5e 100644
--- a/src/main/resources/static/js/samples/samplesMge.js
+++ b/src/main/resources/static/js/samples/samplesMge.js
@@ -98,22 +98,22 @@ function initTable(dataList, limit, page) {
}
},
{field: "customName", width:260,title: "送样单位", unresize: true, align: "center", templet: function (d) {
- return `
${d.customName}
`;
+ return `${d.customName}
`;
}},
{field: "sampleUser", width:150,title: "送样人", unresize: true, align: "center", templet: function (d) {
- return `${d.sampleUser}
`;
+ return `${d.sampleUser}
`;
}},
{field: "sampleTime", width:210,title: "送样时间", unresize: true, align: "center", templet: function (d) {
- return `${d.sampleTime}
`;
+ return `${d.sampleTime}
`;
}},
{field: "sampleTools", width:280,title: "送样设备", unresize: true, align: "center", templet: function (d) {
- return `${d.sampleTools}
`;
+ return `${d.sampleTools}
`;
}},
{field: "collectSamplesUser", width:140,title: "收样人", unresize: true, align: "center", templet: function (d) {
- return `${d.collectSamplesUser}
`;
+ return `${d.collectSamplesUser}
`;
}},
{field: "collectSamplesTime", width:210,title: "收样时间", unresize: true, align: "center", templet: function (d) {
- return `${d.collectSamplesTime}
`;
+ return `${d.collectSamplesTime}
`;
}},
{
field: "teamName", width:210,title: "试验班组", unresize: true, align: "center", templet: function (d) {
@@ -121,7 +121,7 @@ function initTable(dataList, limit, page) {
if (d.teamName == null) {
view = "未派工";
} else {
- view = `${d.teamName}`;
+ view = `${d.teamName}`;
}
return view;
}
diff --git a/src/main/resources/static/js/tools/toolsMge.js b/src/main/resources/static/js/tools/toolsMge.js
index c2a9a14..8bd4997 100644
--- a/src/main/resources/static/js/tools/toolsMge.js
+++ b/src/main/resources/static/js/tools/toolsMge.js
@@ -74,7 +74,7 @@ function laypages(total, page, limit) {
/*初始化表格*/
function initTable(dataList, limit, page) {
- let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+ let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0});
tableIns = table.render({
elem: "#table_data",
height: "full-130",
@@ -89,24 +89,114 @@ function initTable(dataList, limit, page) {
return (page - 1) * limit + d.LAY_INDEX;
}
},
- {field: "sampleTools", width:155,title: "设备类型", unresize: true, align: "center"},
- {field: "devCode", width:150,title: "设备编号", unresize: true, align: "center"},
- {field: "customerCode", width:150,title: "设备编码", unresize: true, align: "center"},
- {field: "devModule", width:150,title: "设备规格", unresize: true, align: "center"},
- {field: "customName", width:175,title: "送样单位", unresize: true, align: "center"},
- {field: "sampleDepartment", width:170,title: "送样部门", unresize: true, align: "center"},
- {field: "manufactureDate", width:150,title: "生产日期", unresize: true, align: "center"},
- {field: "experTime", width:150,title: "试验日期", unresize: true, align: "center"},
- {field: "experConclu", width:120,title: "试验结果", unresize: true, align: "center"},
{
- field: "certificate", title: "合格证",width:90, unresize: true, align: "center", templet: function (d) {
- console.log("d",d.id);
- return '查看';
+ field: "sampleTools",
+ width: 155,
+ title: "设备类型",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.sampleTools}
`;
}
},
{
- field: "qrCode", title: "二维码", width: 90, unresize: true, align: "center", templet: function (d) {
- return '打印';
+ field: "devCode",
+ width: 150,
+ title: "设备编号",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.devCode}
`;
+ }
+ },
+ {
+ field: "customerCode",
+ width: 150,
+ title: "设备编码",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.customerCode}
`;
+ }
+ },
+ {
+ field: "devModule",
+ width: 150,
+ title: "设备规格",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.devModule}
`;
+ }
+ },
+ {
+ field: "customName",
+ width: 175,
+ title: "送样单位",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.customName}
`;
+ }
+ },
+ {
+ field: "sampleDepartment",
+ width: 170,
+ title: "送样部门",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.sampleDepartment}
`;
+ }
+ },
+ {
+ field: "manufactureDate",
+ width: 150,
+ title: "生产日期",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.manufactureDate}
`;
+ }
+ },
+ {
+ field: "experTime",
+ width: 150,
+ title: "试验日期",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.experTime}
`;
+ }
+ },
+ {
+ field: "experConclu",
+ width: 120,
+ title: "试验结果",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `${d.experConclu}
`;
+ }
+ },
+ {
+ field: "certificate",
+ title: "合格证",
+ width: 90,
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `查看`;
+ }
+ },
+ {
+ field: "qrCode",
+ title: "二维码",
+ width: 90,
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return `打印`;
}
},
],
diff --git a/src/main/resources/static/pages/tools/toolsMge.html b/src/main/resources/static/pages/tools/toolsMge.html
index 50b9723..45f2ad8 100644
--- a/src/main/resources/static/pages/tools/toolsMge.html
+++ b/src/main/resources/static/pages/tools/toolsMge.html
@@ -106,6 +106,14 @@
#qr-canvas {
display: none;
}
+
+ .ellipsis {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-width: 150px; /* 根据需要调整宽度 */
+ display: block;
+ }