From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
index 2089138..55fa17e 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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
@@ -74,6 +74,7 @@
<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="HEquipName" id="HEquipName" value="" readonly>
+ <input type="hidden" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
</div>
</div>
<div class="layui-inline">
@@ -132,7 +133,9 @@
var HModName = "SB_TechnologyParameterList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["骞�", "鏈�", "宸ュ簭"];
-
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -198,8 +201,11 @@
function set_ClearBill() {
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
- ////鍔犺浇鎶樼嚎鍥�
+ //鍔犺浇鎶樼嚎鍥�
set_Graphics();
+ if (OperationType==3) {
+ Get_SB_EquipICMOTechParamBill(linterid);
+ }
}
//鍒濆鍖栬〃鏍�
@@ -597,6 +603,9 @@
//宸ヨ壓鍙傛暟
form.on('submit(btnHTechParam)', function () {
+ var HMaterName = $("#HMaterName").val();
+ var HProcName = $("#HProcName").val();
+ var HEquipNumber = $("#HEquipNumber").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -606,7 +615,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '&HProcName=' + HProcName + '&HMaterName=' + HMaterName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -645,6 +654,33 @@
if (result.count == 1) {
var data = result.data;
$("#HEquipName").val(data[0]["HName"]);
+ $("#HEquipNumber").val(data[0]["HEquipFileNumber"]);
+ } else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
+ //鏍规嵁鍏ㄧ▼杩芥函鎶ヨ〃鑾峰彇娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡
+ function Get_SB_EquipICMOTechParamBill(linterid) {
+
+ $.ajax({
+ url: GetWEBURL() + "/QC_CustomerAppealReport/Get_EquipICMOTechParamList",
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data;
+ $("#HProcExchBillNo").val(data[0]["HProcExchBillNo"]);
+ $("#HProcName").val(data[0]["宸ュ簭鍚嶇О"]);
+ $("#HMaterName").val(data[0]["鐗╂枡鍚嶇О"]);
+ $("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
+ $("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
} else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -656,6 +692,19 @@
})
}
+ //#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 get_HideColumn() {
--
Gitblit v1.9.1