From d91487509fae96ecbe99461649e88a16c2c509dd Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 25 二月 2025 13:56:37 +0800
Subject: [PATCH] 提料计划信息列表： 去掉日期过滤 过滤条件中的弹窗设置为可以双击返回
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 72 +++++++++++++++++++++--------------
2 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 17ce304..3ca2147 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5068,7 +5068,7 @@
<publishTime>01/10/2025 16:08:00</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html">
- <publishTime>12/31/2024 10:12:44</publishTime>
+ <publishTime>02/25/2025 13:54:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBill_Add.html">
<publishTime>03/28/2024 10:03:22</publishTime>
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\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.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\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index 5cccfcb..bb16961 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\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.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\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -27,7 +27,7 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
+ <!--<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;">
@@ -45,7 +45,7 @@
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -303,21 +303,21 @@
//#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);
- }
+ ////鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ //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);
+ //}
- //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ ////鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ //$("#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();
@@ -624,8 +624,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ //var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ //var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();
var HSupplierIDName = $("#HSupplierIDName").val();//渚涘簲鍟�
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -705,12 +705,12 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+ //if (HDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ //}
+ //if (HDate1) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ //}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
}
@@ -733,9 +733,9 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
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")); //缁撴潫鏃ユ湡
+ //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")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
$("#HSupplierID").val("");
$("#HSupplierIDName").val("");
@@ -780,7 +780,7 @@
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -800,13 +800,14 @@
//鐗╂枡鍒楄〃
function btnHMaterID() {
+ var HOrgID = sessionStorage["OrganizationID"];
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -963,4 +964,17 @@
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
+ function GetHSupNameValue(obj) {
+ $("#HSupplierID").val(obj[0].HItemID);
+ $("#HSupplierIDName").val(obj[0].渚涘簲鍟嗗悕绉�);
+ } //渚涘簲鍟�
+
+ function GetGyMaterial(obj) //鐗╂枡鍚嶇О
+ {
+ $("#HMaterID").val(obj.HItemID);
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);
+ }
</script>
\ No newline at end of file
--
Gitblit v1.9.1