From 727ee25aeb5fcaf84e2cf009b2eacd3a86bcb3ca Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 28 十一月 2024 12:55:23 +0800
Subject: [PATCH] 新增 环境检测方案,环境检测单
---
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html | 256 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 201 insertions(+), 55 deletions(-)
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..ca74902 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"
@@ -67,58 +67,77 @@
</div>
</div>
<div class="layui-form-item">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-inline">
- <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
- <option value="澶�">澶�</option>
- <option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐐规鍛ㄦ湡</label>
- <div class="layui-input-inline">
- <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璁″垝缁撴潫鏃ユ湡</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
+ <div class="layui-input-inline">
+ <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="澶�">澶�</option>
+ <option value="鏈�">鏈�</option>
+ <option value="鍛�">鍛�</option>
+ </select>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐规鍛ㄦ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁″垝寮�濮嬫棩鏈�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁″垝缁撴潫鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:520px;"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:330px;">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:520px;"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:85px;">鐐规瑙勭▼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID" value="0">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -127,12 +146,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>
@@ -146,7 +170,7 @@
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
</script>
-
+ </div>
</form>
</div>
</div>
@@ -188,6 +212,7 @@
, element = layui.element;
var option = [];//鐐规
+ var option_plan = [];//璁″垝
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -202,6 +227,9 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍔ㄦ�佸姞杞界粍缁�
+ Organ();
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -287,6 +315,33 @@
},
success: function (layero, index) {
+ }
+ });
+ });
+
+ //琛ㄥご璁惧鐐规瑙勭▼淇℃伅
+ form.on('submit(btnHDept)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
});
});
@@ -423,6 +478,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, 500, 5000, 20000]
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns_plan]
+ , done: function (res, curr, count) {
+
+ }
+ };
}
// 鐐规淇℃伅 閰嶄欢淇℃伅
@@ -494,12 +575,37 @@
}
});
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//缂栬緫
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
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 +622,7 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": data.鏃ユ湡
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HBeginDate": data.淇濆吇寮�濮嬫棩鏈�
+ , "HBeginDate": Pub_Format(data.淇濆吇寮�濮嬫棩鏈�, "yyyy-MM-dd")
, "HEndDate": data.淇濆吇缁撴潫鏃ユ湡
, "HExplanation": data.鎽樿
, "HRemark": data.澶囨敞
@@ -524,13 +630,18 @@
, "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
-
+ , "HCREATEORGID": data.HCREATEORGID
+ , "HUSEORGID": data.HUSEORGID
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬鍚嶇О
});
-
+ if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ }
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -567,6 +678,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),
--
Gitblit v1.9.1