From 7a7f218dbcdca1b51f30b10967d611a7830d38f7 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 12 一月 2026 11:21:27 +0800
Subject: [PATCH] 页面获取参数
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 179 ++++++++++++++++++++++++++++++++++-
WebTM/views/基础资料/基础资料/Gy_CarTypeList.html | 29 ++++-
WebTM/views/基础资料/公用基础资料/Gy_MaterialPackingRelationList.html | 20 +++
WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillList.html | 31 +++++-
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 4
5 files changed, 245 insertions(+), 18 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html"
index 5093c7a..d574d63 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.html"
@@ -216,7 +216,10 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID","HOrgID"];
//#endregion
-
+ var params = getUrlVars();
+ var HEndAddr = params[params[0]];
+ var HOrgName = params[params[1]];
+ var HBeginAddr = params[params[2]];
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
@@ -267,11 +270,11 @@
break;
//瀹℃牳鎸夐挳 锛�1:瀹℃牳銆�2:鍙嶅鏍革級
case 'btn-Audit':
- set_CheckBills(1);
+ set_CheckBills(0);
break;
//鍙嶅鏍告寜閽�
case 'btn-DeAudit':
- set_CheckBills(2);
+ set_CheckBills(1);
break;
//鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
case 'btn-Close':
@@ -630,7 +633,12 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
-
+ if (HBeginAddr!= undefined ) {
+ sWhere += " and 瀹℃牳浜�!='' and 鐩殑鍦� =" + HBeginAddr ;
+ }
+ if (HEndAddr != undefined ) {
+ sWhere += " and 瀹℃牳浜�!='' and 濮嬪彂鍦� =" + HEndAddr ;
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -806,7 +814,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_ContractTransportBillEdit/AuditCg_ContractTransportBillEdit',
type: "GET",
- data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1128,7 +1136,18 @@
}
}
-
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
//璇诲彇鏂规
function set_ReadScheme() {
var HIsClose_Manual = false;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelationList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelationList.html"
index 169cdc0..9311ca2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelationList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialPackingRelationList.html"
@@ -219,6 +219,9 @@
window.HDefaultFilter = ""; //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0; //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
//#endregion
+ var params = get_UrlVars();
+ var hmaterid = params[params[0]];
+ var orgid = params[params[1]];
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 鍒濆鍖栫晫闈�
@@ -570,6 +573,12 @@
}
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
+ }
+ if (orgid != undefined) {
+ sWhere += " and HOrgID = '" + orgid + "'";
+ }
+ if (hmaterid != undefined) {
+ sWhere += " and HMaterID = '" + hmaterid + "'";
}
get_Display(sWhere);
@@ -1113,7 +1122,16 @@
}
}
-
+ function get_UrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//璇诲彇鏂规
function set_ReadScheme() {
var HIsClose_Manual = false;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
index 030217a..daf6952 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
@@ -43,7 +43,7 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
-<<<<<<< HEAD
+
<div class="layui-inline">
<label class="layui-form-label">缁勭粐鍚嶇О</label>
<div class="layui-input-block" style="width: 185px;">
@@ -53,10 +53,10 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-=======
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
lay-filter="btnSearch" id="btnSearch">
->>>>>>> cf4a059eee9a05b9b181e9970167f9726379c004
+
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
@@ -144,7 +144,9 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
//#endregion
-
+ var params = getUrlVars();
+ var Type = params[params[0]];
+ var HOrgName = params[params[1]];
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
@@ -443,8 +445,14 @@
if (HName) {
sWhere += " and 杞﹀瀷鍚嶇О like '%" + HName + "%'";
}
+ if (HOrgName != undefined) {
+ sWhere += " and HUSEORGID = " + HOrgName +" and 瀹℃牳浜�!='' ";
+ }
if (HUSEORGID && HUSEORGID != "0") {
sWhere += " and HUSEORGID = " + HUSEORGID;
+ }
+ if (Type != undefined) {
+ sWhere += " and HMaxVolume >= " + Type;
}
sWhere += addSWhereByOpenType();
@@ -627,7 +635,18 @@
}
}
//#endregion
-
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 181f7e8..f2d30a8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -269,6 +269,7 @@
var size = 50;
var params = getUrlVars();
var Type = params[params[0]];
+ var HOrgName = params[params[1]];
var HSupTypeID = 0;
var HSupClsName = '';
//#endregion
@@ -776,6 +777,9 @@
if (HName) {
sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
}
+ if (HOrgName != undefined) {
+ sWhere += " and 瀹℃牳浜�!='' and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
+ }
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index f16a9aa..39f596b 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -64,24 +64,44 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo"
- id="HBillNo" readonly="readonly" autocomplete="off">
+ id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+ <option value="3823">鍣ㄥ叿鎶ュ簾鐢宠鍗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
<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">
+ autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HInnerBillNo" id="HInnerBillNo"
- class="layui-input">
+ class="layui-input">
</div>
</div>
</div>
@@ -194,8 +214,11 @@
<div class="layui-inline custom-hidden">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <input type="text" name="HSourceBillType" id="HSourceBillType"
- class="layui-input" value="" style="float:left;width:100%;">
+ <!--<input type="text" name="HSourceBillType" id="HSourceBillType"
+ class="layui-input" value="" style="float:left;width:100%;">-->
+ <select>
+ <option value="3823">鍣ㄥ叿鎶ュ簾鐢宠鍗�</option>
+ </select>
</div>
</div>
<div class="layui-inline custom-hidden">
@@ -940,7 +963,147 @@
}
//#endregion
+ //#region 閫夋嫨婧愬崟鎸夐挳
+ form.on('submit(HMainSource)', function () {
+ get_checkMainSource();
+ });
+ function get_checkMainSource() {
+ $("#BillType").val("3823")
+ var url = "";
+ var HSourceTitle = "";
+ if ($("#BillType").val() == "3823") {
+ url = "../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBillList.html?openType=2";
+ HSourceTitle = "鍣ㄥ叿鎶ュ簾鐢宠鍗�";
+ } else {
+ return layer.msg('鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭紒');
+ }
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length === 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
+ }
+ //var HSupTypeID_Temp = checkStatus.data[0]["HSupTypeID"];
+ //for (var i = 0; i < checkStatus.data.length; i++) {
+ // if (checkStatus.data[i]["HSupTypeID"] != HSupTypeID_Temp) {
+ // var err = "鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒";
+ // layer.alert(err, { icon: 5 });
+ // return;
+ // }
+ //}
+ //鑾峰彇婧愬崟鏁版嵁
+ var dataArray = [];
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = GetSourceBillList(checkStatus.data[i]["hmainid"], checkStatus.data[i]["hsubid"], checkStatus.data[i]["HBillType"]);
+ if (temp != "none") {
+ dataArray.push(temp);
+ } else {
+ var err = "鏈煡璇㈠埌婧愬崟淇℃伅锛岃鍒锋柊婧愬崟鍒楄〃鍚庨噸鏂伴�夋嫨瀵瑰簲婧愬崟锛�";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+ }
+ setInitBySourceBill(dataArray);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ //#region 鑾峰彇婧愬崟鏁版嵁
+ function GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) {
+ var res = "none";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldScrapOutHouseBill/GetSourceBill_MouldScrapOutHouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType },
+ success: function (result) {
+ if (result.count == 1) {
+ res = result.data[0];
+ } else {
+ res = "none";
+ }
+ },
+ error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
+ //#region 鍐欏叆婧愬崟鏁版嵁
+ function setInitBySourceBill(dataArray) {
+ var data = dataArray[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬
+ });
+
+
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (let i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+ , "HMaterCode": dataArray[i].妯″叿浠ｇ爜 == null ? "" : dataArray[i].妯″叿浠ｇ爜
+ , "HMaterName": dataArray[i].妯″叿 == null ? "" : dataArray[i].妯″叿
+ , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+ , "HUnitCode": dataArray[i].璁￠噺鍗曚綅浠ｇ爜 == null ? "" : dataArray[i].璁￠噺鍗曚綅浠ｇ爜
+ , "HUnitName": dataArray[i].璁￠噺鍗曚綅 == null ? "" : dataArray[i].璁￠噺鍗曚綅
+ , "HBatchNo": ""
+ , "HQty": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+ , "HWHID": dataArray[i].HWHID == null ? 0 : dataArray[i].HWHID
+ , "HWHCode": dataArray[i].瀛愭姤搴熶粨搴撲唬鐮� == null ? "" : dataArray[i].瀛愭姤搴熶粨搴撲唬鐮�
+ , "HWHName": dataArray[i].瀛愭姤搴熶粨搴� == null ? "" : dataArray[i].瀛愭姤搴熶粨搴�
+ , "HSPID": "0"
+ , "HSPCode": ""
+ , "HSPName": ""
+
+ , "HSourceInterID": dataArray[i].hmainid == null ? 0 : dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid == null ? 0 : dataArray[i].hsubid
+ , "HSourceBillType": dataArray[i].HBillType == null ? "" : dataArray[i].HBillType
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙� == null ? "" : dataArray[i].鍗曟嵁鍙�
+ , "HRemark": ""
+ , "HPropertyID": "0"
+ , "HSecUnitID": "0"
+ , "HSecUnitRate": "0"
+
+ , "HDesignLife": "0"
+ , "HLeaveLife": "0"
+
+
+
+ , "HUseLife": "0"
+
+
+
+
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ //#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//鍒濆鍖栬〃鍗曟彃浠�
@@ -992,6 +1155,10 @@
, { field: 'HSPName', title: '浠撲綅鍚嶇О', style: uneditableColStyle, width: 100 }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 100, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 100, hide: true }
+ , { field: 'HSourceBillType', title: 'HSourceBillType', width: 100, hide: true }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
option = {
--
Gitblit v1.9.1