From 7ae052d141e69fe9e19392172fc2960134a03232 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 十二月 2025 15:54:52 +0800
Subject: [PATCH] 1.采购入库单列表、直接调拨单列表、其他出库单列表、生产入库列表、销售出库单列表：layui中开发 查看包装明细
---
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 376 ++++++++++++++++++++++++++++++----------------------
1 files changed, 216 insertions(+), 160 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index a68f7601..0edd7ff 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>搴旀敹鍗曠淮鎶�</title>
@@ -21,7 +22,9 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -38,54 +41,74 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HProjectNumber"
+ id="HProjectNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -93,26 +116,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -120,7 +150,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -128,19 +159,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -148,7 +185,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -207,19 +245,17 @@
var Organization = sessionStorage["Organization"];
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
-
+ var optionPage = [];
var sWhere = "";
var HModName = "Xs_ReceivableBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
var HBillType = "1426";
- //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1426";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+ var HPageTitle = get_PageTitle(HModuleType) || document.title;
//#endregion
@@ -307,7 +343,7 @@
//鎸夐挳璁剧疆
case 'set_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-
+
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
//鍒楄缃�
@@ -344,6 +380,31 @@
})
//#endregion
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
//#region 鍙屽嚮杩涘叆缂栬緫
table.on('rowDouble(mainTable)', function (obj) {
//閫変腑楂樹寒 鍙屽嚮琛�
@@ -376,22 +437,17 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ optionPage.curr = 1;
+ get_FastQuery(2);
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(2);
+
});
//#endregion
@@ -437,6 +493,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ // DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -452,7 +510,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- //, page: true
+ , page: false
, totalRow: true
//, cellMinWidth: 90
, limit: 50
@@ -515,7 +573,7 @@
})
}
});
- //#endregion
+ //#endregion
//#endregion
//#region 鏌ヨ
@@ -525,105 +583,9 @@
url: GetWEBURL() + '/Xs_ReceivableBill/list',
async: false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var totalArray = ["", ""];
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
- }
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�'){
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
- return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
- }
- }
- } //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
-
- option.cols = [col];
- option.data = data1.data;
- table.render(option);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
-
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- }
- //#endregion
-
- //#region 鏌ヨ(涓昏〃)-鍒嗛〉
- function get_DisplayPage(sWhere) {
- var wait = layer.load();//閬僵
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Xs_ReceivableBill/list_byPage',
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
- success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
- if (data1.count != 0) {
- optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var totalArray = ["", ""];
var data = [];
var col = [];
@@ -671,15 +633,97 @@
, cols: [col]
, data: data1.data
, height: 800
- //, page: true
+ , page: true
, totalRow: true
, cellMinWidth: 90
, limit: 50
- //, limits: [50, 500, 5000, 20000]
+ , limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
}
}
+
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 鏌ヨ(涓昏〃)-鍒嗛〉
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xs_ReceivableBill/list_byPage',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
+ success: function (data1) {
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var totalArray = ["", ""];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ } //鍔ㄦ�佹樉绀哄垪鍚�
+
+
option.cols = [col];
option.data = data1.data;
@@ -695,13 +739,8 @@
ColFilter();
}
} else {
- optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
- laypage.render(optionPage);
-
- option.data = [];
- table.render(option);
layer.close(ajaxLoad);
- /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -715,6 +754,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -800,7 +840,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
-
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
sWhere += addSWhereByOpenType();
@@ -817,6 +859,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -841,7 +884,7 @@
, title: '鏂板' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBill.html?OperationType=1&linterid=0&HSouceBillType='
- ,btn: [],
+ , btn: [],
end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btnSearch").trigger('click');
@@ -882,7 +925,7 @@
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- if (data[0].鍗曟嵁鐘舵��=="鍒涘缓") {
+ if (data[0].鍗曟嵁鐘舵�� == "鍒涘缓") {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
@@ -911,7 +954,7 @@
} else {
layer.msg('姝ゆ暟鎹笉鏄垱寤虹姸鎬�,鏃犳硶鍒犻櫎锛�');
}
-
+
})
}
else {
@@ -1213,8 +1256,10 @@
, content: [contentUrl, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1302,6 +1347,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -1321,8 +1375,8 @@
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
- var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�", "杩戝崐骞�", "杩戜竴骞�"];
var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
for (var i = 0; i < valueList.length; i++) {
@@ -1379,7 +1433,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
@@ -1392,7 +1446,8 @@
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
-
+ // get_FastQuery()
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1672,9 +1727,10 @@
}
return vars;
}
- //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
</script>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1