From 362059272e497dcb0f5eb28f09f6bbba875ecee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 05 九月 2024 13:46:42 +0800
Subject: [PATCH] 生产日,月汇报,良率统计,任务单通过率报表修改页面, 设备工艺参数根据采集来源判断单元格是否可以编辑 完善人机料法环报表
---
WebTM/views/IpadIndex.html | 198 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 175 insertions(+), 23 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index e2e590a..8e45e25 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -995,6 +995,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "涓嶈壇閲囬泦")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻涓嶈壇閲囬泦鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1065,6 +1069,10 @@
function CodingReport(event, obj) {
if (wktag == 0) {
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻姹囨姤鏉′欢!", { icon: 5 });
return false;
}
layer.open({
@@ -1160,7 +1168,8 @@
var data = [];
data.push({
"HICMOBillNo": HICMOBillNo,//宸ュ崟鍙�
- "HSourceName": HSBName //璁惧
+ "HSourceName": HSBName, //璁惧
+ "HSourceBillNo": HSourceBillNo //宸ュ簭娴佽浆鍗�
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -1201,6 +1210,116 @@
});
}
+ //妫�楠屽彇鏍锋寜閽偣鍑讳簨浠�
+ function TakeSample(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮�宸ュ崟',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
+ //宸ヨ壓鍙傛暟鐐规鐐瑰嚮浜嬩欢
+ function TechParam(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "宸ヨ壓鍙傛暟鐐规")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻宸ヨ壓鍙傛暟鐐规鏉′欢!", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板宸ヨ壓鍙傛暟鐐规鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=4&linterid=&HEntryID=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
+ //寮傚父绛惧埌澶勭悊鐐瑰嚮浜嬩欢
+ function SingErrMsg(event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮傚父绛惧埌澶勭悊鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBill_BrushCard.html?OperationType=2',
+ end: function () {
+
+ }
+ });
+ }
+
+ //寮傚父楠屾敹鐐瑰嚮浜嬩欢
+ function ErrMsgBackCheck(event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板寮傚父鍙嶉楠屾敹鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
+ end: function () {
+
+ }
+ });
+ }
+
//閫�鍑�
function Esc(event, obj) {
parent.location.href = "index.html"
@@ -1211,29 +1330,35 @@
function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
var flag = false;
var sWhere = "";
- switch (btn) {
- case "寮�宸�":
- sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
- break;
- case "瀹屽伐":
- sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
- break;
- case "鍋滃伐":
- sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
- break;
- case "姹囨姤":
- sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
- break;
- case "鎶ユ鐢宠":
-
- break;
- default:
+ sWhere = {
+ HSourceID: HSourceID1
+ , HICMOBillNo: workcode
+ , HInterID: HSourceInterID
+ , type: btn
}
+ //switch (btn) {
+ // case "寮�宸�":
+ // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
+ // break;
+ // case "瀹屽伐":
+ // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
+ // break;
+ // case "鍋滃伐":
+ // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
+ // break;
+ // case "姹囨姤":
+ // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ // break;
+ // case "鎶ユ鐢宠":
+
+ // break;
+ // default:
+ //}
$.ajax({
url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": JSON.stringify(sWhere) },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
async: false,
success: function (data) {
@@ -1404,9 +1529,9 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-unlink imgicon"></span>
- <span class="imgtitle">寮傚父</span>
+ <span class="imgtitle">寮傚父鐢宠</span>
</div>
</div>
<div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
@@ -1436,14 +1561,41 @@
</div>
</div>
</div>
- <div class="layui-row layui-col-space10">
+ <div class="layui-row layui-col-space10">
<div class="layui-col-sm12 layui-col-md4" onclick="PreventErrMouldCheck(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-engine imgicon"></span>
<span class="imgtitle">闃查敊楠岃瘉</span>
</div>
- </div>
+ </div>
+ <div class="layui-col-sm12 layui-col-md4" onclick="TakeSample(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-form imgicon"></span>
+ <span class="imgtitle">妫�楠屽彇鏍�</span>
+ </div>
+ </div>
+ <div class="layui-col-sm12 layui-col-md4" onclick="TechParam(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-tabs imgicon"></span>
+ <span class="imgtitle">宸ヨ壓鍙傛暟鐐规</span>
+ </div>
+ </div>
</div>
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="SingErrMsg(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-layer imgicon"></span>
+ <span class="imgtitle">寮傚父绛惧埌澶勭悊</span>
+ </div>
+ </div>
+ <div class="layui-col-sm12 layui-col-md4" onclick="ErrMsgBackCheck(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-layer imgicon"></span>
+ <span class="imgtitle">寮傚父楠屾敹</span>
+ </div>
+ </div>
+ </div>
+
</div>
</fieldset>
</div>
--
Gitblit v1.9.1