From 88aa49b6e96b320af06f378bb4e58ad11a456367 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 10 七月 2024 16:01:43 +0800
Subject: [PATCH] 定额申请单添加字段
---
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBill.html | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 160 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
index da941a1..fa6253d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBill.html"
@@ -86,7 +86,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="">
</div>
</div>
<div class="layui-inline">
@@ -298,7 +298,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -345,6 +345,17 @@
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
RoadBillMain(linterid);
+ } else if (OperationType == 4) {//涓嬫帹
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+ setInit_PushBill();
}
//#endregion
@@ -441,6 +452,9 @@
, "HMaterNumber": ""
, "HMaterName": ""
, "HMaterModel": ""
+ , "HWorkCenterID": "0"
+ , "HWorkCenterNumber": ""
+ , "HWorkCenterName": ""
, "HProcID": "0"
, "HProcNumber": ""
, "HProcName": ""
@@ -589,6 +603,16 @@
}
//#endregion
+ //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ function getUrlVars_JSON() {
+ var datajson;
+ var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = $.parseJSON(decodeURI(arr));
+ return datajson;
+ }
+ //#endregion
+
//#region 鐢熸垚鍗曟嵁鍙�
function createBillNo() {
$.ajax({
@@ -621,6 +645,9 @@
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HMaterNumber" } //f7
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HWorkCenterID', title: '宸ヤ綔涓績ID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HWorkCenterNumber', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "HWorkCenterNumber" } //f7
+ , { field: 'HWorkCenterName', title: '宸ヤ綔涓績鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HProcID', title: '宸ュ簭ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProcNumber', title: '宸ュ簭浠ｇ爜', edit: 'text', event: "HProcNumber" } //f7
, { field: 'HProcName', title: '宸ュ簭鍚嶇О', style: 'background-color: #f9f9f9;' }
@@ -657,6 +684,9 @@
, "HProcID": "0"
, "HProcNumber": ""
, "HProcName": ""
+ , "HWorkCenterID": "0"
+ , "HWorkCenterNumber": ""
+ , "HWorkCenterName": ""
, 'HSourceID': '0'
, 'HSourceNumber': ''
, 'HSourceName': ''
@@ -839,6 +869,7 @@
, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
, "HBackRemark": tableMain[0]["HBackRemark"]
, "HChangeType": tableMain[0]["HChangeType"] == null ? "鑷敱" : tableMain[0]["HChangeType"]
+ , "HChangeValue": tableMain[0]["HChangeValue"]
, "HBackRemark": tableMain[0]["HBackRemark"]
});
@@ -860,6 +891,86 @@
}
//#endregion
+ //#region 涓嬫帹椤甸潰璧嬪��
+ function setInit_PushBill() {
+ if (HSouceBillType == "3301") {
+ //鑾峰彇 宸ヨ壓璺嚎淇℃伅
+ var data = getUrlVars_JSON().data;
+ var dataArray = data;
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < data.length; i++) {
+ var temp = "none";
+ var sWhere = "";
+ sWhere += " and hmainid = " + data[0].hmainid;
+ sWhere += " and hsubid = " + data[0].hsubid;
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ temp = result.data[0];
+ } else {
+ temp = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ temp = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ if (temp != "none") {
+ dataArray.push(temp);
+ } else {
+ return;
+ }
+ }
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "RowID": (i + 1) * 10
+ , "HMaterID": dataArray[i].HMaterID
+ , "HMaterNumber": dataArray[i].鐗╂枡浠ｇ爜
+ , "HMaterName": dataArray[i].鐗╂枡鍚嶇О
+ , "HMaterModel": dataArray[i].瑙勬牸鍨嬪彿
+ , "HWorkCenterID": dataArray[i].HCenterID
+ , "HWorkCenterNumber": dataArray[i].宸ヤ綔涓績浠ｇ爜
+ , "HWorkCenterName": dataArray[i].宸ヤ綔涓績鍚嶇О
+ , "HProcID": dataArray[i].hprocid
+ , "HProcNumber": dataArray[i].HProcNo
+ , "HProcName": dataArray[i].宸ュ簭
+ , 'HSourceID': 0
+ , 'HSourceNumber': ""
+ , 'HSourceName': ""
+ , 'HOldPrice': dataArray[i].鍔犲伐鍗曚环
+ , 'HPrice': '0'
+ , 'HOldFixPrice': dataArray[i].宸ヤ环
+ , 'HFixPrice': '0'
+ , 'HBeginDate': Format(new Date(), "yyyy-MM-dd")
+ , 'HEndDate': Format(new Date(), "yyyy-MM-dd")
+ , 'HCostFlag': false
+ , "HRemark": ""
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": HSourceBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+ , "HCloseMan": ""
+ , "HEntryCloseDate": ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟涓嬫帹锛侊紒');
+ }
+ }
+ //#endregion
//#region 瀹℃牳
function set_CheckBill() {
layer.confirm("纭瑕佸鏍稿悧?", function (index) {
@@ -975,6 +1086,15 @@
layer.msg("閮ㄩ棬鏈�夋嫨!");
return false;
}
+ if ($("#HChangeValue").val() == "") {
+ $("#HChangeValue").val(0);
+ return false;
+ }
+ var ref = /^\d+(\.\d+)?$/;
+ if (!ref.test($("#HChangeValue").val())) {
+ layer.msg("璋冩暣骞呭害璇疯缃潪璐熸诞鐐规暟");
+ return false;
+ }
//#endregion
//#region 瀛愯〃鏁版嵁妫�楠�
@@ -985,8 +1105,8 @@
var value1_ = ["鍘熷崟浠�", "鍗曚环", "鍘熷皬鏃跺畾棰�", "灏忔椂瀹氶"]; ////瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗曞搴旂殑鍒楀悕娓呭崟
var value2 = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
var value2_ = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- var value3 = ["HMaterID", "HProcID", "HSourceID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
- var value3_ = ["鐗╂枡", "宸ュ簭", "璧勬簮"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
+ var value3 = ["HMaterID", "HProcID", "HSourceID","HWorkCenterID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
+ var value3_ = ["鐗╂枡", "宸ュ簭", "璧勬簮","宸ヤ綔涓績"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
//闈炵┖妫�楠�
@@ -1026,9 +1146,9 @@
//#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
var num = [];
for (var i = 0; i < option.data.length; i++) {
- temp = option.data[i]["HMaterID"] + "|" + option.data[i]["HProcID"] + "|" + option.data[i]["HSourceID"];
+ temp = option.data[i]["HMaterID"] + "|" + option.data[i]["HProcID"] + "|" + option.data[i]["HSourceID"] + "|" + option.data[i]["HWorkCenterID"];
if ($.inArray(temp, num) != -1) {
- layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡銆佸伐搴忋�佽祫婧愰噸澶嶏紝璇烽噸鏂伴�夋嫨锛�");
+ layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡銆佸伐搴忋�佽祫婧愩�佸伐浣滀腑蹇冮噸澶嶏紝璇烽噸鏂伴�夋嫨锛�");
return false;
}
num.push(temp);
@@ -1260,6 +1380,36 @@
}
})
}
+ if (obj.event == "HWorkCenterNumber") {
+ layer.open({
+ type: 2
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ヤ綔涓績鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
+ , resize: false
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ OptionData = checkStatus.data[0];
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ obj.update({
+ "HWorkCenterID": OptionData.HItemID
+ , "HWorkCenterNumber": OptionData.宸ヤ綔涓績浠ｇ爜
+ , "HWorkCenterName": OptionData.宸ヤ綔涓績鍚嶇О
+ });
+ }
+ })
+ }
obj.event = "";
return false;
}
@@ -1454,6 +1604,10 @@
{
OptionData = data[0]
}
+ function GetWorkCenterValue(data) //杩斿洖宸ヤ綔涓績
+ {
+ OptionData = data[0];
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1