From 00ea07f0fcdb261bf088e8aed9443161064cce1e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 16 十月 2024 09:27:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 188 ++++++++++++--
WebTM/views/模治具管理/器具报表/Sc_MouldResumeCheckQuery.html | 153 +++++++----
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 48 +++
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 127 +++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 2
WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html | 152 +++++++----
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 49 +++
9 files changed, 576 insertions(+), 151 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 67044c2..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8c8a87d..42e7a5f 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,12 +3,12 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/"; //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
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_MouldResumeCheckQuery.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_MouldResumeCheckQuery.html"
index 26675d6..af4a817 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_MouldResumeCheckQuery.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_MouldResumeCheckQuery.html"
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
@@ -19,6 +20,7 @@
.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
background: #aef0f7;
}
+
.my-btn-container {
min-width: 380px; /* 璁剧疆鏈�灏忓搴� */
/* 鍏朵粬闇�瑕佺殑鏍峰紡 */
@@ -95,10 +97,20 @@
, soulTable = layui.soulTable
, tree = layui.tree
var sWhere = "";
+ var HNumber = "";
+ var HName = "";
var option = [];
var optionResume = [];
var titleData = ["HInterID", "HBillType"];
var treeId;
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ HNumber = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇
+ HName = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇
+ HNumber = decodeURI(HNumber);
+ HName = decodeURI(HName);
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -113,7 +125,7 @@
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'get_Exit': get_Exit();
break;
//閫�鍑烘寜閽�
case 'get_Search': get_DisplayResume();
@@ -161,9 +173,15 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
+ if (OperationType == 3) {
+ $("#HNumber").val(HNumber);
+ $("#HName").val(HName);
+ get_FastQuery();
+ get_DisplayResume(linterid)
+ } else {
+ //鏌ヨ
+ get_Display(sWhere);
+ }
//鏌ヨ璁惧鍒嗙被
get_Display_Tree();
}
@@ -310,61 +328,64 @@
function get_DisplayResume(HInterID) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].hmainid.toString();
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
- type: "GET",
- data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- optionResume.cols = [col];
- optionResume.data = data1.data;
+ if (OperationType != 3) {
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
- table.render(optionResume);
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ return;
+ }
+ }
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MouldFileMain/GetMouldResumeList',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- }, error: function () {
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ optionResume.cols = [col];
+ optionResume.data = data1.data;
+
+ table.render(optionResume);
layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
- });
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
- }
-
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//蹇�熻繃婊�
@@ -482,6 +503,28 @@
$("#btnSearch").click();
}
+ //閫�鍑�
+ function get_Exit() {
+ if (OperationType != 3) {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ }
+
+ //#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
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
index 8b9b6d7..403e217 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
@@ -187,7 +187,7 @@
, soulTable = layui.soulTable
var option = [];
var sWhere = "";
-
+ var HModName = "Sc_QualityReportStepBillList";
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 21a9ece..68bcdb3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -258,7 +258,8 @@
<option value="鏀捐">鏀捐</option>
<option value="宸ュ簾">宸ュ簾</option>
<option value="鏂欏簾">鏂欏簾</option>
- <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
+ <option value="鏍蜂欢淇濈暀">鏍蜂欢淇濈暀</option>
+ <option value="">璇烽�夋嫨</option>
</select>
</script>
<script>
@@ -332,6 +333,11 @@
//瀛愯〃鍒濆鍖�
set_InitGrid();
set_ProcessBill(linterid, HEntryID);
+ }
+ else if (OperationType == 6) { //鍑虹珯姹囨姤鍗曚笅鎺�
+ //瀛愯〃鍒濆鍖�
+ set_InitGrid();
+ set_StationOutBill(linterid);
}
//#endregion
@@ -1049,6 +1055,95 @@
})
}
//#endregion
+
+ //#region (鍑虹珯姹囨姤鍗�)涓嬫帹椤甸潰鍒濆鍖�
+ function set_StationOutBill(linterid) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationOutBill/PushDownBackInfo",
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid,"user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ //涓昏〃璧嬪��
+ $("#HEmpID").val(sessionStorage["HEmpID"] == undefined ? 0 : sessionStorage["HEmpID"]);
+ $("#HEmpName").val(sessionStorage["HEmpName"]);
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.杞﹂棿);
+ $("#HGroupID").val(data.HGroupID);
+ $("#HGroupName").val(data.鐢熶骇鐝粍);
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.缁勭粐;
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i]["HMaterID"],
+ "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ "HProcID": result.data[i]["HProcID"],
+ "宸ュ簭": result.data[i]["宸ュ簭"],
+ "HUnitID": result.data[i]["HUnitID"],
+ "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ "HQty": result.data[i]["鍑虹珯鏁伴噺"],
+ "HSourceID": result.data[i]["HSourceID"],
+ "鐢熶骇璧勬簮": result.data[i]["鐢熶骇璧勬簮"],
+ "HBadProcID": "0",
+ "璐ｄ换宸ュ簭": "",
+ "HRemark": "",
+ "HProcExchInterID": result.data[i]["HProcExchInterID"],
+ "HProcExchEntryID": result.data[i]["HProcExchEntryID"],
+ "HProcExchBillNo": result.data[i]["宸ュ簭娴佽浆鍗″彿"],
+ "HICMOInterID": result.data[i]["HICMOInterID"],
+ "HICMOEntryID": result.data[i]["HICMOEntryID"],
+ "HICMOBillNo": result.data[i]["鐢熶骇璁㈠崟鍙�"],
+ "HSourceInterID": result.data[i]["hmainid"],
+ "HSourceEntryID": "0",
+ "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"],
+ "HResult": "",
+ "HEmpID": "0",
+ "妫�楠屽憳": "",
+ "HBadReasonID": "0",
+ "涓嶈壇鍘熷洜": "",
+ "HBarCode": "",
+ "HReportType": "3",
+ "HAddr": "",
+ "HMaker": "",
+ "HMakeDate": Format(new Date(), 'yyyy-MM-dd')
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//#region 寮圭獥閫夋嫨鏂规硶
//#region 鐢熶骇杞﹂棿閫夋嫨椤甸潰
@@ -1134,7 +1229,7 @@
function set_SaveBill(data) {
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
- if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 5 || OperationType == 6) {
refSav = "Add";
data.field.HChangeDate = new Date();
data.field.HSTOCKORGID = data.field.HOrgID;
@@ -1206,7 +1301,7 @@
// return false;
//}
- if ($("#HEmpID").val() == "0") {
+ if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null) {
layer.msg("鐧昏浜烘湭閫夋嫨!");
return false;
}
@@ -1226,6 +1321,22 @@
return false;
} else if (!ref.test(temp)) {
layer.msg("绗�" + (i+1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ if (option.data[i]["HMaterID"] == 0 || option.data[i]["HMaterID"] == undefined || option.data[i]["HMaterID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡淇℃伅涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HProcID"] == 0 || option.data[i]["HProcID"] == undefined || option.data[i]["HProcID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細宸ュ簭淇℃伅涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HResult"] == 0 || option.data[i]["HResult"] == undefined || option.data[i]["HResult"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鍒ゅ畾缁撴灉涓嶅厑璁镐负绌猴紒");
+ return false;
+ }
+ if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細涓嶈壇鍘熷洜涓嶅厑璁镐负绌猴紒");
return false;
}
}
@@ -1430,7 +1541,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": HDataTemp.HItemID
@@ -1473,7 +1584,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HUnitID": HDataTemp.HItemID
@@ -1512,7 +1623,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": HDataTemp.HItemID
@@ -1551,7 +1662,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": HDataTemp.HItemID
@@ -1590,7 +1701,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- if (HDataTemp != {}) {
+ if (JSON.stringify(HDataTemp) != '{}') {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HBadReasonID": HDataTemp.HItemID
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
index f82dbd3..8a1d346 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
@@ -19,6 +20,7 @@
.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
background: #aef0f7;
}
+
.my-btn-container {
min-width: 380px; /* 璁剧疆鏈�灏忓搴� */
/* 鍏朵粬闇�瑕佺殑鏍峰紡 */
@@ -95,10 +97,20 @@
, soulTable = layui.soulTable
, tree = layui.tree
var sWhere = "";
+ var HNumber = "";
+ var HName = "";
var option = [];
var optionResume = [];
var titleData = ["HInterID", "HBillType"];
var treeId;
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ HNumber = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇
+ HName = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇
+ HNumber = decodeURI(HNumber);
+ HName = decodeURI(HName);
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -113,7 +125,7 @@
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'get_Exit': get_Exit();
break;
//閫�鍑烘寜閽�
case 'get_Search': get_DisplayResume();
@@ -161,9 +173,15 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
+ if (OperationType == 3) {
+ $("#HNumber").val(HNumber);
+ $("#HName").val(HName);
+ get_FastQuery();
+ get_DisplayResume(linterid)
+ } else {
+ //鏌ヨ
+ get_Display(sWhere);
+ }
//鏌ヨ璁惧鍒嗙被
get_Display_Tree();
}
@@ -298,60 +316,63 @@
function get_DisplayResume(HInterID) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].hmainid.toString();
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
- type: "GET",
- data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- var data = [];
- var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- optionResume.cols = [col];
- optionResume.data = data1.data;
-
- table.render(optionResume);
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ if (OperationType!=3) {
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ return;
+ }
+ }
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
+ type: "GET",
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- }, error: function () {
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ optionResume.cols = [col];
+ optionResume.data = data1.data;
+
+ table.render(optionResume);
layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
- });
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
- }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
@@ -470,6 +491,27 @@
$("#btnSearch").click();
}
+ //閫�鍑�
+ function get_Exit() {
+ if (OperationType != 3) {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ }
+
+ //#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
//浠ヤ笂鏄痩ayui妯″潡
});
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_FiveMenOneRingList.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_FiveMenOneRingList.html"
index ca97a65..006a217 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_FiveMenOneRingList.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_FiveMenOneRingList.html"
@@ -168,7 +168,7 @@
//
var HModName = "QC_FiveMenOneRingList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
- var titleData = ["娴佽浆鍗d", "鐢熶骇璁㈠崟", "鐗╂枡浠ｇ爜", "瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id","璁惧id"];
+ var titleData = ["娴佽浆鍗d", "鐢熶骇璁㈠崟", "鐗╂枡浠ｇ爜", "瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id","璁惧id","宸ュ簭id"];
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -576,8 +576,15 @@
}, style: 'cursor: pointer;'
});
}
+ else if (data[j].name == '宸ュ簭鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '宸ュ簭鍚嶇О', templet: function (d) {
+ return '<span style="color: blue;">' + d.宸ュ簭鍚嶇О + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else {
- switch (data[j].Type) {
+ switch (data[j].Type) {
//int
case 'DateTime':
col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
@@ -811,33 +818,139 @@
table.on('tool(mainTable_Machine)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
- var linterid = data.鍗曟嵁涓籭d;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅璁惧鍚姩鐐规娓呭崟'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
+ if (data.鍗曟嵁绫诲瀷 == "璁惧鍚姩鐐规鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧鍚姩鐐规娓呭崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "璁惧鐐规璁板綍鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧鐐规璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "璁惧淇濆吇璁板綍鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧淇濆吇璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/Sb_EquipMaintainBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "璁惧缁翠慨璁板綍鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧缁翠慨璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/Sb_Add_EqpMaintenanceBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "妯″叿鐐规璁板綍鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿鐐规璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "妯″叿淇濆吇璁板綍鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿淇濆吇璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "妯″叿缁翠慨璁板綍鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿缁翠慨璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
} else if (obj.event == '妯″叿鍚嶇О') {
var linterid = data.妯″叿id;
+ var HNumber = data.妯″叿缂栫爜;
+ var HName = data.妯″叿鍚嶇О;
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅妯″叿妗ｆ'
+ , title: '鏌ョ湅妯″叿灞ュ巻'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName+''
, resize: false,
end: function () {
}
@@ -846,15 +959,17 @@
})
} else if (obj.event == '璁惧鍚嶇О') {
var linterid = data.璁惧id;
+ var HNumber = data.璁惧缂栫爜;
+ var HName = data.璁惧鍚嶇О;
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅璁惧妗ｆ'
+ , title: '鏌ョ湅璁惧灞ュ巻'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../璁惧绠＄悊/璁惧鎶ヨ〃/Sb_EquipResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -960,15 +1075,17 @@
})
} else if (obj.event == '妯″叿鍚嶇О') {
var linterid = data.妯″叿id;
+ var HNumber = data.妯″叿缂栫爜;
+ var HName = data.妯″叿鍚嶇О;
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅妯″叿妗ｆ'
+ , title: '鏌ョ湅妯″叿灞ュ巻'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
, resize: false,
end: function () {
}
@@ -977,15 +1094,34 @@
})
} else if (obj.event == '璁惧鍚嶇О') {
var linterid = data.璁惧id;
+ var HNumber = data.璁惧缂栫爜;
+ var HName = data.璁惧鍚嶇О;
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鏌ョ湅璁惧妗ｆ'
+ , title: '鏌ョ湅璁惧灞ュ巻'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , content: '../../璁惧绠＄悊/璁惧鎶ヨ〃/Sb_EquipResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '宸ュ簭鍚嶇О') {
+ var linterid = data.鍗曟嵁涓籭d;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧灞ュ巻'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + ''
, resize: false,
end: function () {
}
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..496b09d 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"
@@ -132,7 +132,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 +200,11 @@
function set_ClearBill() {
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
- ////鍔犺浇鎶樼嚎鍥�
+ //鍔犺浇鎶樼嚎鍥�
set_Graphics();
+ if (OperationType==3) {
+ Get_SB_EquipICMOTechParamBill(linterid);
+ }
}
//鍒濆鍖栬〃鏍�
@@ -656,6 +661,45 @@
})
}
+ //鏍规嵁鍏ㄧ▼杩芥函鎶ヨ〃鑾峰彇娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡
+ 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]["璁惧鍚嶇О"]);
+
+ } 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: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
+
+ //#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() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 43d7f6f..33adae7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -191,6 +191,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-NoPassProd" id="btn-NoPassProd">涓嬫帹涓嶈壇鍝佽瘎瀹″鐞嗗崟</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-QualityReport" id="btn-QualityReport">涓嬫帹璐ㄩ噺姹囨姤鍗�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
@@ -728,6 +729,9 @@
//涓嬫帹宸ュ簭鍑虹珯姹囨姤鍗�
case 'btn-NoPassProd': set_NoPassProd();
break;
+ //涓嬫帹璐ㄩ噺姹囨姤鍗�
+ case 'btn-QualityReport': set_QualityReport();
+ break;
//棰勮
case 'btn-Cell': layer.msg('棰勮锛�');
break;
@@ -1649,6 +1653,51 @@
}
}
+ //涓嬫帹璐ㄩ噺姹囨姤鍗�
+ function set_QualityReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+
+ var linterid = [];
+ var HERR = "";
+ var HGroupID_JY = data[0].HGroupID;
+ var HDeptID_JY = data[0].HDeptID;
+
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (data[i].HGroupID != HGroupID_JY || data[i].HDeptID || HDeptID_JY) {
+ HERR += "绗�" + (i+1) + "琛岋紝鐢熶骇鐝粍鎴栬�呯敓浜ц溅闂达紝涓庡叾浣欒涓嶄竴鑷达紝涓嶅厑璁稿悎骞朵笅鎺紒"
+ }
+
+ linterid.push(data[i].hmainid.toString());
+ }
+
+ if (HERR != "") {
+ layer.msg(HERR,{ time: 3000, })
+ return;
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璐ㄩ噺姹囨姤鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=' + 6 + '&linterid=' + linterid.toString() + '&HEntry=0&HProcNo=' + 0 + '&HEntryID=' + 0 + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+
//鏂板鍗曟嵁
function set_AddNew() {
layer.open({
--
Gitblit v1.9.1