From ca774213e1f714dd5e21e6fc93f2f31a1f2508b5 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 15 九月 2022 15:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 17 ++++++++++-------
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html | 10 +++++++++-
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
index 6e86b75..b967d8a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
@@ -381,6 +381,14 @@
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ var contentUrl = "";
+ for (var i = 0; i < urlLen.length-4; i++) {
+ contentUrl += "../";
+ }
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + ' & colName=' + colName;
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -389,7 +397,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: [contentUrl, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
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/ProductionPlanReportList.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/ProductionPlanReportList.html"
index 7d286ae..d0da71c 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/ProductionPlanReportList.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/ProductionPlanReportList.html"
@@ -69,9 +69,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
@@ -93,9 +93,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閿�鍞崟鍙�</label>
+ <label class="layui-form-label" style="width: 85px;">鍞竴ID</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
+ <input type="text" class="layui-input" name="F_BSV_WYID" id="F_BSV_WYID">
</div>
</div>
</div>
@@ -287,9 +287,10 @@
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
var HWorkShopID = $("#HWorkShopID").val();//鐝粍
- var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞崟鍙�
+ var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HOrgID = sessionStorage["OrganizationID"];
@@ -298,9 +299,10 @@
, HEndDate: HEndDate
, HICMOBillNo: HICMOBillNo
, HWorkShopID: HWorkShopID
- , HSeOrderBillNo: HSeOrderBillNo
+ , F_BSV_WYID: F_BSV_WYID
, HMaterNumber: HMaterNumber
, HOrgID: HOrgID
+ , HBillNo: HBillNo
}
get_Display(JSON.stringify(sWhere));
@@ -314,6 +316,8 @@
$("#HICMOBillNo").val("");
$("#HProcExchBillNo").val("");
$("#HName").val("");
+ $("#HBillNo").val("");
+ $("#F_BSV_WYID").val("");
sWhere = " where 1 = 1 ";
get_Display(sWhere);
}
@@ -338,7 +342,6 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterName").val(checkStatus.data[0].HName);
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
$("#HModel").val(checkStatus.data[0].HModel);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
--
Gitblit v1.9.1