From d41e8cb3cce459dc77651682f069b9465b0dda16 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 21 一月 2022 11:13:53 +0800
Subject: [PATCH] 雅琪诺报工台停工单、完工单、开工单列表显示修改
---
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 68 +++++++++++
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html | 68 +++++++++++
WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html | 2
WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html | 2
WebTM/views/IpadStepIndex.html | 5
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 69 +++++++++++
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html | 68 +++++++++++
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 68 +++++++++++
8 files changed, 336 insertions(+), 14 deletions(-)
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 8488760..0bb5af1 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -792,7 +792,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/涓婃枡闃查敊鍗�/Sc_Add_MaterToSourceBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -828,7 +828,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
+ , content: ['鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
, resize: false
, cancel: function () {
@@ -854,6 +854,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
+
content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
index 1a5d13f..58ad7b0 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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
@@ -204,8 +204,72 @@
, { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
, { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200 }
- , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
- , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200}
+ , {
+ field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
+ if (d.鍗曟嵁绫诲瀷 == "3714") {
+ return "宸ュ簭姹囨姤鍗�";
+ }
+ }
+ }
+ , {
+ field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200, templet: function (d) {
+ switch (d.HBillStatus) {
+ case 0:
+ return "鍒涘缓"
+ break;
+ case 1:
+ return "鏈"
+ break;
+ case 2:
+ return "宸插"
+ break;
+ case 3:
+ return "鍏抽棴"
+ break;
+ case 4:
+ return "浣滃簾"
+ break;
+ case 5:
+ return "瀹℃牳閫�鍥�"
+ break;
+ case 6:
+ return "瀹℃牳涓�"
+ break;
+ case 7:
+ return "宸查槄"
+ break;
+ case 8:
+ return "宸插洖澶�"
+ break;
+ case 9:
+ return "缁撴"
+ break;
+ case 10:
+ return "楠岃瘉"
+ break;
+ case 11:
+ return "涓嬭揪"
+ break;
+ case 12:
+ return "寮�宸�"
+ break;
+ case 13:
+ return "鐢宠瀹℃壒"
+ break;
+ case 15:
+ return "鐢宠妫�楠�"
+ break;
+ case 16:
+ return "鍒ゅ畾鍚堟牸"
+ break;
+ case 17:
+ return "鍒ゅ畾涓嶅悎鏍�"
+ break;
+ default:
+ return d.HBillStatus
+ }
+ }
+ }
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index d7f6fd9..fbc0f91 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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.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\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -235,8 +235,73 @@
, { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
- , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200 }
+ , {
+ field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
+ if (d.鍗曟嵁绫诲瀷 == "3714")
+ {
+ return "宸ュ簭姹囨姤鍗�";
+ }
+ }
+ }
+ , {
+ field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200, templet: function (d) {
+ switch (d.HBillStatus) {
+ case 0:
+ return "鍒涘缓"
+ break;
+ case 1:
+ return "鏈"
+ break;
+ case 2:
+ return "宸插"
+ break;
+ case 3:
+ return "鍏抽棴"
+ break;
+ case 4:
+ return "浣滃簾"
+ break;
+ case 5:
+ return "瀹℃牳閫�鍥�"
+ break;
+ case 6:
+ return "瀹℃牳涓�"
+ break;
+ case 7:
+ return "宸查槄"
+ break;
+ case 8:
+ return "宸插洖澶�"
+ break;
+ case 9:
+ return "缁撴"
+ break;
+ case 10:
+ return "楠岃瘉"
+ break;
+ case 11:
+ return "涓嬭揪"
+ break;
+ case 12:
+ return "寮�宸�"
+ break;
+ case 13:
+ return "鐢宠瀹℃壒"
+ break;
+ case 15:
+ return "鐢宠妫�楠�"
+ break;
+ case 16:
+ return "鍒ゅ畾鍚堟牸"
+ break;
+ case 17:
+ return "鍒ゅ畾涓嶅悎鏍�"
+ break;
+ default:
+ return d.HBillStatus
+ }
+ }
+ }
, { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 200 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
index 5fbacd9..1fb7470 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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.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/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
@@ -596,7 +596,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3702' },
+ data: { "HBillType": '3789' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
$("#HInterID").val(0);
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/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.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/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 24fed30..826e196 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/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.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/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -230,8 +230,72 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
- , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+ , {
+ field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', templet: function (d) {
+ if (d.鍗曟嵁绫诲瀷 == "3789") {
+ return "鍋滃伐鍗�";
+ }
+ }
+ }
+ , {
+ field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+ switch (d.HBillStatus) {
+ case 0:
+ return "鍒涘缓"
+ break;
+ case 1:
+ return "鏈"
+ break;
+ case 2:
+ return "宸插"
+ break;
+ case 3:
+ return "鍏抽棴"
+ break;
+ case 4:
+ return "浣滃簾"
+ break;
+ case 5:
+ return "瀹℃牳閫�鍥�"
+ break;
+ case 6:
+ return "瀹℃牳涓�"
+ break;
+ case 7:
+ return "宸查槄"
+ break;
+ case 8:
+ return "宸插洖澶�"
+ break;
+ case 9:
+ return "缁撴"
+ break;
+ case 10:
+ return "楠岃瘉"
+ break;
+ case 11:
+ return "涓嬭揪"
+ break;
+ case 12:
+ return "寮�宸�"
+ break;
+ case 13:
+ return "鐢宠瀹℃壒"
+ break;
+ case 15:
+ return "鐢宠妫�楠�"
+ break;
+ case 16:
+ return "鍒ゅ畾鍚堟牸"
+ break;
+ case 17:
+ return "鍒ゅ畾涓嶅悎鏍�"
+ break;
+ default:
+ return d.HBillStatus
+ }
+ }
+ }
, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
, { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
, { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
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/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.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/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
index a97213e..b233ecf 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/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.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/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
@@ -250,8 +250,72 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
- , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+ , {
+ field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, templet: function (d) {
+ if (d.鍗曟嵁绫诲瀷 == "3788") {
+ return "瀹屽伐鍗�";
+ }
+ }
+ }
+ , {
+ field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+ switch (d.HBillStatus) {
+ case 0:
+ return "鍒涘缓"
+ break;
+ case 1:
+ return "鏈"
+ break;
+ case 2:
+ return "宸插"
+ break;
+ case 3:
+ return "鍏抽棴"
+ break;
+ case 4:
+ return "浣滃簾"
+ break;
+ case 5:
+ return "瀹℃牳閫�鍥�"
+ break;
+ case 6:
+ return "瀹℃牳涓�"
+ break;
+ case 7:
+ return "宸查槄"
+ break;
+ case 8:
+ return "宸插洖澶�"
+ break;
+ case 9:
+ return "缁撴"
+ break;
+ case 10:
+ return "楠岃瘉"
+ break;
+ case 11:
+ return "涓嬭揪"
+ break;
+ case 12:
+ return "寮�宸�"
+ break;
+ case 13:
+ return "鐢宠瀹℃壒"
+ break;
+ case 15:
+ return "鐢宠妫�楠�"
+ break;
+ case 16:
+ return "鍒ゅ畾鍚堟牸"
+ break;
+ case 17:
+ return "鍒ゅ畾涓嶅悎鏍�"
+ break;
+ default:
+ return d.HBillStatus
+ }
+ }
+ }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 115 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 115 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index 1de5b21..04c53cf 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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -259,8 +259,72 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
- , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+ , {
+ field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, templet: function (d) {
+ if (d.鍗曟嵁绫诲瀷 == "3787") {
+ return "寮�鐝崟";
+ }
+ }
+ }
+ , {
+ field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+ switch (d.HBillStatus) {
+ case 0:
+ return "鍒涘缓"
+ break;
+ case 1:
+ return "鏈"
+ break;
+ case 2:
+ return "宸插"
+ break;
+ case 3:
+ return "鍏抽棴"
+ break;
+ case 4:
+ return "浣滃簾"
+ break;
+ case 5:
+ return "瀹℃牳閫�鍥�"
+ break;
+ case 6:
+ return "瀹℃牳涓�"
+ break;
+ case 7:
+ return "宸查槄"
+ break;
+ case 8:
+ return "宸插洖澶�"
+ break;
+ case 9:
+ return "缁撴"
+ break;
+ case 10:
+ return "楠岃瘉"
+ break;
+ case 11:
+ return "涓嬭揪"
+ break;
+ case 12:
+ return "寮�宸�"
+ break;
+ case 13:
+ return "鐢宠瀹℃壒"
+ break;
+ case 15:
+ return "鐢宠妫�楠�"
+ break;
+ case 16:
+ return "鍒ゅ畾鍚堟牸"
+ break;
+ case 17:
+ return "鍒ゅ畾涓嶅悎鏍�"
+ break;
+ default:
+ return d.HBillStatus
+ }
+ }
+ }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
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/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.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/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
index be3242c..568de70 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/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.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/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
@@ -314,7 +314,7 @@
<div class="layui-tab layui-tab-card" style="margin:10px auto;">
<ul class="layui-tab-title">
<li class="layui-this">閰嶆枡璁板綍</li>
- <li>娌诲叿璁板綍</li>
+ <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">娌诲叿璁板綍</li>
</ul>
<div class="layui-tab-content" style="height:350px;">
<div class="layui-tab-item layui-show">
--
Gitblit v1.9.1