From e3e541981e831ccd26530bca0d86d0f70123b55b Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期五, 04 十月 2024 10:11:56 +0800
Subject: [PATCH] Revert "1"
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 83 ----------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 121 +-------------
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 178 ----------------------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 40 ++--
4 files changed, 35 insertions(+), 387 deletions(-)
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 1d07f6f..625d0e6 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -201,11 +201,6 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></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>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><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_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
@@ -248,7 +243,6 @@
var size = 50;
var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Gy_RoutingBillList";
- var HBillType = 3301;
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//鑾峰彇鍙傛暟
function getUrlVars() {
@@ -293,21 +287,6 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
- break;
- //鍙戣捣瀹℃壒
- case 'set_startCheckBill': set_startCheckBill();
- break;
- //鏌ョ湅瀹℃壒杩涘害
- case 'get_CheckFlowInfo': get_CheckFlowInfo();
- break;
- //澶氱骇瀹℃牳
- case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
- break;
- //澶氱骇鍙嶅鏍�
- case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
- break;
- //椹冲洖
- case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
break;
//澶氳涓嬫帹
case 'btn-ProcPriceRequestBills': set_ProcPriceRequestBills();
@@ -647,7 +626,6 @@
//sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
sWhere += " and HMaterID = " + HMaterID;
- sWhere += " and 瀹℃牳浜� != ''";
}
if (HProID != 0 && HProID != "undefined" && HProID != null) {
sWhere += " and HMainProcID = " + HProID;
@@ -1187,149 +1165,6 @@
}
- //#region 鍙戣捣瀹℃壒
- function set_startCheckBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Routing/StartCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- $("#btnSearch").trigger('click');
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
- }
- //#endregion
-
- //#region 鏌ョ湅瀹℃壒杩涘害
- function get_CheckFlowInfo() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].hmainid.toString();
- layer.open({
- type: 2
- , area: ['70%', '70%']
- , title: '鍗曟嵁瀹℃壒杩涘害'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
- , resize: false,
- end: function () {
- ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
- //if (get_needClose_Bar == 0) {
- // $("#btnSearch").trigger('click');
- //} else if (get_needClose_Bar == 1) {
- // $("#get_needClose").trigger('click');
- //}
- }
- , cancel: function () {
-
- }
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
- }
- }
- //#endregion
-
- //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
- function set_CheckBill_Flow(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
- }
- //#endregion
-
- //#region 椹冲洖
- function set_RejectCheck_Flow(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- });
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
- }
- //#endregion
-
//鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -1393,7 +1228,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["field"] + ",";
+ colName += option.cols[0][i]["title"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1428,7 +1263,6 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
- async:"false",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1465,10 +1299,6 @@
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
option.cols[0][i + 1]["hide"] = false;
}
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- }
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -1480,10 +1310,6 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -1538,7 +1364,7 @@
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].title + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
}
$("#ColName").empty();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index fc6a915..5431b90 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -1190,89 +1190,6 @@
getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
break;
- case "P20":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HICMOInterID": data.hicmointerid,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HMaterID": data.HMaterID,
- "HMaterName": data.浜у搧,
- "HMaterNumber": data.浜у搧浠ｇ爜,
- "HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPieceQty": data.娴佽浆鍗℃暟閲�,
- "HPlanQty": data.娴佽浆鍗℃暟閲�,
- "lngBillKey": data.hmainid,
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchHinteID": data.hmainid,
- "HProcPlanEntryID": data.hsubid,
- "HICMOQty": data.浠诲姟鍗曟暟閲�,
- "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HPRDOrgID": data.缁勭粐
- });
- //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- //$("#HBarCode").css("background-color", "#efefef4d");
- HProcExchBillNoFlag = true;
-
- var HProcExchHinteID = $('#HProcExchHinteID').val();
- var HInterID = data.hmainid;
- //鑷姩鍖归厤娴佹按鍙�
- $.ajax({
- url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
- type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
- success: function (data1) {
- if (data1.count == 1) {
- var data = data1.data[0];
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "lngBillSubKey": data.hsubid,
- "HProcName": data.宸ュ簭,
- "HProcID": data.宸ュ簭ID,
- "HProcNo": data.娴佹按鍙�,
- "HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID,
- "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
- });
-
- if (data.棣栭亾宸ュ簭 == "鏄�") {
- FirstEndHProcNo = 1;
- } else if (data.鏈亾宸ュ簭 == "鏄�") {
- FirstEndHProcNo = 2;
- }
- $("#HProcNo").attr("readonly", "readonly");
- $("#HProcNo").css("background-color", "#efefef4d");
- }
- }
- })
-
- option = {
- elem: '#mainTable',
- url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
- //, cellMinWidth: 80
- toolbar: '#toolbarDemo'
- , where: { HProcExchHinteID: HProcExchHinteID }
- , cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
- , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
- ]]
- , height: 500
- }
- table.render(option)
-
- getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
-
- break;
}
//layer.close(index);
//set_InitGrid();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 7935530..9bc8cbf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -266,10 +266,6 @@
var HModName3 = "Sc_StationOutBillSub_SN";
var HModName4 = "Sc_StationOutBillSub_Emp";
var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var params = get_UrlVars();
- var sProcExchBillNo = params[params[0]] == null ? "undefined" : params[params[0]]; //娴佽浆鍗″彿锛堝伐搴忔祦杞崱涓嬫煡鐢ㄥ埌锛�
- var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
- var ViewName = params[params[2]] == null ? "h_v_MES_StationOutBillList" : params[params[2]]; //鎵�璋冪敤鐨勮鍥�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -293,6 +289,7 @@
//宸ュ簭娴佽浆鍗′笅鏌ユ爣璁�
var lookDownBar = 0; //(0:涓嬫煡鎿嶄綔锛�1锛氱洿鎺ユ煡鐪�)
+ var params = get_UrlVars(); //鑾峰彇鍙傛暟
//鍒濆鍖栬〃鏍�
@@ -1605,8 +1602,8 @@
//蹇�熻繃婊�
function get_FastQuery() {
//鍒ゆ柇鏄惁涓轰笅鏌ユ搷浣滐紝鑻ユ槸鍒欏彉鏇存煡璇㈠崟鍙峰拰鏃堕棿杩囨护鏉′欢
- if (sProcExchBillNo != "undefined" && lookDownBar == 0) {
- $("#HProcExchBillNo").val(sProcExchBillNo);
+ if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
+ $("#HProcExchBillNo").val(params[params[0]]);
$("#HBeginDate").val("1990-01-01");
$("#HEndDate").val("2200-12-30");
lookDownBar = 1;
@@ -1775,14 +1772,26 @@
var ajaxLoad = layer.load();
var wait = layer.load();
$.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- url: GetWEBURL() + '/Cj_StationOutBillController/GetSc_StationOutBillList_Json',
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sWhere": sWhere, "HMaker": sessionStorage["HUserName"], "HBillSubType": "3791", "OperationType": OperationType, "ViewName": ViewName },
-
- //url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
- //type: "GET",
- //data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ //success: function (data1) {
+ // if (data1.count == 0) {
+ // option.data = [];
+ // layer.alert(data1.Message, { icon: 5 });
+ // } else {
+ // option.data = data1.data;
+ // }
+ // table.render(option);
+ // btnIs();
+ // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ // }
+ // layer.close(wait);
+ //}, error: function () {
+ // layer.close(wait);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //}
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -1790,11 +1799,6 @@
//缁欑┖鐨勬暟缁勮祴鍊�
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: '鍚堣' });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index 480000f..76b7386 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
@@ -16,7 +16,6 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
- <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
.layui-form-item .layui-inline {
margin-right: 0;
@@ -52,8 +51,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_Print" disabled>鎵撳嵃</button>
- <button type="button" id="batchPrint-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵归噺鎵撳嵃</button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -241,15 +239,10 @@
});
//鎵撳嵃
- form.on('submit(get_Print)', function () {
- get_Print();
- })
-
- //鎵归噺鎵撳嵃
form.on('submit(get_BatchPrint)', function () {
get_BatchPrint();
})
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
@@ -274,8 +267,7 @@
, { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍐呯爜', width: 120 }//鐢熶骇璁㈠崟鍙�
- , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -283,7 +275,6 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
@@ -300,8 +291,8 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
- , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0, "HLotcardQty": 0
+ "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
+ , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
, "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
}];
@@ -341,13 +332,11 @@
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
- , "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
+ , "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
- , "HUsableQty": subdata[i].HUsableQty, "HLotcardQty": subdata[i].HLotcardQty, "HProQty": subdata[i].HProQty
- , "HRoutingInterID": subdata[i].HRoutingInterID, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty
- , "HDate": formatDate(subdata[i].HDate), "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": subdata[i].HBatchNo
- , "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
+ , "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
+ , "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
+ , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": "", "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
}
)
}
@@ -363,7 +352,6 @@
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
- , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿鍐呯爜', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -371,7 +359,6 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
@@ -452,7 +439,6 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
- $('#batchPrint-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵归噺鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
@@ -485,7 +471,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html?HMaterID=' + obj.data.HMaterID + '&HProID=' + 0, 'yes']
+ , content: ["../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -513,7 +499,7 @@
}
//鎵撳嵃
- function get_Print() {
+ function get_BatchPrint() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
@@ -537,91 +523,6 @@
else {
layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑娴佽浆鍗★紒');
}
- }
-
-
- //鎵归噺鎵撳嵃
- var time;
- var num = 0;
- function get_BatchPrint() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
-
- if (checkStatus.data.length > 0) {
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
- time = setInterval(function () {
- dy_PL(data);
- }, 1000);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- })
- }
- else {
- layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
- }
- }
-
- function dy_PL(rest) {
- var HInterID = rest[num].HInterID.toString();
- var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О,b.鐢熶骇璁㈠崟鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
- data: { "sWhere": sWhere },
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
- if (data.data.length != 0) {
- var dataPrint = [];
- for (var i = 0; i < data.data.length; i++) {
- data.data[i]["娴佹按鍙�"] = data.data[i]["娴佹按鍙�"].toFixed(1);
- dataPrint.push(data.data[i])
- }
-
- var Customer = {
- "Table": dataPrint
- }
-
- var args = {
- type: "print",//鎵撳嵃妯″紡
- //type: "preview",//棰勮妯″紡
- showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
- data: Customer
- };
-
- console.log(data.data[0].鍗曟嵁鍙�);
- //var args = {
- // report: urlAddRandomNo("../../grf/cs10.grf"),
- // data: Customer
- //};
- webapp_ws_ajax_run(args);
-
- if (rest.length <= num + 1) {
- num = 0;
- clearInterval(time);
- } else {
- num++;
- }
-
- } else {
- layer.msg("鏌ユ棤鏁版嵁!");
- }
-
- }
- else {
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
- }
- })
-
}
//琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
--
Gitblit v1.9.1