From 1ead526b2860ae24aee5df0fe49b4f0c1f9d0cc9 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 12 六月 2023 22:09:57 +0800
Subject: [PATCH] 称重页面调整--优化质检详细
---
igds-web/src/main/resources/static/admin/inout/in-sample.js | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 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..dc8e4af 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,45 @@
});
}
-//闅愯棌淇℃伅--鏇挎崲涓�*
-function replaceStr(str) {
- if (!str) {
- return "";
- }
- var split = str.split("");
+/**
+ * 鏃堕棿绛�
+ */
+function getTime() {
- if (split.length == 1) {
- return "*";
- }
- if (split.length == 2 || split.length == 3) {
- return str.slice(0, 1) + "**"
- }
- return str.slice(0, 1) + "***" + str.slice(split.length - 1);
+ var now = new Date();
+ var time = now.toLocaleString('chinese', {
+ hour12: false
+ });
+ return time;
}
function showDetail(obj) {
- curSampleData = obj.data;
+ curSampleData = null;
+ var nowTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
+ $("#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 +390,8 @@
Object.assign(curSampleData, data);
submit();
- }, btn2: function () {
+
+ }, btn3: function () {
layer.closeAll();
},
closeBtn: 0
--
Gitblit v1.9.3