From bd2786301c8103e8134757998090e634b439642d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 31 十二月 2021 13:07:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
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 cb61616..538db4b 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
@@ -47,13 +47,19 @@
</div>
</div>
<div class="layui-inline">
+ <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="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
@@ -106,7 +112,7 @@
<label class="layui-form-label">閲囪喘缁勭粐</label>
<div class="layui-input-block">
<select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
- <option value="">瀹夌憺</option>
+
</select>
</div>
</div>
@@ -396,6 +402,34 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
ajaxLabelData = data;
+ //鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
+ var ids = [];
+ $.each(data, function (obj) {
+ ids.push(data[obj].hmainid);
+ })
+ var hasPrivileage = true;
+ $.ajax({
+ url: GetWEBURL() + 'TestSaverPOInStock',
+ type: 'Post',
+ async: false,
+ traditional: true, // 閲嶇偣
+ data: {
+ "": ids // 閲嶇偣
+ },
+ success: function (data) {
+ if (data.code == "0") {
+ layer.alert(data.Message, { icon: 5 });
+ hasPrivileage = false;
+ return hasPrivileage;
+ }
+ },
+ error: function (e) {
+ layer.alert(e.Message, { icon: 5 });
+ }
+ });
+ if (!hasPrivileage) {
+ return;
+ }
var rows = '';
var HEntry = '';
for (var i = 0; i < data.length; i++) {
@@ -430,7 +464,7 @@
})
}
break;
- btn - barcode
+
case 'btn-barcode':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -551,7 +585,10 @@
};
});
-
+ //娓叉煋閲囪喘缁勭粐
+ var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+ $("#HPURCHASEORGID").append(Organization);
+ form.render('select');
///鍔犺浇鏄剧ず鏁版嵁
function RoadHBillNo(sqlWhere) {
@@ -587,6 +624,8 @@
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
sqlWhere += " and 鍗曟嵁鍙� like ^^%" + $("#HBillNo").val() + "%^^";
+ if ($("#HShortNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
@@ -595,8 +634,8 @@
sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
if ($("#HClStatus").val() != "")
sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
- if ($("#HPURCHASEORGID").val() != "")
- sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+ //if ($("#HPURCHASEORGID").val() != "")
+ // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
if ($("#HDate1").val() != "") {
sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
}
--
Gitblit v1.9.1