From 222e62df3dfecb71d669b2509e4e8822638791a6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 26 六月 2025 08:22:15 +0800
Subject: [PATCH] 华远：直观图调整
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 208 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 129 insertions(+), 79 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 3ed31aa..59893bd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -125,8 +125,8 @@
</div>
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 6.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
</div>
</div>
</div>
@@ -291,7 +291,7 @@
//};
var Sctag = "0";
var columns = "";
- var HIsSave = false;
+ var HIsCheck = false;
//#endregion
@@ -351,6 +351,23 @@
else if (OperationType == 4) {//涓嬫帹
setInit_PushBill();
}
+ else if (OperationType == 5) {//澶嶅埗
+ set_EditFromGrid();
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val();
+ $("#HUpDateDate").val();
+ $("#HChecker").val();
+ $("#HCheckDate").val();
+ $("#HCloseMan").val();
+ $("#HCloseDate").val();
+ $("#HDeleteMan").val();
+ $("#HDeleteDate").val();
+ //get_file();
+ }
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
@@ -409,7 +426,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes'],
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -455,13 +472,6 @@
content: ['../../PublicPage/ProductionOrder.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- option.data = [{
- "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
- "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0, "HICMOTempID": 0
- }];
- table.render(option);
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
@@ -483,30 +493,22 @@
if (isAllEqual(list)) //鐩稿悓鍗曞彿
{
//console.log(checkStatus.data);
- if (checkStatus.data.length > 1) {
- for (var i = 0; i < checkStatus.data.length - 1; i++) //琛ヨ
- {
- //var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
- table.cache["mainTable"].push({
- "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
- "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0, "HICMOTempID": 0
- });
- option.data = table.cache["mainTable"];
- table.render(option);
- }
+ var optionData = [];
+ for (var i = 0; i < checkStatus.data.length; i++) //琛ヨ
+ {
+ var NewRow = {
+ "HMaterID": checkStatus.data[0].HMaterID, "HMaterCode": checkStatus.data[0].HMaterCode, "HMaterName": checkStatus.data[0].HMaterName, "HMaterSpec": checkStatus.data[0].HMaterSpec, "HUnitID": checkStatus.data[0].HUnitID, "HUnitCode": checkStatus.data[0].HUnitCode, "HUnitName": checkStatus.data[0].HUnitName,
+ "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
+ "HICMOBillNo": checkStatus.data[0].鍗曟嵁鍙�, "HICMOInterID": checkStatus.data[0].hmainid, "HICMOEntryID": checkStatus.data[0].HEntryID, "HRemark": "", "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].HEntryID, "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�,
+ "HSourceBillType": 3710
+ };
+ optionData.push(NewRow);
}
- option.data = checkStatus.data;
- table.render(option);
- //for (var i = 0; i < checkStatus.data.length; i++) {
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterID"] .layui-table-cell').text(checkStatus.data[i].HMaterID);
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterCode"] .layui-table-cell').text(checkStatus.data[i].HMaterCode);
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterName"] .layui-table-cell').text(checkStatus.data[i].HMaterName);
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HMaterSpec"] .layui-table-cell').text(checkStatus.data[i].HMaterSpec);
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitID"] .layui-table-cell').text(checkStatus.data[i].HUnitID);
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitCode"] .layui-table-cell').text(checkStatus.data[i].HUnitCode);
- // $('.layui-table-view[lay-id="mainTable"]').children('.layui-table-box').children('.layui-table-body').find('table tbody tr[data-index="' + i + '"]').find('td[data-field="HUnitName"] .layui-table-cell').text(checkStatus.data[i].HUnitName);
- //}
+
+ table.reload("mainTable", {
+ data: optionData //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
else {
@@ -538,7 +540,7 @@
//#region 鎻愪氦淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
var refSav = "";
- if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
refSav = "Add";
}
if (OperationType == 3) {
@@ -549,6 +551,13 @@
var row = [];
for (var i = 0; i < table.cache['mainTable'].length; i++) {
if (table.cache['mainTable'][i] != "") {
+ if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterSpec.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterSpec.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterSpec = table.cache["mainTable"][i].HMaterSpec.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
row.push(table.cache['mainTable'][i])
}
}
@@ -567,7 +576,6 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- HIsSave = true;
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
@@ -618,7 +626,7 @@
//#region 鎵撳嵃
form.on('submit(get_PrintReport)', function (data) {
- if (HIsSave == true) {
+ if (HIsCheck == true) {
layer.open({
type: 2
, area: ['50%', '50%']
@@ -631,7 +639,7 @@
})
}
else {
- layer.msg('璇蜂繚瀛樺崟鎹暟鎹悗鎵撳嵃锛�');
+ layer.msg('璇峰鏍稿崟鎹垚鍔熷悗鎵撳嵃锛�');
}
});
//#endregion
@@ -711,6 +719,7 @@
data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ HIsCheck = true;
layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -745,7 +754,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -754,26 +763,65 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMaterID: checkStatus.data[0].HItemID,
- HMaterCode: checkStatus.data[0].鐗╂枡浠ｇ爜,
- HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
- HMaterSpec: checkStatus.data[0].瑙勬牸鍨嬪彿,
- });
+
+ //閫変腑澶氳鏃�
+ if (checkStatus.data.length > 1) {
+ var rowIndex = $(obj.tr).attr("data-index") * 1; //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+ for (var i = 0; i < checkStatus.data.length; i++) { //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害 鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+ if (rowIndex + i >= option.data.length) { //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+ var NewRow = {
+ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
+ "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
+ "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ "HSourceBillType": 0
+ };
+
+ table.cache["mainTable"].push(NewRow); //鍒涘缓鏂扮殑鍖呭惈鏁扮粍 浼犲叆table.cache["mainTable"]鏁扮粍
+ option.data = table.cache["mainTable"]; //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+ table.render(option);//娓叉煋鐣岄潰
+ }
+ option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID; //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HMaterCode = checkStatus.data[i].鐗╂枡浠ｇ爜; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠ｇ爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HMaterName = checkStatus.data[i].鐗╂枡鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡鍚嶇О 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HMaterSpec = checkStatus.data[i].瑙勬牸鍨嬪彿; //灏唎ption.data鏁扮粍涓搴旇鐨� 瑙勬牸鍨嬪彿 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+ option.data[rowIndex + i].HUnitCode = checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜;
+ option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁￠噺鍗曚綅鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁￠噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID 鏇存柊璁￠噺鍗曚綅灞炴��
+ }
+ table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+ } else {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterCode: checkStatus.data[0].鐗╂枡浠ｇ爜,
+ HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
+ HMaterSpec: checkStatus.data[0].瑙勬牸鍨嬪彿,
+ HUnitID: checkStatus.data[0].HUnitID,
+ HUnitCode: checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О,
+ });
+ }
+
+
+
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
}, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != "" && OptionData != []) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HMaterID: OptionData[0].HItemID,
- HMaterCode: OptionData[0].鐗╂枡浠ｇ爜,
- HMaterName: OptionData[0].鐗╂枡鍚嶇О,
- HMaterSpec: OptionData[0].瑙勬牸鍨嬪彿,
+ HMaterID: OptionData.HItemID,
+ HMaterCode: OptionData.鐗╂枡浠ｇ爜,
+ HMaterName: OptionData.鐗╂枡鍚嶇О,
+ HMaterSpec: OptionData.瑙勬牸鍨嬪彿,
+ HUnitID: OptionData.HUnitID,
+ HUnitCode: OptionData.璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: OptionData.璁￠噺鍗曚綅鍚嶇О,
});
OptionData = [];
}
@@ -792,7 +840,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=HUnitList', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -816,12 +864,12 @@
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
}, end: function () {
- if (OptionData.length > 0) {
+ if (OptionData != "" && OptionData != []) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HUnitID: OptionData[0].HItemID,
- HUnitCode: OptionData[0].璁￠噺鍗曚綅浠ｇ爜,
- HUnitName: OptionData[0].璁￠噺鍗曚綅鍚嶇О
+ HUnitID: OptionData.HItemID,
+ HUnitCode: OptionData.璁￠噺鍗曚綅浠ｇ爜,
+ HUnitName: OptionData.璁￠噺鍗曚綅鍚嶇О
});
OptionData = [];
}
@@ -840,7 +888,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -867,9 +915,9 @@
if (OptionData.length > 0) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HSourceID: OptionData[0].HItemID,
- HSourceCode: OptionData[0].鐢熶骇璧勬簮浠ｇ爜,
- HSourceName: OptionData[0].鐢熶骇璧勬簮鍚嶇О
+ HSourceID: OptionData[0][0].HItemID,
+ HSourceCode: OptionData[0][0].鐢熶骇璧勬簮浠ｇ爜,
+ HSourceName: OptionData[0][0].鐢熶骇璧勬簮鍚嶇О
});
OptionData = [];
}
@@ -939,22 +987,22 @@
, { 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: '鐗╂枡鍚嶇О', style: 'background-color:#efefef4d;', width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', style: 'background-color:#efefef4d;', 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: '鍗曚綅鍚嶇О', style: 'background-color:#efefef4d;', width: 100 }
, { field: 'HSourceID', title: 'HSourceID', edit: 'text', width: 100, hide: true }
, { field: 'HSourceCode', title: '璧勬簮浠ｇ爜', edit: 'text', event: 'HSourceCode', width: 100 }
- , { field: 'HSourceName', title: '璧勬簮鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HSourceName', title: '璧勬簮鍚嶇О', style: 'background-color:#efefef4d;', width: 100 }
, { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
, { field: 'HWorkerCode', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', event: 'HWorkerCode', width: 100 }
- , { field: 'HWorkerName', title: '鎿嶄綔鍛樺悕绉�', edit: 'text', width: 100 }
+ , { field: 'HWorkerName', title: '鎿嶄綔鍛樺悕绉�', style: 'background-color:#efefef4d;', width: 100 }
, { field: 'HQty', title: '鐢熶骇鏁伴噺', edit: 'text', width: 100, totalRow: true }
, { field: 'HBadQty', title: '涓嶈壇鏁伴噺', edit: 'text', width: 100, totalRow: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', edit: 'text', width: 100 }
- , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text', width: 100, hide: true }
- , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', style: 'background-color:#efefef4d;', width: 100 }
+ , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', style: 'background-color:#efefef4d;', width: 100, hide: true }
+ , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', style: 'background-color:#efefef4d;', width: 100, hide: true }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', width: 100, hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
@@ -1132,12 +1180,12 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{
- "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
- "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
- "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
- "HSourceBillType": 0, "HICMOTempID": 0
- }];
+ //option.data = [{
+ // "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
+ // "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
+ // "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
+ // "HSourceBillType": 0, "HICMOTempID": 0
+ //}];
table.render(option);
}
//#endregion
@@ -1148,6 +1196,7 @@
$.ajax({
url: GetWEBURL() + "Sc_ICMOReportBill/Sc_GetICMOReportBillListCheckDetai",
type: "GET",
+ async: false,
data: {
"HID": linterid
},
@@ -1166,8 +1215,8 @@
$("#HEmpID").val(data.HEmpID);
$("#HEmpName").val(data.缁熻鍛�);
$("#HMainSourceBillNo").val(data.HMainSourceBillNo);
- $("#HMainSourceInterID").val(data.HMainSourceInterID);
- $("#HMainSourceEntryID").val(data.HMainSourceEntryID);
+ $("#HMainSourceInterID").val(data.HMainSourceInterID == null ? 0 : data.HMainSourceInterID);
+ $("#HMainSourceEntryID").val(data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID);
$("#HExplanation").val("");
$("#HRemark").val(data.琛ㄥご澶囨敞);
PicUpload();
@@ -1189,6 +1238,7 @@
$.ajax({
url: GetWEBURL() + 'Sc_ICMOReportBill/Sc_ICMOReportBillListProjectDetai',
type: "GET",
+ async: false,
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
@@ -1354,7 +1404,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1659,11 +1709,11 @@
$("#HEmpID").val(obj[0].HItemID);
}
//鐗╂枡
- function GetMaterValue(obj) {
+ function GetGyMaterial(obj) {
OptionData = obj;
}
//鍗曚綅
- function GetUnitValue(obj) {
+ function GetHUnitListValue(obj) {
OptionData = obj;
}
//鐢熶骇璧勬簮
--
Gitblit v1.9.1