From 32d9fb8dc24c915f58cf56abdb1bb404ee71e3a9 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 24 三月 2025 19:43:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index cd78280..b9ee951 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -735,7 +735,6 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
- //$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
$('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
$('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
@@ -1279,7 +1278,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1319,7 +1318,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1369,7 +1368,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1580,7 +1579,7 @@
var ajaxLoad = layer.load();
var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/QC_WorkSelfCheckBill/QC_WorkSelfCheckBillList",
+ url: GetWEBURL() + "/QC_WorkSelfCheckBill/QC_WorkSelfCheckBillEdit",
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -2153,7 +2152,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2193,7 +2192,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2231,7 +2230,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2306,9 +2305,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
})
//鍒濆鍖栬〃鏍�
@@ -3846,6 +3843,32 @@
}
}
+ //琛ㄥご 鑾峰彇妫�楠屾柟妗�
+ function get_CheckItem()//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_BaseInformation/Gy_EnvironmentTestSchemeBillMainEditList",
+ type: "GET",
+ async: false,
+ data: { "linterid": $("#HEnvironmentTestSchemeID").val() == "" ? 0 : $("#HEnvironmentTestSchemeID").val(), "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ rowdata.push(
+ {
+ "HEnvironmentItemID": d.data[i].HEnvironmentItemID, "HEnvironmentItemName": d.data[i].妫�娴嬮」鐩�,
+ "HMeasure": "0", "HTargetVal": d.data[i].鐩爣鍊�, "HUpLimit": d.data[i].涓婇檺鍊�, "HDownLimit": d.data[i].涓嬮檺鍊�
+ }
+ )
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ })
+ }
+
+
//鑾峰彇鐝
function get_HWorkShift() {
--
Gitblit v1.9.1