From 1f6591e90e8ac4b5c04c06265e9464e3a9473ae2 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 05 十二月 2025 09:09:48 +0800
Subject: [PATCH] 添康任务清单修复
---
WebTM/views/模治具管理/模治具管理/BatchGen_MouldFile.html | 2
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html | 5 ++
WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html | 94 +++++++++++++++++++++++++++++++++++++++++++++-
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 2
4 files changed, 97 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html"
index 8f70098..4261e62 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/BatchGen_MouldFile.html"
@@ -91,7 +91,7 @@
type: "Get",
url: GetWEBURL() + "/Gy_Mould/SaveBatchGen_MouldFile",
async: true,
- data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum },
+ data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum, "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data) {
if (data.count == 1) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
index 8506aba..7e353f4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -1775,7 +1775,10 @@
// 鍚屾瀛愯〃SN鐮佸埌琛ㄥご
function syncSubTableToHeader() {
var tableData = table.cache['mainTable'];
- if (tableData && tableData.length > 0) {
+ var isStep=0;
+ if ($("#HQCNote1_SN").val() != "" || $("#HQCNote1_SN").val() != null || $("#HQCNote2_SN").val() != "" || $("#HQCNote3_SN").val() != "" || $("#HQCNote4_SN").val() != "")
+ isStep=1
+ if (tableData && tableData.length > 0 && isStep!=1) {
var firstRow = tableData[0];
$("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
$("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 0e54d93..ade7e56 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -1413,7 +1413,7 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
-
+ , "HCheckBillType": data.HCheckBillType
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
HOrgIDBar = sessionStorage["OrganizationID"];
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index 4a24574..47899a1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -45,6 +45,28 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">灏忚溅缂栫爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HCarBarCode" id="HCarBarCode">
@@ -72,7 +94,7 @@
<label class="layui-form-label" style="width: 85px;">浠撳簱鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HWHID" id="HWHID" value="0" style="display:none">
- <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHID" id="btnHWHID" style="padding: 0 10px; margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -82,7 +104,7 @@
<label class="layui-form-label" style="width: 85px;">浠撲綅鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HSPID" id="HSPID" value="0" style="display:none">
- <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHStockPlaceID" id="btnHStockPlaceID" style="padding: 0 10px; margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -285,6 +307,23 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ var today = new Date();
+ var twoDaysAgo = new Date();
+ twoDaysAgo.setDate(today.getDate() - 2);
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(twoDaysAgo, "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
get_FastQuery();
@@ -357,7 +396,23 @@
}
});
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("-1");
+ }
+ //#endregion
//鏌ヨ
function get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere) {
var index = layer.load(0, { shade: false });
@@ -370,7 +425,7 @@
async:false,
data: { "HBillType": HBillType, "HCarBarCode": HCarBarCode, "HProcExBillNo": HProcExBillNo, "HMaterNumber": HMaterNumber, "HWHID": HWHID, "HSPID": HSPID, "sWhere": sWhere },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count >-1) {
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -447,6 +502,10 @@
//蹇�熸煡璇�
function get_FastQuery() {
+ var HWHName = $("#HWHName").val();
+ var HStockPlaceName = $("#HStockPlaceName").val();
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
var HCarBarCode = $('#HCarBarCode').val()
var HBillType = $('#HBillType').val()
var HProcExBillNo = $('#HProcExBillNo').val()
@@ -525,6 +584,14 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
+ if (HBeginDate && HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鎿嶄綔鏃堕棿, 23) between '" + HBeginDate + "' and '" + HEndDate + "' "
+ }
+ if (HStockPlaceName) {
+ sWhere += "and 搴撲綅鍚嶇О like '%" + HStockPlaceName + "%'";
+
+ }
+ if (HWHName) sWhere += "and 浠撳簱 like '%" + HWHName + "%'";
get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -532,6 +599,9 @@
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$('#HCarBarCode').val("")
$('#HBillType').val("")
$('#HProcExBillNo').val("")
@@ -549,6 +619,7 @@
$("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
+ sWhere = "";
get_FastQuery();
}
@@ -569,7 +640,24 @@
table.exportFile(ins.config.id, option.data, "xls");
}
//#endregion
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
//浠撳簱
form.on('submit(btnHWHID)', function () {
//椤甸潰灞�-鑷畾涔�
--
Gitblit v1.9.1