From 07fff6eeaafa82bd187d5da407f6e2c698ea97a4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 20 三月 2024 16:13:26 +0800
Subject: [PATCH] 销售订单下推销售退货单、销售退货单保存：不需要判断源单单据状态
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 18 +++++++++---------
WebTM/views/销售管理/销售退货单/Kf_ICStockBackBill.html | 22 +++++++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 45b4893..faecb34 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -1000,16 +1000,16 @@
, "HSourceBillType": "1401"
}
dataArray.push(temp);
- if (data[i].鐘舵�� != "宸插鏍�") {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
- layer.alert(err, { icon: 5 });
- return;
- }
+ //if (data[i].鐘舵�� != "宸插鏍�") {
+ // var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ // layer.alert(err, { icon: 5 });
+ // return;
+ //}
- if (data[i].琛岀姸鎬� == "宸插叧闂�") {
- layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
- return;
- }
+ //if (data[i].琛岀姸鎬� == "宸插叧闂�") {
+ // layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ // return;
+ //}
if (data[i].瀹㈡埛 != HCusName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
index e0c8553..132d607 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
@@ -199,7 +199,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍑哄簱浠撳簱</label>
+ <label class="layui-form-label">鍏ュ簱浠撳簱</label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -551,13 +551,13 @@
if (HSourceBillData == null) {
layer.alert("淇濆瓨澶辫触!绗�" + (i+1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
- } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
- var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
- layer.alert(err, { icon: 5 });
- return;
- } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
- return;
+ //} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+ // var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ // layer.alert(err, { icon: 5 });
+ // return;
+ //} else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+ // layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+ // return;
}
} else {
return;
@@ -1370,15 +1370,15 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID"}//f7
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
- , { field: 'HQty', title: '瀹炲彂鏁伴噺', width: 100, totalRow: true, edit: 'text', event: "HQty" }
+ , { field: 'HQtyMust', title: '搴旈��鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+ , { field: 'HQty', title: '瀹為��鏁伴噺', width: 100, totalRow: true, edit: 'text', event: "HQty" }
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text', event: "HPrice" }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text', event: "HTaxPrice" }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HTaxMoney', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HWHID', title: 'HWHID', width: 100, edit: 'text', hide: true, style: 'background-color:#efefef4d;' }
- , { field: '鍙戣揣浠撳簱', title: '鍙戣揣浠撳簱', width: 100, edit: 'text', event: "HWHID" }
+ , { field: '鍙戣揣浠撳簱', title: '鍏ュ簱浠撳簱', width: 100, edit: 'text', event: "HWHID" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { field: 'HQty_Full', title: '婊¤溅閲嶉噺', width: 100, edit: 'text', event: "HQty_Full", hide: true }
--
Gitblit v1.9.1