From 9ab21170825a93eca3293fa083d17dcbd50e41a7 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:12:14 +0800
Subject: [PATCH] 1
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 94 ++++++++++++++++++++++--------
WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html | 37 ++++++++++++
2 files changed, 104 insertions(+), 27 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index 94c2700..058b9e2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -46,7 +46,7 @@
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
- lay-filter="HInitTimeCycle" style="width:190px;">
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
@@ -54,34 +54,43 @@
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
- style="width:190px;">
+ 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;">
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
- id="HBillNo" style="width:190px;">
+ id="HBillNo" style="width:190px;">
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <select name="HUSEORGID" id="HUSEORGID" class=" ForFilteringSchemes" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnSearch" id="btnSearch">
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">
+ 閲嶇疆
+ </button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
- id="HFilterScheme_Now"></div>
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
@@ -89,29 +98,33 @@
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes"
- name="HEmpName" id="HEmpName" style="width:190px;">
+ name="HEmpName" id="HEmpName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes"
- name="HSupName" id="HSupName" style="width:190px;">
+ name="HSupName" id="HSupName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes"
- name="HBillno2" id="HBillno2" style="width:190px;">
+ name="HBillno2" id="HBillno2" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+ lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">
+ 閲嶆柊鍚屾
+ </button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnResCnzManual" id="btnResCnzManual"
- style="padding:0 5px">鎵嬪伐鍚屾</button>
+ lay-filter="btnResCnzManual" id="btnResCnzManual"
+ style="padding:0 5px">
+ 鎵嬪伐鍚屾
+ </button>
</div>
<div class="layui-inline">
<div class="layui-row" style="margin-top:5px">
@@ -119,13 +132,13 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName" id="ColName" class="ForFilteringSchemes"
- lay-filter="ColName" style="width:190px;">
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator" id="Comparator" class="ForFilteringSchemes"
- lay-filter="Comparator" style="width:190px;">
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -145,7 +158,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent" id="ColContent">
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -154,13 +167,13 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName1" id="ColName1" class="ForFilteringSchemes"
- lay-filter="ColName1" style="width:190px;">
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -180,7 +193,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent1" id="ColContent1">
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -189,13 +202,13 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName2" id="ColName2" class="ForFilteringSchemes"
- lay-filter="ColName2" style="width:190px;">
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -215,7 +228,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent2" id="ColContent2">
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -507,6 +520,8 @@
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+
+ Organ();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -622,7 +637,28 @@
}
});
}
-
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//鏌ヨ瀛愯〃鏁版嵁
function get_DisplaySub(obj) {
var datas = obj; //鑾峰緱褰撳墠琛屾暟鎹�
@@ -1121,6 +1157,7 @@
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HEmpName = $("#HEmpName").val();
var HSupName = $("#HSupName").val();//渚涘簲鍟�
+ var HUSEORGID = $("#HUSEORGID").val();//zuzhi
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -1217,7 +1254,9 @@
sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
}
-
+ if (HUSEORGID) {
+ sWhere += " and 缁勭粐 like '%" + HUSEORGID + "%'";
+ }
sWhere += addSWhereByOpenType();
//娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
@@ -1329,7 +1368,10 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[i].split('|');
+
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index 3998d2d..2186ab0 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -60,6 +60,14 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <select name="HUSEORGID" id="HUSEORGID" class=" ForFilteringSchemes" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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>
@@ -454,6 +462,7 @@
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+ Organ();
}
//鍒濆鍖栬〃鏍�
@@ -663,6 +672,7 @@
var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
var Warehouse = $("#Warehouse").val();//浠撳簱
var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+ var HUSEORGID = $("#HUSEORGID").val();
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -770,6 +780,9 @@
if (Hmaker) {
sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
}
+ if (HUSEORGID && HUSEORGID!=0) {
+ sWhere += " and HOrgID like '%" + HUSEORGID + "%'";
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -795,7 +808,28 @@
});
})
//#endregion
-
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//鍒犻櫎
function set_DeleteBill() {
@@ -1036,6 +1070,7 @@
$("#ColName2").val();//澶嶉�夋
$("#Comparator2").val()
$("#ColContent2").val();
+ $("#HUSEORGID").val("");
form.render('select');
sWhere = "";
}
--
Gitblit v1.9.1