From c32c47bed40ee7bef531ea42df2fcdd55d479fc4 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 06 一月 2026 09:40:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 73 insertions(+), 26 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 f1d0ed0..8f9df81 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>
@@ -247,6 +260,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="push_POStockInCheckBill" id="push_POStockInCheckBill"><i class="layui-icon layui-icon-set"></i>涓嬫帹(鏉ユ枡妫�楠屽崟)</button>
</div>
</script>
<table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
@@ -427,6 +441,11 @@
get_ResCnzManual(layer, HBillType, get_FastQuery)
})
+ //涓嬫帹鏉ユ枡妫�楠屽崟
+ form.on("submit(push_POStockInCheckBill)", function(data){
+ push_POStockInCheckBill()
+ })
+
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
@@ -501,6 +520,8 @@
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+
+ Organ();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -616,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; //鑾峰緱褰撳墠琛屾暟鎹�
@@ -1115,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()
@@ -1211,7 +1254,9 @@
sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
}
-
+ if (HUSEORGID) {
+ sWhere += " and 缁勭粐 like '%" + HUSEORGID + "%'";
+ }
sWhere += addSWhereByOpenType();
//娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
@@ -1323,7 +1368,9 @@
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;
--
Gitblit v1.9.1