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/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMainList.html | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMainList.html"
index 9914bb9..fc2450f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMainList.html"
@@ -100,6 +100,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTCheck"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉楠屾敹鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -128,7 +129,7 @@
, laydate = layui.laydate
var option = [];
var sWhere = "";
- var HModName = "OA_ErrMsgBackReceiveBillMainList";
+ var HModName = "OA_ErrMsgBackHandleBillMainList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["hmainid", "HDeptID", "HReceiveID", "HErrMsgBackTypeID", "HEquipID", "HMouldID", "HSignEmpID","HHandleEmpID"];
@@ -198,10 +199,14 @@
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn-Drop':
set_DropBill(0);
- break;
+ break;
//鍙嶄綔搴熸寜閽�
case 'btn-DeDrop':
set_DropBill(1);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'btn-XTCheck':
+ set_XTCheck(1);
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -291,7 +296,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackSignBillList',
+ url: GetWEBURL() + '/Sc_MESTransFerWorkBill/Get_OA_ErrMsgBackHandleBillList',
async: false,
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
@@ -339,7 +344,9 @@
layer.close(ajaxLoad);
-
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -462,6 +469,27 @@
}
//#endregion
+ //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+ function set_XTCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏂板寮傚父鍙嶉楠屾敹鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=&HSouceBillType=' + 4531 + ''
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ }
//#region 鍒犻櫎
function set_DeleteBill() {
@@ -473,7 +501,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackSignBill',
+ url: GetWEBURL() + 'Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackHandleBill',
type: "GET",
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -520,7 +548,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackSignBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/AuditOA_ErrMsgBackHandleBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -556,7 +584,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Sc_MESTransFerWorkBill/CloseOA_ErrMsgBackSignBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MESTransFerWorkBill/CloseOA_ErrMsgBackHandleBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -592,7 +620,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackSignBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Sc_MESTransFerWorkBill/DeleteOA_ErrMsgBackHandleBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -737,6 +765,21 @@
}
//#endregion
+
+ //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
--
Gitblit v1.9.1