From f7bb7e16d29508a3f0642710d9d0ed149f8ee660 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 31 五月 2024 13:13:18 +0800
Subject: [PATCH] 工序：新增/编辑 时,选着检验方案后,保存失败； 检验方案：回显分析方法、缺陷等级 、破坏性检验、重点检查； 工序检验单：选择抽样方案后关闭弹框； 产品器具清单：增加工序字段； 维修记录单维护：初始化日期； 维修验收单维护：列表 显示 验收项目 显示不对,编辑 时,子表 验收项目 回显 数据不对
---
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html | 14 ++-
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 28 +++---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 27 +++---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 26 +++---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 6
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 45 ++++++++---
WebTM/WebTM.csproj | 2
WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMain.html | 78 +++++++++++++++++++
8 files changed, 165 insertions(+), 61 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e46f5e2..970386a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1449,7 +1449,6 @@
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鐐规瑙勭▼鍗昞Sc_MouldDotCheckRuleBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿缁翠慨娲惧伐鍗昞Sc_MouldRepairSendWorkBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
@@ -2483,6 +2482,7 @@
<Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 8deccbf..0925311 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -814,7 +814,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HQCSchemeName_Fst").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
- $("#HQCSchemeID_Fst").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeID_Fst").val(checkStatus.data[0].hmainid);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -839,7 +839,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HQCSchemeName_Proc").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
- $("#HQCSchemeID_Proc").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeID_Proc").val(checkStatus.data[0].hmainid);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -864,7 +864,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HQCSchemeName_Patrol").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
- $("#HQCSchemeID_Patrol").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeID_Patrol").val(checkStatus.data[0].hmainid);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
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\347\256\241\347\220\206/Gy_MaterialMouldBillMain.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\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
index c533ad3..26d9ef0 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\347\256\241\347\220\206/Gy_MaterialMouldBillMain.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\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
@@ -83,7 +83,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <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="padding-left: 80px;width:185px;">
</div>
</div>
<div class="layui-inline">
@@ -162,6 +162,16 @@
<label class="layui-form-label" style="width: 85px;">璁惧鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HEquipModel" lay-verify="HEquipModel" id="HEquipModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -409,6 +419,12 @@
});
//#endregion
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_Process();
+ });
+ //#endregion
+
//#region 閫夋嫨璐熻矗浜烘寜閽�
form.on('submit(btnSearchHEmp)', function () {
get_checkSearchHEmp();
@@ -475,7 +491,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMouldID": "",
+ "HMouldID": 0,
"HMouldNumber": "",
"HMouldName": "",
"HMouldType": "",
@@ -616,6 +632,40 @@
$("#HDeptID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_Process() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
layer.close(layer.index);
}
@@ -975,6 +1025,8 @@
, "HEmpName": tableMain[0]["璐熻矗浜�"]
, "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
, "HOrgID": tableMain[0].HOrgID
+ , "HProcID": tableMain[0].HProcID
+ , "HProcName": tableMain[0].宸ュ簭鍚嶇О
@@ -1097,6 +1149,28 @@
return Result = false;
}
+ var sSubTable = table.cache['mainTable'];
+ if (sSubTable.length < 1) {
+ layer.msg("鏄庣粏淇℃伅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ for (var i = 0; i < sSubTable.length; i++) {
+ if (!sSubTable[i].HMouldID) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝鍣ㄥ叿缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (!sSubTable[i].HMouldQty) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝妯＄┐鏁颁笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (!sSubTable[i].HRate) {
+ var indexRow = i + 1;
+ layer.msg("绗�" + indexRow + "琛岋紝鍗犳瘮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
return Result;
}
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\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.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\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 698ee67..657bb5e 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\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.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\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -136,13 +136,16 @@
</button>
</div>
</div>
-
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨寮�濮嬫棩鏈�</label>
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
- </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -158,19 +161,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨缁撴潫鏃ユ湡</label>
+ <label class="layui-form-label">缁翠慨寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
+ <input class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">缁翠慨缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <input class="layui-input" name="HRepairEndDate" id="HRepairEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
</div>
</div>
</div>
@@ -345,7 +344,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -1006,7 +1005,8 @@
$("#HPlanInterID").val(0);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
-
+ $("#HRepairBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HRepairEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
});
}
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\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.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\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
index 75f806f..78aa1d5 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\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.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\347\256\241\347\220\206/Sc_Add_MouldRepairCheckBillList.html"
@@ -622,7 +622,13 @@
success: function (result) {
//console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ var subarr = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ subarr.push({ "HRepairCheckID": data[i].HRepairCheckID, "HRepairCheckCode": data[i].楠屾敹椤圭洰浠ｇ爜, "HRepairCheckName": data[i].楠屾敹椤圭洰, "HRepairCheckContent": data[i].楠屾敹鍐呭, "HManagerID": data[i].HManagerSonID, "HManagerCode": data[i].瀛愯礋璐ｄ汉浠ｇ爜, "HManagerName": data[i].瀛愯礋璐ｄ汉, "HRemark": data[i].琛ㄤ綋澶囨敞});
+ }
+
+ option.data = subarr;
table.render(option);
} else {
@@ -715,7 +721,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -729,8 +735,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HRepairCheckID: checkStatus.data[0].hitemid,
- HRepairCheckCode: checkStatus.data[0].缁翠慨椤圭洰浠ｇ爜,
- HRepairCheckName: checkStatus.data[0].缁翠慨椤圭洰,
+ HRepairCheckCode: checkStatus.data[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
+ HRepairCheckName: checkStatus.data[0].缁翠慨楠屾敹椤圭洰,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index f94fa26..22dab4a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1802,18 +1802,21 @@
$("#HRejectQty").val(checkStatus.data[0].鎷掔粷鏁�);
$("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
$("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
- option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
- option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].鎶芥牱鏂规鍚嶇О;
- option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].鎶芥牱绫诲瀷;
- option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].妫�楠屾按骞�;
- option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].涓ユ牸搴�;
- option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
- option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].鏍锋湰閲�;
- option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].鏍锋湰閲�;
- option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].鍏佽鏁�;
- option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].鎷掔粷鏁�;
- option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].涓婇檺鍊�;
- option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].涓嬮檺鍊�;
+
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].鍏佽鏁�;
+ option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].鎷掔粷鏁�;
+ option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].涓婇檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].涓嬮檺鍊�;
+ }
rowdata_Value = [];
for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 03f2025..de74e89 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -534,7 +534,7 @@
Pub_Close(2);
} else {
Pub_Close(1);
- }
+ }
//var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
//parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
@@ -943,7 +943,7 @@
, done: function (res, curr, count) {
}
- };
+ };
}
//淇濆瓨
@@ -1235,18 +1235,23 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
- //table.cache["mainTable"].push(NewRow);
- //option.data = table.cache["mainTable"];
- //table.render(option);
- var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < tableBak.length; i++) {
- buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+
+ if (option.data[i - 1].HDestructInspect) {
+ $('#HDestructInspect' + i + '').attr("checked", true);
+ }
+ if (option.data[i - 1].HKeyInspect) {
+ $('#HKeyInspect' + i + '').attr("checked", true);
+ }
}
- buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
+ form.render('select');
+ form.render('checkbox');
}
//澶嶅埗涓�琛�
@@ -1264,6 +1269,20 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HDefectLevel' + i + '').find("option[value='" + option.data[i - 1].HDefectLevel + "']").attr("selected", true);
+ $('#HStatus' + i + '').find("option[value='" + option.data[i - 1].HStatus + "']").attr("selected", true);
+
+ if (option.data[i - 1].HDestructInspect) {
+ $('#HDestructInspect' + i + '').attr("checked", true);
+ }
+ if (option.data[i - 1].HKeyInspect) {
+ $('#HKeyInspect' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
}
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index a00e646..c8593a1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1871,18 +1871,20 @@
$("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
$("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
- option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
- option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].鎶芥牱鏂规鍚嶇О;
- option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].鎶芥牱绫诲瀷;
- option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].妫�楠屾按骞�;
- option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].涓ユ牸搴�;
- option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
- option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].鏍锋湰閲�;
- option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].鏍锋湰閲�;
- option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].鍏佽鏁�;
- option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].鎷掔粷鏁�;
- option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].涓婇檺鍊�;
- option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].涓嬮檺鍊�;
+ if ($("#HEntryID").val() - 1 >= 0) {
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].鎶芥牱鏂规鍚嶇О;
+ option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].鎶芥牱绫诲瀷;
+ option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].妫�楠屾按骞�;
+ option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].涓ユ牸搴�;
+ option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
+ option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].鏍锋湰閲�;
+ option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].鍏佽鏁�;
+ option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].鎷掔粷鏁�;
+ option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].涓婇檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].涓嬮檺鍊�;
+ }
rowdata_Value = [];
for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
--
Gitblit v1.9.1