From d0cb515dae7ef450a58e8aa7a251406ca36fc36a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 14 七月 2022 15:54:30 +0800
Subject: [PATCH] 优化
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 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 bda5c42..32e5dc7 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
@@ -112,7 +112,6 @@
<label class="layui-form-label">閲囪喘缁勭粐</label>
<div class="layui-input-block">
<select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
- <option value="">瀹夌憺</option>
</select>
</div>
</div>
@@ -243,18 +242,23 @@
//{ checkbox: true, fixed: true }
{ type: 'checkbox', fixed: 'left' }
//{ type: 'radio', fixed: true }
- , { field: 'sorderid', title: '搴忓彿', width: 80/*, 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: '鐘舵��', 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' */ }
, { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
- , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
+ , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
+ , { field: 'FStockInQty', title: '绱鍏ュ簱鏁伴噺', width: 120 }
+ , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 120 }
+ , { field: 'FMRBQTY', 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 }
@@ -402,6 +406,50 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
ajaxLabelData = data;
+ //鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
+ var ids = "";
+ var entryids = "";
+ $.each(data, function (obj) {
+ ids += data[obj].hmainid + ",";
+ entryids += data[obj].hsubid + ",";
+ })
+ ids = ids.substring(0, ids.length - 1);
+ entryids = entryids.substring(0, entryids.length - 1);
+ var hasPrivileage = true;
+ $.ajax({
+ url: GetWEBURL() + 'TestSaverPOInStock',
+ type: 'get',
+ async: false,
+ traditional: true, //閲嶇偣
+ data: {
+ "ids": ids,
+ "entryids": entryids //閲嶇偣
+ },
+ 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++) {
@@ -436,7 +484,7 @@
})
}
break;
- btn - barcode
+
case 'btn-barcode':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -557,7 +605,10 @@
};
});
-
+ //娓叉煋閲囪喘缁勭粐
+ var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+ $("#HPURCHASEORGID").append(Organization);
+ form.render('select');
///鍔犺浇鏄剧ず鏁版嵁
function RoadHBillNo(sqlWhere) {
@@ -603,8 +654,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