From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支
---
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 373 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 322 insertions(+), 51 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 0c7ac99..9f475fb 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,7 +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>
+ <script src="../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -30,11 +30,11 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
<h1 style="text-align: center; padding: 10px 0;"><b>璁惧鐐规璁″垝鍗�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-row">
@@ -53,14 +53,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐐规鍛ㄦ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鐐规鍛ㄦ湡<label style="color:red"> * </label></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" style="width: 85px;">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 185px;" ">
+ <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>
@@ -76,7 +76,7 @@
</div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧<label style="color:red"> * </label></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">
@@ -122,6 +122,97 @@
</div>
</div>
</div>
+ <div class="layui-row" style="margin-top:10px;">
+ <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 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: 60%;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>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <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="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </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-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </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 type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -139,9 +230,9 @@
<div class="layui-tab-item">
<!--鐐规璁″垝-->
<table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
- </div>
+ </div>
</div>
- </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -167,6 +258,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../layuiadmin/PubCustom.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
var params = get_UrlVars();
@@ -208,11 +300,22 @@
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍔ㄦ�佸姞杞界粍缁�
+ Organ();
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
}
+ else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //澶嶅埗
+ OperationType = 1;
+ set_EditFromGrid(linterid);
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ }
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ //$("#HUSEORGID").attr("disabled", true);
set_EditFromGrid();
}
else {
@@ -225,7 +328,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" };
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -304,9 +407,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../PublicPage/EqpInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html?openType=2', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -315,8 +418,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEquipName").val(checkStatus.data[0].HName);
- $("#HEquipID").val(checkStatus.data[0].HInterID);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ $("#HEquipID").val(checkStatus.data[0].hmainid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -343,7 +446,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -362,6 +465,33 @@
form.render('select');
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_DocCheckItem2(checkStatus.data[0].hmainid);
+ }
+ });
+ });
+
+ //琛ㄥご璁惧鐐规瑙勭▼淇℃伅
+ 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?openType=2&HOrgName=' + sessionStorage["Organization"], '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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
});
});
@@ -392,6 +522,10 @@
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
, { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+ , { field: 'HDotCheckItemClassID', title: '鐐规椤圭洰鍒嗙被ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemClassName', title: '鐐规椤圭洰鍒嗙被', edit: 'text', event: 'HDotCheckItemClassName' }
+ , { field: 'HDotCheckItemMethodID', title: '鐐规鏂规硶ID', edit: 'text', hide: true }
+ , { field: 'HDotCheckItemMethodName', title: '鐐规鏂规硶', edit: 'text', event: 'HDotCheckItemMethodName' }
, { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -417,7 +551,7 @@
//鐐规璁″垝
columns_plan = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
@@ -432,7 +566,7 @@
, page: true
, totalRow: true
, limit: 500
- , limits:[50,200,500,1000,3000]
+ , limits: [50, 200, 500, 1000, 3000]
, cellMinWidth: 120
, height: 500
, cols: [columns_plan]
@@ -445,7 +579,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -456,6 +590,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": sBillType },
success: function (d) {
var myDate = new Date();
@@ -468,17 +603,38 @@
}
});
}
+ //鑾峰彇缁勭粐
+ 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, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
- table.render(option);
+ //option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "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);
+ //option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ //table.render(option_plan);
}
// 鐐规淇℃伅
@@ -493,7 +649,7 @@
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": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
table.render(option);
if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓嶄负绌烘椂
@@ -503,7 +659,7 @@
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].瀛愬娉�
+ "HManagerName": DJData[i].璐熻矗浜�, "HRemark": DJData[i].瀛愬娉�, "HDotCheckItemClassID": DJData[i].HDotCheckItemClassID, "HDotCheckItemClassName": DJData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": ""
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -526,16 +682,16 @@
$.ajax({
url: GetWEBURL() + "Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListCheckDetai",
type: "GET",
+ async: false,
data: {
"HID": linterid
},
success: function (result) {
- //console.log(result.code)
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //console.log(result)
- var data = result.data.h_v_Sb_EquipDotCheckPlanBillList[0];
+ var data = result.data.h_v_Sb_EquipDotCheckPlanBill_Edit2[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HInterID": OperationType == 2 ? "" : linterid
+ , "HBillNo": OperationType == 2 ? "" : data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HEquipName": data.璁惧鍚嶇О
@@ -548,8 +704,24 @@
, "HRemark": data.琛ㄥご澶囨敞
, "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
, "HMouldDotCheckRuleName": data.璁惧鐐规瑙勭▼
+ , "HCREATEORGID": data.HCREATEORGID
+ , "HUSEORGID": data.HUSEORGID
+ , "HDeptID": data.HDeptID
+ , "HDeptName": data.閮ㄩ棬鍚嶇О
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
-
+ 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' });
}
@@ -560,17 +732,20 @@
}
// 缂栬緫鑾峰彇琛ㄤ綋--鐐规椤圭洰
function set_EditGrid(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai',
type: "GET",
+ async: false,
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
- console.log(result);
- //console.log('gouba' + result);
if (result.count == 1) {
- option.data = result.data;
+ var data = result.data;
+ var subarr = [];
+ for (var i = 0; i < data.length; i++) {
+ subarr.push({ "HDotCheckItemID": data[i].鐐规椤圭洰ID, "HDotCheckCode": data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": data[i].鐐规椤圭洰, "HDotCheckPart": data[i].鐐规閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerCode": data[i].璐熻矗浜轰唬鐮�, "HManagerName": data[i].璐熻矗浜�, "HRemark": data[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].鐐规鏂规硶鍚嶇О });
+ }
+ option.data = subarr;
table.render(option);
} else {
@@ -585,11 +760,11 @@
// 缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
function set_EditGrid_Plan(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/GetPlanList',
type: "GET",
+ async: false,
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
if (result.count == 1) {
@@ -693,7 +868,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -702,14 +877,38 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HDotCheckItemID: checkStatus.data[0].HItemID,
- HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
- HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
- //HDotCheckPart: checkStatus.data[0].鐐规閮ㄤ綅
- });
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemID: checkStatus.data[0].HItemID,
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О,
+ HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
+ HDotCheckItemClassID: checkStatus.data[0].HDotCheckItemClassID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О,
+ //HDotCheckPart: checkStatus.data[0].鐐规閮ㄤ綅
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ } else {
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HDotCheckItemID"] != 0 && tableBak[i]["HDotCheckItemID"] != "" && tableBak[i]["HDotCheckItemID"] != undefined && tableBak[i]["HDotCheckItemID"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckCode": checkStatus.data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": checkStatus.data[i].鐐规椤圭洰鍚嶇О, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" });
+ }
+
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -725,13 +924,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?Type=HEmp', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -742,8 +941,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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -755,6 +954,74 @@
}
});
}
+
+ if (obj.event === 'HDotCheckItemClassName') //鐐规椤圭洰鍒嗙被
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规椤圭洰鍒嗙被鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemClassID: checkStatus.data[0].HItemID,
+ HDotCheckItemClassName: checkStatus.data[0].鐐规椤圭洰鍒嗙被鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+ if (obj.event === 'HDotCheckItemMethodName') //鐐规鏂规硶
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐐规鏂规硶鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true
+ , content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDotCheckItemMethodID: checkStatus.data[0].HItemID,
+ HDotCheckItemMethodName: checkStatus.data[0].鐐规鏂规硶鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -768,6 +1035,10 @@
layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
+ 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++) {
--
Gitblit v1.9.1