From 5faab615c58b52dec282b6ea5db12830ffa33894 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 04 一月 2023 17:01:18 +0800
Subject: [PATCH] 问题修改
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 23 ++++++++---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 4 ++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 14 ++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 44 ++++++++++++++++------
4 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 704203c..2197558 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -402,6 +402,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈鐢熸垚鏉＄爜鏁伴噺涓嶈兘瓒呭嚭鏈敓鎴愭潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HBatchNo == "" || _sSubStr[i].HKFDate == "")) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规鎴栫敓浜ф棩鏈熶笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
layer.load(3)
$.ajax(
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 8b06d2c..3713626 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -67,12 +67,19 @@
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
- <div class="layui-inline">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
<div class="layui-colla-content" style="padding-left:82px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
@@ -418,8 +425,10 @@
sqlWhere += " and 婧愬崟鍗曞彿 like ^^%" + $("#HBillNoFrom").val() + "%^^";
if ($("#HInnerBillNo").val() != "")
sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
- //if ($("#HShortNumber").val() != "")
- // sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
+ if ($("#HOldMaterNumber").val() != "")
+ sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
+ if ($("#HMaterNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index aba26a7..c5f9182 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -109,8 +109,16 @@
<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
</div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鐗╂祦鍗曞彿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
+ </div>
+ </div>
</div>
+
</div>
+
</div>
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -271,7 +279,7 @@
, { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text' , event: "inputHQty"}
, { field: 'HRQty', title: '鏈叆搴撴暟閲�', width: 100 }
, { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 120}
+ , { field: 'HBatchNo', title: '鎵规', width: 120,edit: 'text',}
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
@@ -658,6 +666,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (sSubStr[i].HBatchNo == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index c77ed01..628b05c 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -31,17 +31,7 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">璁㈠崟鐘舵��</label>
- <div class="layui-input-block">
- <select name="HStatus" id="HStatus" lay-filter="">
- <option value="" selected="">鍏ㄩ儴</option>
- <option value="鏈‘璁�">鏈‘璁�</option>
- <option value="宸茬‘璁�">宸茬‘璁�</option>
- <option value="宸查┏鍥�">宸查┏鍥�</option>
- </select>
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -52,6 +42,12 @@
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
</div>
</div>
<div class="layui-inline">
@@ -134,7 +130,27 @@
</select>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈‘璁�">鏈‘璁�</option>
+ <option value="宸茬‘璁�">宸茬‘璁�</option>
+ <option value="宸查┏鍥�">宸查┏鍥�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹屾垚鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏈畬鎴�" selected="">鏈畬鎴�</option>
+ <option value="宸插畬鎴�">宸插畬鎴�</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -471,12 +487,16 @@
//鏌ヨ鏉′欢
function get_FastQuery(table, option) {
var sqlWhere = "";
+ if ($("#HFinishStatus").val() != "")
+ sqlWhere += " and 瀹屾垚鐘舵�� like ^^%" + $("#HFinishStatus").val() + "%^^";
if ($("#HStatus").val() != "")
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
if ($("#HShortNumber").val() != "")
sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
+ if ($("#HOldMaterNumber").val() != "")
+ sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
--
Gitblit v1.9.1