From 645d1546b8660b5ca877579b8786e09e1bc1bad5 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 07 七月 2025 10:36:49 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 4
WebTM/views/仓存管理/组托单/Sc_PackUnionBillMain_Setto.html | 26 ++++----
WebTM/views/仓存管理/装箱单/Sc_PackUnionBillMain_Packing.html | 25 ++++----
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 90 +++++++++++++++++++++++++++--
WebTM/layuiadmin/Scripts/webConfig.js | 5 +
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 4
WebTM/WebTM.csproj | 2
7 files changed, 116 insertions(+), 40 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3afc85e..47b1268 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -326,7 +326,6 @@
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList_Batch.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
- <Content Include="views\WMS鎵爜妯″潡\灏忚溅閿佸畾\Kf_TrolleyPositionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByWorkShop_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBill_PDA.html" />
@@ -650,7 +649,6 @@
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\ReportPODemandPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\ReportPODemandPlanBillList_S.html" />
- <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagBarCodeList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoExcel.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c7c7253..e3d209c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,8 +2,8 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ShowAllFiles</ProjectView>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 3083f0c..7d1cee5 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
@@ -31,7 +31,8 @@
//var WEBURL = "http://192.168.60.12/API"; //涓帶
//var WEBURL = "http://192.168.6.5:8082/API/"; //鑸滄垚
/*var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌*/
- var WEBURL = "http://localhost:81/API";
+ //var WEBURL = "http://36.134.2.30:200/WEBS-API/"; //閲戝竻
+ //var WEBURL = "http://localhost:81/API";
return WEBURL
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html"
index 1fdb339..1b55be7 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html"
@@ -98,11 +98,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -132,11 +132,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -166,11 +166,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <= </option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -736,13 +736,15 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
+ debugger
$("#HBillNo").val("");
$('#HStatus').find("option[value='-1']").attr("selected", true);
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
$("#ColContent").val("");
$("#ColName").val("0");
- $("#Comparator").val("0"); $("#ColContent2").val("");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
$("#ColContent1").val("");
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
index 7886cdd..a1fe791 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
@@ -96,11 +96,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -130,11 +130,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -164,11 +164,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <= </option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
- <>
+ <>
</option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
@@ -735,12 +735,13 @@
function set_ClearQuery() {
$("#HBillNo").val("");
$('#HStatus').find("option[value='-1']").attr("selected", true);
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
$("#HOrgID").val(sessionStorage["OrganizationID"]);
$("#ColContent").val("");
$("#ColName").val("0");
- $("#Comparator").val("0"); $("#ColContent2").val("");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
$("#ColContent1").val("");
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 0722866..0362d9d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -259,7 +259,7 @@
}
columns.push({
- field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
+ field: 'PLANSUM', title: '鎻愭枡璁″垝鍚堣', filter: true });
option = {
elem: '#mainTable'
@@ -322,7 +322,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- option.data = addTotalField(result.data);
+ option.data = result.data;
//鍒楄缃�
DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
ins = table.render(option);
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 5c60d4c..7313dcd 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -22,6 +22,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -34,6 +35,25 @@
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
+ </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">
@@ -54,14 +74,7 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HProName" id="HProName">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -80,6 +93,14 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -391,6 +412,25 @@
}
});
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ 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(btnResCnz)', function (data) {
var HBillno2 = $('#HBillno2').val();
@@ -439,6 +479,14 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ 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"));
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栫粍缁�
@@ -660,6 +708,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HOrgID = "";
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProNumber = $("#HProNumber").val();//椤圭洰浠ｇ爜
var HProName = $("#HProName").val();//椤圭洰鍚嶇О
@@ -761,6 +811,12 @@
}
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
if (number == 2) {
if (HOrgID==null) {
@@ -1362,6 +1418,24 @@
}
//#endregion
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 6, 29, 90];
+ 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("90");
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
--
Gitblit v1.9.1