From bd307a6664b3bf488efa557790625f3af185fd72 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 02 十二月 2024 15:09:43 +0800
Subject: [PATCH] 采购订单，收料通知单，采购入库单，应付单，付款单，销售订单，发货通知单，销售出库单，应收单 分页优化，列设置默认页大小添加 添加新js文件
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 32 +--
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 35 +--
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 28 +-
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 2
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 26 +-
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 27 +-
WebTM/layuiadmin/SetColumn.js | 21 ++
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 109 ++++++-----
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 29 +-
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 106 ++++++-----
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 27 +-
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 28 +-
WebTM/WebTM.csproj | 1
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 30 +--
14 files changed, 247 insertions(+), 254 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index da0cbe9..c87334a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -97,6 +97,7 @@
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\SetColumn.js" />
<Content Include="layuiadmin\modules\tableFilter2.js" />
<Content Include="layuiadmin\PlateBinding.js" />
<Content Include="layuiadmin\PageTitle.js" />
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
new file mode 100644
index 0000000..a2031e4
--- /dev/null
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -0,0 +1,21 @@
+锘�//#region 璁剧疆琛ㄦ牸椤靛ぇ灏忓垵濮�
+function DisPlay_HideColumn_GetPageSize(HModName, user,optionPage) {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": user },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ if (data1.data[0].HPageSize > 0) {
+ optionPage.limit = data1.data[0].HPageSize;
+ }
+
+ } else {
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+}
+ //#endregion
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index f073f0a..38b4158 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -16,7 +16,7 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -201,8 +201,6 @@
var sWhere = "";
var HModName = "YF_PayMentBillList";
var HBillType = "2103";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -369,21 +367,17 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
@@ -428,6 +422,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -464,8 +460,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -594,9 +588,9 @@
url: GetWEBURL() + '/YF_PayMentBill/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index f7c12bb..ee6ecf7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -1642,8 +1642,8 @@
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID"}//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text'}
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, event: "HPrice", style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, edit: 'text' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
@@ -1760,52 +1760,12 @@
table.render(optionEntry);
}
function set_InitGridHaveSource() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , limit: 500
- , height: 500
- , loading: false
- , cols: [[ //瀛愯〃
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
- , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
- , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
- , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
- , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
- , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
- , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ //閫変腑婧愬崟鍚庢暟閲忎笉鍙紪杈�
+ for (var i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i]["field"] == "HQty") {
+ option.cols[0][i]["edit"] = false;
+ }
+
}
}
//#endregion
@@ -2072,6 +2032,56 @@
});
table.render(option);
break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0 ||obj.data.HQty == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ table.render(option);
+ layer.msg("閲戦鎴栨暟閲忚杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1; //閲戦=鏁伴噺*鍗曚环
+ var HPrice = HMoney / HQty;
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+ HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty
+ , HPrice: HPrice
+ , HMoney: HMoney
+ , HTaxMoney: HTaxMoney
+ , HlineTotal: HlineTotal
+ , HTaxPrice, HTaxPrice
+ , HRelTaxPrice: HRelTaxPrice
+ , HlineTotalBB: HlineTotalBB
+ , HMoneyBB: HMoneyBB
+ });
+ table.render(option);
+ break;
default:
}
});
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 1248439..8ff67d0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -21,6 +21,7 @@
<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">
@@ -206,8 +207,6 @@
var option = [];
var sWhere = "";
var HModName = "Cg_PayableBillList";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1114";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -367,21 +366,16 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#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
@@ -427,6 +421,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -463,8 +459,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -574,9 +568,9 @@
url: GetWEBURL() + '/Cg_PayableBill/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 5ba23ca..3205bf9 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -2508,7 +2508,7 @@
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
+ if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
obj.del();//婧愮爜鍒犻櫎琛屾槸璧嬪��={}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 193684b..c33ddeb 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -19,6 +19,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -259,8 +260,6 @@
var sWhere = "";
var option = [];
var HModName = "Cg_POInStockBillList";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -294,21 +293,17 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option, 2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option, 2);
+
});
//#endregion
@@ -382,6 +377,8 @@
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(1)
@@ -495,8 +492,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -588,9 +583,9 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/page',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index eafa438..45b0520 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -20,6 +20,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/modules//tableFilter2.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -327,7 +328,6 @@
var currRowIndex = 0; //鐢ㄤ簬瀹氫綅瀛愮獥鍙ｅ綋鍓嶉�変腑鐨勮
var childData = null; //鐢ㄤ簬鑾峰彇瀛愮獥鍙ｈ繑鍥炵殑鏁版嵁
//#endregion
-
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -350,9 +350,7 @@
var option = [];
var Name = "MouldProdInHouseCellWidth";
var HModName = "Cg_POOrderBillList";
- var HBillType = "1102";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
+ var HBillType = "1102";
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1102";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -508,11 +506,9 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
table.on('tool(mainTable)' , function (obj) {
@@ -586,11 +582,9 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option, 2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option, 2);
+
});
//琛ㄥご淇℃伅閮ㄩ棬寮圭獥
@@ -851,8 +845,10 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"],optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery(table, option,1)
+ get_FastQuery(table, option, 1)
//鍔犺浇涓氬姟鍛�
//get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
@@ -1006,8 +1002,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -1123,9 +1117,9 @@
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/page',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 958bc8c..3279491 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -19,6 +19,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -257,8 +258,6 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Xs_SeOutStockBill";
var HBillType = "1402";
@@ -298,21 +297,17 @@
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -357,6 +352,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(table, option);
DisPlay_HideColumn();
@@ -467,8 +464,6 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
get_FastQuery(table, option);
}
}
@@ -596,9 +591,9 @@
url: GetWEBURL() + '/Xs_SeOutStockBill/list_byPage',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
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_ReceivableBill.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_ReceivableBill.html"
index 1da4aa0..944680d 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_ReceivableBill.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_ReceivableBill.html"
@@ -1291,6 +1291,60 @@
});
table.render(option)
break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0 || obj.data.HQty == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ table.render(option);
+
+ layer.msg("鏁伴噺鎴栭噾棰濊杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1; //閲戦=鏁伴噺*鍗曚环
+ var HPrice = HMoney / HQty; //鍗曚环
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
+ HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
+ HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
+ , HPrice: HPrice //鏇存柊HPrice瀛楁锛孒Price
+ , HMoney: HMoney //鏇存柊HMoney瀛楁锛孒Money
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HlineTotal: HlineTotal //鏇存柊HlineTotal瀛楁锛孒lineTotal
+ , HTaxPrice, HTaxPrice //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ , HRelTaxPrice: HRelTaxPrice //鏇存柊HRelTaxPrice瀛楁锛屽叾鍊兼潵鑷彉閲廐RelTaxPrice
+ , HlineTotalBB: HlineTotalBB //鏇存柊HlineTotalBB瀛楁锛屽叾鍊兼潵鑷彉閲廐lineTotalBB
+ , HMoneyBB: HMoneyBB
+ });
+ table.render(option);
+ break;
default:
}
});
@@ -2120,13 +2174,13 @@
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID"}//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text', event: "HQty" }
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, event: "HPrice", style: 'background-color:#efefef4d;' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, edit: 'text' }
, { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
@@ -2237,52 +2291,11 @@
table.render(optionEntry);
}
function set_InitGridHaveSource() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , limit: 500
- , height: 500
- , loading: false
- , cols: [[ //瀛愯〃
- { type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', width: 100 }
- , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
- , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
- , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
- , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 100, edit: 'text' }
- , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
- , { field: 'HTaxMoney', title: '绋庨', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HMoneyBB', title: '鏈綅甯侀噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
- , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, totalRow: true, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-
- , { field: 'HSeOrderTaxPrice', title: '璁㈠崟鍚◣鍗曚环', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderInterID', title: '閿�鍞鍗曞唴鐮�', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ //閫変腑婧愬崟鍚庢暟閲忎笉鍙紪杈�
+ for (var i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i]["field"] == "HQty") {
+ option.cols[0][i]["edit"] = false;
+ }
}
}
//#endregion
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 b5001aa..510e3c5 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"
@@ -21,6 +21,7 @@
<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">
@@ -207,9 +208,7 @@
var Organization = sessionStorage["Organization"];
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
-
+ var optionPage = [];
var sWhere = "";
var HModName = "Xs_ReceivableBillList";
@@ -376,22 +375,17 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
-
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(2);
- }
+ optionPage.curr = 1;
+ 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 +431,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(1);
//Organ();
@@ -619,9 +615,9 @@
url: GetWEBURL() + '/Xs_ReceivableBill/list_byPage',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var totalArray = ["", ""];
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 5ecd884..1db77f5 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -18,7 +18,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -262,8 +262,6 @@
var Organization = sessionStorage["Organization"];
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Xs_SeOrderBillList";
var HBillType = "1401";
@@ -310,11 +308,9 @@
form.on('submit(btnSearch)', function (data) {
//鏍囪褰撳墠鏁版嵁涓� 鏌ヨ鏁版嵁
get_needClose_Bar = 0;
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -323,11 +319,9 @@
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -615,7 +609,8 @@
//鏌ヨ
//get_FastQuery();
//get_Display(" and 1=0 ");
-
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
get_DisplayPage(" and 1=0 ");
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -756,8 +751,6 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
if (get_needClose_Bar == 0) {
get_FastQuery();
@@ -960,9 +953,9 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOrderBill/list_ByPage',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -1738,7 +1731,7 @@
if (get_needClose_Bar == 0) {
//璁剧疆椤垫暟涓�1
- page = 1;
+ optionPage.curr = 1;
}
//鏍囪褰撳墠鏁版嵁涓� 寰呭叧闂」
@@ -1753,9 +1746,9 @@
url: GetWEBURL() + '/Xs_SeOrderBill/sortList__ByPage',
async: false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.count != 0) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 74feb37..e680fb9 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -17,7 +17,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -243,8 +243,6 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Kf_SellOutBillList";
var HBillType = "1205";
@@ -283,23 +281,17 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
-
-
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -509,6 +501,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(table, option);
DisPlay_HideColumn();
@@ -600,8 +594,6 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
get_FastQuery(table, option);
}
}
@@ -768,9 +760,9 @@
url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList_byPage',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 210c9b8..57f8f70 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -19,7 +19,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -252,8 +252,7 @@
var sWhere = "";
var option = [];
var HModName = "Kf_POStockInBillList";
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
+
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1201";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -285,21 +284,17 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery();
- }
+ optionPage.curr = 1;
+ get_FastQuery();
+
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option, 2);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option, 2);
+
});
//#endregion
@@ -344,6 +339,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery(table, option,2);
@@ -442,8 +439,6 @@
//棣栨涓嶆墽琛�
if (!first) {
//do something
- page = obj.curr;
- size = obj.limit;
get_FastQuery();
}
}
@@ -567,9 +562,9 @@
url: GetWEBURL() + '/Kf_POStockInBill/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
--
Gitblit v1.9.1