From 2b0f02b1b22e82f54c99b3e3f45a840f5246ea1d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 05 六月 2025 13:58:48 +0800
Subject: [PATCH] 完成 20250604 测试记录 修复20250527 通过复制进入编辑页面时 审核按钮启用的问题
---
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit.html | 34 +
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeUseBillList.html | 230 +++++++-
WebTM/WebTM.csproj.user | 2
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit.html | 9
WebTM/views/模治具管理/模具状态分析/Sc_MouldStatusAnalysis_Card.js | 17
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html | 18
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeChangeBillList.html | 269 +++++++++-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeUseBillList.html | 206 +++++++-
WebTM/layuiadmin/layui-common-custom.js | 102 ++++
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html | 510 ++++++++++++++------
WebTM/layuiadmin/SetColumn.js | 2
WebTM/WebTM.csproj | 1
12 files changed, 1,100 insertions(+), 300 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 133a28a..f50a4a6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -106,6 +106,7 @@
<Content Include="layuiadmin\ext\tableFilter.js" />
<Content Include="layuiadmin\ext\tableMerge.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\layui-common-custom.js" />
<Content Include="layuiadmin\layui\css\layui2.10.0.css" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui2.10.0.js" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 2f7c57c..cbf1153 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 2f27e57..79f400d 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -344,7 +344,7 @@
}
//#endregion
-//#region 闅愯棌鍒楄缃紪杈戦〉闈�
+//#region 闅愯棌鍒楄缃紪杈戦〉闈� 甯﹀洖璋冿紝鐢ㄤ簬璁剧疆涓嶅彲缂栬緫鍒�
function get_HideColumnEditWithCallback(HModName, user, option, table, callback) {
var colName = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
diff --git a/WebTM/layuiadmin/layui-common-custom.js b/WebTM/layuiadmin/layui-common-custom.js
new file mode 100644
index 0000000..3ce025d
--- /dev/null
+++ b/WebTM/layuiadmin/layui-common-custom.js
@@ -0,0 +1,102 @@
+// 瀵煎嚭涓篹xcel(閫氱敤)
+function ExportExcel(HModName, ins, option) {
+ var ModRightNameCheck = HModName + "_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+}
+
+// 娓呴櫎鍒跺崟淇℃伅
+function Clear_BillMakeMsg(formLayui, formWrapperStr) {
+ if (typeof Object.assign === 'function') {
+ let formObj = formLayui.val(formWrapperStr)
+ formObj['HMaker'] = sessionStorage['HMaker']
+ formObj['HMakeDate'] = ''
+ formObj['HChecker'] = ''
+ formObj['HCheckDate'] = ''
+ formObj['HUpDater'] = ''
+ formObj['HUpDateDate'] = ''
+ formObj['HCloseMan'] = ''
+ formObj['HCloseDate'] = ''
+ formObj['HDeleteMan'] = ''
+ formObj['HDeleteDate'] = ''
+ formObj['HStopMan'] = ''
+ formObj['HStopDate'] = ''
+ form.val(formWrapperStr, formObj);
+ }
+}
+
+// 璁剧疆涓嶅彲缂栬緫鍒� / 闅愯棌鍒�
+function setUneditableCol(option, editable, hideCols) {
+ if (Array.isArray(editable) !== true) {
+ return
+ }
+ let UneditableColStyle = 'background-color: #eeeeee;'
+ option.cols[0].forEach(item => {
+ if (editable.includes(item.field) !== true) {
+ item.edit = ''
+ if (item.style !== undefined) {
+ item.style += ';' + UneditableColStyle
+ } else {
+ item.style = UneditableColStyle
+ }
+
+ } else {
+ item.edit = 'text'
+ }
+
+ if (hideCols.includes(item.field) === true) {
+ item.hide = true
+ }
+ });
+ return option
+}
+
+// 璁剧疆涓嶅彲缂栬緫鍒� / 闅愯棌鍒� 閫氳繃璁剧疆涓嶅彲缂栬緫
+function setUneditableCol_WithUneditable(option, uneditable, hideCols) {
+ if (Array.isArray(uneditable) !== true) {
+ return
+ }
+ let UneditableColStyle = 'background-color: #eeeeee;'
+ option.cols[0].forEach(item => {
+ if (uneditable.includes(item.field) === true) {
+ item.edit = ''
+ if (item.style !== undefined) {
+ item.style += ';' + UneditableColStyle
+ } else {
+ item.style = UneditableColStyle
+ }
+
+ } else {
+ item.edit = 'text'
+ }
+
+ if (hideCols.includes(item.field) === true) {
+ item.hide = true
+ }
+ });
+ return option
+}
+
+// 椤甸潰HTML瑙ｆ瀽瀹屾垚鍚庢墽琛�
+function onCreated(callback) {
+ document.addEventListener('DOMContentLoaded', callback)
+}
+
+// 椤甸潰璧勬簮鍔犺浇瀹屾垚鍚庢墽琛�
+function onLoad(callback) {
+ window.addEventListener('load', callback)
+}
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html"
index 1dfad0e..d01d500 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html"
@@ -291,6 +291,19 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
});
+ } else if (OperationType == 2) {
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3846' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ ClearMakeMsg()
}
else if (OperationType == 3) {
//绂佺敤缁勭粐閫夐」
@@ -395,6 +408,7 @@
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
function set_ClearBill() {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -569,6 +583,18 @@
}
});
})
+ }
+
+ // 澶嶅埗 閲嶇疆鍒跺崟淇℃伅
+ function ClearMakeMsg() {
+ $("#hmaker").val(sessionStorage['HMaker'])
+ $('#hmakedate').val(Format(new Date(), 'yyyy-MM-dd'))
+ $('#hchecker').val('')
+ $('#hcheckdate').val('')
+ $('#hupdater').val('')
+ $('#hupdatetime').val('')
+ $('#hdeleteman').val('')
+ $('#hdeletedate').val('')
}
//琛屽唴鍒犻櫎蹇嵎閿�
@@ -774,6 +800,14 @@
, "HCloseDate": d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd")
});
+ if (OperationType == 3) {
+ if (isEmpty(d.data[0].瀹℃牳浜�) !== true) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ } else {
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
index 7bdfa44..d96edd8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
@@ -425,6 +425,7 @@
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
function set_ClearBill() {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
//鍒濆鍖栫粍缁�
Organ();
//鍒跺崟浜�
@@ -838,6 +839,14 @@
, "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
+ if (OperationType == 3) {
+ if (isEmpty(d.data[0].瀹℃牳浜�) !== true) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ } else {
+ $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js"
index bb1a602..866fd57 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\212\266\346\200\201\345\210\206\346\236\220/Sc_MouldStatusAnalysis_Card.js"
@@ -1,22 +1,5 @@
class Sc_MouldStatusAnalysis_Card extends HTMLElement {
- static observedAttributes = ["color", "size"];
constructor() {
super()
- }
-
- connectedCallback() {
- console.log("鑷畾涔夊厓绱犳坊鍔犺嚦椤甸潰銆�");
- }
-
- disconnectedCallback() {
- console.log("鑷畾涔夊厓绱犱粠椤甸潰涓Щ闄ゃ��");
- }
-
- adoptedCallback() {
- console.log("鑷畾涔夊厓绱犵Щ鍔ㄨ嚦鏂伴〉闈€��");
- }
-
- attributeChangedCallback(name, oldValue, newValue) {
- console.log(`灞炴�� ${name} 宸插彉鏇淬�俙);
}
}
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
index 78150c6..a64a297 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫鍣ㄥ叿瀵垮懡璋冩暣鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <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">
<style type="text/css">
@@ -14,6 +16,7 @@
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
@@ -24,10 +27,12 @@
<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>
-
-
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Checker">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -44,7 +49,8 @@
<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" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+ id="HBillNo" readonly="readonly" autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
<input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
@@ -52,66 +58,96 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ <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">
+ <input type="text" name="HInnerBillNo" id="HInnerBillNo"
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璋冩暣浜�<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璋冩暣浜�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HEmpList" 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 style="color:red"> * </label></label>
+ <label class="layui-form-label">璐熻矗浜�<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMangerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HMangerName" id="HMangerName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMangerID" id="HMangerID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HMangerList" 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">閮ㄩ棬<label style="color:red"> * </label></label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> *
+ </label></label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HDeptName" id="HDeptName"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="Department" 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">璋冩暣鍘熷洜</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HReason" id="HReason"></textarea>
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HReason"
+ id="HReason"></textarea>
</div>
</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>
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea"
+ name="HExplanation" id="HExplanation"></textarea>
</div>
</div>
</div>
<div class="layui-form-item">
-
<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>
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
+ </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;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
+ class="ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
</div>
</div>
@@ -122,25 +158,29 @@
<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>
+ <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>
+ <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>
+ <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>
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -149,25 +189,29 @@
<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>
+ <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>
+ <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>
+ <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>
+ <input type="text" class="layui-input" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -175,13 +219,15 @@
<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>
+ <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>
+ <input type="text" class="layui-input" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -193,10 +239,9 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
-
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
<script type="text/html" id="xuhao">
@@ -209,7 +254,7 @@
</div>
<script type="text/html" id="barDemo">
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -218,6 +263,9 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/layui-common-custom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script>
//鑾峰彇鍙傛暟
function getUrlVars() {
@@ -232,22 +280,24 @@
}
-
+ var optionData = []
var params = getUrlVars();
var hID = params[params[0]];//缂栬緫鏌ョ湅
+ var operationType = params[params[1]] // 鍒ゆ柇鎿嶄綔绫诲瀷 1: 鏂板,2: 澶嶅埗,3: 缂栬緫
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'util'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
, table = layui.table
, form = layui.form
, laydate = layui.laydate
+ , util = layui.util
, element = layui.element;
//甯歌鐢ㄦ硶
@@ -264,10 +314,15 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "3824";
+ var HModName = 'Sc_Add_MouldLiftChangeBillList'
+ var EditableCol = ['HMaterCode', 'HNewLeaveLife', 'HRemark'] // 鍙紪杈戝垪
+ var titleData = ['HMaterID', 'HUnitID', 'HPropertyID', 'HPropertyCode', 'HPropertyName'
+ , 'HSecUnitID', 'HSecUnitCode', 'HSecUnitName', 'HSecUnitRate'
+ ] // 闅愯棌鍒�
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
var tableReload = table.reload;
var option = {
@@ -296,42 +351,55 @@
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100, totalRow: true }
, { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', width: 100, totalRow: true }
- , { field: 'HNewLeaveLife', title: '鏂板墿浣欏鍛�', edit: 'text', width:100 , totalRow: true }
+ , { field: 'HNewLeaveLife', title: '鏂板墿浣欏鍛�', edit: 'text', width: 100, totalRow: true }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
]]
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
- table.render(option);
+
+ if (operationType == undefined) {
+ operationType = 1;
+ hID = 0;
}
- else {
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'Sc_MouldLifeChangeBill/Sc_MouldLifeChangeBillListProjectDetai',
- type: "GET",
- data: { "sqlWhere": "and hmainid=" + hID },
- success: function (result) {
- //console.log(result);
- //console.log('gouba' + result);
- 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 });
- }
- });
-
+ //鍒濆鍖栫粍缁�
+ Organ();
+ if (operationType == 1) {
+ Add_New()
+ } else if (operationType == 2) {
+ Init_Grid()
+ Add_New()
+ } else {
+ Init_Grid()
}
+ // //鍒ゆ柇鏄惁鏂板
+ // if (hID == null || hID == 0) {
+ // option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
+ // table.render(option);
+ // }
+ // else {
+ // $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ // //缂栬緫鍔犺浇鏁版嵁
+ // $.ajax({
+ // url: GetWEBURL() + '/Sc_MouldLifeChangeBill/Sc_MouldLifeChangeBillListProjectDetai',
+ // type: "GET",
+ // data: { "sqlWhere": "and hmainid=" + hID },
+ // success: function (result) {
+ // //console.log(result);
+ // //console.log('gouba' + result);
+ // 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 });
+ // }
+ // });
+ // }
//澶村伐鍏锋爮浜嬩欢
var rowid = 0;
var rows = 0;
@@ -365,6 +433,12 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
//layer.alert(copyrow);
}
+ break;
+ case 'set_HideColumn':
+ get_HideColumnEditWithCallback(HModName, sessionStorage["HUserName"], option, table, function () {
+ option = setUneditableCol(option, EditableCol, titleData)
+ init_Table()
+ });
break;
}
});
@@ -418,10 +492,13 @@
HMaterCode: checkStatus.data[0].妯″叿缂栧彿,
HMaterName: checkStatus.data[0].妯″叿鍚嶇О,
HMaterSpec: checkStatus.data[0].妯″叿鍨嬪彿,
- HLeaveLife: HMouldLife,
+ // HLeaveLife: HMouldLife,
HNewLeaveLife: 0,//checkStatus.data[0].HNewLife,
HDesignLife: checkStatus.data[0].鍒濆璁捐瀵垮懡, //璁捐瀵垮懡
-
+ HLeaveLift: checkStatus.data[0].鍓╀綑瀵垮懡, // 鍘熷墿浣欏鍛�
+ HUnitID: checkStatus.data[0].HUnitID,
+ HUnitName: checkStatus.data[0]['璁￠噺鍗曚綅'],
+ HUnitCode: checkStatus.data[0]['璁￠噺鍗曚綅浠ｇ爜']
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -431,7 +508,23 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
+ if (isEmpty(optionData) === false) {
+ obj.update({
+ HMaterID: optionData[0].hmainid,
+ HMaterCode: optionData[0].妯″叿缂栧彿,
+ HMaterName: optionData[0].妯″叿鍚嶇О,
+ HMaterSpec: optionData[0].妯″叿鍨嬪彿,
+ // HLeaveLife: HMouldLife,
+ HNewLeaveLife: 0,//checkStatus.data[0].HNewLife,
+ HDesignLife: optionData[0].鍒濆璁捐瀵垮懡, //璁捐瀵垮懡
+ HLeaveLift: optionData[0].鍓╀綑瀵垮懡, // 鍘熷墿浣欏鍛�
+ HUnitID: optionData[0].HUnitID,
+ HUnitName: optionData[0]['璁￠噺鍗曚綅'],
+ HUnitCode: optionData[0]['璁￠噺鍗曚綅浠ｇ爜']
+ });
+ optionData = []
+ }
}
});
}
@@ -566,85 +659,11 @@
- function RoadBillMain(hID)//鍔犺浇琛ㄥご
- {
-
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
- $.ajax({
- url: GetWEBURL() + "Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai",
- type: "GET",
- data: {
- "HID": hID
- },
- success: function (result) {
-
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldLifeChangeBillList_Edit[0];
- console.info(data);
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HEmpID": data.HEmpID //璋冩暣浜篒D
- , "HEmpName": data.璋冩暣浜� //璋冩暣浜哄悕绉�
- , "HMangerID": data.HMangerID //璐熻矗浜篒D
- , "HMangerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
- , "HDeptID": data.HDeptID //閮ㄩ棬ID
- , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
- , "HReason": data.璋冩暣鍘熷洜 //璋冩暣鍘熷洜
- , "HExplanation": data.鎽樿 //鎽樿
- , "HRemark": 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")
- });
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
-
-
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (hID == null || hID == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3824' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(0);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
- }
-
-
//琛ㄥご淇℃伅璋冩暣浜哄脊绐�
form.on('submit(HEmpList)', function () {
@@ -683,6 +702,34 @@
}
});
});
+
+ //瀹℃牳
+ form.on('submit(Checker)', function () {
+ var InterID = hID
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldLifeChangeBill/AuditSc_MouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
//琛ㄥご淇℃伅璐熻矗浜哄脊绐�
form.on('submit(HMangerList)', function () {
@@ -772,7 +819,7 @@
}
});
-
+
function formatDate(date) {
var d = new Date(date),
month = '' + (d.getMonth() + 1),
@@ -842,7 +889,7 @@
});
//#region 鏍规嵁椤圭洰璐圭敤鍒嗙被杩斿洖杩欎釜鍒嗙被鐨勫��
- function getHMould (HItemID) {
+ function getHMould(HItemID) {
$.ajax({
url: GetWEBURL() + '/Sc_MouldRepairInBillList/Get_HMouldLifeUsePic',
type: "GET",
@@ -851,7 +898,7 @@
success: function (data1) {
if (data1.count == 1) {
var data = data1.data;
- HMouldLife=data[0].鍓╀綑瀵垮懡
+ HMouldLife = data[0].鍓╀綑瀵垮懡
} else {
layer.alert(data1.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -862,16 +909,161 @@
}
//#endregion
+ function Init_Grid() {
+ RoadBillMain(hID);
+ DisPlay_HideColumn(HModName, sessionStorage['HUserName'], option, titleData)
+ option = setUneditableCol(option, EditableCol, titleData)
+ init_Table()
+ }
+
+ function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ {
+
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": hID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MouldLifeChangeBillList_Edit[0];
+ console.info(data);
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HEmpID": data.HEmpID //璋冩暣浜篒D
+ , "HEmpName": data.璋冩暣浜� //璋冩暣浜哄悕绉�
+ , "HMangerID": data.HMangerID //璐熻矗浜篒D
+ , "HMangerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HReason": data.璋冩暣鍘熷洜 //璋冩暣鍘熷洜
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": 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 (isEmpty(data.瀹℃牳浜�) === false) {
+ if (operationType != 2) {
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ }
+ } else {
+ $('#check-btn').removeClass('layui-btn-disabled').attr('disabled', false)
+ }
+
+ if (operationType == 2) {
+ $("#HMaker").val(sessionStorage['HUserName'])
+ $("#HMakeDate").val('')
+ $("#HChecker").val('')
+ $("#HCheckDate").val('')
+ $("#HUpDater").val('')
+ $("#HUpDateDate").val('')
+ $("#HCloseMan").val('')
+ $("#HCloseDate").val('')
+ $("#HDeleteMan").val('')
+ $("#HDeleteDate").val('')
+ }
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ 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>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function init_Table() {
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldLifeChangeBill/Sc_MouldLifeChangeBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + hID },
+ success: function (result) {
+ //console.log(result);
+ //console.log('gouba' + result);
+ 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 Add_New() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ let shijian = util.toDateString(new Date().toLocaleString(), 'yyyy-MM-dd')
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3824' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(0);
+ }
+ });
+
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
+ table.render(option);
+ }
+
+
});
//瀹氫箟鍏ㄥ眬鍙橀噺
var HMouldLife;
-
+
function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
-
+
function GetHEmpValue(obj) { //杩斿洖璋冩暣浜�
EmpName = obj[0].HName;
$("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
@@ -882,9 +1074,12 @@
$("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HMangerID").val(obj[0].HItemID);
}
-
-
-
+
+
+ onLoad(() => {
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
+ })
+
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
if ($("#HDeptName").val() == '') {
layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -913,7 +1108,10 @@
return true;
}
-
+ function GetMouldFileValue(data) {
+ optionData = data
+ }
</script>
</body>
+
</html>
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.html"
index 5ef6369..be69979 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeUseBillList.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鍣ㄥ叿瀵垮懡鑰楃敤鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <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/zgqCustom/zgqCustom.js"></script>
@@ -15,9 +17,15 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
+ <script src="../../../layuiadmin/layui-common-custom.js"></script>
<style>
- .main-btn { /*澶撮儴涓绘寜閽�*/
- padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ .main-btn {
+ /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px;
+ /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
height: 30px;
line-height: 30px;
}
@@ -25,10 +33,12 @@
.btn-title {
font-size: 16px;
}
+
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
overflow: visible !important;
}
+
/* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
td .layui-form-select {
margin-top: -10px;
@@ -48,14 +58,19 @@
</style>
</head>
+
<body>
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 10px; ">
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+ lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+ lay-filter="btnChecker" id="btnChecker">瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+ lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<h1 style="text-align:center;"><b>鍣ㄥ叿瀵垮懡鑰楃敤鍗�</b></h1>
@@ -71,14 +86,18 @@
<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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <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">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 122px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 68px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate"
+ id="HDate" style="padding-left: 68px;">
</div>
</div>
<div class="layui-inline">
@@ -90,21 +109,35 @@
</div>
<div class="layui-row">
<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>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMangerName" name="HMangerName" id="HMangerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HMangerID" id="HMangerID" lay-verify="HMangerID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManger" id="btnHManger" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" lay-verify="HMangerName"
+ name="HMangerName" id="HMangerName"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;"
+ readonly>
+ <input type="hidden" name="HMangerID" id="HMangerID"
+ lay-verify="HMangerID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button"
+ lay-submit="" lay-filter="btnHManger" id="btnHManger"
+ 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;padding: 9px 18px;">閮ㄩ棬</label>
+ <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;">
+ <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>
@@ -112,7 +145,8 @@
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HExplanation" id="HExplanation">
+ <input type="text" class="layui-input" name="HExplanation"
+ id="HExplanation">
</div>
</div>
</div>
@@ -133,19 +167,22 @@
<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>
+ <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>
+ <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>
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -153,19 +190,22 @@
<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>
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+ 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="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+ <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="HBacker " id="HBacker " style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBacker " id="HBacker "
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -173,38 +213,44 @@
<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>
+ <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>
+ <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>
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate"
+ style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-row">
<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>
+ <input type="text" class="layui-input" name="HUpDateDate"
+ id="HUpDateDate" 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>
+ <input type="text" class="layui-input" name="HDeleteDate"
+ id="HDeleteDate" 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="HBackDate" id="HBackDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBackDate"
+ id="HBackDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -219,7 +265,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -231,7 +277,7 @@
</script>
<script>
-
+ var optionData = []
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -248,13 +294,15 @@
, element = layui.element
, laydate = layui.laydate
var option = [];
-
+ var titleData = ['HMaterID', 'HUnitID']
+ var unEditableCols = ['璁￠噺鍗曚綅', 'HDesignLife', 'HLeaveLife', 'HNewLeaveLife', 'HMaterSpec']
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "3845";
+ var HModName = "Sc_Add_MouldLifeUseBillList"
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
@@ -270,6 +318,29 @@
//鍒濆鍖�
set_ClearBill();
+ if (OperationType == 2) {
+ //绂佺敤缁勭粐閫夐」
+ $("#HPRDORGID").attr("disabled", true);
+ $("#HDate").attr("disabled", true);
+ RoadBillMain(linterid);
+ $("#HMaker").val(sessionStorage['HMaker'])
+ $("#HMakeDate").val('')
+ $("#HChecker").val('')
+ $("#HCheckDate").val('')
+ $("#HUpDater").val('')
+ $("#HUpDateDate").val('')
+ $("#HCloseMan").val('')
+ $("#HCloseDate").val('')
+ $("#HDeleteMan").val('')
+ $("#HDeleteDate").val('')
+ // $("#HInterID").val(linterid);
+ linterid = 0
+ } else if (OperationType == 3) {
+ $("#HPRDORGID").attr("disabled", true);
+ $("#HDate").attr("disabled", true);
+ RoadBillMain(linterid);
+ $("#HInterID").val(linterid);
+ }
if (linterid == null || linterid == 0) {
OperationType = 1;
@@ -284,16 +355,8 @@
}
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰
- //绂佺敤缁勭粐閫夐」
- $("#HPRDORGID").attr("disabled", true);
- $("#HDate").attr("disabled", true);
- RoadBillMain(linterid);
- $("#HInterID").val(linterid);
- }
$("#HMaker").val(sessionStorage["HUserName"]);
-
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -335,10 +398,12 @@
checkRefresh();
}
break;
- ////鍒楄缃�
- //case 'set_HideColumn':
- // get_HideColumn();
- // break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumnEditWithCallback(HModName, sessionStorage['HUserName'], option, table, function () {
+ refreshColSetting()
+ });
+ break;
}
});
@@ -415,6 +480,35 @@
}
});
+ form.on('submit(btnChecker)', function () {
+ var InterID = linterid;
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldLifeUseBill/AuditSc_MouldLifeUseBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ $('#btnSave').addClass('layui-btn-disabled').attr('disabled', true)
+ $('#btnChecker').addClass('layui-btn-disabled').attr('disabled', true)
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
table.on('edit(mainTable)', function (obj) {
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
@@ -456,12 +550,19 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ $('#btnChecker').addClass('layui-btn-disabled').attr('disabled', true)
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖� 缁勭粐
Organ();
set_InitGrid();
+ }
+
+ function refreshColSetting() {
+ option = setUneditableCol_WithUneditable(option, unEditableCols, titleData);
+ DisPlay_HideColumn(HModName, sessionStorage['HUserName'], option, table)
+ table.render(option)
}
//鑾峰彇缁勭粐
@@ -499,6 +600,7 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HMaterID', title: 'HMaterID ', width: 100, hide: true }
, { field: '鍣ㄥ叿', title: '鍣ㄥ叿', edit: 'text', event: "HMaterID" }//f7
+ , { field: 'HMaterSpec', title: '鍣ㄥ叿瑙勬牸' }//f7
, { field: 'HUnitID', title: 'HUnitID ', width: 100, hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
, { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', totalRow: true }
@@ -594,10 +696,26 @@
obj.update({
"鍣ㄥ叿": checkStatus.data[0].妯″叿鍚嶇О
, "HMaterID": checkStatus.data[0].hmainid
+ , "HMaterSpec": checkStatus.data[0].褰撳墠妯″叿瑙勬牸
+ , 'HUnitID': checkStatus.data[0].HUnitID
+ , '璁￠噺鍗曚綅': checkStatus.data[0].璁￠噺鍗曚綅
, "HDesignLife": checkStatus.data[0].鍒濆璁捐瀵垮懡
, "HLeaveLife": checkStatus.data[0].鍓╀綑瀵垮懡
})
layer.close(index);//鍏抽棴寮圭獥
+ }, end: function () {
+ if (isEmpty(optionData) === false) {
+ obj.update({
+ "鍣ㄥ叿": optionData[0].妯″叿鍚嶇О
+ , "HMaterID": optionData[0].hmainid
+ , "HMaterSpec": optionData[0].褰撳墠妯″叿瑙勬牸
+ , 'HUnitID': optionData[0].HUnitID
+ , '璁￠噺鍗曚綅': optionData[0].璁￠噺鍗曚綅
+ , "HDesignLife": optionData[0].鍒濆璁捐瀵垮懡
+ , "HLeaveLife": optionData[0].鍓╀綑瀵垮懡
+ })
+ optionData = []
+ }
}
})
}
@@ -717,7 +835,6 @@
async: false,
data: { "HInterID": linterid },
success: function (d) {
-
//$("#HPRDORGID").val(d.data[0].HPRDORGID);
//涓昏〃
form.val("formData", {
@@ -743,6 +860,20 @@
, "HDeleteDate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
+ // if (OperationType == 2) {
+
+ // }
+
+ if (isEmpty(d.data[0].瀹℃牳浜�) === false) {
+ if (OperationType != 2) {
+ $('#btnSave').addClass('layui-btn-disabled').attr('disabled', true)
+ }
+ } else {
+ if (OperationType != 2) {
+ $('#btnChecker').removeClass('layui-btn-disabled').attr('disabled', false)
+ }
+ }
+
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < d.data.length; i++) {
@@ -750,12 +881,12 @@
{
"HMaterID": d.data[i].HMaterID, "鍣ㄥ叿": d.data[i].鍣ㄥ叿, "HUnitID": d.data[i].HUnitID, "璁￠噺鍗曚綅": d.data[i].璁￠噺鍗曚綅,
"HDesignLife": d.data[i].璁捐瀵垮懡, "HLeaveLife": d.data[i].鏈鍓╀綑瀵垮懡, "HUseLife": d.data[i].鏈鑰楃敤,
- "HNewLeaveLife": d.data[i].鏈鍓╀綑瀵垮懡, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ "HNewLeaveLife": d.data[i].鏈鍓╀綑瀵垮懡, "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HMaterSpec": d.data[i].褰撳墠妯″叿瑙勬牸
}
)
}
option.data = rowdata;
- table.render(option);
+ refreshColSetting()
form.render('select');
}
})
@@ -787,6 +918,11 @@
$("#HDeptID").val(obj[0].HItemID);
}
+ function GetMouldFileValue(data) { // 杩斿洖鍣ㄥ叿
+ optionData = data
+ }
+
</script>
</body>
+
</html>
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
index 7637102..c309db1 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿瀵垮懡璋冩暣鍗�</title>
@@ -20,12 +21,14 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/layui-common-custom.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -40,38 +43,44 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-inline">
@@ -80,28 +89,44 @@
</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;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
+ class="ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HModelNumber" id="HModelNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HModelNumber" id="HModelNumber" style="width:190px;">
</div>
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -109,26 +134,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -136,26 +168,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -163,7 +202,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -174,7 +214,8 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>銆�
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Copy" id="Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
@@ -185,6 +226,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -198,7 +240,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -306,6 +348,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栫粍缁�
+ Organ()
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -436,7 +480,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ if (data[i].name === '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -449,8 +502,9 @@
laypage.render(optionPage);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
@@ -483,7 +537,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=0',
+ content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=0&operationType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -507,7 +561,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=' + hID
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=' + hID + '&operationType=3'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -558,6 +612,12 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
break;
+ // 澶嶅埗鎸夐挳
+ case 'btn-Copy': set_AddCopy();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': ExportExcel(HModName, ins, option);
+ break;
//瀹℃牳
case 'btn-audit': get_Audit();
break;
@@ -594,6 +654,15 @@
break;
};
});
+
+ //琛ㄦ牸鑷畾涔変簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data
+ switch (obj.event) {
+ case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
+ }
+ })
+
//瀹℃牳
function get_Audit() {
var checkStatus = table.checkStatus('mainTable')
@@ -601,7 +670,7 @@
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
$.ajax({
- type: "GET",
+ type: "GET",
url: GetWEBURL() + "/Sc_MouldLifeChangeBill/AuditSc_MouldLifeChangeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
@@ -716,7 +785,7 @@
}
}
//#endregion
-
+
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -1098,6 +1167,48 @@
get_FastQuery()
form.render("select");
}
+ }, btn: ['纭畾']
+ , btn1: function (index, layero) {
+ let iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ let checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ layer.alert('璇烽�夋嫨涓�鏉℃暟鎹�!', { icon: 5 })
+ return
+ }
+ let HInterID = checkStatus.data[0].hmainid;
+ HInterID_Choose = checkStatus.data[0].hmainid;
+ debugger
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
}
})
}
@@ -1118,7 +1229,82 @@
// , format:'yyyy-MM-dd HH:mm'
//});
+ //#region 鑷畾涔変簨浠舵崟鑾�
+ function onHBillNumberClickHandler(data) {
+ var hID = data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=' + hID + '&operationType=3'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ //#endregion
+ // 澶嶅埗
+ function set_AddCopy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗' + HPageTitle
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=' + hID + '&operationType=2'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ }
+ }
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ 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>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
@@ -1165,4 +1351,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
index 029041c..2503801 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿瀵垮懡鑰楃敤鍗曠淮鎶�</title>
@@ -17,7 +18,10 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/layui-common-custom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -34,48 +38,67 @@
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -83,26 +106,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes"
+ lay-filter="Comparator1" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -110,26 +140,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes"
+ lay-filter="Comparator2" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -137,7 +174,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -148,8 +186,8 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Copy" id="Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></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>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -161,6 +199,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -178,7 +217,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -278,8 +317,22 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ // 澶嶅埗鎸夐挳
+ case 'btn-Copy': set_AddCopy();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': ExportExcel('Sc_MouldLifeUseBill', ins, option);
+ break;
};
});
+
+ // 鑷畾涔変簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data
+ switch (obj.event) {
+ case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
+ }
+ })
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -470,7 +523,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ if (data[i].name === '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
@@ -483,8 +545,9 @@
laypage.render(optionPage);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
@@ -641,7 +704,7 @@
, area: ['100%', '100%']
, title: '缂栬緫' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: './Sc_Add_MouldLifeUseBillList.html?OperationType=3&linterid=' + linterid +''
+ , content: './Sc_Add_MouldLifeUseBillList.html?OperationType=3&linterid=' + linterid + ''
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -664,7 +727,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldLifeUseBill/Delete',
type: "GET",
- data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
@@ -1098,11 +1161,93 @@
get_FastQuery()
form.render("select");
}
+ }, btn: ['纭畾']
+ , btn1: function (index) {
+ let iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ let checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length != 1) {
+ layer.alert('璇烽�夋嫨涓�鏉℃暟鎹�!', { icon: 5 })
+ return
+ }
+ let HInterID = checkStatus.data[0].hmainid;
+ HInterID_Choose = checkStatus.data[0].hmainid;
+ debugger
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
}
})
}
//#endregion
+
+ //#region 鑷畾涔変簨浠剁洃鍚�
+ function onHBillNumberClickHandler(data) {
+ let linterid = data.HMainID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sc_Add_MouldLifeUseBillList.html?OperationType=3&linterid=' + linterid + ''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+ //#endregion
+
+ // 澶嶅埗
+ function set_AddCopy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ let linterid = data[0].HMainID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Sc_Add_MouldLifeUseBillList.html?OperationType=2&linterid=' + linterid + ''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+
+ }
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
@@ -1148,4 +1293,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index dc1864e..8750564 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -137,8 +137,9 @@
<label class="layui-form-label">楠屾敹鍛�<label style="color:red"> *
</label></label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" readonly
- class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSecManagerName" id="HSecManagerName"
+ readonly class="layui-input" value=""
+ style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID"
class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn"
@@ -936,6 +937,7 @@
//鍒濆鍖栬〃鍗曟彃浠�
function set_InitFrom() {
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true)
// 鍒濆鍖栫粍缁�
Organ()
//甯歌鐢ㄦ硶
@@ -1110,13 +1112,15 @@
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": isEmpty(data.浣滃簾鏃ユ湡) === true ? "" : util.toDateString(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd HH:mm:ss")
});
-
- if (isEmpty(data.瀹℃牳浜�) === false) {
- $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true)
- } else {
- $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false)
+ if (OperationType == 3) {
+ if (isEmpty(data.瀹℃牳浜�) === false) {
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true)
+ } else {
+ $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false)
+ }
}
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
--
Gitblit v1.9.1