From ba05bfe432029f2abcd3459f3fcc636d8922ad4b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 22 十一月 2024 15:21:11 +0800
Subject: [PATCH] 选整单功能
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 202 ++++-
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 316 +++++++++
WebTM/views/验收入库/外购入库/Kf_POStockInBillListQuery.html | 36
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 49
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html | 35
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 41
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 434 +++++++++++++
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 318 +++++++++
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 153 ++++
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 2
WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html | 36
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillQuery.html | 36
WebTM/views/销售管理/销售订单/Xs_SeOrderBillQuery.html | 36
WebTM/views/领料发货/销售出库/Kf_SellOutBillQuery.html | 36
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 178 +++++
15 files changed, 1,744 insertions(+), 164 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index d499e16..c31b52d 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1067,31 +1067,36 @@
var hmainid = data[0].hmainid;
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
- type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
- success: function (result) {
- console.log('gouba' + result);
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
+ if (data[0].鐘舵�� == "鍒涘缓" || data[0].鐘舵�� == "瀹℃牳閫�鍥�" ) {
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
layer.close(wait);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
+ });
+ } else {
+ layer.msg('鍗曟嵁鐘舵�佹湭鍦ㄥ垱寤�');
+ layer.close(wait);
+ }
})
}
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_PayMentBill.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_PayMentBill.html"
index d1f0a73..ca24214 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_PayMentBill.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_PayMentBill.html"
@@ -26,6 +26,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button type="button" id="check-btn" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -582,6 +583,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
//if (AllowLoadData(data)) {
@@ -1103,6 +1110,152 @@
}
//#endregion
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+
+ url = "../../閲囪喘绠$悊/搴斾粯鍗�/Cg_PayableBillQuery.html?openType=2&HOrgID=" + HOrgID;
+
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ //鑾峰彇渚涘簲鍟嗕唬鐮�,璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_PayableBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": 0
+ , "HMainSourceEntryID": 0
+ , "HMainSourceBillNo": ''
+ , "HMainSourceBillType": '1114'
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].绋庣巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ /*, "HSSNum": checkStatus[0].缁撶畻鍙�*/
+ , "HAccSupID": dataArray[0].HSupID
+ , "HAccSupName": dataArray[0].渚涘簲鍟�
+ , "HSumMoney": dataArray[0].閲戦
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3) //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HInvoiceBillNo_Sub": dataArray[i].鍙戠エ缂栧彿 ? "" : dataArray[i].鍙戠エ缂栧彿
+ , "HReceiveBillInterID": dataArray[i].hmainid
+ , "HReceiveBillEntryID": dataArray[i].hsubid
+ , "HReceiveBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceDate": Format(dataArray[i].鏃ユ湡, "yyyy-MM-dd")
+ , "HSourceMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HSourceMoneyBB": dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , "HInovceExRate": dataArray[i].姹囩巼
+
+ , "HSourceRemark": dataArray[i].琛ㄤ綋澶囨敞
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": '1114'
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': dataArray[i].HPOOrderInterID
+ , 'HPOOrderEntryID': dataArray[i].HPOOrderEntryID
+ , 'HPOOrderBillNo': dataArray[i].HPOOrderBillNo
+
+ , "HSeOrderInterID": dataArray[i].HSeOrderInterID
+ , "HSeOrderEntryID": dataArray[i].HSeOrderEntryID
+ , "HSeOrderBillNo": dataArray[i].HSeOrderBillNo
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ }
+ //#endregion
+
+
//#region 缁撶畻鏂瑰紡閫夋嫨椤甸潰
function get_checkSS() {
layer.open({
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 ec92e1a..b7b835d 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"
@@ -47,6 +47,7 @@
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -498,6 +499,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
//#region 鍒ゆ柇婧愬崟鐘舵��
@@ -615,6 +622,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#BillType").val() == "1102") {
@@ -1303,6 +1311,316 @@
})
}
//#endregion
+
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#BillType").val() == "1102") {
+ url = "../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else if ($("#BillType").val() == "1201") {
+ url = "../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillListQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ //鑾峰彇渚涘簲鍟嗕唬鐮�,璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#BillType").val() == "1102") {
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ option.data = [];//娓呯┖瀛愯〃
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].HManagerID
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ , "HPSStyleID": dataArray[0].HPSStyleID
+ , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠g爜
+ });
+
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': HTaxMoney //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;//鏁伴噺
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#BillType").val() == "1201") {
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/list',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": "0"
+ , "HSSName": ""
+ , "HPSStyleID": dataArray[0].HPSStyleID
+ , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠g爜
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
+ });
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].瀹炴敹鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': HTaxMoney //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//#endregion
//#region 瀛愯〃鍒濆鍖�
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_PayableBillQuery.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_PayableBillQuery.html"
index b9fb0c8..b1f41a9 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_PayableBillQuery.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_PayableBillQuery.html"
@@ -202,7 +202,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -439,7 +439,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -465,8 +465,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -484,6 +484,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_PayableBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -502,7 +503,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1414,13 +1415,26 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1723,7 +1737,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
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_POInStockBillQuery.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_POInStockBillQuery.html"
index be07278..116578f 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_POInStockBillQuery.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_POInStockBillQuery.html"
@@ -216,7 +216,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -460,7 +460,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -486,8 +486,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -505,6 +505,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -523,7 +524,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1488,14 +1489,24 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
-
})
//瀛愯〃鍗曢��
@@ -1797,7 +1808,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
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_POOrderBillQuery.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_POOrderBillQuery.html"
index 100c10f..76e1570 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_POOrderBillQuery.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_POOrderBillQuery.html"
@@ -23,6 +23,7 @@
background: #ceedfa;
color: black
}
+
</style>
</head>
@@ -210,7 +211,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -453,7 +454,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
////鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -463,7 +464,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-330'
+ , height: 'full-300'
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -479,8 +480,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -498,6 +499,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -516,7 +518,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1480,15 +1482,26 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
-
-
+
})
//瀛愯〃鍗曢��
table.on('row(mainTableSub)', function (obj) {
@@ -1789,7 +1802,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
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/Add_Edit_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/Add_Edit_Xs_SeOutStockBillList.html"
index 1878e93..d385499 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/Add_Edit_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/Add_Edit_Xs_SeOutStockBillList.html"
@@ -48,6 +48,7 @@
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius " lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -423,7 +424,25 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1402' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HMakeDate").val(shijian);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+ }
//#endregion
@@ -493,6 +512,12 @@
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
+ });
+ //#endregion
+
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
});
//#endregion
@@ -581,6 +606,7 @@
var ajaxLoad = layer.load();
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
$.ajax({
@@ -852,12 +878,139 @@
//#endregion
+
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- //#region鎵撳嵃
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html";
+ if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
+ return layer.msg('璇烽�夋嫨鍗曟嵁绫诲瀷');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + getSupType().name + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ //鑾峰彇璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#HSourceBillType").val() == "1401") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var checkStatus = data1;
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰缂栫爜);
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+
+ $("#HCusID").val(checkStatus.data[0].HCusID);
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].甯佸埆);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HWHID").val(checkStatus.data[0].涓讳粨搴搃d);
+ $("#HWHName").val(checkStatus.data[0].涓讳粨搴�);
+
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var HQty = checkStatus.data[i].鏁伴噺 - checkStatus.data[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = checkStatus.data[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ option.data.push({
+ "HMaterID": checkStatus.data[i].HMaterID
+ , "鐗╂枡浠g爜": checkStatus.data[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[i].HUnitID
+ , "璁¢噺鍗曚綅": checkStatus.data[i].璁¢噺鍗曚綅
+ , "HWHID": checkStatus.data[i].HWhID
+ , "鍙戣揣浠撳簱": checkStatus.data[i].瀛愪粨搴�
+ , "HQty": HQty,
+ "HPrice": checkStatus.data[i].鍗曚环,
+ "HMoney": HMoney
+ , "HRemark": ""
+ , "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
+ , "HSourceBillType": checkStatus.data[i].HBillType
+ , "HSourceInterID": checkStatus.data[i].hmainid
+ , "HSourceEntryID": checkStatus.data[i].hsubid
+ })
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
+ //#region 鎵撳嵃
function get_PrintReport(data) {
var hmainid = data.field["HInterID"];
console.log(hmainid);
@@ -1012,51 +1165,6 @@
});
}
//#endregion
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '1402' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HMakeDate").val(shijian);
- $("#HMaker").val(sessionStorage["HUserName"]);
- }
- });
- //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
- get_DeptHManage();
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(linterid);
- RoadBillMain(linterid);
- /* RoadBillSub(linterid);*/
- }
-
-
- //閫�鍑�
- form.on('submit(Exit)', function (data) {
- if (linterid == undefined) {
- //鍏抽棴椤电
- Pub_Close(2);
- }
- else {
- //鍏抽棴椤电
- Pub_Close(1);
- }
- });
//#region 淇濆瓨鏂规硶
function set_SaveBill(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 f9321f3..ecf515c 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"
@@ -1016,7 +1016,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
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_SeOutStockBillQuery.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_SeOutStockBillQuery.html"
index 0654a02..ff47c60 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_SeOutStockBillQuery.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_SeOutStockBillQuery.html"
@@ -216,7 +216,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -456,7 +456,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /* get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -482,8 +482,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -501,6 +501,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOutStockBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -519,7 +520,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1487,13 +1488,26 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1796,7 +1810,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
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 e3be052..ad2c02f 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"
@@ -47,6 +47,7 @@
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -484,6 +485,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
//#region 鍒ゆ柇婧愬崟鐘舵��
@@ -601,6 +608,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#BillType").val() == "1401") {
@@ -641,7 +649,7 @@
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃鎴愭湰浠稥ntry 璧嬪��
var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
@@ -778,25 +786,25 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HMangerID": dataArray[0].HManagerID
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
- , "HCusID": dataArray[0].hsupid
+ , "HCusID": dataArray[0].HSupID
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
+ , "HCurID": dataArray[0].涓昏〃甯佸埆id
+ , "HCurName": dataArray[0].涓昏〃甯佸埆
+ , "HExRate": dataArray[0].涓昏〃姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃 璧嬪��
var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
rowdataEntry.push(
{
@@ -1691,6 +1699,406 @@
})
}
//#endregion
+
+
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#BillType").val() == "1401") {
+ url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ HSourceBillName = "閿�鍞鍗�";
+ }
+ else if ($("#BillType").val() == "1205") {
+ url = "../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ HSourceBillName = "閿�鍞嚭搴撳崟";
+ }
+ else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ //鑾峰彇璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#BillType").val() == "1401") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].HManagerID
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCusID": dataArray[0].HCusID
+ , "HCusName": dataArray[0].瀹㈡埛
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ });
+
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
+ //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].HNoTaxCost; //鎴愭湰浠�
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ } else {
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ }
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#BillType").val() == "1205") {
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].HManagerID
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCusID": dataArray[0].hsupid
+ , "HCusName": dataArray[0].瀹㈡埛
+ , "HCurID": dataArray[0].涓昏〃甯佸埆id
+ , "HCurName": dataArray[0].涓昏〃甯佸埆
+ , "HExRate": dataArray[0].涓昏〃姹囩巼
+ , "HSSID": "0"
+ , "HSSName": ""
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ });
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].宸插叧鑱旀暟閲� * 1; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ }
+ else {
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ }
+
+ optionEntry.data = rowdataEntry;
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//#endregion
//#region 瀛愯〃鍒濆鍖�
@@ -3185,15 +3593,15 @@
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HCusID": dataArray[0].hsupid
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
+ , "HCurID": dataArray[0].涓昏〃甯佸埆id
+ , "HCurName": dataArray[0].涓昏〃甯佸埆
+ , "HExRate": dataArray[0].涓昏〃姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃 璧嬪��
var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
@@ -3365,7 +3773,7 @@
function getDecByMaterID(HMaterID) {
var resultData = {};
$.ajax({ // 寮傛璇锋眰
- url: GetWEBURL() + "Gy_Material/getDecByID", //璇锋眰鍦板潃
+ url: GetWEBURL() + "/Gy_Material/getDecByID", //璇锋眰鍦板潃
async: false, //鏄惁寮�鍚紓姝�
type: "GET", //璇锋眰绫诲瀷
data: { //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
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_SeOrderBillQuery.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_SeOrderBillQuery.html"
index 3177b03..9ed6c49 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_SeOrderBillQuery.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_SeOrderBillQuery.html"
@@ -210,7 +210,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -453,7 +453,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -479,8 +479,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -498,6 +498,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOrderBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -516,7 +517,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1483,13 +1484,26 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1792,7 +1806,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 鐘舵�� = '宸插鏍�' ";
}
return addSWhere;
}
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_SellOutBill.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_SellOutBill.html"
index 2e6ae0f..54c973c 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_SellOutBill.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_SellOutBill.html"
@@ -48,6 +48,7 @@
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="btn-print" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -674,6 +675,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 鎵撳嵃鎸夐挳
form.on('submit(btn-print)', function (data) {
get_PrintReport();
@@ -833,6 +840,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#BillType").val() == "1401") {
@@ -1984,6 +1992,314 @@
})
}
//#endregion
+
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#BillType").val() == "1401") {
+ url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else if ($("#BillType").val() == "1402") {
+ url = "../../閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佹敼婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HCusID = $("#HSupID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ //鑾峰彇璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#BillType").val() == "1401") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
+ , "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+ , "HSupID": dataArray[0].HCusID
+ , "HSupName": dataArray[0].瀹㈡埛
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴鐢佃瘽
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰缂栫爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPieceQty": "0"
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼 == "" ? 0 : dataArray[i].绋庣巼
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , "HTaxMoney": dealDoubleToFixed(HTaxMoney, 2)
+ , "HWHID": dataArray[i].HWhID
+ , "鍙戣揣浠撳簱": dataArray[i].瀛愪粨搴�
+ , "HRemark": ""
+
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+
+
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#BillType").val() == "1402") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBill/list',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
+ , "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /* , "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+ , "HSupID": dataArray[0].HCusID
+ , "HSupName": dataArray[0].瀹㈡埛
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴鐢佃瘽
+ , "HSellSID": "0"
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰缂栫爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPieceQty": "0"
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": "0"
+ , "HTaxRate": "0"
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , "HTaxMoney": "0"
+ , "HWHID": dataArray[i].HWHID
+ , "鍙戣揣浠撳簱": dataArray[i].鍙戣揣浠撳簱
+ , "HRemark": ""
+
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+
+
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//#endregion
//#region 瀛愯〃鍒濆鍖�
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_SellOutBillQuery.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_SellOutBillQuery.html"
index 82c980d..aeec93e 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_SellOutBillQuery.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_SellOutBillQuery.html"
@@ -203,7 +203,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -438,7 +438,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -464,8 +464,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -483,6 +483,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_SellOutBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -501,7 +502,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1438,13 +1439,26 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1747,7 +1761,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
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/Add_Edit_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/Add_Edit_Kf_POStockInBillList.html"
index 0658ad3..14fd16d 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/Add_Edit_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/Add_Edit_Kf_POStockInBillList.html"
@@ -51,6 +51,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -537,6 +538,11 @@
get_PrintReport();
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
//閫夋嫨涓氬姟鍛樻寜閽�
form.on('submit(HEmpList)', function () {
get_checkEmp();
@@ -603,6 +609,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#HSourceBillType").val() == "1102") {
@@ -2442,6 +2449,177 @@
}
}
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#HSourceBillType").val() == "1102") {
+ url = "../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else if ($("#HSourceBillType").val() == "1103") {
+ url = "../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + getSupType().name + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ //鑾峰彇渚涘簲鍟嗕唬鐮�,璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#HSourceBillType").val() == "1102") {
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var checkStatus = data1;
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID);
+
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ for (var j = 0; j < checkStatus.data.length; j++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+ "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+ })
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#HSourceBillType").val() == "1103") {
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POInStockBill/list',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ checkStatus = data1;
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+ $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ for (var j = 0; j < checkStatus.data.length; j++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": HNewQty, "HRemark": "",
+ "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+ })
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
var HOrgID = $("#HOrgID").val();
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_POStockInBillListQuery.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_POStockInBillListQuery.html"
index 07d4c25..3266523 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_POStockInBillListQuery.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_POStockInBillListQuery.html"
@@ -209,7 +209,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -446,7 +446,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -567,8 +567,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -586,6 +586,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_POStockInBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -604,7 +605,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
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) {
@@ -1546,13 +1547,26 @@
//#region 琛岀偣鍑讳簨浠�
table.on('row(mainTable)', function (obj) {
+
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1855,7 +1869,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
--
Gitblit v1.9.1