From 8c03d471e000a3c0deca6cc1e99daa348f925dd0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 11 六月 2024 21:10:57 +0800
Subject: [PATCH] 修复防错验证,设备启动点检,跳转不出数据
---
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBill.html | 9 ++++++---
WebTM/views/IpadIndex.html | 6 ++++--
WebTM/layuiadmin/Scripts/webConfig.js | 2 +-
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 8 +++++---
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index acdb86a..a2912fb 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
/*var WEBURL = "http://localhost/API/"; */ //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
+ // var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
// var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 0cfd1a8..dccac29 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1126,7 +1126,8 @@
data.push({
"HMaterID": HMaterID,
"HProcID": HProcID,
- "HSourceID": HSourceID1,
+ "HSourceID": HSourceID1,
+ "SCOrder": HICMOBillNo
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -1154,7 +1155,8 @@
success: function (dom, index) {
var data = [];
data.push({
- "HMaterID": HMaterID
+ "HMaterID": HMaterID,
+ "SCOrder": HICMOBillNo
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 1cc3a3a..d11f9c1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -309,11 +309,13 @@
var HMaterID = ""; //鐗╂枡
var HSourceID = ""; //鐢熶骇璧勬簮
var HProcID = ""; //宸ュ簭
+ var SCOrde = "";//鐢熶骇璁㈠崟鍙�
var edit = function (data) {
HMaterID = data[0].HMaterID;
HSourceID = data[0].HSourceID;
HProcID = data[0].HProcID;
+ SCOrde = data[0].SCOrde;
}
layui.config({
@@ -409,7 +411,7 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
//鑾峰彇鎶ュ伐鍙拌烦杞暟鎹�
- RoadBillEdit(HMaterID, HProcID, HSourceID);
+ RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrde);
//绂佺敤缁勭粐閫夐」
$('#HOrgID').attr("disabled", true);
}
@@ -1198,13 +1200,13 @@
//#endregion
//#region 鎶ュ伐骞冲彴璺宠浆璧嬪��
- function RoadBillEdit(HMaterID, HProcID, HSourceID)//鍔犺浇琛ㄥご
+ function RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrde)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/锘縎c_WorkBeginDotCheckBillList",
type: "GET",
async: false,
- data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
+ data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID, "SCOrde": SCOrde,"user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data;
var tableSub = result.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
index 35ffda0..8aa038e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBill.html"
@@ -253,8 +253,10 @@
<script>
var HMaterID = ""; //鐗╂枡
+ var SCOrder = "";//鐢熸垚璁㈠崟鍙�
var edit = function (data) {
HMaterID = data[0].HMaterID;
+ SCOrder = data[0].SCOrder;
}
layui.config({
@@ -349,7 +351,7 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
//鑾峰彇鎶ュ伐鍙拌烦杞暟鎹�
- RoadBillEdit(HMaterID);
+ RoadBillEdit(HMaterID, SCOrder);
//绂佺敤缁勭粐閫夐」
$('#HOrgID').attr("disabled", true);
}
@@ -925,13 +927,14 @@
//#endregion
//#region 鎶ュ伐骞冲彴璺宠浆璧嬪��
- function RoadBillEdit(HMaterID)//鍔犺浇琛ㄥご
+ function RoadBillEdit(HMaterID, SCOrder)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Qc_PreventErrMouldCheckBill/锘縌c_PreventErrMouldCheckBillList",
type: "GET",
async: false,
- data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+ data: {
+ "HMaterID": HMaterID, "SCOrder": SCOrder,"user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data;
var tableSub = result.data;
--
Gitblit v1.9.1