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/生产管理/生产任务单/Sc_ICMOBillList.html | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 448 insertions(+), 24 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index cecbb27..457afb3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -92,11 +92,19 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px;display:none;">閲嶇疆</button>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
-
+
</div>
<div class="layui-colla-content">
<div class="layui-row">
@@ -143,6 +151,60 @@
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
+ <label class="layui-form-label">杩囨护1</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护2</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
@@ -165,7 +227,7 @@
</div>
</div>
</div>
- </div>
+ </div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<!--<div class="layui-btn-container">
@@ -196,10 +258,13 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOChangeBill" id="btn-PushICMOChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductInBill" id="btn-PushProductInBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇鍏ュ簱鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushQualityReportBill" id="btn-PushQualityReportBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璐ㄩ噺姹囨姤鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductionReturnBill" id="btn-PushProductionReturnBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇閫�搴撳崟)</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit_NT" id="Edit_NT"><i class="layui-icon layui-icon-form"></i>缂栬緫(鏃犲垪琛�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>澶嶅埗(鏃犲垪琛�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
@@ -251,12 +316,13 @@
var sWhere = "";
var HModName = "Sc_ICMOBillList";
var HDeptID = 0;
-
+
var params = getUrlVars();
var HDeptID = params[params[0]];
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
-
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData = [];
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -267,10 +333,10 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
- var HClassTag = "ForFilteringSchemes";
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
- window.HModuleName = "鐢熶骇璁㈠崟";
+ window.HModuleName = "鐢熶骇璁㈠崟";
//鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -280,6 +346,9 @@
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
+
+ //鑾峰彇缁勭粐
+ Organ();
//鑾峰彇杞﹂棿鍒�
var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
@@ -337,6 +406,15 @@
break;
//涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)
case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
+ break;
+ //涓嬫帹(鐢熶骇鍏ュ簱鍗�)
+ case 'btn-PushProductInBill': set_PushProductInBill();
+ break;
+ //涓嬫帹(鐢熶骇璐ㄩ噺姹囨姤鍗�)
+ case 'btn-PushQualityReportBill': set_PushQualityReportBill();
+ break;
+ //涓嬫帹(鐢熶骇閫�搴撳崟)
+ case 'btn-PushProductionReturnBill':set_PushProductionReturnBill();
break;
//鏂板
case 'set_AddNew': set_AddNew();
@@ -445,6 +523,29 @@
get_FastQuery();
});
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//琛岀洃鍚簨浠�
table.on('row(mainTable)', function (obj) {
var flag = !obj.tr.find(':checkbox:first').prop('checked');
@@ -475,13 +576,13 @@
//#endregion
//#region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ get_DefaultModule();
}
//#endregion
@@ -591,6 +692,7 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', sort: true }
+ //, { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
, { field: '瀹㈡埛', title: '瀹㈡埛', sort: true }
@@ -679,6 +781,66 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ //var data = [];
+ //var col = [];
+ ////缁欑┖鐨勬暟缁勮祴鍊�
+ //for (var key in data1.list) {
+ // //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ // data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ // //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ // var patrn = new RegExp(/^h/i);
+ // if (patrn.test(data1.list[key].ColmCols)) {
+ // titleData[key] = data1.list[key].ColmCols;
+ // }
+ //}
+ ////鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+ //for (var i = 0; i < data.length; i++) {
+ // // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ // if ($.inArray(data[i].name, titleData) > -1) {
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ // }
+ // else {
+ // switch (data[i].Type) {
+ // //int
+ // case 'DateTime':
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ // break;
+ // case 'long':
+ // case 'Int32':
+ // case 'Int64':
+ // case 'double':
+ // case 'Decimal':
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ // break;
+ // default:
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ // }
+ // }
+ //}
+
+ ////鍔ㄦ�佹樉绀哄垪鍚�
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 'full-120'
+ // , page: true
+ // , limits: [50, 500, 5000, 50000]
+ // , limit: 50
+ // , cellMinWidth: 90
+ // , done: function (res, curr, count) {
+ // soulTable.render(this);
+ // }
+ //}
+ //ins = table.render(option);
+
+ ////鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+
option.data = data1.data;
ins = table.render(option);
layer.close(ajaxLoad);
@@ -721,6 +883,13 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -742,6 +911,52 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com;
+ }
+
+
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com;
}
//浼犻�掔殑鍙傛暟涓嶄负NAN
@@ -800,7 +1015,7 @@
if (GetDataCols != "") {
sWhere += GetDataCols;
}
-
+ sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -824,6 +1039,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
}
@@ -979,6 +1200,160 @@
}
//#endregion
+
+ //#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
+ function set_PushProductInBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length > 0) {
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ var temp = {
+ "hmainid": data[i].hmainid
+ , "hsubid": data[i].hsubid
+ , "HBillStatus": data[i].鍗曟嵁鐘舵��
+ , "HSourceBillType": "3710"
+ }
+ dataArray.push(temp);
+ if (data[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鍗曟嵁鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+
+ if (data[i].琛岀姸鎬� != "" ) {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+ }
+
+ var datajson = {
+ "data": dataArray
+ };
+
+ var url = encodeURI('../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=4&linterid=0&HSouceBillType=3710&res=' + JSON.stringify(datajson))
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璁㈠崟-涓嬫帹鐢熶骇鍏ュ簱鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: url
+ , btn: [],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+ //#endregion
+
+ //#region 涓嬫帹(鐢熶骇璐ㄩ噺姹囨姤鍗�)
+ function set_PushQualityReportBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ var HEntryID = data[0].hsubid.toString();
+
+ //#region 鍒ゆ柇婧愬崟鐘舵��
+ var HSourceBillData = "";
+ var HSourceBillData = getSourceBillStatus_ICMOBill(hID); //鑾峰彇婧愬崟鏁版嵁
+ if (HSourceBillData != "none") {
+ if (HSourceBillData.length == 0) {
+ layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌鐢熶骇璁㈠崟鍗曟嵁!", { icon: 5 });
+ return;
+ } else if (HSourceBillData[0]["鍗曟嵁鐘舵��"] != "宸插鏍�") {
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氱敓浜ц鍗曞崟鎹姸鎬佷负鈥�" + HSourceBillData[0]["鍗曟嵁鐘舵��"] + "鈥濓紝涓嶅厑璁镐笅鎺ㄧ敓浜ц川閲忔眹鎶ュ崟锛�";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+ } else {
+ return;
+ }
+ //#endregion
+
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嬫帹-鐢熶骇璐ㄩ噺姹囨姤鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=4&linterid=' + hID + '&HSouceBillType=3710&closeType=1&HEntryID=' + HEntryID
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 涓嬫帹锛堢敓浜ч��搴撳崟锛�
+ function set_PushProductionReturnBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length > 0) {
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ var temp = {
+ "hmainid": data[i].hmainid
+ , "hsubid": data[i].hsubid
+ , "HBillStatus": data[i].鐘舵��
+ , "HSourceBillType": "3710"
+ }
+ dataArray.push(temp);
+ if (data[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鍗曟嵁鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+
+ if (data[i].琛岀姸鎬� != "" ) {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
+ return;
+ }
+ }
+
+ var datajson = {
+ "data": dataArray
+ };
+
+ var url = encodeURI('../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnEdit.html?OperationType=4&linterid=0&HSouceBillType=3710&res=' + JSON.stringify(datajson))
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璁㈠崟-涓嬫帹鐢熶骇閫�搴撳崟'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: url
+ , btn: [],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+ //#endregion
+
//鏂板
function set_AddNew() {
layer.open({
@@ -1081,7 +1456,7 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
- }
+ }
// 澶嶅埗
function set_copy() {
@@ -1376,10 +1751,27 @@
- //瀵煎嚭Execel
+ //#region 瀵煎嚭Execel
function get_Export() {
- table.exportFile(ins.config.id, option.data, "xls");
+ var ModRightNameCheck = "Sc_ICMOBillList_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
+ //#endregion
@@ -1430,7 +1822,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1651,6 +2043,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
@@ -1747,7 +2143,7 @@
//鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
var HIsClose_Manual = false;
//鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
- var Filter = document.getElementsByClassName(HClassTag);
+ var Filter = document.getElementsByClassName(HClassTag);
var HFilterIdList = "";//杩囨护鏉′欢
var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
@@ -1757,7 +2153,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
@@ -1958,7 +2354,7 @@
//#endregion
-
+
//#endregion
//#region 鑾峰彇婧愬崟-鐢熶骇璁㈠崟鍗曟嵁鐘舵��
@@ -1983,6 +2379,34 @@
return HSourceBillData;
}
//#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 addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ }
+ return addSWhere;
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
@@ -2004,7 +2428,7 @@
var HRemark = data[0].澶囨敞
//鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
document.getElementById("HFilterScheme_Now").style.display = "block";
- document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
HInterID = data[0].hmainid
//鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
for (let i = 0; i < data.length; i++) {
@@ -2024,7 +2448,7 @@
}
});
}
- //#endregion
+ //#endregion
function GetDataCol(data) {
GetDataCols = data;
--
Gitblit v1.9.1