From 02af6ea33f505e4e06dc91785154898a801b267d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 14 四月 2025 12:21:56 +0800
Subject: [PATCH] 修复出站单 第三个自定义过滤没有数据显示，完善生产质量汇报单 复制一行不显示，修复不良原因查询在其他页面打开报错，性能散点报表 增加生产资源过滤，设备工艺参数点检表 完善 初始化点检人 id未赋值
---
WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
index 16779c6..5aa4a49 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkDay.html"
@@ -29,7 +29,7 @@
<body>
<div class="layui-fluid" style="padding: 0;">
- <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card" style="padding: 15px; height: 100%; ">
<div class="layui-card-body" style="padding: 1px;">
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
@@ -41,7 +41,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -49,7 +49,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓婄彮鏃堕棿</label>
+ <label class="layui-form-label">涓婄彮鏃堕棿锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
</div>
@@ -63,7 +63,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍗堜紤寮�濮�</label>
+ <label class="layui-form-label">鍗堜紤寮�濮嬶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
</div>
@@ -77,7 +77,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏅氫紤寮�濮�</label>
+ <label class="layui-form-label">鏅氫紤寮�濮嬶細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
</div>
@@ -86,6 +86,34 @@
<label class="layui-form-label">鏅氫紤缁撴潫锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤寮�濮嬶紙澶滐級锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakBegin2" id="HNoonbreakBegin2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤缁撴潫锛堝锛夛細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakEnd2" id="HNoonbreakEnd2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤寮�濮嬶紙澶滐級锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakBegin2" id="HNightbreakBegin2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤缁撴潫锛堝锛夛細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakEnd2" id="HNightbreakEnd2" autocomplete="off" model="datetime">
</div>
</div>
</div>
@@ -128,26 +156,53 @@
laydate.render({
elem: '#HWorkBegin'
, type: 'time'
+ , trigger: 'click'
});
laydate.render({
elem: '#HWorkEnd'
, type: 'time'
+ , trigger: 'click'
});
laydate.render({
elem: '#HNoonbreakBegin'
, type: 'time'
+ , trigger: 'click'
});
laydate.render({
elem: '#HNoonbreakEnd'
, type: 'time'
+ , trigger: 'click'
});
laydate.render({
elem: '#HNightbreakBegin'
, type: 'time'
+ , trigger: 'click'
});
laydate.render({
elem: '#HNightbreakEnd'
, type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNoonbreakBegin2'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNoonbreakEnd2'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNightbreakBegin2'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNightbreakEnd2'
+ , type: 'time'
+ , trigger: 'click'
+
});
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -249,13 +304,17 @@
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
- , "HDate": data.HDate
+ , "HDate": Format(new Date(result.data[0].HDate), "yyyy-MM-dd")
, "HWorkBegin": data.HWorkBegin
, "HWorkEnd": data.HWorkEnd
, "HNoonbreakBegin": data.HNoonbreakBegin
, "HNoonbreakEnd": data.HNoonbreakEnd
, "HNightbreakBegin": data.HNightbreakBegin
, "HNightbreakEnd": data.HNightbreakEnd
+ , "HNoonbreakBegin2": data.HNoonbreakBegin2
+ , "HNoonbreakEnd2": data.HNoonbreakEnd2
+ , "HNightbreakBegin2": data.HNightbreakBegin2
+ , "HNightbreakEnd2": data.HNightbreakEnd2
});
layer.close(ajaxLoad);
} else {
--
Gitblit v1.9.1