From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index 4ce0ddb..defdbba 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -1161,6 +1161,17 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);
+ return;
+ }
+ }
setReceivableBill(checkStatus);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -1195,7 +1206,7 @@
"HMainSourceInterID": 0
, "HMainSourceEntryID": 0
, "HMainSourceBillNo": ''
- , "HMainSourceBillType": '1114'
+ , "HMainSourceBillType": '1426'
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
@@ -1241,7 +1252,7 @@
, "HSourceInterID": dataArray[i].hmainid
, "HSourceEntryID": dataArray[i].hsubid
, "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
- , "HSourceBillType": 1114
+ , "HSourceBillType": 1426
, "HRelationQty": "0"
, "HRelationMoney": "0"
@@ -1315,7 +1326,11 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
- layer.msg("鎻愪氦鎴愬姛");
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
});
}
else {
@@ -1427,7 +1442,7 @@
, "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�
, "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�
, "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
- , "HSourceBillType": 1114
+ , "HSourceBillType": result.data[i].婧愬崟绫诲瀷
, "HRelationQty": result.data[i].鍏宠仈鏁伴噺
, "HRelationMoney": result.data[i].鍏宠仈閲戦
@@ -1733,7 +1748,7 @@
for (var i = 0; i < option.cols[0].length - 1; i++) {
var dataCols = dataCol[j].split('|');
//閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[4]) {
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
--
Gitblit v1.9.1