From 1f04de10815fda88229254f445820cab8b759f31 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 五月 2024 16:08:58 +0800
Subject: [PATCH] 设备/模具模块添加字段，保养计划添加安全结束时间点；根据产品+工序查看sop
---
WebTM/views/设备管理/Sb_EqpRepairCheckBillList.html | 4
WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html | 4
WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckPlanBillList.html | 47 ++++++++-
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 9 +
WebTM/views/设备管理/Sb_EquipMaintainBillList.html | 4
WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html | 70 +++++++++++++
WebTM/views/IpadIndex.html | 9 +
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html | 4
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 2
WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html | 4
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 7
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 9 +
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 4
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html | 10 -
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 18 +++
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 79 +++++++++++++++
WebTM/views/设备管理/Sb_EqpMaintenanceBillList.html | 4
WebTM/views/设备管理/Sb_EqpConkBookBillList.html | 4
18 files changed, 242 insertions(+), 50 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 2038586..26dd9af 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -44,6 +44,7 @@
var HEmpName = ""; //鎿嶄綔鍛�
var HManagerName = ""; //璐熻矗浜�
var HGroupName = ""; //鐝粍
+ var HProcID = 0; //宸ュ簭
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
@@ -166,7 +167,7 @@
HManagerName = $("#" + us + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
HGroupName = $("#" + gro + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
HManagerID = "HManagerID" + i;
- HGroupID= "HGroupID" + i;
+ HGroupID = "HGroupID" + i;
HManagerID = $("#" + HManagerID + "").html();
HGroupID = $("#" + HGroupID + "").html();
@@ -211,6 +212,7 @@
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span><span style="margin-left:25px;">鏃ユ湡锛�</span><span>' + LoadData1[i].璁″垝鏃ユ湡 + '</span></h1>';
html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>宸ュ簭ID锛�</span><span id="procid' + (i + 1) + '">' + LoadData1[i].HProcID + '</span></h1>';
html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty + '</span></h1>';
@@ -405,7 +407,7 @@
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/DeleteGetLineBindBillList",
type: "GET",
- data: { "HSourceID": HSourceID ,"user": sessionStorage["HUserName"]},
+ data: { "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data) {
if (data.count > 0) {
@@ -441,6 +443,7 @@
HICMOBillNo = $("#wk" + i + "").html(); //鐢熶骇璁㈠崟鍙�
HMaterName = $("#ptn" + i + "").html(); //浜у搧鍚嶇О
HMaterID = $("#materid" + i + "").html(); //浜у搧ID
+ HProcID = $("#procid" + i + "").html(); //宸ュ簭ID
if (workcode != "" && workcode != null) {
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -705,7 +708,7 @@
shift: 2,
area: ['95%', '95%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID,
+ content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID + '&HProcID=' + HProcID,
end: function () {
},
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
index 0bc4b20..3fd3744 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -490,8 +490,8 @@
data: { "oMain": sMainSub },
success: function (data1) {
if (data1.count == 1) {
- option.data = arr;
- table.render(option);
+ //option.data = arr;
+ //table.render(option);
//layer.close(wait);
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
$('#ChoseFile').removeClass("layui-btn-disabled").attr("disabled", false);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
index a8488e9..906c640 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckPlanBillList.html"
@@ -127,12 +127,17 @@
</div>
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鐐规椤逛俊鎭�</li>
+ <li>鐐规璁″垝</li>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<div class="layui-tab-item">
- <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ <!--淇濆吇璁″垝-->
+ <table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
</div>
</div>
</div>
@@ -188,6 +193,7 @@
, element = layui.element;
var option = [];//鐐规
+ var option_plan = [];//璁″垝
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -423,6 +429,32 @@
}
};
+
+ //鐐规璁″垝
+ columns_plan = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
+ , { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
+ , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
+ , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
+ , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+ ];
+ option_plan = {
+ id: 'mainTable_plan'
+ , elem: '#mainTable_plan'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , limit: 500
+ , limits: [50, 200, 500, 1000, 3000]
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns_plan]
+ , done: function (res, curr, count) {
+
+ }
+ };
}
// 鐐规淇℃伅 閰嶄欢淇℃伅
@@ -500,6 +532,10 @@
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
+
+ set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ table.render(option_plan);
}
//缂栬緫鍔犺浇琛ㄥご
function set_EditForm(linterid) {
@@ -516,7 +552,7 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": data.鏃ユ湡
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HBeginDate": data.淇濆吇寮�濮嬫棩鏈�
+ , "HBeginDate": Pub_Format(data.淇濆吇寮�濮嬫棩鏈�, "yyyy-MM-dd")
, "HEndDate": data.淇濆吇缁撴潫鏃ユ湡
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
@@ -524,8 +560,8 @@
, "HMouldName": data.浜у搧妯″叿
, "HCycleUnit": data.鍛ㄦ湡鍗曚綅
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
- , "HBeginDate": data.璁″垝寮�濮嬫棩鏈�
- , "HEndDate": data.璁″垝缁撴潫鏃ユ湡
+ , "HBeginDate": Pub_Format(data.璁″垝寮�濮嬫棩鏈�, "yyyy-MM-dd")
+ , "HEndDate": Pub_Format(data.璁″垝缁撴潫鏃ユ湡, "yyyy-MM-dd")
, "HMouldDotCheckRuleName": data.HMouldDotCheckRuleNo
, "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
@@ -567,6 +603,41 @@
}
});
}
+
+ // 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+ function set_EditGrid_Plan(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MouldDotCheckPlanBill/GetPlanList',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+ , "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ }
+ )
+ }
+
+ option_plan.data = rowdata;
+ table.render(option_plan);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
function formatDate(date) {
var d = new Date(date),
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index dbe233b..5c76fb9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -535,6 +535,7 @@
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
];
@@ -575,7 +576,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
@@ -618,8 +619,8 @@
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HCycleUnit": data.鍛ㄦ湡鍗曚綅
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
- , "HBeginDate": data.璁″垝寮�濮嬫棩鏈�
- , "HEndDate": data.璁″垝缁撴潫鏃ユ湡
+ , "HBeginDate": formatDate(data.璁″垝寮�濮嬫棩鏈�) //寮�濮嬫棩鏈�
+ , "HEndDate": formatDate(data.璁″垝缁撴潫鏃ユ湡) //缁撴潫鏃ユ湡
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
, "HMouldMaintainRuleID": data.HMouldMaintainRuleID
@@ -690,7 +691,7 @@
for (let i = 0; i < data.length; i++) {
rowdata.push(
{
- "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+ "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
, "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
}
)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
index 96882fa..2d8445a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
@@ -76,6 +76,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -166,14 +168,11 @@
case 'get_Exit':
Pub_Close(2);
break;
-
- //瀹℃牳鎸夐挳
- case 'btn-Audit':
- set_CheckBill();
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit':
- set_AbandonCheck();
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
break;
//棰勮鎸夐挳
case 'btn-Print':
@@ -436,6 +435,40 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+
+ //瀹℃牳/鍙嶅鏍�
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/CheckSc_MouldDotCheckPlanBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
//棰勮
function get_ViewReport() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
index 04d6af1..24449a5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
@@ -183,15 +183,7 @@
//鍒犻櫎
case 'btn-Delete':
set_DeleteBill();
- break;
- //瀹℃牳鎸夐挳
- case 'btn-Audit':
- set_CheckBill();
- break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit':
- set_AbandonCheck();
- break;
+ break;
//棰勮鎸夐挳
case 'btn-Print':
get_PrintReport();
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index b006185..cee9d56 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -89,9 +89,21 @@
<div class="layui-input-inline">
<input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
</div>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇鍐插埡鏁�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUseQtys" id="HUseQtys" class="layui-input" value="0">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="0">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
@@ -198,7 +210,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -523,6 +535,8 @@
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HUseQtys": data.淇濆吇鍐插埡鏁�
+ , "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
});
} else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index c0f2480..611a0ba 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -196,7 +196,9 @@
HMaterID = params[params[1]]; //鐗╂枡ID
HSourceNo = params[params[2]]; //宸ュ崟鍙�
HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�
- get_SopFile(HMaterID, HSourceNo);
+ HProcID = params[params[4]]; //宸ュ簭ID
+ //get_SopFile(HMaterID, HSourceNo);// 鐗╂枡
+ get_SopFile2(HMaterID, HProcID); //鐗╂枡+宸ュ簭
return;
}
else {
@@ -365,6 +367,72 @@
}
//#endregion
+ //#region 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇浣滀笟鎸囧涔�
+ function get_SopFile2(HMaterID, HProcID) {
+ var wait = layer.load();//閬僵
+ $("#file").html("");
+ $(".layui-carousel-ind").html("");
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SopBill/getListByMaterProc',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "HProcID": HProcID },
+
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data[0]) {
+ HInterID = data1.data[0].HInterID
+ }
+ option.data = data1.data;
+ table.render(option);
+ //鏀寔鎾斁鐨勮棰戞牸寮�
+ var videoExtensions = ['.mp4', '.webm', '.Ogg'];
+
+ for (let i = 0; i < data1.data.length; i++) {
+ var html = '';
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
+ var FileName = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath = data1.data[i].鏂囦欢鍦板潃;
+ //html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
+ html += '<div><img src=../../../' + FilePath + ' alt="" style="width:100%;height:100%"></div>'
+ $("#file").append(html);
+ }
+ if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
+ var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath2 = data1.data[i].鏂囦欢鍦板潃;
+ //<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
+ html += '<div><embed src="../../../' + FilePath2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ $("#file").append(html);
+ }
+ if (videoExtensions.includes(data1.data[i].鏂囦欢绫诲瀷)) {
+ var FileName3 = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath3 = data1.data[i].鏂囦欢鍦板潃;
+ var vvv = '';
+ vvv += '<source src=../../../' + FilePath3 + ' type="video/webm" />'
+ $("#video").append(vvv);
+ }
+
+ }
+
+ if (data1.data.length == 0) {
+ var html2 = '<h1 style="text-align:center;line-height:570px;color:red;font-weight:bolder;">鏆傛湭涓婁紶鏂囦欢</h1>';
+ $("#file").append(html2);
+ }
+ ins.reload({ autoplay: false })
+
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 鍔犺浇缃戞牸
function get_Display(HSourceID, HID) {
var wait = layer.load();//閬僵
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index c53c38f..5d6d290 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
index dea58da..6ac5960 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
@@ -11,8 +11,8 @@
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
index 6af4bf4..5eb8a68 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index c64c2a7..c3ebcab 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index bcda536..4e83057 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index bc1515a..9d8af3e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 2f0edf0..d013651 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -589,6 +589,7 @@
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
];
@@ -648,7 +649,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -789,7 +790,7 @@
for (let i = 0; i < data.length; i++) {
rowdata.push(
{
- "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+ "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
, "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
}
)
@@ -937,7 +938,7 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
- }
+ }
if (checkStatus.data.length === 1) {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 8950078..4a4514f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/HideButton.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
- <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index a9b05a1..a9cf984 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -53,6 +53,14 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">
+ 淇濆吇瀹夊叏澶╂暟
+ </label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
@@ -524,6 +532,7 @@
, "HCheckCycle": data.淇濆吇鍛ㄦ湡
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
});
} else {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index c996d31..d50c37d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -293,7 +293,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
+ , height: 'full-180'
, page: true
, cellMinWidth: 90
, limit: 50
--
Gitblit v1.9.1