From 10494fafa787da141b3feb1a84417a1716bb7f25 Mon Sep 17 00:00:00 2001 From: 沈泽 <211959439@qq.com> Date: 星期五, 08 十月 2021 16:55:38 +0800 Subject: [PATCH] 1 --- WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 12 ++-- WebTM/layuiadmin/Scripts/webConfig.js | 4 WebTM/views/index.html | 2 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBill.html | 110 ++++++++++++++++++++++++------------ 4 files changed, 83 insertions(+), 45 deletions(-) diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index 8c20031..802a542 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -2,10 +2,10 @@ function GetWEBURL() { //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒 //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴 - //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 + var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴 //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃� - var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆 + //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆 //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃� //var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣� diff --git a/WebTM/views/index.html b/WebTM/views/index.html index d40b09b..fbbc168 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -466,7 +466,7 @@ <dd> <a>浠撳偍绠$悊</a> <dl class="layui-nav-child"> - <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBill.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗�</a></dd> + <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗�</a></dd> <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曟嵁缁存姢</a></dd> <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</a></dd> <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html ">鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�</a></dd> diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" index fba9c7d..a208cdd 100644 --- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" +++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" @@ -871,48 +871,86 @@ return [year, month, day].join('-'); } - - form.on('submit(Saver)', function (data) {//淇濆瓨 - //debugger; - data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜� + //淇濆瓨鎻愪氦 + form.on('submit(btnSave)', function (data) {//鎻愪氦 + //var tableData = data.field; + data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐 var sMainStr = JSON.stringify(data.field); var sSubStr = JSON.stringify(table.cache['mainTable']); var sMainSub = sMainStr + ';' + sSubStr; - - - $.ajax( - { - type: "POST", - url: GetWEBURL() + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� - async: true, - data: { "msg": sMainSub }, - dataType: "json", - success: function (data) { - if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 - layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () { - $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true); - var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩 - parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽 - }); - } - else { - - f_alert(data.Message); - console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable)); - } - layer.closeAll("loading"); - }, - error: function (err) { - - f_alert("閿欒:" + err); - console.log("Reason" + sMainStr); + var index = layer.load(); + $.ajax({ + type: "POST", + url: GetWEBURL() + "/Pay_SingleBalBill/AddBill", + //url:"http://localhost:12761/Gy_RoutingBill/AddBill", + async: true, + data: { "sMainSub": sMainSub }, + 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();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 + // parent.location.href = "../../../views/index.html" + // }//鍏抽棴 + //}, function () { window.location.reload(); });//鏂板 + layer.close(index); + layer.msg("鎻愪氦鎴愬姛"); } - }); + else { + layer.close(index); + layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }, + error: function (err) { + layer.close(index); + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); }); - function f_alert(sMsg) { - layer.alert(sMsg, { icon: 5 }); + //form.on('submit(Saver)', function (data) {//淇濆瓨 + // //debugger; + // data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜� + // var sMainStr = JSON.stringify(data.field); + // var sSubStr = JSON.stringify(table.cache['mainTable']); + // var sMainSub = sMainStr + ';' + sSubStr; - } + + // $.ajax( + // { + // type: "POST", + // url: GetWEBURL() + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + // async: true, + // data: { "msg": sMainSub }, + // dataType: "json", + // success: function (data) { + // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + // layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () { + // $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true); + // var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩 + // parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽 + // }); + // } + // else { + + // f_alert(data.Message); + // console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable)); + // } + // layer.closeAll("loading"); + // }, + // error: function (err) { + + // f_alert("閿欒:" + err); + // console.log("Reason" + sMainStr); + // } + // }); + //}); + //function f_alert(sMsg) { + // layer.alert(sMsg, { icon: 5 }); + + //} //鐩戝惉鎻愪氦 form.verify({ diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" index 122afe1..86e81f9 100644 --- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" +++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>妯℃不鍏风敓浜ч鐢ㄥ崟鍒楄〃</title> + <title>宸ヨ祫缁撶畻(涓汉)鍒楄〃</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> @@ -210,7 +210,7 @@ function get_Display(sWhere) { var ajaxLoad = layer.load(); $.ajax({ - url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill', + url: GetWEBURL() + '/Pay_SingleBalBill/list', type: "GET", data: { "sWhere": sWhere }, success: function (data1) { @@ -237,12 +237,12 @@ layer.open({ type: 2, skin: 'layui-layer-rim', //鍔犱笂杈规 - title: '鏂板妯″叿棰嗙敤鍗�', + title: '鏂板宸ヨ祫缁撶畻(涓汉)', closeBtn: 1, shift: 2, area: ['100%', '100%'], maxmin: true, - content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html', + content: '../宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBill.html', end: function () { //鍒锋柊椤甸潰, location.reload(); @@ -261,12 +261,12 @@ layer.open({ type: 2 , area: ['100%', '100%'] - , title: '缂栬緫妯″叿棰嗙敤鍗�' + , title: '缂栬緫宸ヨ祫缁撶畻(涓汉)' , closeBtn: 1 , shade: 0.6 //閬僵閫忔槑搴� , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?hID=' + hID + , content: '../宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBill.html?hID=' + hID , resize: false, end: function () { //鍒锋柊椤甸潰, -- Gitblit v1.9.1