From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 160 +++++++++++++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 73 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 45818a3..01d79ec 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -77,29 +77,11 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="margin-bottom:5px">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐*</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浣跨敤缁勭粐*</label>
- <div class="layui-input-inline" style="margin-bottom: -15px;">
- <div class="layui-form">
- <div class="layui-form-item">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
+ <div class="layui-form-item" style="margin-bottom:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
</div>
</div>
<div class="layui-inline">
@@ -109,9 +91,31 @@
</div>
</div>
<div class="layui-row">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" >鍒涘缓缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style="width: 265%;">
+ <select name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" >浣跨敤缁勭粐*</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style="width: 265%;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -385,13 +389,16 @@
set_AddFNew();
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
- $("#HCreateID").attr("disabled", true);
+ $("#HCreateOrgID").attr("disabled", true);
+
+ //璁剧疆瀹㈡埛浠ｇ爜
+ //set_CusNumber_Add();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
- $("#HCreateID").attr("disabled", true);
+ $("#HCreateOrgID").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -399,23 +406,7 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛�
- //閫夋嫨鍒涘缓缁勭粐
- form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
- var sMainStr = JSON.stringify(data.field);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缁勭粐'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
+
//缁撶畻鏂瑰紡寮圭獥
form.on('submit(btnSearchProc)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -427,7 +418,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/SettleStyleInformation.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -470,12 +461,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '缁撶畻鏂瑰紡鍒楄〃',
+ title: '璐у竵鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/CurrencyInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -485,7 +476,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCurName").val(checkStatus.data[0].HName);
+ $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
$("#HCurID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -507,12 +498,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '缁撶畻鏂瑰紡鍒楄〃',
+ title: '瀹㈡埛鍒嗙被鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/CustomerTypeInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CusType.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -522,7 +513,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCusTypeName").val(checkStatus.data[0].HName);
+ $("#HCusTypeName").val(checkStatus.data[0].瀹㈡埛鍒嗙被鍚嶇О);
$("#HCusTypeID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -544,12 +535,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '缁撶畻鏂瑰紡鍒楄〃',
+ title: '瀹㈡埛鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/AreaInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_AreaSet.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -559,7 +550,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HAreaName").val(checkStatus.data[0].HName);
+ $("#HAreaName").val(checkStatus.data[0].鍦板尯鍚嶇О);
$("#HAreaID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -591,6 +582,8 @@
}
$("#HUSEORGID").append(Organization);
$("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ $("#HCreateOrgID").append(Organization);
+ $("#HCreateOrgID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -598,23 +591,6 @@
})
}
- //閫夋嫨浣跨敤缁勭粐
- form.on('submit(HUseOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
- var sMainStr = JSON.stringify(data.field);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缁勭粐'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
//閫夋嫨瀹㈡埛绫诲瀷
dropdown.render({
elem: '#HCusStatus'
@@ -738,6 +714,31 @@
//#region 姝ら〉闈腑鎵�鏈夌殑鏂规硶
+ //#region 鏂板鏃惰幏鍙栧鎴蜂唬鐮�
+ function set_CusNumber_Add() {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Customer/getMaxCusNumber",
+ type: "GET",
+ data: {
+
+ },
+ success: function (d) {
+ if (d.code == "1") {
+ var HCusNumberLength = d.data[0].HNumber.length;
+ var HCusNumber = d.data[0].HNumber * 1 + 1;
+ while (HCusNumber.length < HCusNumberLength)
+ {
+ HCusNumber += "0";
+ }
+ $("#HNumber").val(HCusNumber);
+ } else {
+ layer.msg(d.Message);
+ }
+ }
+ });
+ }
+ //#endregion
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
$.ajax({
@@ -746,7 +747,7 @@
data: {},
success: function (d) {
$("#HInterID").val(d.data[0].hitemid);
- $("input[name='HStopflag']").prop("checked", 'true');//true:閫変腑 false:涓嶉�変腑
+ //$("input[name='HStopflag']").prop("checked", 'false');//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
}
});
@@ -816,6 +817,19 @@
layer.msg("璇疯緭鍏ュ鎴峰悕绉帮紒", { icon: 5 });
return false;
}
+
+ var HTaxRate = $('#HTaxRate').val();
+ if (HTaxRate.substring(HTaxRate.length - 1, HTaxRate.length) == ".") {
+ layer.msg("澧炲�肩◣鐜囩殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HTaxRate)) {
+ layer.msg("澧炲�肩◣鐜囪杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
//var HTaxRate = $("#HTaxRate").val();
//if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
// layer.msg("澧炲�肩◣鐜囦笉寰椾负绌猴紒", { icon: 5 });
--
Gitblit v1.9.1