From b742f00aac8e1e1bb628232383c35e67f4a41e4e Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期五, 26 一月 2024 15:21:28 +0800
Subject: [PATCH] 1
---
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
index d208f98..13b3597 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
@@ -202,21 +202,21 @@
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鍣ㄥ叿浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
, { field: 'HPropertyCode', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HPropertyCode', width: 100 }
- , { field: 'HPropertyName', title: '杈呭姪灞炴��', edit: 'text', width: 100 }
+ , { field: 'HPropertyName', title: '杈呭姪灞炴��', width: 100 }
, { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
, { field: 'HSecUnitCode', title: '杈呭姪璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HSecUnitCode', width: 100 }
- , { field: 'HSecUnitName', title: '杈呭姪璁￠噺鍗曚綅', edit: 'text', width: 100 }
+ , { field: 'HSecUnitName', title: '杈呭姪璁￠噺鍗曚綅', width: 100 }
, { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', edit: 'text', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
, { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', width: 100 }
- , { field: 'HNewLife', title: '鏂板墿浣欏鍛�', edit: 'text', width: 100 }
+ , { field: 'HNewLeaveLife', title: '鏂板墿浣欏鍛�', edit: 'text', width: 100 }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
@@ -224,7 +224,7 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
table.render(option);
}
else {
@@ -260,7 +260,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -340,7 +340,7 @@
HMaterName: checkStatus.data[0].HName,
HMaterSpec: checkStatus.data[0].HModel,
HLeaveLife: checkStatus.data[0].HLeaveLife,
- HNewLife: checkStatus.data[0].HNewLife,
+ HNewLeaveLife: checkStatus.data[0].HNewLife,
HDesignLife: checkStatus.data[0].HDesignLife, //璁捐瀵垮懡
});
@@ -673,12 +673,12 @@
form.on('submit(Exit)', function (data) {//
- if (hID == undefined) {
+ if (params[params[0]] == undefined) {
//鍏抽棴椤电
Pub_Close(2);
}
else {
- //鍏抽棴椤电
+ //鍏抽棴寮圭獥
Pub_Close(1);
}
});
@@ -710,7 +710,7 @@
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
if (AllowLoadData(sSubStr)) {
$.ajax(
--
Gitblit v1.9.1