From 7df042662e1929abdd667cfd7b037f4e10e8c2ad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 三月 2024 11:27:56 +0800
Subject: [PATCH] 其他应付单 增加子表保存,目录放到采购管理,其他入库单编辑模块 并完善 其他出库单 列表功能；（ 常规 功能， 新增，修改，删除，审核，作废，关闭，自定义过滤，源单类型列表（源单 手工录入）， 合计行，保存控制，审核控制，删除控制，关联数回填 等等 ） （注： 基础资料选择， 均用 基础资料列表 的方式）
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 236 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 188 insertions(+), 48 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/Add_Edit_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/Add_Edit_Xs_SeOrderBillList.html"
index 8d04915..907dbe1 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/Add_Edit_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/Add_Edit_Xs_SeOrderBillList.html"
@@ -145,6 +145,15 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
+ <div class="layui-input-inline">
+ <select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="0">鏅�氬崟鎹�</option>
+ <option style="color:blue;" value="1">杩斾慨鍗曟嵁</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -736,20 +745,49 @@
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
- //鎭㈠鏁版嵁鍒扮紪杈戝墠
- obj.update({
- HPrice: oldText
- });
- table.render(option);
+ if ($("#HBillSubType").val() == "0") {
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
- setSelectHisStockGoodsByTableRender();
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- return;
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ } else {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
}
-
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
@@ -846,18 +884,48 @@
case "HTaxPrice": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp)) {
- //鎭㈠鏁版嵁鍒扮紪杈戝墠
- obj.update({
- HTaxPrice: oldText
- });
- table.render(option);
+ if ($("#HBillSubType").val() == "0") {
+ if (!ref.test(temp) || temp == "0") {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
- setSelectHisStockGoodsByTableRender();
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
- layer.msg("鍚◣鍗曟嵁璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
- return;
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ } else {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
@@ -937,6 +1005,39 @@
if (HEarnestRate != 0) {
HEarnestRateTemp = HEarnestRate;
+ }
+ });
+ //#endregion
+
+ //#region 閿�鍞鍗曠被鍨嬩笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HBillSubType)', function (data) {
+ if ($("#HBillSubType").val() == "0") {
+ //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+ for (var i = 1; i <= option.data.length; i++) {
+ option.data[i - 1].HisStockGoods = "false";
+ }
+ //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+ var HisStockGoodsList = '<option value="false">鍚�</option>';
+ HisStockGoodsList += '<option value="true">鏄�</option>';
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HisStockGoods' + i + '').empty();
+ $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+ $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+ }
+ form.render('select');
+ } else if ($("#HBillSubType").val() == "1") {
+ //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+ for (var i = 1; i <= option.data.length; i++) {
+ option.data[i - 1].HisStockGoods = "true";
+ }
+ //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+ var HisStockGoodsList = '<option value="true">鏄�</option>';
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HisStockGoods' + i + '').empty();
+ $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+ $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+ }
+ form.render('select');
}
});
//#endregion
@@ -1071,9 +1172,9 @@
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text' }
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: 'HCusMaterNumber', title: '瀹㈡埛鐗╂枡缂栫爜', width: 100, edit: 'text' }
, { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', width: 100, edit: 'text' }
- , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
@@ -1210,6 +1311,7 @@
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
, "HEarnestRate": data.瀹氶噾姣斾緥
+ , "HBillSubType": data.HBillSubType
, "HManagerID": data.HManagerID
, "HManagerName": data.涓荤
, "HSellSID": data.HSellSID
@@ -1337,7 +1439,10 @@
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
+ , btn2: function (index, layero) {
+ $("#HEmpName").val("");
+ $("#HEmpID").val("0");
+ }
})
}
//#endregion
@@ -1626,6 +1731,11 @@
return false;
}
+ if ($("#HBillSubType").val() != "0" && $("#HBillSubType").val()!="1") {
+ layer.msg("璇烽�夋嫨閿�鍞鍗曠被鍨�!");
+ return false;
+ }
+
//if ($("#HSellSID").val() == "0") {
// layer.msg("閿�鍞柟寮忔湭閫夋嫨!");
// return false;
@@ -1675,13 +1785,21 @@
//鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1"){
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
+
//绋庣巼鏍煎紡鏍￠獙
temp = option.data[i]["HTaxRate"] + "";
@@ -1692,32 +1810,54 @@
//鍚◣鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HTaxPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1"){
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
+
//閲戦鏍煎紡鏍￠獙
temp = option.data[i]["HMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
//浠风◣鍚堣鏍煎紡鏍￠獙
temp = option.data[i]["HlineTotal"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
if (option.data[i]["HDate"] == "") {
@@ -2239,7 +2379,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠ｇ爜","閿�鍞嚭搴撴暟閲�","閿�鍞嚭搴撳鏍告暟閲�","閿�鍞嚭搴撳鏍搁噾棰�","鐢熶骇鏁伴噺","閿�鍞��搴撴暟閲�","閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- titleData = [];
+ //titleData = [];
dataCol = data1.data[0].HGridString.split(',');
--
Gitblit v1.9.1