From d4a4a6bbb6fc55e21ab6db1319edaf23541bdc2f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 15 十月 2024 16:40:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 39 ++++
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_TK.html | 4
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 258 +++++++++++++++++++-------------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 20 +
WebTM/views/生产管理/报工台工序/完工/Sc_Add_MESEndStepWorkBillList.html | 2
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 12
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 42 ++++
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 7
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html | 6
WebTM/views/质量管理/质量报表/QC_QualityMonthSumReport.html | 8
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 5
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 24 ++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 4
WebTM/WebTM.csproj | 1
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 3
16 files changed, 296 insertions(+), 141 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 58fe220..a404706 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -550,6 +550,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 67044c2..ee77abe 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
index 02fc0f7..335d06f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
@@ -504,7 +504,7 @@
//#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_WorkCenter/list',
@@ -684,6 +684,7 @@
if (HOrgID) {
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
+ sWhere += " and 绂佺敤鏍囪 != 'Y'";
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
index 353744b..462ece4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
@@ -868,7 +868,7 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
- window.parent.location.reload();
+ //window.parent.location.reload();
});
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index e7da65b..8024eeb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -207,7 +207,7 @@
if (result.code == "2") {
layer.close(index);
layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
- parent.GetSwipeCardStart({ "data": 0 });
+ parent.GetSwipeCardStart({ "data": 0, "HName": "" });
setTimeout(function () {
var index2 = parent.layer.getFrameIndex(window.name);
parent.layer.close(index2);
@@ -246,7 +246,7 @@
if (result.code == "1") {
layer.msg("鍖归厤!", { time: 1 * 1000, icon: 1 }, function (index) {
- parent.GetSwipeCardStart({ "data": 1 });
+ parent.GetSwipeCardStart({ "data": 1, "HName": $("#HEmpName").val() });
setTimeout(function () {
var index2 = parent.layer.getFrameIndex(window.name);
parent.layer.close(index2);
@@ -254,7 +254,7 @@
})
} else {
layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
- parent.GetSwipeCardStart({ "data": 0 });
+ parent.GetSwipeCardStart({ "data": 0, "HName": $("#HEmpName").val() });
setTimeout(function () {
var index2 = parent.layer.getFrameIndex(window.name);
parent.layer.close(index2);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 71f3d97..9649c4f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -1139,8 +1139,8 @@
, data: data1.data
, height: 'full-120'
//, page: true
- //, limits: [50, 500, 5000, 50000]
- //, limit: 500
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
, cellMinWidth: 90
, done: function (res, curr, count) {
soulTable.render(this);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index f19dc61..5f30287 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -679,7 +679,7 @@
});
//瀹℃牳鎻愪氦
- function SaveVerify()
+ function SaveVerify(HName)
{
var InterID = $("#HInterID").val();
if (!AllowLoadData())//鏁版嵁楠岃瘉
@@ -690,7 +690,7 @@
type: "GET",
url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": HName },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -1268,6 +1268,7 @@
end: function () {
if (OptionData.length > 0) {
if (OptionData[0]["data"] == "1") {
+ data2.field["HMaker"] = OptionData[0]["HName"];
save(data2);
} else if (OptionData[0]["data"] == "0") {
layer.msg("鍥犱负鎶�鑳戒笉鍖归厤,鏃犳硶淇濆瓨!")
@@ -1304,11 +1305,12 @@
num.push(table.cache["mainTable"][i])
}
}
-
+ //鏇存柊瀹℃牳浜轰负鍒峰崱浜�
+ var HName = data.field["HMaker"];
//瀛愯〃鏁版嵁搴忓垪鍖�
var sSubStr = JSON.stringify(num);
var sMainStr = JSON.stringify(data.field);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
@@ -1328,7 +1330,7 @@
if (data.Verify == "Y") //鑷姩瀹℃牳
{
layer.close(index);
- SaveVerify(); //瀹℃牳
+ SaveVerify(HName); //瀹℃牳
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
index d747960..8572513 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
@@ -46,7 +46,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
<div class="layui-input-block">
<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
@@ -379,6 +379,9 @@
HVaule.push(option.data[i].瀹為檯鍊�);
} else {
HVaule.push(option.data[i].鏁伴噰鍊�);
+ HMax.push(option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
}
}
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 0343369..ca97a65 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -168,7 +168,7 @@
//
var HModName = "QC_FiveMenOneRingList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
- var titleData = ["娴佽浆鍗d", "鐢熶骇璁㈠崟", "鐗╂枡浠ｇ爜", "瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id"];
+ var titleData = ["娴佽浆鍗d", "鐢熶骇璁㈠崟", "鐗╂枡浠ｇ爜", "瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id","璁惧id"];
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -230,80 +230,7 @@
var HMaterModel = $("#HMaterModel").val();//瑙勬牸鍨嬪彿
var HProcExchBillNo = $("#HProcExchBillNo").val();//涓绘祦杞崱鍙�
var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
+
//if (SN) {
// sWhere += " and 鍞竴鐮� like '%" + SN + "%'";
@@ -374,13 +301,11 @@
function set_InitGrid_Man() {
option_Man = {
elem: '#mainTable_Man'
- , toolbar: '#toolbarDemo'
- , page: true
+ , toolbar: '#toolbarDemo'
, totalRow: true
, height: 600
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: []
, data: []
};
@@ -391,12 +316,10 @@
option_Machine = {
elem: '#mainTable_Machine'
, toolbar: '#toolbarDemo'
- , page: true
, totalRow: true
, height: 600
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: []
, data: []
};
@@ -407,12 +330,10 @@
option_Material = {
elem: '#mainTable_Material'
, toolbar: '#toolbarDemo'
- , page: true
, totalRow: true
, height: 600
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: []
, data: []
};
@@ -423,12 +344,10 @@
option_Method = {
elem: '#mainTable_Method'
, toolbar: '#toolbarDemo'
- , page: true
, totalRow: true
, height: 600
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: []
, data: []
};
@@ -438,10 +357,8 @@
function set_InitGrid_Environments() {
option_Environments = {
elem: '#mainTable_Environments'
- , page: false
, height: 600
, totalRow: true
- , cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: []
, data: []
@@ -486,18 +403,11 @@
for (var j = 0; j < data.length; j++) {
if ($.inArray(data[j].name, titleData) > -1) {
col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if (data[j].name == '閰嶄欢娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
+ }
+ else if (data[j].name == '娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
col.push({
- field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '閰嶄欢娴佽浆鍗�', templet: function (d) {
- return '<span style="color: blue;">' + d.閰嶄欢娴佽浆鍗� + '</span>'
- }, style: 'cursor: pointer;'
- });
- }
- else if (data[j].name == '涓绘祦杞崱') {//娣诲姞瓒呴摼鎺�
- col.push({
- field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '涓绘祦杞崱', templet: function (d) {
- return '<span style="color: blue;">' + d.涓绘祦杞崱 + '</span>'
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '娴佽浆鍗�', templet: function (d) {
+ return '<span style="color: blue;">' + d.娴佽浆鍗� + '</span>'
}, style: 'cursor: pointer;'
});
}
@@ -587,11 +497,11 @@
}
table.render(option_Measure);
- $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].鎴愬搧鐗╂枡浠ｇ爜);
- $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].鎴愬搧鐗╂枡);
- $("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].鎴愬搧瑙勬牸鍨嬪彿);
- $("#HProcExchBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].涓绘祦杞崱);
- $("#HICMOBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].涓荤敓浜ц鍗�);
+ $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].瑙勬牸鍨嬪彿);
+ $("#HProcExchBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].娴佽浆鍗�);
+ $("#HICMOBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐢熶骇璁㈠崟);
layer.close(ajaxLoad);
@@ -687,6 +597,8 @@
, data: data1.data.h_p_QC_FiveMenOneRingList_Query
, height: 'full-80'
, cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ ,page: false
}
table.render(option_Man);
//鏈�
@@ -697,6 +609,8 @@
, data: data1.data.h_p_QC_FiveMenOneRingList_Query1
, height: 'full-80'
, cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
}
table.render(option_Machine);
//鏂�
@@ -707,6 +621,8 @@
, data: data1.data.h_p_QC_FiveMenOneRingList_Query2
, height: 'full-80'
, cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , page: false
}
table.render(option_Material);
//娉�
@@ -717,6 +633,7 @@
, data: data1.data.h_p_QC_FiveMenOneRingList_Query3
, height: 'full-80'
, cellMinWidth: 90
+ , page: false
}
table.render(option_Method);
//鐜�
@@ -727,6 +644,7 @@
, data: data1.data.h_p_QC_FiveMenOneRingList_Query4
, height: 'full-80'
, cellMinWidth: 90
+ , page: false
}
table.render(option_Environments);
//娴�
@@ -737,6 +655,7 @@
, data: data1.data.h_p_QC_FiveMenOneRingList_Query5
, height: 'full-80'
, cellMinWidth: 90
+ , page: false
}
table.render(option_Measure);
layer.close(ajaxLoad);
@@ -1076,6 +995,133 @@
}
});
+ //娴�
+ table.on('tool(mainTable_Measure)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.鍗曟嵁涓籭d;
+ if (data.鍗曟嵁绫诲瀷 =="棣栦欢妫�楠屽崟") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅棣栦欢妫�楠屽崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "宸℃妫�楠屽崟") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅宸℃璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "鏈妫�楠屽崟") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鏈妫�楠屽崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "杞﹂棿鑷鍗�") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅杞﹂棿鑷鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../杞﹂棿鑷鍗�/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "鐢熶骇璐ㄩ噺姹囨姤鍗�") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鐢熶骇璐ㄩ噺姹囨姤鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (data.鍗曟嵁绫诲瀷 == "涓嶈壇鍝佸鐞嗗崟") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅涓嶈壇鍝佸鐞嗗崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
//#endregion
//#region 闅愯棌鍒楄缃�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index 2d998dd..9ef3642 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -63,9 +63,12 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -174,6 +177,12 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
+ //#region 浜у搧缂栫爜
+ form.on('submit(btnHMaterID)', function (data) {
+ btnHMaterID();
+ });
+ //#endregion
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -933,6 +942,32 @@
}
//#endregion
+ //鐗╂枡鍒楄〃
+ function btnHMaterID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
index d4d9940..d0da046 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
@@ -63,11 +63,14 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -174,6 +177,12 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
+ //#region 浜у搧缂栫爜
+ form.on('submit(btnHMaterID)', function (data) {
+ btnHMaterID();
+ });
+ //#endregion
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -459,7 +468,7 @@
}
},
itemStyle: {
- color: '#33CCFF' // 璁剧疆鏌辩姸鍥捐摑鑹�
+ color: '#FF0000' // 璁剧疆鏌辩姸鍥剧孩鑹�
},
data: HBackCount
},
@@ -752,6 +761,31 @@
}
//#endregion
+ //鐗╂枡鍒楄〃
+ function btnHMaterID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityMonthSumReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityMonthSumReport.html"
index 17f2bcf..283b4e5 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityMonthSumReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityMonthSumReport.html"
@@ -733,7 +733,7 @@
}
},
legend: {
- data: ['璐ㄩ噺闂ㄩ�冮�哥巼', '涓婇檺鍊�'],
+ data: ['璐ㄩ噺闂ㄩ�冮�哥巼', '鐩爣涓婇檺鍊�'],
top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
@@ -802,15 +802,15 @@
itemStyle: {
normal: {
lineStyle: {
- color: '#8E8E8E' // 璁剧疆绾挎潯棰滆壊涓虹伆鑹�
+ color: '#1E90FF' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
},
- color: '#8E8E8E' // 璁剧疆绾挎潯棰滆壊涓虹伆鑹�
+ color: '#1E90FF' // 璁剧疆绾挎潯棰滆壊涓鸿摑鑹�
}
},
data: HAverage
},
{
- name: '涓婇檺鍊�',
+ name: '鐩爣涓婇檺鍊�',
type: 'line',
barWidth: 10,
barGap: 0,
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
index 778deaf..88acb19 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
@@ -525,7 +525,12 @@
var FistPass = [];//涓�娆″悎鏍�
var HProcTarGetVal = [];//鍚勫伐搴忕洰鏍囧��
var Pass = [];//鍚堟牸
- var HTitle = "鍚勫伐搴忚秼鍔垮浘";//鍥惧舰鏍囬
+ var HTitle = "";//鍥惧舰鏍囬
+ if ($("#HProcName").val() == "") {
+ HTitle = "鍚勫伐搴忚秼鍔垮浘";
+ } else {
+ HTitle = $("#HProcName").val() + "瓒嬪娍鍥�";
+ }
if (option.data.length > 0) {
for (let i = 0; i < option.data.length; i++) {
H_X.push(option.data[i].鏃ユ湡);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 25d940d..370eed7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -1717,7 +1717,7 @@
default:
}
}
- sWhere += " and HBillSubType<>'SUB'";
+ sWhere += " and HBillSubType<>''SUB''";
//sWhere = sWhere.replace(/'/g, "''");
@@ -1954,6 +1954,28 @@
soulTable.render(this);
}
}
+
+ //鍒ゆ柇鏄惁鏈夋煡鐪嬪伐浠锋潈闄�
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/CheckProcPrice",
+ async: false,
+ data: { "UserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ } else {
+ //鏃犳潈闄�
+ for (let i = 0; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].field == '宸ュ簭宸ヤ环') {
+ option.cols[0][i].hide = true; //闅愯棌宸ヤ环瀛楁
+ }
+ }
+ }
+ layer.closeAll("loading");
+ }
+ })
+
ins = table.render(option);
laypage.render(optionPage);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 40793d5..471dff8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1055,7 +1055,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
@@ -1108,7 +1109,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
@@ -1188,7 +1190,8 @@
, { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
, { field: 'HQty', title: '娴佽浆鍗℃暟閲�', totalRow: true, edit: 'text', width:120 }
, { field: 'HSNCtrl', title: 'SN杩囩珯鎺у埗', templet: "#HSNCtrl", width: 120 }
-
+ , { field: 'HRoutingBillMainID', title: '宸ヨ壓璺嚎ID', hide: true }
+ , { field: 'HRoutingBillEntryID', title: '宸ヨ壓璺嚎瀛怚D', hide: true }
//, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
//, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
//, { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜', edit: 'text', event: "HDeptCheck" }
@@ -1250,7 +1253,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1915,7 +1919,7 @@
"HQty": HLZQty, "HSNCtrl": data[i].SN杩囩珯鎺у埗 == 0 ? "false" : "true", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�,
- "HRelationQty_OutBad": "0"
+ "HRelationQty_OutBad": "0", "HRoutingBillMainID": data[i].hmainid, "HRoutingBillEntryID": data[i].hsubid
});
}
option.data = Tablerow;
@@ -2253,7 +2257,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
@@ -2788,7 +2793,8 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
+ "HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
}];
table.render(option);
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
index 15d73ed..af3c481 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_TK.html"
@@ -243,8 +243,8 @@
var sSubStr = table.cache['mainTable'];
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_TianKang",
- type: "Post",
- data: { "HInterID": HInterID, "FID": option.data[0].FID },
+ type: "Get",
+ data: { "FID": option.data[0].FID },
success: function (result) {
if (result.code == "1") {
layer.msg("瀹℃牳鎴愬姛", {
--
Gitblit v1.9.1