From 26f0d72d113dc6ec3e6cb7e776ec6154645694e3 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 05 一月 2022 16:46:41 +0800
Subject: [PATCH] 夏宝
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 413 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 256 insertions(+), 157 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
index 5a40f5b..5886990 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
@@ -46,13 +46,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>
@@ -67,8 +73,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>
@@ -89,6 +95,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>
@@ -96,7 +103,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>
@@ -113,9 +120,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>
@@ -135,20 +142,17 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<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-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>
-
</div>
-
-
-
- </div>
</div>
</div>
+ </div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
<script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
@@ -203,12 +207,12 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , laydate = layui.laydate
- , table = layui.table
- , form = layui.form
- , element = layui.element;
+ , admin = layui.admin
+ , layer = layui.layer
+ , laydate = layui.laydate
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate1'
@@ -229,47 +233,50 @@
, toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
, defaultToolbar: ['filter', 'exports', 'print']
// , where: { msg: "", NowPage: 1, OnePage: 10 }
- , cellMinWidth: 100
- , cols: [[
- //{ 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: 180, sort: true, fixed: 'left' }
- , { 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: 180, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, 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, hide: 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 }
- ]]
- //, skin: 'row' //琛ㄦ牸椋庢牸
- // , even: true
- , page: true //鏄惁鏄剧ず鍒嗛〉
- , limits: [10, 20, 50,100]
- , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
- , done: function (res, curr, count) {
- _cur_page = curr;
- layer.closeAll("loading");
- }
+ , cellMinWidth: 100
+ , cols: [[
+ //{ 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: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */ }
+ , { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
+ , { 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: '浜よ揣鏃ユ湡', 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, hide: 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 }
+ ]]
+ //, skin: 'row' //琛ㄦ牸椋庢牸
+ // , even: true
+ , page: true //鏄惁鏄剧ず鍒嗛〉
+ , limits: [10, 20, 50, 100]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ //, height: 500
+ , done: function (res, curr, count) {
+ _cur_page = curr;
+ layer.closeAll("loading");
+ }
});
//澶村伐鍏锋爮浜嬩欢
@@ -281,20 +288,20 @@
layer.alert(JSON.stringify(data));
break;
- //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
+ //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
RoadHBillNo(sql);
- break;
+ break;
case 'btn-confirm':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
_cur_page = $(".layui-laypage-em").next().html();
if (data[0]["鐘舵��"] == "鏈‘璁�") {
layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
$.ajax({
type: "get",
- url: GetWEBURL()+"EntrustOrderAccept",
+ url: GetWEBURL() + "EntrustOrderAccept",
data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -311,7 +318,7 @@
layer.close(index);
});
-
+
}
else {
layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜纭鎿嶄綔锛�", { icon: 5 });
@@ -319,37 +326,37 @@
break;
case 'btn-back':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
_cur_page = $(".layui-laypage-em").next().html();
var HBackRemark;
if (data[0]["鐘舵��"] == "鏈‘璁�") {
- layer.prompt({
- formType: 2,
- //value: '',
- title: '璇疯緭鍏ラ┏鍥炵悊鐢�',
- area: ['400px', '200px'] //鑷畾涔夋枃鏈煙瀹介珮
- }, function (value, index, elem) {
- HBackRemark = value.toString();
- $.ajax({
- type: "get",
- url: GetWEBURL()+"EntrustOrderRefuse",
- data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg("鎷掔粷鎴愬姛锛�", { icon: 1 });
- RoadHBillNo(sql);
- }
- else {
- // $("#verifycode").click();
- layer.msg(result.Message, { icon: 5 });
- }
- layer.closeAll("loading");
+ layer.prompt({
+ formType: 2,
+ //value: '',
+ title: '璇疯緭鍏ラ┏鍥炵悊鐢�',
+ area: ['400px', '200px'] //鑷畾涔夋枃鏈煙瀹介珮
+ }, function (value, index, elem) {
+ HBackRemark = value.toString();
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "EntrustOrderRefuse",
+ data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg("鎷掔粷鎴愬姛锛�", { icon: 1 });
+ RoadHBillNo(sql);
}
- })
- //alert(value); //寰楀埌value
- layer.close(index);
- });
+ else {
+ // $("#verifycode").click();
+ layer.msg(result.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ }
+ })
+ //alert(value); //寰楀埌value
+ layer.close(index);
+ });
}
else {
@@ -358,7 +365,7 @@
break;
case 'btn-details':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
var linterid = data[0].hmainid.toString();
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
@@ -376,9 +383,29 @@
}
})
break;
+ case 'btn-barcode':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ //if (data[0].鏈敓鎴愭潯鐮佹暟閲� <= 0) {
+ // layer.msg("閫変腑琛屽凡鐢熸垚鏉＄爜锛�", { icon: 5 });
+ //}
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏉＄爜鐢熸垚'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + data[0].hmainid + '&lentryid=' + data[0].hsubid + '&type =SRM_EntrustOrderBill', 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
ajaxLabelData = data;
var rows = '';
var HEntry = '';
@@ -387,31 +414,100 @@
rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
}
else {
- HEntry += (i+1) + ',';
+ HEntry += (i + 1) + ',';
}
}
if (HEntry != '') {
HEntry = HEntry.substring(0, HEntry.length - 1);
layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
}
- else{
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '閫佽揣鍗�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1601', 'yes']
- , resize: false
- //, cancel: function () {
- // $(".layui-btn").removeClass("layui-btn-disabled");
- //}
- })
+ else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閫佽揣鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1601', 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
}
break;
case 'btn-exit':
parent.layui.admin.events.closeThisTabs();
+ break;
+ case 'btn-report':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ _cur_page = $(".layui-laypage-em").next().html();
+ var arr = new Array();
+ var checkStatus = table.checkStatus('mainTable'),
+ data = checkStatus.data;
+ if (checkStatus.data.length == 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ for (var i = 0; i < data.length; i++) {
+ arr.push(data[i].hmainid + '-' + data[i].hsubid);
+ }
+ var OrderBackId = "";
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁㈠崟鍙嶉鐘舵��',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../PublicPage/OrderBackInfomation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ OrderBackId = checkStatus.data[0].HItemID.toString();
+
+ $.ajax({
+ url: GetWEBURL() + 'EntrustOrderBack',
+ //url: 'http://localhost:8082/LuBaoAPI/' + 'POOrderBack',
+ async: false,
+ type: "GET",
+ dataType: "json",
+ data: { "HmainidList": arr.toString(), "OrderBackId": OrderBackId },
+ success: function (data1) {
+ if (data1.Message.indexOf("鎴愬姛") > 0) {
+ layer.msg("鎿嶄綔鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ });
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+
+ }
+ });
break;
};
});
@@ -419,11 +515,11 @@
///鍔犺浇鏄剧ず鏁版嵁
- function RoadHBillNo (sqlWhere) {
+ function RoadHBillNo(sqlWhere) {
where = sqlWhere;
$.ajax({
type: "get",
- url: GetWEBURL()+"GetEntrustOrderBill",
+ url: GetWEBURL() + "GetEntrustOrderBill",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
success: function (result) {
@@ -452,6 +548,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() != "")
@@ -477,70 +575,71 @@
}
}
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;
//浠庣涓�椤靛紑濮�
_cur_page = 1;
RoadHBillNo(sqlWhere);
- });
+ });
var $ = layui.$, active = {
f_Query: function () { //鏌ヨ
-
+
},
f_Qrjq: function () { //鎺ュ彈
-
+
},
f_Bhjq: function () { //鎷掔粷
-
+
},
- //JSreload: function () {
- // var demoReload = $('#test-table-demoReload');
- // //鎵ц閲嶈浇
- // table.JSreload('test-table-reload', {
- // page: {
- // curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
- // }
- // , where: {
- // key: {
- // id: demoReload.val()
- // }
- // }
- // });
- //}
- };
+ //JSreload: function () {
+ // var demoReload = $('#test-table-demoReload');
+ // //鎵ц閲嶈浇
+ // table.JSreload('test-table-reload', {
+ // page: {
+ // curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ // }
+ // , where: {
+ // key: {
+ // id: demoReload.val()
+ // }
+ // }
+ // });
+ //}
+ };
$('.test-table-reload-btn .layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
- });
+ });
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1