From 32773c624990f39e5df76a379fb6ffea2ff41d45 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 15 八月 2024 13:04:23 +0800
Subject: [PATCH] 修改流转卡下推设备工艺参数点检查询, pDA设备维修记录单 扫描设备条码 如果一条就直接显示,;两天就打开弹框选着已审核,未关闭的故障
---
WebTM/WebTM.csproj.user | 7 +
WebTM/views/模治具管理/器具报表/Sc_MouldLifeUsePicReport.html | 8 -
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 7 +
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 2
WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html | 10 ++
WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html | 2
WebTM/views/IpadIndex.html | 42 ++++++++++
WebTM/views/设备管理/Sb_EqpMaintenanceBillList.html | 39 +++++++++
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 44 +++++++++--
WebTM/views/设备管理/Sb_EqpConkBookBillList.html | 53 ++++++++++--
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 2
11 files changed, 182 insertions(+), 34 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 65037ad..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\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 />
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 2fa2240..f4f5488 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1238,6 +1238,42 @@
});
}
+ //宸ヨ壓鍙傛暟鐐规鐐瑰嚮浜嬩欢
+ function TechParam(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板宸ヨ壓鍙傛暟鐐规鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=4&linterid=&HEntryID=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
//閫�鍑�
function Esc(event, obj) {
parent.location.href = "index.html"
@@ -1486,6 +1522,12 @@
<span class="imgtitle">妫�楠屽彇鏍�</span>
</div>
</div>
+ <div class="layui-col-sm12 layui-col-md4" onclick="TechParam(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-tabs imgicon"></span>
+ <span class="imgtitle">宸ヨ壓鍙傛暟鐐规</span>
+ </div>
+ </div>
</div>
</div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
index 75cfb0f..5b68379 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
@@ -152,12 +152,10 @@
</div>
</div>
<div>
- <div style="width:99%;height:calc(100vh);">
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- </div>
<div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
</div>
- <div id="histogram1" style="width:99.5%;height:calc(68vh);margin-top:30px;">
+ <div style="width:99%;height:calc(100vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -565,7 +563,7 @@
// 濉厖鏁版嵁
for (let i = 0; i < option.data.length; i++) {
- Life.push(option.data[i].鍘熷墿浣欏鍛�);
+ Life.push(option.data[i].鍓╀綑瀵垮懡);
}
}
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_MouldFile.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_MouldFile.html"
index d0744f6..35629d0 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_MouldFile.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_MouldFile.html"
@@ -382,6 +382,12 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <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="HInitLife" id="HInitLife">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -1719,6 +1725,7 @@
$("#HDesignLife").val(d.data[0].鍒濆璁捐瀵垮懡);
$("#HUseLife").val(d.data[0].浣跨敤瀵垮懡);
$("#HLeaveLife").val(d.data[0].鍓╀綑瀵垮懡);
+ $("#HInitLife").val(d.data[0].涓婄嚎鍒濆鍖栧鍛�);
$("#HCaveQty").val(d.data[0].绌存暟);
$("#HProdQty").val(d.data[0].宸茬敓浜ф暟閲�);
$("#HProdWeight").val(d.data[0].宸茬敓浜ч噸閲�);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index d3cf246..ba77c7e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -584,7 +584,7 @@
title: '璁惧鏁呴殰鐧昏鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html?type=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 5ddd04f..e40670c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -479,7 +479,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/Sb_EqpMaintenanceBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EqpMaintenanceBillList.html?type=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index 044f718..eadf207 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -470,10 +470,17 @@
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
+
//鏌ヨ
- //get_Display(sWhere);
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_DefaultModule();
+
+ } else {
+ get_DefaultModule();
+ }
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+
}
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -590,7 +597,7 @@
});
//蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -868,6 +875,36 @@
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HNumber = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 璁惧浠ｇ爜
+ if (openType == 2) {
+ sWhere += " and 瀹℃牳浜� IS NOT NULL and 瀹℃牳浜� <> '' and (鍏抽棴浜� IS NULL OR 鍏抽棴浜� = '') ";
+ form.render("select");
+ return true;
+ } else if (openType==3) {
+ sWhere += " and 瀹℃牳浜� IS NOT NULL and 瀹℃牳浜� <> '' and (鍏抽棴浜� IS NULL OR 鍏抽棴浜� = '') and 璁惧浠ｇ爜 like '%" + HNumber+"%' ";
+ form.render("select");
+ return true;
+ }
+ }
+ //#endregion
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
@@ -886,6 +923,7 @@
form.render('select');
}
//#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -1094,14 +1132,7 @@
//#endregion
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
-
-
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
index 354b4b0..5f008f3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
@@ -343,9 +343,15 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_Display(sWhere);
- //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ } else {
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+
+
}
//鍒濆鍖栬〃鏍�
@@ -896,6 +902,32 @@
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (openType == 2) {
+ sWhere += " and 瀹℃牳浜� IS NOT NULL and 瀹℃牳浜� <> '' and (鍏抽棴浜� IS NULL OR 鍏抽棴浜� = '') ";
+ form.render("select");
+ return true;
+ }
+ }
+ //#endregion
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
@@ -914,6 +946,7 @@
form.render('select');
}
//#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
index 3906a40..d63e542 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
@@ -238,6 +238,7 @@
<th>璁惧鍚嶇О</th>
<td class="bz_td">
<input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HNumber" id="HNumber" value="" autocomplete="off" class="layui-input">
<input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
@@ -690,6 +691,7 @@
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
+ var hnumber = $("HNumber").val()
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -697,7 +699,7 @@
title: '璁惧缁翠慨鐧昏鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html?type=2&HNumber='+hnumber, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -708,6 +710,10 @@
$("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
$("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+
+ $("#HEquipID").val(checkStatus.data[0].hmainid);
+ $("#HNumber").val(checkStatus.data[0].璁惧浠ｇ爜);
+ $("#HBarName").val(checkStatus.data[0].璁惧鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -910,6 +916,7 @@
if (result.count == 1) {
var data = result.data[0];
$("#HEquipID").val(data.HInterID);
+ $("#HNumber").val(data.HEquipFileNumber);
$("#HBarName").val(data.HName);
$("#HBarSpec").val(data.HModel);
$("#HBarModel").val(data.HModel2);
@@ -925,6 +932,7 @@
HProcExchBillNoFlag = true;
layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
else {
$("#HBarCode").val("");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 2bd5a84..9c054b2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -328,7 +328,33 @@
</script>
<script>
+ //鑾峰彇鍙傛暟
var OptionData = [];
+ var HBillType = ""; //鍗曟嵁绫诲瀷
+ var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
+ var HSourceBillNo = ""; //婧愬崟鍗曞彿
+ var HSourceBillType = ""; //婧愬崟绫诲瀷
+ var refSav = ""; //鎻愪氦绫诲瀷
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HInterID = params[params[1]];//鍗曟嵁鍐呯爜
+ var HEntry = params[params[2]];//鍗曟嵁瀛愬唴鐮�
+ }
+
+
+ var edit = function (data) {
+ HSourceInterID = data[0].HSourceInterID;
+ HSourceEntryID = data[0].HSourceEntryID;
+ HSourceBillNo = data[0].HSourceBillNo;
+ HSourceBillType = data[0].HSourceBillType;
+
+ }
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -346,10 +372,7 @@
var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
var option = {};
- var params = get_UrlVars();
- var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
- var HInterID = params[params[0]] == null ? 0 : params[params[1]]; //鍗曟嵁鍐呯爜
- var HEntry = params[params[0]] == null ? 0 : params[params[2]]; //鍗曟嵁瀛愬唴鐮�
+
//#endregion
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -418,7 +441,12 @@
$("#HMaker").val(HMaker);
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
//宸ュ簭娴佽浆鍗￠〉闈笅鎺�
- set_ProcessBill(HInterID, HEntry);
+ if (HInterID == "") { //鎶ュ伐鍙颁笅鎺�
+ set_ProcessBill(HSourceInterID, HSourceEntryID);
+ } else {
+ set_ProcessBill(HInterID, HEntry);
+ }
+
OperationType = 1;
}
else {
@@ -1335,14 +1363,14 @@
//#endregion
//#region (宸ュ簭娴佽浆鍗�)涓嬫帹椤甸潰鍒濆鍖�
- function set_ProcessBill(HInterID, HEntry) {
+ function set_ProcessBill(HSourceInterID, HSourceEntryID) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + "/LEMS/MES_IF_EquipICMOTechParamList_Json",
type: "GET",
async: false,
- data: { "hinterid": HInterID, "HEntryID": HEntry, "user": sessionStorage["HUserName"] },
+ data: { "hinterid": HSourceInterID, "HEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
success: function (d) {
var result = d;
@@ -1483,7 +1511,7 @@
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
//鎿嶄綔绫诲瀷锛圤perationType=1鏂板銆丱perationType=2缂栬緫锛�
if (OperationType == 2) {
- Pub_Close(1);
+ Pub_Close(2);
}
else {
Pub_Close(2);
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_TechnologyParameterClass.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_TechnologyParameterClass.html"
index e08dbee..333b31d 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_TechnologyParameterClass.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_TechnologyParameterClass.html"
@@ -759,7 +759,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterType.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
--
Gitblit v1.9.1