From ae2c433ecf08e10d55488320e5db0936ca323710 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 五月 2023 20:44:21 +0800
Subject: [PATCH] 扦样提交3
---
igds-web/src/main/resources/static/admin/inout/in-sample.js | 75 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-sample.js b/igds-web/src/main/resources/static/admin/inout/in-sample.js
index 3538deb..525ebf8 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-sample.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-sample.js
@@ -1,5 +1,6 @@
//褰撳墠鑺傜偣 鍏ュ簱璐ㄦ
var layer;
+var laydate;
var form;
var table;
var page = 1;
@@ -12,7 +13,7 @@
layer = layui.layer;
form = layui.form;
table = layui.table;
- var laydate = layui.laydate;
+ laydate = layui.laydate;
laydate.render({
elem: '#start',
@@ -27,9 +28,10 @@
});
laydate.render({
- elem: '#foodYear',
+ elem: '#sampleTime',
theme: '#7b8e9f',
- type: 'year',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ type: 'datetime'
});
// 鍒濆鍖栬〃鍗曟暟鎹�
@@ -342,38 +344,72 @@
});
}
-//闅愯棌淇℃伅--鏇挎崲涓�*
-function replaceStr(str) {
- if (!str) {
- return "";
- }
- var split = str.split("");
+/**
+ * 鏃堕棿绛�
+ */
+function getTime() {
- if (split.length == 1) {
- return "*";
+ var now = new Date();
+ var time = now.toLocaleString('chinese', {
+ hour12: false
+ });
+ return time;
+}
+
+function formatDateTime(date, format) {
+ const o = {
+ 'M+': date.getMonth() + 1, // 鏈堜唤
+ 'd+': date.getDate(), // 鏃�
+ 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 灏忔椂
+ 'H+': date.getHours(), // 灏忔椂
+ 'm+': date.getMinutes(), // 鍒�
+ 's+': date.getSeconds(), // 绉�
+ 'q+': Math.floor((date.getMonth() + 3) / 3), // 瀛ｅ害
+ S: date.getMilliseconds(), // 姣
+ a: date.getHours() < 12 ? '涓婂崍' : '涓嬪崍', // 涓婂崍/涓嬪崍
+ A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
+ };
+ if (/(y+)/.test(format)) {
+ format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
}
- if (split.length == 2 || split.length == 3) {
- return str.slice(0, 1) + "**"
+ for (let k in o) {
+ if (new RegExp('(' + k + ')').test(format)) {
+ format = format.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+ );
+ }
}
- return str.slice(0, 1) + "***" + str.slice(split.length - 1);
+ return format;
}
function showDetail(obj) {
- curSampleData = obj.data;
+ curSampleData = null;
+ var nowTime = formatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
+ $("#printTime").html(nowTime);
+ curSampleData = obj.data;
+ if(!curSampleData.sampleTime){
+ curSampleData.sampleTime = nowTime;
+ }
+ if(!curSampleData.sampleUser){
+ curSampleData.sampleUser = sampleUser;
+ }
// 璧嬪��
form.val("form-detail", curSampleData);
form.render();
layer.open({
type: 1,
- title: "鎵︽牱淇℃伅",
- area: ['900px', '400px'],
+ title: "鎵︽牱绠＄悊淇℃伅",
+ area: ['900px', '520px'],
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
- btn: ['淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
+ btn: ['淇濆瓨骞舵墦鍗�', '淇濆瓨鎻愪氦','鍏抽棴鍙栨秷'],
yes: function () {
+ layer.alert("鏉″舰鐮佸緟纭畾锛�");
+ }, btn2: function () {
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
obj.update(data);
@@ -381,7 +417,8 @@
Object.assign(curSampleData, data);
submit();
- }, btn2: function () {
+
+ }, btn3: function () {
layer.closeAll();
},
closeBtn: 0
--
Gitblit v1.9.3