WebTM/views/系统管理/多级审批/审核流程单/Xt_CheckFlowEdit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/系统管理/多级审批/审核流程单/Xt_CheckFlowList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/views/ϵͳ¹ÜÀí/¶à¼¶ÉóÅú/ÉóºËÁ÷³Ìµ¥/Xt_CheckFlowEdit.html
@@ -133,37 +133,8 @@ //#endregion //#region è¿å ¥é¡µé¢å³å è½½ var params = getUrlVars(); var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®å ç var HSouceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å //夿æ¯å¦æ°å¢ if (linterid == null || linterid == 0) { OperationType = 1; $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", data: { "HBillType": '8803' }, success: function (d) { //èµå¼ $("#HInterID").val(d.data[0].HInterID); $("#HName").val(d.data[0].HBillNo); } }); } else {//å¦æä¿®æ¹åèµ°ä¸é¢ new /* RoadBillMain(linterid, linteridSub);*/ } set_ClearBill(); //夿æ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ //if (sessionStorage.login != "login") { // layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", { // icon: 4, skin: 'layui-layer-lan', title: "温馨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½'] // }, function () { window.location.href = "../../../user/login.html"; }); //} var option = { elem: '#mainTable' @@ -191,6 +162,39 @@ }]; option.data = rowdata; table.render(option); var params = getUrlVars(); var linterid = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å var OperationType = params[params[1]]; //ä»åæ°ä¸è·å åæ®å ç //夿æ¯å¦æ°å¢ if (linterid == null || linterid == 0) { OperationType = 1; $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", data: { "HBillType": '8803' }, success: function (d) { //èµå¼ $("#HInterID").val(d.data[0].HInterID); $("#HName").val(d.data[0].HBillNo); } }); } else {//å¦æä¿®æ¹åèµ°ä¸é¢ new RoadBillMain(linterid); } //夿æ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ //if (sessionStorage.login != "login") { // layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", { // icon: 4, skin: 'layui-layer-lan', title: "温馨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½'] // }, function () { window.location.href = "../../../user/login.html"; }); //} //#endregion @@ -465,6 +469,64 @@ }); } //ç¼è¾ç¶ææ¶ï¼æ ¹æ®å ç ï¼è·åä¿¡æ¯å¹¶åå ¥çé¢ function RoadBillMain(linterid)//å 载表头 { var sWhere = "and Hmainid=" + linterid; //æ¥è¯¢å®¡æ ¸é¡¹ç®è®¾ç½®æ¯å¦åå¨ $.ajax({ url: GetWEBURL() + "/Xt_CheckFlowBill/Xt_CheckFlowBillList", type: "GET", data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, success: function (d) { if (d.code == 1) { // 说æéªè¯æåäºï¼ var data = d.data[0]; var HStandard = data["é»è®¤æµç¨"]; //ç¦ç¨æ è®° if (HStandard) { $("input[name='HStandard']").attr("checked", true); $("#HStandard").val(true); } form.render('checkbox'); //主表 form.val("formData", { //formTest å³ class="layui-form" æå¨å ç´ å±æ§ lay-filter="" 对åºçå¼ "HName": d.data[0].æµç¨åç§° , "HInterID": d.data[0].Hmainid , "HBillTypeID": d.data[0].HBillTypeID , "HDeptID": d.data[0].HDeptID , "HDeptIDName": d.data[0].é¨é¨ , "HRemark": d.data[0].夿³¨ }); //å表 èµå¼ var rowdata = []; for (var i = 0; i < d.data.length; i++) { rowdata.push( { "HFlowNo": d.data[i].æµç¨å·, "HCheckItemID": d.data[i].HCheckItemID, "HCheckItemNumber": d.data[i].HCheckItemNumber , "HCheckItemName": d.data[i].HCheckItemName, "HJumpFlag": d.data[i].æ¯å¦å è®¸è·³è¿ == 1 ? true : false , "HMakerSelf": d.data[i].HMakerSelf == 1 ? true : false, "HCheckMan": d.data[i].HCheckMan } ) } option.data = rowdata; table.render(option); for (var i = 0; i < d.data.length; i++) { if (d.data[i].æ¯å¦å 许跳è¿) { $('#HJumpFlag' + (i + 1)).attr("checked", true); } if (d.data[i].HMakerSelf) { $('#HMakerSelf' + (i + 1)).attr("checked", true); } } form.render('checkbox'); } } }) } //éªè¯ function AllowLoadData() { WebTM/views/ϵͳ¹ÜÀí/¶à¼¶ÉóÅú/ÉóºËÁ÷³Ìµ¥/Xt_CheckFlowList.html
@@ -79,7 +79,7 @@ <script type="text/html" id="toolbarDemo"> <div class="layui-btn-container"> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>æ°å¢</button> <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>ç¼è¾</button>--> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>ç¼è¾</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>å é¤</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>å·æ°</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>å设置</button> @@ -131,6 +131,10 @@ //æ°å¢æé® case 'btn-Add': set_AddNew(); break; //ç¼è¾æé® case 'btn-Edit': set_Edit(); break; case 'btn-Delete': set_DeleteBill(); @@ -372,7 +376,7 @@ shift: 2, area: ['100%', '100%'], maxmin: true, content: '../å®¡æ ¸æµç¨å/Xt_CheckFlowEdit.html', content: '../å®¡æ ¸æµç¨å/Xt_CheckFlowEdit.html?linterid=0&HSouceBillType=1', end: function () { //å·æ°é¡µé¢, get_FastQuery(table, option); @@ -383,6 +387,36 @@ }); } //ä¿®æ¹ function set_Edit() { var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { var linterid = data[0].Hmainid; layer.open({ type: 2, skin: 'layui-layer-rim', //å ä¸è¾¹æ¡ title: 'æ°å¢å®¡æ ¸æµç¨å', closeBtn: 1, shift: 2, area: ['100%', '100%'], maxmin: true, content: '../å®¡æ ¸æµç¨å/Xt_CheckFlowEdit.html?linterid=' + linterid +'&HSouceBillType=3', end: function () { //å·æ°é¡µé¢, get_FastQuery(table, option); }, success: function (layero, index) { } }); } else { layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼'); } } // å·æ° function get_Refresh() { WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -53,10 +53,12 @@ <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> <div style="padding: 10px; "> <button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >é¢è§</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button> <!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >é¢è§</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button>--> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button> </div> <div class="layui-tab" lay-filter="tab-POStockInBill"> <ul class="layui-tab-title" lay-filter="tab-all"> @@ -464,50 +466,6 @@ //#region è¿å ¥é¡µé¢å³å è½½ //åå§åè¡¨æ ¼ DisPlay_HideColumn(); //å¶å人 $("#HMaker").val(sessionStorage["HUserName"]); //ç»ç» Organ(); //夿æ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ //if (sessionStorage.login != "login") { // layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", { // icon: 4, skin: 'layui-layer-lan', title: "温馨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½'] // }, function () { window.location.href = "../../user/login.html"; }); //} var params = getUrlVars(); var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®å ç var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å //var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å« //夿æ¯å¦æ°å¢ if (linterid == null || linterid == 0) { //linteridSub = -1; OperationType = 1; $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", data: { "HBillType": '3301' }, success: function (d) { //console.log(d.data); $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } }); } else {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¦ç¨ç»ç»é项 $("#HOrgID").attr("disabled", true); RoadBillMain(linterid); //RoadBillSub(linterid); } var option = { elem: '#mainTable' , toolbar: '#toolbarDemo' @@ -593,6 +551,66 @@ option.data = rowdata; table.render(option); //å¶å人 $("#HMaker").val(sessionStorage["HUserName"]); //ç»ç» Organ(); //夿æ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ //if (sessionStorage.login != "login") { // layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", { // icon: 4, skin: 'layui-layer-lan', title: "温馨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½'] // }, function () { window.location.href = "../../user/login.html"; }); //} var params = getUrlVars(); var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾ var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®å ç var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å //var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å« //夿æ¯å¦æ°å¢ if (linterid == null || linterid == 0) { //linteridSub = -1; OperationType = 1; $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", data: { "HBillType": '3301' }, success: function (d) { //console.log(d.data); $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } }); } else if (OperationType == 2) { //ç¦ç¨ç»ç»é项 $("#HOrgID").attr("disabled", true); RoadBillMain(linterid); $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", async: false, data: { "HBillType": '3301' }, success: function (d) { $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").attr("readOnly", false); $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } }); } else {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¦ç¨ç»ç»é项 $("#HOrgID").attr("disabled", true); RoadBillMain(linterid); //RoadBillSub(linterid); } //åå§åè¡¨æ ¼ DisPlay_HideColumn(); //#endregion //#region 触åäºä»¶ï¼å æ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç @@ -627,7 +645,7 @@ get_checkRoutingGroup(); }); //æ¯å¦é»è®¤å·¥èº form.on('checkbox(checkboxHStandard)', function (data) { $("#HStandard").val(data.elem.checked); @@ -823,7 +841,16 @@ //ä¿åæäº¤ form.on('submit(btnSave)', function (data) {//æäº¤ if (AllowLoadData(data)) { set_AddNew(data); set_AddNew(data); } }); //éåº form.on('submit(btnEdit)', function (data) { if (OperationType == 1) { Pub_Close(2); } else { Pub_Close(1); } }); @@ -938,7 +965,7 @@ //window.close();//å ³éå½å页 }) form.on('submit(Saver)', function (data) { //ä¿å //debugger; var sMainStr = JSON.stringify(data.field); @@ -1340,6 +1367,7 @@ $.ajax({ url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json", type: "GET", async: false, data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, success: function (d) { @@ -1352,13 +1380,13 @@ } //主表 form.val("formData", { //formTest å³ class="layui-form" æå¨å ç´ å±æ§ lay-filter="" 对åºçå¼ "HBillNo": d.data[0].åæ®å· , "HInterID": d.data[0].hmainid "HBillNo": OperationType == 2 ? "" : d.data[0].åæ®å· , "HInterID": OperationType == 2 ? 0 :d.data[0].hmainid , "HDate": Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd") , "HName": d.data[0].å·¥èºåç§° , "HMaterNumber": d.data[0].ç©æä»£ç , "HMaterName": d.data[0].ç©æåç§° , "HMaterID": d.data[0].hmaterid , "HMaterNumber": OperationType == 2 ? "" : d.data[0].ç©æä»£ç , "HMaterName": OperationType == 2 ? "" : d.data[0].ç©æåç§° , "HMaterID": OperationType == 2 ? "" : d.data[0].HMaterID , "HUnitName": d.data[0].计éåä½ , "HUnitID": d.data[0].hunitid , "HMainTimeUnit": d.data[0].è¿è¡æ¶é´åä½ @@ -1385,7 +1413,7 @@ , "HOrgID": d.data[0].HOrgID }); //å表 èµå¼ //å表 èµå¼ var rowdata = []; for (var i = 0; i < d.data.length; i++) { rowdata.push( @@ -1446,7 +1474,7 @@ var sSubStr = JSON.stringify(num); //var hentryid = linteridSub;//å表 æåºid var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"]; var index = layer.load(); $.ajax({ type: "POST", @@ -1457,14 +1485,7 @@ dataType: "json", success: function (data) { if (data.count == 1) { //layer.confirm(data.Message, { // icon: 1, skin: 'layui-layer-lan', title: "温馨æç¤º", closeBtn: 0, btn: ['æ°å¢'], // btn2: function () { // //parent.layui.admin.events.closeThisTabs();å ³éé¡µç¾ // //window.close();//å ³é页é¢ï¼æµè§å¨ææï¼PDAæ æ // parent.location.href = "../../../views/index.html" // }//å ³é //}, function () { window.location.reload(); });//æ°å¢ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true); layer.close(index); layer.msg("æäº¤æå"); } WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -89,6 +89,7 @@ <div class="layui-btn-container"> <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_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button> @@ -149,6 +150,9 @@ break; //å é¤ case 'set_DeleteBill': set_DeleteBill(); break; //å¤å¶ case 'set_Copy': set_Copy(); break; //æµè§ case 'get_PrintReport': get_PrintReport(); @@ -486,6 +490,29 @@ } //#endregion //å¤å¶ function set_Copy() { var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { var linterid = data[0].HItemID; layer.open({ type: 2 , area: ['100%', '100%'] , title: 'å·¥èºè·¯çº¿-ç¼è¾' , shift: 0//å¼¹åºå¨ç» , content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=' , end: function () { //å·æ°é¡µé¢, location.reload(); } }) } else { layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼'); } } //#region å·æ° function get_Refresh() { set_ClearQuery();