From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 8b386f4..dd7b7f8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -79,7 +79,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -135,7 +135,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍐呯爜</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" readonly>
@@ -766,8 +766,9 @@
$("#HBillNo").val("");
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
- $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
- $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
HDeptID = sessionStorage["HDeptID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
//鑾峰彇鏈�澶у崟鎹彿
@@ -787,8 +788,8 @@
get_HWorkShift();
}
else if (OperationType == 2) {
- $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]);
- $("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]);
+ $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);//鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
HDeptID = sessionStorage["HDeptID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
@@ -873,6 +874,7 @@
$("#HSourceName").val(data.HSourceName);
$("#HSourceID").val(data.HSourceID);
$("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.HMaterName);
$("#HMainSourceBillNo").val("");
$("#HMainSourceBillType").val(data.HBillType);
$("#HMainSourceInterID").val(data.HInterID);
@@ -880,7 +882,8 @@
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
- $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
+
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -1162,7 +1165,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) {
@@ -1204,7 +1207,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) {
@@ -1254,7 +1257,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) {
@@ -1639,6 +1642,7 @@
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
form.on('submit(btnSearchQCScheme)', function () {
var HName = $("#HMaterName").val();
+ var HProcName = $("#HProcName").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1648,7 +1652,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '&HProcName=' + HProcName + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1687,7 +1691,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) {
@@ -1725,7 +1729,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1763,7 +1767,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=HUnitList', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1801,7 +1805,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) {
@@ -1848,7 +1852,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) {
@@ -2114,7 +2118,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes'],
+ content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -2153,7 +2157,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html', 'yes'],
+ content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -3550,7 +3554,7 @@
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
- if (result.count == 1) {
+ if (result.data.length > 0) {
$("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
$("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
}
@@ -3948,16 +3952,17 @@
}
//#endregion
- //鑷姩甯﹀嚭妫�楠岄」鐩�
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
function GetCheckItemID() {
var HName = $("#HMaterName").val();
var HProName = $("#HProcName").val();
+ var HSourceID = $("#HSourceID").val();
if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemID",
type: "GET",
async: false,
- data: { "HName": HName, "HProName": HProName },
+ data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
success: function (result) {
if (result.code == 1) {
$("#HQCSchemeID").val(result.data[0].hmainid);
--
Gitblit v1.9.1