From 5ec4f6da5baf97e664c8b2472ee8903e141a9243 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 28 二月 2022 10:45:25 +0800
Subject: [PATCH] 夏宝采购订单、送货单(订货数量改为订单数量、关联数量改为已送货数量)
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 151 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 104 insertions(+), 47 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 686aa60..f700251 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
@@ -8,6 +8,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <style type="text/css">
+ .layui-input-block {
+ width: 200px;
+ }
+ </style>
</head>
<body>
@@ -46,6 +51,12 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</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">
@@ -53,7 +64,7 @@
</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>
@@ -74,18 +85,18 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
</div>
- </div>
- <div class="layui-inline">
+ </div>-->
+ <!--<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDate2" id="HDate2">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">浜よ揣鏃堕棿</label>
<div class="layui-input-block">
@@ -102,15 +113,14 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">閲囪喘缁勭粐</label>
<div class="layui-input-block">
<select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
- <option value="">瀹夌憺</option>
</select>
</div>
- </div>
- <div class="layui-inline">
+ </div>-->
+ <!--<div class="layui-inline">
<label class="layui-form-label">鏄惁宸蹭笅鎺ㄩ�佽揣鍗�</label>
<div class="layui-input-block">
<select id="HISGenerate" name="HISGenerate" lay-filter="">
@@ -119,7 +129,7 @@
<option value="鍚�">鍚�</option>
</select>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -237,31 +247,34 @@
//{ checkbox: true, fixed: true }
{ type: 'checkbox', fixed: 'left' }
//{ type: 'radio', fixed: true }
- , { field: 'sorderid', title: '搴忓彿', width: 80, fixed: true }
- , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
- , { field: 'hsubid', title: 'hsubid', sort: true, fixed: true, hide: true }
- , { field: '鐘舵��', title: '鐘舵��', sort: true, fixed: true }
- , { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100, fixed: true }
- , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100, fixed: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180, sort: true, fixed: 'left' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 180, sort: true, fixed: 'left' }
+ , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true */ }
+ , { field: 'hmainid', title: 'hmainid', sort: true, /*fixed: true,*/ hide: true }
+ , { field: 'hsubid', title: 'hsubid', sort: true, /*fixed: true,*/ hide: true }
+ , { field: '鐘舵��', title: '鐘舵��', sort: true/*, fixed: true */ }
+ //, { field: '鍙嶉鐘舵��', title: '鍙嶉鐘舵��', width: 100/*, fixed: true */}
+ //, { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100/*, fixed: true */}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true/*, fixed: 'left' */ }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true/*, fixed: 'left' */ }
, { field: 'HSupID', title: 'HSupID', width: 180, hide: true }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true, fixed: 'left' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */, hide: true }
, { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 180, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
+ , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
+ //, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
- , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', sort: true }
- , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
+ , { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', sort: true }
, { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 180, sort: true }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true }
- , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�', sort: true }
- , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', sort: true }
- , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', sort: true }
+ , { field: '鍏宠仈鏁伴噺', title: '宸查�佽揣鏁伴噺', sort: true }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈�佽揣鏁伴噺', sort: true }
+ , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', sort: true, hide: true}
+ , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', sort: true, hide: true}
, { field: '鍏抽棴鐘舵��', title: '鍏抽棴鐘舵��', sort: true }
, { field: '鍙樻洿鐘舵��', title: '鍙樻洿鐘舵��', sort: true }
- , { field: '閲囪喘缁勭粐', title: '閲囪喘缁勭粐', sort: true }
+ , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
+ , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
+ , { field: '閲囪喘缁勭粐', title: '閲囪喘缁勭粐', sort: true, hide: true}
, { field: '纭浜�', title: '纭浜�', sort: true, hide: true }
, { field: '纭鏃ユ湡', title: '纭鏃ユ湡', sort: true, hide: true }
, { field: '椹冲洖浜�', title: '椹冲洖浜�', sort: true, hide: true }
@@ -395,6 +408,45 @@
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;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , page: {
+ curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+ }
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ 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++) {
@@ -429,7 +481,7 @@
})
}
break;
- btn - barcode
+
case 'btn-barcode':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -550,7 +602,10 @@
};
});
-
+ //娓叉煋閲囪喘缁勭粐
+ var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+ $("#HPURCHASEORGID").append(Organization);
+ form.render('select');
///鍔犺浇鏄剧ず鏁版嵁
function RoadHBillNo(sqlWhere) {
@@ -586,6 +641,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() != "")
@@ -594,22 +651,22 @@
sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
if ($("#HClStatus").val() != "")
sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
- if ($("#HPURCHASEORGID").val() != "")
- sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
- if ($("#HDate1").val() != "") {
- sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
- }
- if ($("#HDate2").val() != "") {
- sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
- }
- if ($("#HISGenerate").val() != "") {
- if ($("#HISGenerate").val() == "鏄�") {
- sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
- }
- else if ($("#HISGenerate").val() == "鍚�") {
- sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
- }
- }
+ //if ($("#HPURCHASEORGID").val() != "")
+ // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+ //if ($("#HDate1").val() != "") {
+ // sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+ //}
+ //if ($("#HDate2").val() != "") {
+ // sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+ //}
+ //if ($("#HISGenerate").val() != "") {
+ // if ($("#HISGenerate").val() == "鏄�") {
+ // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
+ // }
+ // else if ($("#HISGenerate").val() == "鍚�") {
+ // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
+ // }
+ //}
var Time = $("#Time").val();
--
Gitblit v1.9.1