From b00c147dbc4da3d6104333f876a2bc74031af1cd Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 06 三月 2024 17:29:43 +0800
Subject: [PATCH] 1.优化其他应收单,2.客户应收账款明细分析报表：双击弹窗，根据单据类型，显示单据明细(即显示单据的编辑页面)分别是 销售出库单和收款单3.发货通知单编辑功能完善： 增加 选择源单（销售订单） 的功能，点击 选单按钮， 弹出 销售订单列表， 选择要下推的销售订单（可多选），点击确定，将数据返回至界面，保存单据时 ，将 源单主内码，子内码，源单号，源单类型存入。 保存方法中，增加 反写关联数量至 销售订单的 存储过程。如果 销售订单的关联数量等于或超过了订单数量则 关闭 该行，如果全部行都行关闭了，则 关闭该整个 订单。 发货通知单列表： 单据删除时， 编制存储过程，撤销该发货通知单 源单的关联数量。 如果 销售订单的关联数量等于或超过了订单数量则 关闭 该行，反之则 反关闭 ，如果全部行都行关闭了，则 关闭该整个 订单， 反之则 反关闭。
---
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 2
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 10 +
WebTM/views/基础资料/公用基础资料/Gy_ProjectMoney.html | 82 +++++++---
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 9 +
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 171 +++++++++++++++++++--
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.htmlList.html | 60 ++++---
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 9
WebTM/views/应收管理/报表分析/YS_CusShouldIncomeEntryReport.html | 96 ++++++++++++
8 files changed, 365 insertions(+), 74 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html"
index 956c712..037d341 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProjectMoney.html"
@@ -125,7 +125,6 @@
//#endregion
-
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -179,7 +178,7 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(1);
});
// 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -214,8 +213,12 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display(sWhere);
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
+
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -307,7 +310,7 @@
layer.close(index);
}
//蹇�熸煡璇�
- function get_FastQuery() {
+ function get_FastQuery(number) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
@@ -386,24 +389,28 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var hID = data[0].HItemID.toString();
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫椤圭洰璐圭敤'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
+ if (data[0].瀹℃牳浜� == "" && data[0].瀹℃牳浜� == null && data[0].绂佺敤浜� == "" && data[0].绂佺敤浜� == null ) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫椤圭洰璐圭敤'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -518,8 +525,33 @@
}
//#endregion
-
-
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+ if (openType == 2) {
+ sWhere += " and ISNULL(瀹℃牳浜�,'') != '' ";
+
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
index 9fe7c5a..d68e023 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/YS_CusShouldIncomeEntryReport.html"
@@ -295,6 +295,102 @@
});
//#endregion
+ //#region 鍙屽嚮杩涘叆缂栬緫
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+ var HBillNo = obj.data["鍗曟嵁鍙�"];
+ var sWhere = "";
+
+ if (obj.data.鍗曟嵁绫诲瀷 == "閿�鍞嚭搴撳崟") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var linterid = data1.data[0].hmainid
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫閿�鍞鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=10'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+
+ else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ } else if (obj.data.鍗曟嵁绫诲瀷 == "鏀舵鍗�") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ $.ajax({
+ url: GetWEBURL() + '/YS_ReceiveBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var linterid = data1.data[0].hmainid
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫閿�鍞鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=10'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+ }else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ });
+ //#endregion
+
//#region 瀵煎嚭Execel
function get_Export() {
table.exportFile(ins.config.id, option.data, "xls");
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 734f3f0..f0e2207 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -103,7 +103,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">椤圭洰璐圭敤</label>
+ <label class="layui-form-label">椤圭洰璐圭敤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HProjectMoneyName" id="HProjectMoneyName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HProjectMoneyID" id="HProjectMoneyID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -113,7 +113,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戠エ绫诲瀷</label>
+ <label class="layui-form-label">鍙戠エ绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HType" id="HType" lay-filter="HType" style="width:190px;">
</select>
@@ -128,25 +128,25 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">涓嶅惈绋庨噾棰�</label>
+ <label class="layui-form-label">涓嶅惈绋庨噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">绋庣巼</label>
+ <label class="layui-form-label">绋庣巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off" >
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎬婚噾棰�</label>
+ <label class="layui-form-label">鎬婚噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁忔墜浜�</label>
+ <label class="layui-form-label">缁忔墜浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -317,6 +317,11 @@
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
OperationType = 1;
+
+
+ //鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇 閮ㄩ棬 缁忔墜浜�
+ getCzyglByUser();
+
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -471,7 +476,10 @@
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+
});
//#endregion
@@ -679,9 +687,11 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCusID").val(checkStatus.data[0].瀹㈡埛ID);
- $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О );
-
+ $("#HCusName").val(checkStatus.data[0].HName);
+ $("#HCusID").val(checkStatus.data[0].HItemID);
+ var HCusID=$("#HCusID").val();
+ getHTaxRateByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
+ getCustomerByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜�,绋庣巼
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -697,7 +707,7 @@
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰璐圭敤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "yes"]
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -733,6 +743,52 @@
}
//#endregion
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+ //#region 琛ㄥご鏁版嵁妫�楠�
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HAccDate").val() == "") {
+ layer.msg("鏀舵鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HCusID").val() == "") {
+ layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HProjectMoneyID").val() == "0") {
+ layer.msg("璐圭敤椤圭洰鏈�夋嫨!");
+ return false;
+ }
+ if ($("#HType").val() == "") {
+ layer.msg("鍙戠エ绫诲瀷鏈�夋嫨!");
+ return false;
+ }
+ if ($("#HEmpID").val() == "0") {
+ layer.msg("缁忔墜浜烘湭閫夋嫨!");
+ return false;
+ }
+ if ($("#HMoney").val() == "0") {
+ layer.msg("涓嶅惈绋庨噾棰濅笉鑳戒负闆�");
+ return false;
+ }
+ if ($("#HTaxRate").val() == "0") {
+ layer.msg("绋庣巼涓嶈兘涓洪浂");
+ return false;
+ }
+ if ($("#HSumMoney").val() == "0") {
+ layer.msg("鎬婚噾棰濅笉鑳戒负闆�");
+ return false;
+ }
+ return true;
+ }
+ //#endregion
//#endregion
//#region 淇濆瓨HMaker
@@ -861,8 +917,87 @@
//#endregion
-
-
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
+ function getHTaxRateByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ $("#HTaxRate").val(data.HTaxRate);
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇閮ㄩ棬 缁忔墜浜�
+ function getCzyglByUser() {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCzyglByUser",
+ async: false,
+ type: "GET",
+ data: {
+ "CurUserName": sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HEmpID").val(data.HEmpID); //缁忔墜浜篿d
+ $("#HEmpName").val(data.HEmpName); //缁忔墜浜�
+ $("#HDeptID").val(data.HDeptID); //閮ㄩ棬id
+ $("#HDeptName").val(data.HDeptName); //閮ㄩ棬
+
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜� 绋庣巼
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HCusID").val(data.HCusID);
+ $("#HCusName").val(data.HCusName);
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HTaxRate").val(data.HTaxRate);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//#endregion
@@ -880,11 +1015,11 @@
$("#HEmpID").val(obj[0].HItemID);
}
- function GetHSupValue(obj) //杩斿洖瀹㈡埛
- {
- $("#HCusName").val(obj[0].HName);
- $("#HCusID").val(obj[0].HItemID);
- }
+ //function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ //{
+ // $("#HCusName").val(obj[0].HName);
+ // $("#HCusID").val(obj[0].HItemID);
+ //}
</script>
</body>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
index b294891..6a1fc52 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
@@ -254,18 +254,24 @@
});
var linterid = obj.data["hmainid"];
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏀舵鍗�-缂栬緫'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , btn: ['纭畾'],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
+ if (obj.data.鍗曟嵁鐘舵�� == "鍒涘缓") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏀舵鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.alert('鍗曟嵁涓嶆槸鍒涘缓鐘舵��,涓嶈兘杩涜缂栬緫');
+ }
+
});
//#endregion
@@ -476,19 +482,23 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
- , btn: [],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
+ if (data[0].鍗曟嵁鐘舵�� =="鍒涘缓") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+ }
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
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 d86564a..18a2866 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"
@@ -701,7 +701,7 @@
]]
}
- option.data = rowdata;
+ option.data = [];
table.render(option);
}
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 1bb25bd..acb1321 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"
@@ -266,6 +266,9 @@
, { field: '鎽樿', title: '鎽樿', sort: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', sort: true, hide: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', sort: true, hide: true }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', sort: true, hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 125, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
@@ -388,12 +391,16 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HsupId = data[0].hsubid;
+ var HQty = data[0].鏁伴噺;
+ var HSourceInterID = data[0].婧愬崟涓诲唴鐮�;
+ var HSourceEntryID = data[0].婧愬崟瀛愬唴鐮�;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
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 7eba075..58231e4 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"
@@ -86,7 +86,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
@@ -428,7 +428,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+ var closeType = params[params[3]];//瀹㈡埛搴旀敹璐︽鏄庣粏 鍙屽嚮寮圭獥寮瑰嚭鍙兘鏌ョ湅涓嶈兘缂栬緫 绂佺敤鎸夐挳
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -464,6 +464,11 @@
getCzyglByUser();
}
else if (OperationType == 3) { //缂栬緫
+ if (closeType == 10) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+
+ }
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
}
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 322a446..740f8ff 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"
@@ -46,8 +46,8 @@
<div class="layui-card-header">
<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="btn-print">鎵撳嵃</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="Exit">閫�鍑�</button>
</div>
</div>
@@ -469,6 +469,7 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]];//瀹㈡埛搴旀敹璐︽鏄庣粏 鍙屽嚮寮圭獥寮瑰嚭鍙兘鏌ョ湅涓嶈兘缂栬緫 绂佺敤鎸夐挳
}
//#endregion
@@ -489,6 +490,11 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) { //缂栬緫
+ if (closeType == 10) {
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#btn-print').addClass("layui-btn-disabled").attr("disabled", true);
+ }
//淇敼鏃朵富琛↖D
$("#HInterID").val(linterid);
--
Gitblit v1.9.1