From a2811b348e8f32f68d9e9e1bac58f828c202b5bb Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 24 七月 2023 20:56:47 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 182 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 152 insertions(+), 30 deletions(-)
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_ProcessSendWorkList.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_ProcessSendWorkList.html"
index c6f2cfa..bb6efb2 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_ProcessSendWorkList.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_ProcessSendWorkList.html"
@@ -106,8 +106,13 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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" 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" lay-event="btn_print"><i class="layui-icon layui-icon-print"></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>
</div>
@@ -136,7 +141,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+ var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID","hentryid","鐢熶骇杞﹂棿ID","缁勭粐ID","浜у搧ID","鍗曚綅ID","鐢熶骇璧勬簮ID","鎿嶄綔宸D","鐝粍ID","HWWOrderEntryID","HWWOrderInterID","ieid"];
var option = [];
var HModName = "Sc_ProcessSendWorkList";
@@ -162,11 +167,26 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
- //瀹℃牳
- case 'set_CheckBill': set_CheckBill();
- break;
+ ////瀹℃牳
+ //case 'set_CheckBill': set_CheckBill();
+ // break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //鎵撳嵃
+ case 'btn_print': get_print();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -211,6 +231,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -229,7 +250,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_ProcessSendWork/Sc_ProcessSendWorkList',
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/Sc_ProcExchSendWorkBillList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -262,7 +283,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 800
+ , height: 'full-50'
, page: true //寮�鍚垎椤�
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -336,7 +357,7 @@
sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
}
if (HDeptName && HDeptName != "0") {
- sWhere += " and HWorkShopID = '" + HDeptName + "'";
+ sWhere += " and 鐢熶骇杞﹂棿ID = '" + HDeptName + "'";
}
if (HProcExchBillNo) {
sWhere += " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'";
@@ -388,7 +409,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鐢熶骇璁㈠崟缂栬緫'
+ , title: '宸ュ簭娲惧伐鍗曠紪杈�'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1'
, end: function () {
@@ -411,7 +432,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + '/Sc_ProcessSendWork/DelProcessSendWork',
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/DelProcessSendWork',
type: "GET",
data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -439,27 +460,131 @@
}
- //瀹℃牳
- function set_CheckBill() {
+ //鎵撳嵃
+ function get_print() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hmainid = data[0].hmainid;
- layer.confirm("纭瑕佸鏍稿悧锛屽鏍稿悗涓嶈兘鎭㈠", { title: "瀹℃牳纭" }, function (index) {
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ var arr = [];
+ var ieid = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].hmainid.toString());
+ arr.push(data[i].hentryid.toString());
+ ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList_GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ ////瀹℃牳
+ //function set_CheckBill() {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var hmainid = data[0].hmainid;
+ // layer.confirm("纭瑕佸鏍稿悧锛屽鏍稿悗涓嶈兘鎭㈠", { title: "瀹℃牳纭" }, function (index) {
+ // var wait = layer.load();
+ // //閫昏緫鍒犻櫎鏂规硶
+ // $.ajax({
+ // url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill',
+ // type: "GET",
+ // data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // //鍏抽棴褰撳墠frame
+ // layer.close(wait);
+ // layer.msg(result.Message);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // get_FastQuery();
+
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // layer.close(wait);
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // layer.close(wait);
+ // }
+ // });
+ // })
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ // }
+
+ //}
+
+ // 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
+ var HInterID = data[0].hmainid;
$.ajax({
- url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill',
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/CheckSc_ProcExchSendWorkBill',
type: "GET",
- data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- //鍏抽棴褰撳墠frame
- layer.close(wait);
- layer.msg(result.Message);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcExchSendWorkBill/CloseSc_ProcExchSendWorkBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -472,16 +597,11 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
}
-
}
- // 鍒锋柊
- function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
- }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -534,7 +654,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
--
Gitblit v1.9.1