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_ClassTimePrjList.html | 144 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 25 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
index 1c2aed4..77e7c9f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrjList.html"
@@ -118,10 +118,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Cell" id="btn_Cell"style="float:right"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RefreshCell" id="btn_RefreshCell"style="float:right"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme" style="float:right"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme" style="float:right"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton" style="float:right"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn" style="float:right"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
</form>
@@ -136,7 +136,7 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
- //#region 鍏叡鍙橀噺
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -154,9 +154,12 @@
var columns = "";
var HModName = "Gy_ClassTimePrjList";
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var Type = params[params[0]];
+ var OperationType = params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
//#endregion
- //#region 銆愯繃婊ゆ柟妗堛��
+ //#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
@@ -169,7 +172,7 @@
//#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -180,11 +183,14 @@
set_StockOrg();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鍒锋柊
- sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
- get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
+ //浠庡叾浠栨ā鍧楁墦寮�鍩虹璧勬枡鍒楄〃 缁勭粐涓哄綋鍓嶇粍缁囦笖涓嶅彲缂栬緫
+ if (OperationType == 2) {
+ $("#HStockOrgID").val(sessionStorage["Organization"]) //缁勭粐
+ $("#HStockOrgID").attr("disabled", true);
+ form.render('select');
+ }
}
//#endregion
@@ -215,7 +221,8 @@
form.render('select');
}
layer.closeAll("loading");
- }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
})
}
//#endregion
@@ -259,7 +266,9 @@
else {
layer.alert(data1.Message, { icon: 5 });
}
- }, error: function (e) {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (e) {
layer.alert(e.Message, { icon: 5 });
}
});
@@ -337,11 +346,58 @@
} else {
table.render(option);
}
- }, error: function () {
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HModName, HModName, HMaker);
+
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
}
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ switch (Type) {
+ case "HClassTimePrj": //琛ㄥご鍙屽嚮杩斿洖
+ parent.GetHClassTimePrjValue(data);
+ break;
+ case "HClassTimePrjList": //鍒楄〃鍙屽嚮杩斿洖
+ var dataList = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetHClassTimePrjListValue(dataList);
+ break;
+ }
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
//#endregion
//#endregion
@@ -479,7 +535,9 @@
layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
layer.close(wait);
}
- }, error: function (err) {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
layer.close(wait);
}
@@ -523,7 +581,9 @@
} else {
layer.alert(result.Message, { icon: 5 });
}
- }, error: function () {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -564,7 +624,9 @@
} else {
layer.alert(result.Message, { icon: 5 });
}
- }, error: function () {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -605,7 +667,9 @@
} else {
layer.alert(data1.Message, { icon: 5 });
}
- }, error: function (e) {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (e) {
layer.alert(e.Message, { icon: 5 });
}
});
@@ -647,7 +711,9 @@
} else {
layer.alert(data1.Message, { icon: 5 });
}
- }, error: function (e) {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (e) {
layer.alert(e.Message, { icon: 5 });
}
});
@@ -737,11 +803,18 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- if (HStockOrgName =="鍏ㄩ儴") {
- sWhere = "1=1";
+ //鐩存帴鍒楄〃鎵撳紑
+ if (OperationType == undefined || OperationType == 1) {
+ if (HStockOrgName == "鍏ㄩ儴") {
+ sWhere = "1=1";
+ }
+ else {
+ sWhere = "缁勭粐='" + HStockOrgName + "'";
+ }
}
+ //浠庡叾浠栨ā鍧楁墦寮�鍩虹璧勬枡鍒楄〃
else {
- sWhere = "缁勭粐='" + HStockOrgName + "'";
+ sWhere = "HUSEORGID=" + sessionStorage["OrganizationID"];
}
if (ColName != 0 && Comparator != 0) {
@@ -781,12 +854,20 @@
//#region 鍒楄〃鍒锋柊
function get_Display(sWhere) {
+ //鐩存帴鍒楄〃鎵撳紑
+ if (OperationType == undefined || OperationType == 1) {
+ OperationType = 1;
+ }
+ //浠庡叾浠栨ā鍧楁墦寮�鍩虹璧勬枡鍒楄〃
+ else {
+ sWhere += " and 绂佺敤鏍囪='' and 瀹℃牳浜�<>''";
+ }
var ajaxLoad = layer.load();
$.ajax({
type: "GET",
url: GetWEBURL() + '/Gy_ClassTimePrjController/GetGy_ClassTimePrjList_Json',
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sWhere": sWhere, "HMaker": HMaker },
+ data: { "sWhere": sWhere, "HMaker": HMaker, "OperationType": OperationType },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -839,6 +920,11 @@
ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HModName, HModName, HMaker);
+
layer.close(ajaxLoad);
//鑷畾涔夎繃婊や笅鎷夋鍔犺浇
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -849,6 +935,7 @@
layer.alert(data1.Message, { icon: 5 });
}
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function () {
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -877,8 +964,9 @@
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
function get_DefaultModule() {
$.ajax({
- url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
type: "GET",
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
success: function (data1) {
if (data1.count == 1) {
@@ -913,7 +1001,9 @@
get_FastQuery();
form.render("select");
}
- }, error: function () {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -1024,6 +1114,7 @@
}
layer.closeAll("loading");
},
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
error: function (err) {
@@ -1081,6 +1172,7 @@
//#endregion
//#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
@@ -1114,7 +1206,9 @@
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
- }, error: function () {
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function () {
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
--
Gitblit v1.9.1