From 4a3b55d623ffbfa34e5c3ecbe7b9af2fcb36d24c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 03 四月 2024 13:46:25 +0800
Subject: [PATCH] 费用项目基础资料：从弹窗打开时数据过滤没有数据问题解决
---
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 365 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 284 insertions(+), 81 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index 859149d..08d09dd 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -23,13 +24,9 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
</div>
-
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -37,83 +34,91 @@
<li class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
- <h1 style="text-align:center;"><b>璁惧鐐规璁″垝鍗�</b></h1>
+ <h1 style="text-align: center; padding: 10px 0;"><b>璁惧鐐规璁″垝鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <div class="layui-form-item">
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
- <input id="HInterID" name="HInterID" type="hidden" />
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input class="layui-input" name="HDate" id="HDate" 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 type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+ <label class="layui-form-label" style="width: 85px;">鐐规鍛ㄦ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧</label>
- <div class="layui-input-inline">
- <input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-inline">
+ <label class="layui-form-label" style="width: 85px;">鍛ㄦ湡鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 185px;" ">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
- <option value="鍛�">鍛�</option>
</select>
</div>
</div>
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label" style="width: 85px;">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
<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">
+ <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="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEquipList" id="HEquipList" 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">璁″垝寮�濮嬫棩鏈�</label>
- <div class="layui-input-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="HMouldDotCheckRuleName" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" lay-verify="HMouldDotCheckRuleID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldDotCheckRule" id="btnHMouldDotCheckRule" 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;">
<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">
+ <label class="layui-form-label" style="width: 85px;">璁″垝缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<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-row" style="margin-top:10px;">
<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>
+ <label class="layui-form-label" style="width: 85px;">鎽樿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:493px;"></textarea>
</div>
</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>
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:493px;"></textarea>
</div>
</div>
</div>
@@ -121,8 +126,22 @@
</div>
</div>
</div>
-
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card">
+ <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="mainTable_plan" lay-filter="mainTable_plan"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -172,10 +191,19 @@
, laydate = layui.laydate
, element = layui.element;
var option;
+ var option_plan;
var sBillType = "3904";
- var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ //var TabRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3904";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
//鍒濆鍖栬〃鏍�
@@ -197,7 +225,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = TabRow;
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -235,9 +263,9 @@
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+ if (AllowLoadData(sSubStr)) {
+ $.ajax({
type: "POST",
url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
@@ -248,7 +276,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
}
else {
@@ -264,6 +292,7 @@
console.log("Reason" + sMainStr);
}
});
+ }
});
//琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(HEquipList)', function () {
@@ -275,9 +304,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../PublicPage/EqpInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ ,content: ['../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -286,8 +315,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HItemID);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ $("#HEquipID").val(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -302,6 +331,41 @@
}
});
});
+
+ //琛ㄥご璁惧鐐规瑙勭▼淇℃伅
+ form.on('submit(btnHMouldDotCheckRule)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧鐐规瑙勭▼鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.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('璇烽�夋嫨鏁版嵁');
+ }
+ console.log(checkStatus);
+ $("#HMouldDotCheckRuleName").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+ $("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
+ $("#HCheckCycle").val(checkStatus.data[0].鐐规鍛ㄦ湡);
+ //$("#HBeginDate").val(Pub_Format(checkStatus.data[0].璁″垝寮�濮嬫棩鏈�, "yyyy-MM-dd"));
+ //$("#HEndDate").val(Pub_Format(checkStatus.data[0].璁″垝缁撴潫鏃ユ湡, "yyyy-MM-dd"));
+ form.render('select');
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_DocCheckItem2(checkStatus.data[0].hmainid);
+ }
+ });
+ });
+
//#endregion
@@ -321,9 +385,9 @@
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- //琛ㄥご
+ //鐐规椤圭洰
columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
@@ -341,9 +405,37 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: true
+ , limit: 100
+ , totalRow: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+
+ //鐐规璁″垝
+ 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) {
}
@@ -353,7 +445,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [TabRow];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -380,9 +472,54 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [TabRow];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
+
+
+ set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�","DiffDate":0 }];
+ table.render(option_plan);
}
+
+ // 鐐规淇℃伅
+ function get_DocCheckItem2(data) {
+ $.ajax({
+ url: GetWEBURL() + "/Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai",
+ type: "GET",
+ async: false,
+ data: { "sqlWhere": "and hmainid=" + data },
+ success: function (result) {
+ if (result != null) {
+ if (result.count == 1) {
+ var DJData = result.data;//鐐规
+ var rowdate1 = layui.table.cache["mainTable"];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ table.render(option);
+
+ if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
+ {
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < DJData.length; i++) {
+ var checkrow = {
+ "HDotCheckItemID": DJData[i].鐐规椤圭洰ID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": DJData[i].鐐规椤圭洰, "HDotCheckPart": DJData[i].鐐规閮ㄤ綅,
+ "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].璐熻矗浜篒D, "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�
+ };
+ buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ }
+ })
+ }
+
//缂栬緫鍔犺浇琛ㄥご
function set_EditForm(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -405,10 +542,12 @@
, "HEquipID": data.璁惧ID
, "HCycleUnit": data.鍛ㄦ湡鍗曚綅
, "HCheckCycle": data.鐐规鍛ㄦ湡
- , "HBeginDate":data.寮�濮嬫棩鏈�
- , "HEndDate": data.缁撴潫鏃ユ湡
+ , "HBeginDate": formatDate(data.寮�濮嬫棩鏈�)
+ , "HEndDate": formatDate(data.缁撴潫鏃ユ湡)
, "HExplanation": data.鎽樿
- ,"HRemark":data.琛ㄥご澶囨敞
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
+ , "HMouldDotCheckRuleName": data.璁惧鐐规瑙勭▼
});
} else {
@@ -419,7 +558,7 @@
}
});
}
- // 缂栬緫鑾峰彇琛ㄤ綋
+ // 缂栬緫鑾峰彇琛ㄤ綋--鐐规椤圭洰
function set_EditGrid(linterid) {
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
@@ -433,6 +572,40 @@
if (result.count == 1) {
option.data = result.data;
table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ // 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
+ function set_EditGrid_Plan(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/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 });
@@ -457,9 +630,15 @@
}
//澧炲姞涓�琛�
function set_AddLine(NewRow) {
- table.cache["mainTable"].push(NewRow);
- option.data = table.cache["mainTable"];
- table.render(option);
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
}
//澶嶅埗涓�琛�
function set_CopyLine(data) {
@@ -509,12 +688,12 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
+ title: '鐐规椤圭洰鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../PublicPage/CheckItemInformation.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -526,8 +705,9 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
- HDotCheckCode: checkStatus.data[0].HNumber,
- HDotCheckItem: checkStatus.data[0].HName
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
+ //HDotCheckPart: checkStatus.data[0].鐐规閮ㄤ綅
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -545,13 +725,13 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
+ title: '鑱屽憳鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
- maxmin: true,
- content: ['../PublicPage/UserInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -562,8 +742,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HManagerID: checkStatus.data[0].HItemID,
- HManagerCode: checkStatus.data[0].HNumber,
- HManagerName: checkStatus.data[0].HName
+ HManagerCode: checkStatus.data[0].鑱屽憳浠ｇ爜,
+ HManagerName: checkStatus.data[0].鑱屽憳鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -581,6 +761,29 @@
}
})
}
+ //鏁版嵁楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var Result = true;
+ if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HDotCheckItemID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HManagerID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ }
+ }
+ return Result;
+ }
//閿欒淇℃伅
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -589,9 +792,9 @@
//#endregion
-
+
});
- </script>
+ </script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1