From b10683228765b32e7386b059352ac817982fa664 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 20 一月 2022 13:29:21 +0800
Subject: [PATCH] 退货单加字段源单单号
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 162 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 111 insertions(+), 51 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 5c21e81..30cdff9 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>
@@ -68,8 +74,8 @@
<label class="layui-form-label">鍏抽棴鐘舵��</label>
<div class="layui-input-block">
<select id="HClStatus" name="HClStatus" lay-filter="">
- <option value="">鍏ㄩ儴</option>
- <option value="鏈叧闂�" selected="">鏈叧闂�</option>
+ <option value="" selected>鍏ㄩ儴</option>
+ <option value="鏈叧闂�">鏈叧闂�</option>
<option value="宸插叧闂�">宸插叧闂�</option>
</select>
</div>
@@ -90,6 +96,7 @@
<label class="layui-form-label">浜よ揣鏃堕棿</label>
<div class="layui-input-block">
<select id="Time" name="Time" lay-filter="">
+ <option value="0" selected>鍏ㄩ儴</option>
<option value="1">涓�鍛ㄥ唴浜よ揣</option>
<option value="2">浜屽懆鍐呬氦璐�</option>
<option value="3">涓�鏈堝唴浜よ揣</option>
@@ -97,7 +104,7 @@
<option value="5">涓夋湀鍐呬氦璐�</option>
<option value="6">鍗婂勾鍐呬氦璐�</option>
<option value="7">涓�骞村唴浜よ揣</option>
- <option value="8" selected="">闀挎湡浜よ揣</option>
+ <option value="8">闀挎湡浜よ揣</option>
</select>
</div>
</div>
@@ -105,8 +112,6 @@
<label class="layui-form-label">閲囪喘缁勭粐</label>
<div class="layui-input-block">
<select id="HPURCHASEORGID" name="HPURCHASEORGID" lay-filter="">
- <option value="">缁勭粐1</option>
- <option value="">缁勭粐2</option>
</select>
</div>
</div>
@@ -114,9 +119,9 @@
<label class="layui-form-label">鏄惁宸蹭笅鎺ㄩ�佽揣鍗�</label>
<div class="layui-input-block">
<select id="HISGenerate" name="HISGenerate" lay-filter="">
- <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
<option value="鏄�">鏄�</option>
- <option value="鍚�" selected="">鍚�</option>
+ <option value="鍚�">鍚�</option>
</select>
</div>
</div>
@@ -141,8 +146,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>姹囨姤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉＄爜</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
@@ -237,18 +242,23 @@
//{ 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: 180, sort: true, fixed: 'left' }
- , { 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: '璁″垝璺熻釜鍗曞彿', 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: 'FSHDD', 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 }
@@ -393,9 +403,52 @@
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++) {
+ if (data[i]["鏈叧鑱旀暟閲�"] == 0) {
+ layer.msg("鍗曟嵁鍙�:" + data[i]["鍗曟嵁鍙�"] + "宸插叏閮ㄧ敓鎴愰�佽揣鍗曪紒", { icon: 5 });
+ return;
+ }
if (data[i]["鐘舵��"] == "宸茬‘璁�") {
rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
}
@@ -423,7 +476,7 @@
})
}
break;
- btn - barcode
+
case 'btn-barcode':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -544,7 +597,10 @@
};
});
-
+ //娓叉煋閲囪喘缁勭粐
+ var Organization = '<option value=' + sessionStorage["OrganizationID"] + ' style="color:red;">' + sessionStorage["Organization"] + '</option>';
+ $("#HPURCHASEORGID").append(Organization);
+ form.render('select');
///鍔犺浇鏄剧ず鏁版嵁
function RoadHBillNo(sqlWhere) {
@@ -580,6 +636,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() != "")
@@ -588,8 +646,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() + "^^";
}
@@ -607,33 +665,35 @@
var Time = $("#Time").val();
- var dd = new Date();
- var dt;
- switch (Time) {
- case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
- case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
- case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
- case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
- case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
- case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
- case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
- default: dd = new Date(dd.setDate(dd.getDate()));
- }
- dt = dd.getFullYear().toString();
- if (dd.getMonth() + 1 < 10) {
- dt = dt + "-0" + (dd.getMonth() + 1).toString();
- }
- else {
- dt = dt + "-0" + (dd.getMonth() + 1).toString();
- }
- if (dd.getDate() < 10) {
- dt = dt + "-0" + dd.getDate().toString();
- }
- else {
- dt = dt + "-" + dd.getDate().toString();
- }
- if (Time != 8) {
- sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+ if (Time > 0) {
+ var dd = new Date();
+ var dt;
+ switch (Time) {
+ case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+ case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+ case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+ case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+ case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+ case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+ case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+ default: dd = new Date(dd.setDate(dd.getDate()));
+ }
+ dt = dd.getFullYear().toString();
+ if (dd.getMonth() + 1 < 10) {
+ dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ }
+ else {
+ dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ }
+ if (dd.getDate() < 10) {
+ dt = dt + "-0" + dd.getDate().toString();
+ }
+ else {
+ dt = dt + "-" + dd.getDate().toString();
+ }
+ if (Time != 8) {
+ sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+ }
}
sql = sqlWhere;
//浠庣涓�椤靛紑濮�
--
Gitblit v1.9.1