From 97d36147044f5bd4a00a256ec7af2205023899f0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 23 五月 2025 19:05:31 +0800
Subject: [PATCH] fix: 完成测试记录20250521 功能完善
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html | 393 ++++++-
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 122 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 311 +++++-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html | 241 ++++-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html | 251 ++++-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 582 +++++++++---
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 1
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html | 236 ++++-
WebTM/layuiadmin/SetColumn.js | 56
WebTM/views/基础资料/公用基础资料/Gy_MaterialCorrection.html | 4
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html | 262 ++++-
WebTM/views/模治具管理/器具点检规程单/Sc_MouldDotCheckRuleBillList.html | 22
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html | 258 ++++-
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 2
14 files changed, 2,089 insertions(+), 652 deletions(-)
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index c59e2de..223f5ff 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -6,13 +6,13 @@
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- var contentUrl = "";
+ var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
for (var i = 0; i < urlLen.length - 4; i++) {
contentUrl += "../";
}
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -51,7 +51,7 @@
contentUrl += "../";
}
contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
-
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -73,7 +73,7 @@
//#endregion
//#region 璁剧疆琛ㄦ牸椤靛ぇ灏忓垵濮�
-function DisPlay_HideColumn_GetPageSize(HModName, user,optionPage) {
+function DisPlay_HideColumn_GetPageSize(HModName, user, optionPage) {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
@@ -85,7 +85,7 @@
optionPage.limit = data1.data[0].HPageSize;
optionPage.limits.push(data1.data[0].HPageSize);
}
-
+
} else {
}
}, error: function () {
@@ -105,7 +105,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = [];*/
+ /* var titleData = [];*/
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
@@ -203,7 +203,7 @@
//#region 闅愯棌鍒楄缃紪杈戦〉闈�
-function get_HideColumnEdit(HModName,user,option,table) {
+function get_HideColumnEdit(HModName, user, option, table) {
var colName = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
@@ -227,9 +227,43 @@
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumnEdit(HModName, user, option,table);
+ DisPlay_HideColumnEdit(HModName, user, option, table);
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+}
+//#endregion
+
+//#region 闅愯棌鍒楄缃紪杈戦〉闈�
+function get_HideColumnEditAfterReload(HModName, user, option, table, callback) {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ colTitleName = encodeURI(colTitleName.substring(0, colTitleName.length - 1));
+ /*urlStr.replace(/%/g, '%25');*/
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumnEdit(HModName, user, option, table);
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ callback.call()
}
})
}
@@ -301,7 +335,7 @@
}
//閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
if (dataCol.length == newCols[0].length - 1) {
- newCols[0].push(option.cols[0][dataCol.length+1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
+ newCols[0].push(option.cols[0][dataCol.length + 1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
option.cols = newCols;
//鍙栨秷鍐荤粨鍒�
for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -322,7 +356,7 @@
}
}
//璁剧疆鍒楁帓搴�
- for (var i = 1; i < option.cols[0].length-1; i++) {
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
if (data1.data[0].HSortFlag == "鏄�") {
option.cols[0][i]["sort"] = true;
}
@@ -389,7 +423,7 @@
colName += option.cols[0][i]["field"] + ",";
colTitleName += option.cols[0][i]["title"] + ",";
}
-
+
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 068e7f0..3d70e60 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.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>
@@ -16,6 +17,7 @@
<script src="../../../layuiadmin/HideButton_New.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -32,49 +34,62 @@
<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 ForFilteringSchemes" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
+ id="HNumber">
</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 ForFilteringSchemes" name="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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-inline">
<label class="layui-form-label">閮ㄩ棬浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2"
+ id="HNumber2" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<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="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>
@@ -82,26 +97,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>
@@ -109,26 +131,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>
@@ -136,7 +165,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>
@@ -192,8 +222,8 @@
var HModName = "Gy_DepartmentList";
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HUSEORGID", "HEmpID","璐熻矗浜�"];
-
+ var titleData = ["HItemID", "HUSEORGID", "HEmpID", "璐熻矗浜�"];
+
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -352,7 +382,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_FastQuery();
+ get_FastQuery();
}
//#endregion
@@ -376,7 +406,7 @@
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
- , cellMinWidth: 90
+ , cellMinWidth: 90
};
}
//#endregion
@@ -447,12 +477,12 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
layer.close(ajaxLoad);
-
+
if ($("#ColName option").length < 1) {
ColFilter();
get_DefaultModule();//鍔犺浇鏂规
}
-
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -547,6 +577,7 @@
if (HName) {
sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HName + "%'";
}
+ //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
get_Display(sWhere);
sWhere = "";
}
@@ -555,7 +586,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HNumber").val("");
- $("#HName").val("");
+ $("#HName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -706,7 +737,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1&&data[0].瀹℃牳浜�==="") {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜� === "") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -714,7 +745,7 @@
$.ajax({
url: GetWEBURL() + 'DeltetGy_Department',
type: "GET",
- data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -819,6 +850,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
+ //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
get_Display(sWhere);
}
//#endregion
@@ -877,7 +909,7 @@
for (var i = 0; i < option.cols[0].length - 2; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
- }
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -1195,22 +1227,23 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgName = decodeURI(params[params[1]]);
- var addSWhere = "";
+ let addSWhere = "";
- if (openType != "undefined" && HOrgName != "undefined") {
- if (openType == 1) {
- /*addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
- addSWhere = " and 绂佺敤鏍囪 = '' and 杞﹂棿鏍囪 = 'Y' ";
+ if (openType != "undefined") {
+ if (openType == 1 && HOrgName != "undefined") {
+ /*addSWhere = " and 绂佺敤鏍囪 = '' 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
+ addSWhere = " and 绂佺敤鏍囪 = ' ' and 杞﹂棿鏍囪 = 'Y' ";
Organization = HOrgName.toString();
} else {
- addSWhere = " and 绂佺敤鏍囪 = '' ";
- Organization = HOrgName.toString();
+ addSWhere = " and 绂佺敤鏃堕棿 is null and 瀹℃牳浜� !='' ";
}
}
return addSWhere;
}
//#endregion
//#endregion
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
@@ -1251,11 +1284,12 @@
});
}
//#endregion
- //#endregion
+ //#endregion
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 32d1696..1614f55 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -1046,6 +1046,7 @@
}
//#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
index 68e7137..0e31719 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialCorrection.html"
@@ -901,11 +901,15 @@
}
//鎵归噺鏇存柊
function batchUpdate(obj, reg) {
+ debugger
let field = obj.field;
let value = obj.value;
tempData.forEach(item => {
item[field] = value
})
+ table.reload('tempTable', {
+ data: tempData
+ })
}
function btnrowDouble(obj) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html"
index d2c34d4..79147a0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\202\271\346\243\200\350\247\204\347\250\213\345\215\225/Sc_MouldDotCheckRuleBillList.html"
@@ -111,13 +111,9 @@
<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>
@@ -146,9 +142,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -180,9 +176,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <=
+ </option>
<option value="<">
- << /option>
+ <
+ </option>
<option value="<>">
<>
</option>
@@ -853,7 +851,7 @@
$("#ColName").val("0");
$("#Comparator").val("0");
$("#ColContent2").val("");
- $("#ColName2").val("0");
+ $("#ColName2").val("0");
$("#Comparator2").val("0");
$("#ColContent1").val("");
$("#ColName1").val("0");
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_MouldProdBackBillList.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_MouldProdBackBillList.html"
index 0dfbf8d..87d46f3 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_MouldProdBackBillList.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_MouldProdBackBillList.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">
<div class="layui-row layui-col-space15">
@@ -22,10 +25,16 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Checker" id="check-btn">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="print">鎵撳嵃</button>
</div>
</div>
<div class="layui-card-body">
@@ -41,7 +50,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>
@@ -49,55 +59,80 @@
<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="HWHName" id="HWHName" class="layui-input" readonly value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HWHName" id="HWHName" class="layui-input"
+ readonly value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHNumber" id="HWHNumber"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" 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="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" lay-filter="HSecManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <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"
+ lay-filter="HSecManagerList" 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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HKeeperList" 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" readonly 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" readonly
+ 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>
@@ -106,7 +141,8 @@
<div class="layui-inline">
<label class="layui-form-label">寰�鏉ョ被鍨�</label>
<div class="layui-input-inline">
- <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
+ <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID"
+ class="layui-input" value="" style="float:left;width:150px">
<option value="1">渚涘簲鍟�</option>
<option value="2">瀹㈡埛</option>
<option value="3">杞﹂棿閮ㄩ棬</option>
@@ -116,17 +152,22 @@
<div class="layui-inline">
<label class="layui-form-label">寰�鏉ュ崟浣�</label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HSupName" id="HSupName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HSupList" 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">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <select name="HSourceBillType" lay-filter="aihao"
+ id="HSourceBillType">
<option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
<option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
</select>
@@ -135,7 +176,8 @@
<div class="layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value=""
+ style="float:left;width:100%;">
</div>
</div>
</div>
@@ -143,13 +185,15 @@
<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 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>
@@ -160,25 +204,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>
@@ -187,25 +235,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>
@@ -213,13 +265,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>
@@ -259,7 +313,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/layui/layui.js"></script>
@@ -306,7 +360,11 @@
var HModName = "Sc_MouldProdBackBillEdit";
//鍏ㄥ眬鍙橀噺
window.HSupType = $("#HSupTypeID").val();
+ // 姝ｅ垯琛ㄨ揪寮�
+ var cancelEditStyleList = new RegExp(/HMaterName|HMaterSpec|HUnitName|HQtyMust|HWHName|HSPName/i)
+ var HideColmReg = new RegExp(/HBatchNo|HDesignLife|HLeaveLife|HUseLife|HPrice|HMoney/i)
//#endregion
+
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "3803";
@@ -322,9 +380,18 @@
set_InitGrid();
set_CountGrid();
DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+ ColumnAddNotEditableStyle()
+ ColumnHideColumnSetting()
+ // 鍦ㄨ幏鍙栧垪璁剧疆鍚庝細閲嶇疆option锛岄渶瑕侀噸鏂扮粰style璧嬪��
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
+ }
+ else if (OperationType == 2) {
+ set_EditFromGrid(linterid);
+
+ get_MAXNum();
+ table.render(option)
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -351,7 +418,11 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+ get_HideColumnEditAfterReload(HModName, sessionStorage["HUserName"], option, table
+ , function () {
+ location.reload();
+ }
+ );
break;
}
});
@@ -611,6 +682,32 @@
});
+ //瀹℃牳
+ form.on('submit(Checker)', function (data) {
+ var InterID = linterid
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdBackBill/AuditMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
@@ -859,7 +956,7 @@
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "Sc_MouldProdBackBill/Sc_MouldProdBackBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -911,7 +1008,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldProdBackBill/Sc_MouldProdBackBillListProjectDetai',
+ url: GetWEBURL() + '/Sc_MouldProdBackBill/Sc_MouldProdBackBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
@@ -1364,6 +1461,40 @@
}
+ // 缁欎笉鍏佽缂栬緫鐨勬暟鎹坊鍔犳牱寮�
+ function ColumnAddNotEditableStyle(regExp) {
+ let notEditableStyle = "; background: #e2e2e2;"
+ let opt = option
+ debugger
+ for (let col of option.cols[0]) {
+ if (regExp.test(col.field) === true) {
+ col.style += notEditableStyle;
+ col.edit = null
+ }
+ }
+ }
+
+ // 缁欎笉鍏佽缂栬緫鐨勬暟鎹坊鍔犳牱寮�
+ function ColumnAddNotEditableStyle() {
+ let notEditableStyle = "; background: #e2e2e2;"
+ let opt = option
+ debugger
+ for (let col of option.cols[0]) {
+ if (cancelEditStyleList.test(col.field) === true) {
+ col.style += notEditableStyle;
+ col.edit = null
+ }
+ }
+ }
+
+ // 璁剧疆鍒楅殣钘�
+ function ColumnHideColumnSetting() {
+ for (let col of option.cols[0]) {
+ if (HideColmReg.test(col.field) === true) {
+ col.hide = true
+ }
+ }
+ }
});
function GetHWHValue(obj) //杩斿洖浠撳簱
@@ -1426,4 +1557,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_MouldProdBackBillList.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_MouldProdBackBillList.html"
index ee62e85..5072372 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_MouldProdBackBillList.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_MouldProdBackBillList.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>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -39,47 +41,58 @@
<span>鏇村</span>
</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>
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ <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">
+ <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">
+ <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">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
@@ -88,50 +101,61 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬淇℃伅</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDept" id="HDept" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDept"
+ id="HDept" style="width:190px;">
</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="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterNumber" id="HMaterNumber" style="width:190px;">
</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-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HWhName" id="HWhName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HWhName"
+ id="HWhName" style="width:190px;">
</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="HSupName" id="HSupName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupName"
+ id="HSupName" style="width:190px;">
</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="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
<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>
@@ -139,26 +163,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" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ style="width:190px;" class="ForFilteringSchemes">
<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>
@@ -166,26 +197,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" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ style="width:190px;" class="ForFilteringSchemes">
<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>
@@ -193,7 +231,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>
@@ -204,9 +243,11 @@
<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="Add"><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" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></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="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="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>
@@ -225,7 +266,7 @@
</div>
</div>
</div>
-
+
<!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -235,7 +276,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
@@ -294,7 +335,7 @@
set_ClearQuery();
optionPage.curr = 1;
get_FastQuery(table, option);
-
+
});
//#endregion
@@ -302,7 +343,7 @@
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
get_FastQuery(table, option);
-
+
});
//#endregion
@@ -335,6 +376,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ // 鍒濆鍖栫粍缁�
+ Organ();
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -376,7 +419,7 @@
soulTable.render(this);
}
, cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
@@ -469,7 +512,7 @@
laypage.render(optionPage);
}
//#endregion
-
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -478,7 +521,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_MouldProdBackBill/GetMouldProdBackBill',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -538,7 +581,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 });
+ }
}
}
}
@@ -551,8 +603,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"]);
@@ -649,7 +702,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -675,7 +728,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Sc_MouldProdBackBill/DeltetMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID,"user": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -702,6 +755,7 @@
break;
case 'btn-view': get_ViewReport();
break;
+ // 鎵撳嵃
case 'btn-print': get_PrintReport();
break;
//瀹℃牳
@@ -735,12 +789,25 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ // 澶嶅埗鎸夐挳
+ case 'btn-Copy': set_AddCopy();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
};
});
+ // 琛ㄦ牸鑷畾涔変簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data;
+ switch (obj.event) {
+ case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
+ }
+ })
//棰勮
function get_ViewReport() {
var checkStatus = table.checkStatus('mainTable')
@@ -792,7 +859,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Sc_MouldProdBackBill/AuditMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1},
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -849,6 +916,53 @@
}
}
+ //澶嶅埗鍗曟嵁
+ 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_MouldProdBackBillList.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
+ }
+ }
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+
//#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -882,6 +996,30 @@
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
}
+ }
+ //#endregion
+
+ //#region 鑾峰彇缁勭粐
+ 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");
+ }
+ })
}
//#endregion
@@ -1303,7 +1441,28 @@
}
//#endregion
-
+ function onHBillNumberClickHandler(data) {
+ var hID = new String(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_MouldProdBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
@@ -1350,4 +1509,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_MouldProdInBillEdit.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_MouldProdInBillEdit.html"
index 36924ce..cbaeed8 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_MouldProdInBillEdit.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_MouldProdInBillEdit.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/layui/layui.js"></script>
@@ -50,6 +52,7 @@
}*/
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
<div class="layui-row layui-col-space15">
@@ -59,140 +62,275 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button>
- <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Add">鏂板</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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="planview">棰勮</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
+ <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Copy">澶嶅埗</button>
+ <button type="button" id="addnew-btn"
+ class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Add">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Checker" id="check-btn">瀹℃牳</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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="planview">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="print">鎵撳嵃</button>
</div>
</div>
-
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <h1 style="text-align:center;"><b>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</b></h1>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <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 id="HInterID" name="HInterID" type="hidden" />
- <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
- </div>
- </div>
- <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">
- </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">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ <h1 style="text-align:center;"><b>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <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 id="HInterID" name="HInterID" type="hidden" />
+ <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <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="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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>
- <div class="layui-input-inline">
- <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" 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>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" readonly 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">
- <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:100%;">
- </div>
+ <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">
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">寰�鏉ョ被鍨�</label>
- <div class="layui-input-inline">
- <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
- <option value="1">渚涘簲鍟�</option>
- <option value="2">瀹㈡埛</option>
- <option value="3">杞﹂棿閮ㄩ棬</option>
- </select>
- </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">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" 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>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" 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>
+ <div class="layui-input-inline">
+ <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"
+ lay-filter="HSecManagerList" 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>
+ <div class="layui-input-inline">
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HKeeperList" 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>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" readonly
+ 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" 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" class="layui-form-hidden" style="display: none;">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSourceBillType" id="HSourceBillType"
+ class="layui-input" value="" style="float:left;width:100%;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ョ被鍨�</label>
+ <div class="layui-input-inline">
+ <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID"
+ class="layui-input" value="" style="float:left;width:150px">
+ <option value="1">渚涘簲鍟�</option>
+ <option value="2">瀹㈡埛</option>
+ <option value="3">杞﹂棿閮ㄩ棬</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> *
+ </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" id="HSupName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HSupList" 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" style="display: none;">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value=""
+ style="float:left;width:100%;">
+ </div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation"
+ id="HExplanation"></textarea>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark"
+ id="HRemark"></textarea>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate"
+ id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan"
+ style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteDate"
+ id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
</div>
</div>
</div>
+
+
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
@@ -227,7 +365,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>
//鑾峰彇鍙傛暟
@@ -247,7 +385,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'layer'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -255,13 +393,15 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , layer = layui.layer
//鏌ヨ鏉′欢
var option = [];
var option1 = [];
var sWhere = "";
var sBillType = "3801";
var HModName = "Sc_MouldProdInBillEdit";
+ var cancelEditStyleList = new RegExp(/HMaterName|HMaterSpec|HUnitName|HQtyMust|HWHName|HSPName/i)
//鍏ㄥ眬鍙橀噺
window.HSupType = $("#HSupTypeID").val();
//#endregion
@@ -274,7 +414,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -282,9 +422,16 @@
set_InitGrid();
set_CountGrid();
DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
+ ColumnAddNotEditableStyle(cancelEditStyleList)
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
+ }
+ if (OperationType == 2) {//鏃犳簮鏂板
+ set_EditFromGrid(linterid);
+
+ get_MAXNum();
+ table.render(option)
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -295,12 +442,13 @@
//#endregion
//#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+ // 缂栬緫鐘舵�佺洃鍚�
//澶村伐鍏锋爮
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
@@ -311,7 +459,9 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+ get_HideColumnEditAfterReload(HModName, sessionStorage["HUserName"], option, table, function () {
+ location.reload()
+ })
break;
}
});
@@ -331,7 +481,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -344,7 +494,7 @@
$("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
$("#HWHID").val(checkStatus.data[0].HItemID);
$("#HWHNumber").val(checkStatus.data[0].浠撳簱浠ｇ爜);
-
+
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -451,7 +601,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -482,6 +632,7 @@
$("#HSupID").val("");
$("#HSupName").val("");
});
+
function getSupType() {
var type = $("#HSupTypeID").val();
@@ -633,8 +784,35 @@
, "HSupName": "" //鎽樿
, "HSupID": 0 //澶囨敞
});
-
+
});
+
+ // 瀹℃牳
+ form.on('submit(Checker)', function (data) {
+ var InterID = linterid
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").click();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
//棰勮
form.on("submit(planview)", function (data) {
if (linterid != "" || linterid != null) {
@@ -679,13 +857,15 @@
})
//鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
table.on('edit(mainTable)', function (obj) {
- // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
- //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+ let index = $(obj.tr[0]).closest('tr').data('index') // 鑾峰彇瀵硅薄鎵�鍦ㄧ殑琛屽湪琛ㄤ腑鐨勭储寮曞��
+ let tableCache = table.cache['mainTable']
switch (field) {
case "HDesignLife": //璁捐瀵垮懡
value = isNaN(value) ? 0 : value;
@@ -716,10 +896,21 @@
case "HQty": //瀹炴敹鏁伴噺
value = isNaN(value) ? 0 : value;
var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ // 瀵规瘮瀹炴敹鏁伴噺鍜屽簲鏀舵暟閲忥紝瀹炴敹鏁伴噺涓嶅緱澶т簬搴旀敹鏁伴噺
+ let HQtyMustTemp = data.HQtyMust
+ let HQtyTemp = Number(value) // 缂栬緫涓殑鍊奸粯璁ゆ槸瀛楃涓插舰寮忥紝闇�瑕佽浆鍨嬫垚鏁板瓧褰㈠紡
+ if (HQtyTemp > HQtyMustTemp) {
+ layer.msg("瀹炴敹鏁伴噺鐨勫�间笉寰楀ぇ浜庡簲鏀舵暟閲�!")
+ tableCache[index].HQty = HQtyMustTemp == 0 ? 0 : 1;
+ }
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
+ // obj.update({
+ // HMoney: HQtyTemp * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ // });
+ tableCache[index].HMoney = HPrice * tableCache[index].HQty;;
+ table.reload('mainTable', {
+ data: tableCache
+ })
break;
case "HPrice": //鍗曚环
value = isNaN(value) ? 0 : value;
@@ -761,30 +952,31 @@
}
//鍒濆鍖栨槑缁嗚〃鏍�
function set_InitGrid() {
+ let disabled_color = '#e2e2e2';
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', field:"搴忓彿", title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { templet: '#xuhao', field: "搴忓彿", title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鍣ㄥ叿浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', style: 'background: ' + disabled_color, width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', style: 'background: ' + disabled_color, width: 100 }
, { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
- , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100, totalRow: true }
- , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', style: 'background: ' + disabled_color, width: 100 }
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100, totalRow: true }
, { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100, totalRow: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', style: 'background: ' + disabled_color, width: 100, totalRow: true }
, { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100, totalRow: true }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100, totalRow: true }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100, totalRow: true }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
, { field: 'HWHCode', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+ , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', style: 'background: ' + disabled_color, width: 120 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '鏀舵枡浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 120 }
- , { field: 'HSPName', title: '鏀舵枡浠撲綅鍚嶇О', edit: 'text', width: 120 }
+ , { field: 'HSPName', title: '鏀舵枡浠撲綅鍚嶇О', style: 'background: ' + disabled_color, width: 120 }
, { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -794,7 +986,7 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
- , totalRow: true
+ , totalRow: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -802,35 +994,38 @@
, done: function (res, curr, count) {
}
};
+
+ debugger
}
//鍒濆姹囨�讳俊鎭�
function set_CountGrid() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
- , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100, totalRow: true }
- , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
- , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
- , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+ // { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', event: 'HMaterCode', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+ , { field: '鎵规', title: '鎵规', width: 100 }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 100, totalRow: true }
+ , { field: 'hwhid1', title: 'HWHID', width: 100, hide: true }
+ , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', event: 'HWHCode', width: 120 }
+ , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱鍚嶇О', width: 120 }
+ , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', width: 100 }
];
option1 = {
id: 'mainTable1'
, elem: '#mainTable1'
, height: 500
, page: true
- , totalRow: true
+ , totalRow: true
, limit: 500
, cellMinWidth: 120
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
+ this.elem.next().find('td').css('background-color', '#e2e2e2');
}
};
}
@@ -839,7 +1034,8 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true);
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
table.render(option);
}
//鑾峰彇鏈�澶у崟鎹彿
@@ -863,13 +1059,15 @@
function set_EditFromGrid(linterid) {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
table.render(option);
}
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
+ //鍒濆鍖栫粍缁�
+ Organ();
$.ajax({
- url: GetWEBURL() + "Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -898,7 +1096,25 @@
, "HSupName": data.寰�鏉ュ崟浣� //鎽樿
, "HSupID": data.HSupID //澶囨敞
});
+ if (OperationType == 2) {
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true);
+ }
+ if (OperationType == 3 && data.瀹℃牳浜� != '') {
+ $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true);
+ $('#add-btn').addClass('layui-btn-disabled').attr('disabled', true);
+ }
+ $("#HMaker").val(data.鍒跺崟浜�)
+ $("#HChecker").val(data.瀹℃牳浜�)
+ $("#HCloseMan").val(data.鍏抽棴浜�)
+ $("#HUpDater").val(data.淇敼浜�)
+ $("#HMakeDate").val(data.鍒跺崟鏃ユ湡)
+ $("#HCheckDate").val(data.瀹℃牳鏃ユ湡)
+ $("#HCloseDate").val(data.鍏抽棴鏃ユ湡)
+ $("#HUpDateDate").val(data.淇敼鏃ユ湡)
+ $("#HDeleteMan").val(data.浣滃簾浜�)
+ $("#HDeleteDate").val(data.浣滃簾鏃ユ湡)
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -912,7 +1128,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldProdInBill/Sc_MouldScrapInProdBillListProjectDetai',
+ url: GetWEBURL() + '/Sc_MouldProdInBill/Sc_MouldScrapInProdBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
@@ -1024,7 +1240,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html', 'yes']
+ , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1094,7 +1310,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/PropertyInformation.html', 'yes'],
+ content: ['../../PublicPage/PropertyInformation.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1131,7 +1347,7 @@
}
});
}
-
+
//璁￠噺鍗曚綅浠ｇ爜
if (obj.event === 'HUnitCode') //璁￠噺鍗曚綅浠ｇ爜
{
@@ -1144,7 +1360,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1250,7 +1466,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1302,7 +1518,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html', 'yes']
+ , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -1416,6 +1632,41 @@
//#endregion
+ //#region 鑾峰彇缁勭粐
+ 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");
+ }
+ })
+ }
+ //#endregion
+
+ // 缁欎笉鍏佽缂栬緫鐨勬暟鎹坊鍔犳牱寮�
+ function ColumnAddNotEditableStyle(regExp) {
+ let notEditableStyle = "; background: #e2e2e2;"
+ let opt = option
+ debugger
+ for (let col of option.cols[0]) {
+ if (regExp.test(col.field) === true) {
+ col.style += notEditableStyle;
+ }
+ }
+ }
});
@@ -1447,7 +1698,7 @@
} else {//閮ㄩ棬
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
- }
+ }
}
function GetHSupNameValue(obj) //寰�鏉ュ崟浣嶏紙渚涘簲鍟嗭級
@@ -1481,6 +1732,9 @@
{
OptionData = obj;
}
+
+
</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_MouldProdInBillList.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_MouldProdInBillList.html"
index e4c14ae..16d97e9 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_MouldProdInBillList.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_MouldProdInBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿閲囪喘鍏ュ簱鍗曞垪琛�</title>
@@ -19,7 +20,9 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -36,48 +39,66 @@
<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" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="HStatus" lay-filter="HStatus" style="width:190px;" class="ForFilteringSchemes" id="HStatus">
- <option value="-1" selected="selected">鍏ㄩ儴</option>
- <option value="0">鏈鏍�</option>
- <option value="1">宸插鏍�</option>
- <option value="2">宸插叧闂�</option>
+ <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" name="HBeginDate"
+ id="HBeginDate">
</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;">
- </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="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
+ id="HEndDate">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HStatus" lay-filter="HStatus" style="width:190px;"
+ class="ForFilteringSchemes" id="HStatus">
+ <option value="-1" selected="selected">鍏ㄩ儴</option>
+ <option value="0">鏈鏍�</option>
+ <option value="1">宸插鏍�</option>
+ <option value="2">宸插叧闂�</option>
+ </select>
+ </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-row" style="margin-top:5px">
<div class="layui-inline">
<div class="layui-inline">
@@ -87,31 +108,36 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬淇℃伅</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDept" id="HDept" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDept"
+ id="HDept" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input" name="HMaterNumber"
+ id="HMaterNumber" style="width:190px;">
</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-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HWhName" id="HWhName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HWhName" id="HWhName" style="width:190px;">
</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="HSupName" id="HSupName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HSupName" id="HSupName" style="width:190px;">
</div>
</div>
</div>
@@ -119,19 +145,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
<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>
@@ -139,26 +171,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" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ style="width:190px;" class="ForFilteringSchemes">
<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>
@@ -166,26 +205,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" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ style="width:190px;" class="ForFilteringSchemes">
<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>
@@ -193,7 +239,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>
@@ -204,9 +251,11 @@
<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="Add"><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" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></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="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="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>
@@ -230,7 +279,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 () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -246,7 +295,7 @@
var Organization = sessionStorage["Organization"];
-
+ var ins // 瀵煎嚭
var optionPage = [];
var HModName = "Sc_MouldProdInBillList"
var HBillType = "3801";
@@ -254,6 +303,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var titleData = []
var Name = "MouldProdInHouseCellWidth";
//#region 銆愯繃婊ゆ柟妗堛��
@@ -294,6 +344,9 @@
switch (obj.event) {
//鏂板鎸夐挳
case 'btn-Add': set_AddNew();
+ break;
+ // 澶嶅埗鎸夐挳
+ case 'btn-Copy': set_AddCopy();
break;
//缂栬緫鎸夐挳
case 'btn-Edit': set_ShowBill();
@@ -338,25 +391,36 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
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) {
set_ClearQuery();
optionPage.curr = 1;
get_FastQuery(table, option);
-
+
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
- get_FastQuery(table, option);
-
+ get_FastQuery(table, option);
+
});
//杈撳叆妗嗗洖杞︽柟娉�
$('input').on('keydown', function (event) {
@@ -366,17 +430,56 @@
});
//#endregion
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
+ //#endregion
//#region 姝ら〉闈㈡墍鏈夋柟娉�
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ //鍒濆鍖栫粍缁�
+ Organ();
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
var columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'hmainid', title: '鍗曟嵁ID', width: 200, hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true, sort: true }
+ , {
+ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true, sort: true,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+ }
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
@@ -385,8 +488,8 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200, sort: true }
, { field: '鎵规', title: '鎵规', width: 200, sort: true }
, { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 200, totalRow: true, sort: true, totalRow: true }
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, totalRow: true, sort: true, totalRow: true}
- , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true}
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, totalRow: true, sort: true, totalRow: true }
+ , { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true }
, { field: '閲戦', title: '閲戦', width: 200, totalRow: true, sort: true, totalRow: true }
, { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', width: 200, sort: true, totalRow: true }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200, sort: true, totalRow: true }
@@ -476,14 +579,14 @@
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var wait = layer.load();//閬僵
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+ // var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ // var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ // if (HBeginDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ // }
+ // if (HEndDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ // }
$.ajax({
url: GetWEBURL() + '/Sc_MouldProdInBill/Get_MouldProdInBillList',
type: "GET",
@@ -511,14 +614,14 @@
var wait = layer.load();//閬僵
var ajaxLoad = layer.load();
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+ // var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ // var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ // if (HBeginDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ // }
+ // if (HEndDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ // }
$.ajax({
url: GetWEBURL() + '/Sc_MouldProdInBill/list_byPage',
@@ -534,7 +637,7 @@
DataList = data1.data;
option.data = data1.data;
//鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
////鍒锋柊琛ㄦ牸鏁版嵁
//DisPlay_HideColumn();
ins = table.render(option);
@@ -543,15 +646,16 @@
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
} else {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
laypage.render(optionPage);
option.data = [];
- table.render(option);
+ ins = table.render(option);
layer.close(ajaxLoad);
/*layer.alert(data1.code + data1.Message, { icon: 5 });*/
}
@@ -585,6 +689,34 @@
}
});
+ }
+ //澶嶅埗鍗曟嵁
+ function set_AddCopy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = 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_MouldProdInBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ get_FastQuery(table, option);
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
+ }
}
//缂栬緫鍗曟嵁
function set_ShowBill() {
@@ -705,7 +837,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag":1 },
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -987,7 +1119,7 @@
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
}
-
+
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$('#HStatus').find("option[value='-1']").attr("selected", true);
@@ -1038,6 +1170,7 @@
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
function get_DefaultModule() {
$.ajax({
url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
@@ -1066,37 +1199,55 @@
}
}
- //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- //if (HInitTimeCycle != -1) {
- // $('#HBeginDate').prop('disabled', true);
- // $('#HEndDate').prop('disabled', true);
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
- // $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- // $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- // ////鎵ц鏌ヨ鏂规硶
- // //get_FastQuery();
- //} else {
- // $('#HBeginDate').prop('disabled', false);
- // $('#HEndDate').prop('disabled', false);
- //}
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏌ヨ
+ get_FastQuery();
form.render("select");
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- ////鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
- //form.render("select");
+ //鎵ц鏌ヨ鏂规硶
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
}
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//淇濆瓨鏂规
function set_SaveScheme() {
@@ -1256,8 +1407,71 @@
}
})
}
-
//#endregion
+
+ //#region 鑾峰彇缁勭粐
+ 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");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ function onHBillNumberClickHandler(data) {
+ var linterid = 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_MouldProdInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ get_FastQuery(table, option);
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
@@ -1300,4 +1514,5 @@
//#endregion
</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_MouldProdMoveBill.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_MouldProdMoveBill.html"
index 78c45cc..f1f787b 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_MouldProdMoveBill.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_MouldProdMoveBill.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,16 @@
<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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Checker" id="check-btn">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="print">鎵撳嵃</button>
</div>
@@ -45,7 +54,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>
@@ -53,55 +63,80 @@
<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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HWHName" id="HWHName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHNumber" id="HWHNumber"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" 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="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" lay-filter="HSecManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <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"
+ lay-filter="HSecManagerList" 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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HKeeperList" 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" readonly 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" readonly
+ 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>
@@ -114,33 +149,47 @@
</select>
</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>
<div class="layui-form-item">
- <div class="layui-inline">
+ <div class="layui-inline" style="display: none;">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <select name="HSourceBillType" lay-filter="aihao"
+ id="HSourceBillType">
<option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
<option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display: none;">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value=""
+ style="float:left;width:100%;">
</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 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>
@@ -151,25 +200,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>
@@ -178,25 +231,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>
@@ -204,13 +261,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>
@@ -252,7 +311,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/layui/layui.js"></script>
@@ -314,7 +373,7 @@
, height: 500
, totalRow: true
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
- , page: true //寮�鍚垎椤�
+ // , page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { templet: '#xuhao', field: '搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
@@ -382,11 +441,50 @@
option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
+ else if (OperationType == 2) {
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ RoadBillMain(hID)
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + hID },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.list[0];
+ table.render(option);
+ option1.data = result.list[1];
+ table.render(option1);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ hID = 0;
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3814' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(0);
+ }
+ });
+ }
else {
$("#HInterID").val(hID);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai',
+ url: GetWEBURL() + '/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + hID },
success: function (result) {
@@ -406,7 +504,9 @@
});
}
+ Organ()
DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+
//澶村伐鍏锋爮浜嬩欢
var rowid = 0;
@@ -506,6 +606,7 @@
option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
option.data[rowIndex + i].HUnitCode = checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜;
option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁￠噺鍗曚綅;
+ option.data[rowIndex + i].HQty = 1
}
table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
}
@@ -939,6 +1040,32 @@
layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
}
});
+
+ form.on("submit(Checker)", function (data) {
+ var InterID = linterid;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
//鎵撳嵃Printing
form.on("submit(print)", function (data) {
if (hID != "" || hID != null) {
@@ -1027,7 +1154,7 @@
//alert(hID);
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
- url: GetWEBURL() + "Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai",
type: "GET",
data: {
"HID": hID
@@ -1343,7 +1470,30 @@
}
});
-
+ //#region 鑾峰彇缁勭粐
+ 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");
+ }
+ })
+ }
+ //#endregion
+ // 浠ヤ笂鏄痩ayui妯″潡
});
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
@@ -1505,4 +1655,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_MouldProdMoveBillList.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_MouldProdMoveBillList.html"
index faf2b06..dd3adf7 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_MouldProdMoveBillList.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_MouldProdMoveBillList.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>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -39,99 +41,116 @@
<span>鏇村</span>
</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>
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ <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">
+ <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">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <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="HDept" id="HDept" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDept"
+ id="HDept" style="width:190px;">
</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="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterNumber" id="HMaterNumber" style="width:190px;">
</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-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HWhName" id="HWhName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HWhName"
+ id="HWhName" style="width:190px;">
</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="HSupName" id="HSupName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupName"
+ id="HSupName" 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>
@@ -139,26 +158,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" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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>
@@ -166,26 +192,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input" value="" name="ColContent1"
+ class="ForFilteringSchemes" 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" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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>
@@ -193,7 +226,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input" value="" name="ColContent2"
+ class="ForFilteringSchemes" id="ColContent2">
</div>
</div>
</div>
@@ -205,8 +239,10 @@
<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-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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="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>
@@ -234,7 +270,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
@@ -342,6 +378,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ // 鍒濆鍖栫粍缁�
+ Organ();
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -367,7 +405,7 @@
}
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
-
+
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -382,7 +420,7 @@
}
, limit: 50
, cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
@@ -427,7 +465,7 @@
, { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true, totalRow: true }
, { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true }
, { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true, totalRow: true }
- , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true}
+ , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125, sort: true, totalRow: true }
, { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125, sort: true, totalRow: true }
, { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125, sort: true, totalRow: true }
@@ -541,7 +579,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 });
+ }
}
}
}
@@ -554,8 +601,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"]);
@@ -612,7 +660,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -701,8 +749,22 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ // 澶嶅埗鎸夐挳
+ case 'btn-Copy': set_AddCopy();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ 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')
@@ -711,7 +773,7 @@
var InterID = data[0].hmainid.toString();
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
success: function (result) {
if (result.count == 1) {
@@ -758,6 +820,31 @@
});
})
//#endregion
+
+ // 鐐瑰嚮瓒呴摼鎺�
+ 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_MouldProdMoveBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+
//鍙嶅鏍�
function get_FAudit() {
var checkStatus = table.checkStatus('mainTable')
@@ -866,6 +953,78 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
}
}
+
+ //澶嶅埗
+ 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_MouldProdMoveBill.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
+ }
+ }
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+
+ //#region 鑾峰彇缁勭粐
+ 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");
+ }
+ })
+ }
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -949,7 +1108,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
+
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
@@ -1339,4 +1498,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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.html"
index 1711d97..7f72925 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_MouldProdOutBillEdit.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_MouldProdOutBillEdit.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,16 @@
<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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Checker" id="check-btn">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="print">鎵撳嵃</button>
</div>
@@ -45,7 +54,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>
@@ -53,55 +63,90 @@
<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="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HWHName" id="HWHName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHNumber" id="HWHNumber"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
+ value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="WareHouse" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"
+ style="margin-left:-9px;"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</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>
<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="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" lay-filter="HSecManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <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"
+ lay-filter="HSecManagerList" 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="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID"
+ class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HKeeperList" 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" readonly 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" readonly
+ 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>
@@ -110,7 +155,8 @@
<div class="layui-inline">
<label class="layui-form-label">寰�鏉ョ被鍨�</label>
<div class="layui-input-inline">
- <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
+ <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID"
+ class="layui-input" value="" style="float:left;width:150px">
<option value="1">渚涘簲鍟�</option>
<option value="2">瀹㈡埛</option>
<option value="3">杞﹂棿閮ㄩ棬</option>
@@ -120,26 +166,32 @@
<div class="layui-inline">
<label class="layui-form-label">寰�鏉ュ崟浣�</label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ <input type="text" name="HSupName" id="HSupName" readonly
+ class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input"
+ value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn"
+ lay-filter="HSupList" 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">
+ <div class="layui-inline" style="display: none;">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <select name="HSourceBillType" lay-filter="aihao"
+ id="HSourceBillType">
<option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
<option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display: none;">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:100%;">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value=""
+ style="float:left;width:100%;">
</div>
</div>
</div>
@@ -147,13 +199,15 @@
<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 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>
@@ -164,25 +218,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>
@@ -191,25 +249,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>
@@ -217,13 +279,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>
@@ -265,7 +329,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>
@@ -309,6 +373,8 @@
var sWhere = "";
var sBillType = "3802";
var HModName = "Sc_MouldProdOutBillEdit";
+ var cancelEditStyleList = new RegExp(/HMaterName|HMaterSpec|HUnitName|HQtyMust|HWHName|HSPName/i)
+ var HideColmReg = new RegExp(/HBatchNo|HDesignLife|HLeaveLife|HUseLife|HPrice|HMoney/i)
//鍏ㄥ眬鍙橀噺
window.HSupType = $("#HSupTypeID").val();
//#endregion
@@ -341,15 +407,23 @@
$("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
+ //鍒濆鍖栫粍缁�
+ Organ();
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
//鍒濆鍖栬〃鏍�
set_InitGrid();
set_CountGrid();
DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+ ColumnAddNotEditableStyle()
+ ColumnHideColumnSetting()
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
+ }
+ if(OperationType == 2) {
+ set_EditFromGrid(linterid);
+ get_MAXNum();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -373,9 +447,13 @@
//澶嶅埗涓�琛�
case 'btn-CopyLine': btnCopyLine(data);
break;
- //鍒楄缃�
+ //鍒楄缃� 鍙兘瀛樺湪浣庣増鏈殑娴忚鍣ㄦ棤娉曚娇鐢ㄧ殑闂
case 'set_HideColumn':
- get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+ get_HideColumnEditAfterReload(HModName, sessionStorage["HUserName"], option, table,
+ function () {
+ location.reload();
+ }
+ )
break;
}
});
@@ -442,7 +520,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager&openType=2', 'yes'],
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -480,7 +558,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper&openType=2', 'yes'],
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -687,6 +765,31 @@
});
});
+ //瀹℃牳
+ form.on('submit(Checker)', function (data) {
+ var InterID = linterid
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdOutBill/AuditMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
+ 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);
+ $("btn-check").addClass('layui-btn-disabled').attr('disabled', true)
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
//鐩戝惉鍗曞厓鏍肩紪杈�
table.on('edit(mainTable)', function (obj) {
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
@@ -695,6 +798,9 @@
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+ // 璇ョ洃鍚嚱鏁扮殑obj涓殑update鍑芥暟鏈夐棶棰橈紝浣跨敤琛ㄧ紦瀛樺姞绱㈠紩鐨勬柟寮忔洿鏂板搴斿垪鐨勬暟鎹�
+ let tableCache = table.cache['mainTable']
+ let index = $(obj.tr[0]).closest('tr').data('index');
switch (field) {
case "HDesignLife": //璁捐瀵垮懡
@@ -726,10 +832,18 @@
case "HQty": //瀹炲彂鏁伴噺
value = isNaN(value) ? 0 : value;
var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ let HQtyMust_Temp = tableCache[index].HQtyMust
+ let HQty_Temp = Number(value)
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
- obj.update({
- HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
- });
+ debugger
+ if (HQty_Temp > HQtyMust_Temp) {
+ layer.msg("瀹炴敹鏁伴噺鐨勫�间笉寰楀ぇ浜庡簲鏀舵暟閲�!")
+ tableCache[index].HQty = HQtyMust_Temp == 0 ? 0 : 1;
+ }
+ tableCache[index].HMoney = HPrice * tableCache[index].HQty;
+ table.reload('mainTable', {
+ data: tableCache
+ })
break;
case "HPrice": //鍗曚环
value = isNaN(value) ? 0 : value;
@@ -774,30 +888,31 @@
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ let disabled_color = '#dddddd'
columns = [
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { templet: '#xuhao', field:'搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { templet: '#xuhao', field: '搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
, { field: 'HMaterCode', title: '鍣ㄥ叿浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
- , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+ , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', style: 'background: ' + disabled_color, width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', style: 'background: ' + disabled_color, width: 100 }
+ , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100, hide: true }
, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
, { field: 'HUnitCode', title: '璁￠噺鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
- , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
- , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100, totalRow: true }
- , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100, totalRow: true }
- , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100, totalRow: true }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', style: 'background: ' + disabled_color, width: 100 }
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100, totalRow: true, hide: true }
+ , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100, totalRow: true, hide: true }
+ , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100, totalRow: true, hide: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', style: 'background: ' + disabled_color, width: 100, totalRow: true }
, { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100, totalRow: true }
- , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100, totalRow: true }
- , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100, totalRow: true }
+ , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100, totalRow: true, hide: true }
+ , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100, totalRow: true, hide: true }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
, { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: 'HWHName', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+ , { field: 'HWHName', title: '鍙戞枡浠撳簱', style: 'background: ' + disabled_color, width: 120 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 100 }
- , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
+ , { field: 'HSPName', title: '浠撲綅', style: 'background: ' + disabled_color, width: 100 }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -881,7 +996,7 @@
//缂栬緫鑾峰彇琛ㄥご
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai",
+ url: GetWEBURL() + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai",
type: "GET",
data: {
"HID": linterid
@@ -935,7 +1050,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鍔犺浇鏁版嵁
$.ajax({
- url: GetWEBURL() + 'Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai',
+ url: GetWEBURL() + '/Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai',
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
@@ -1386,9 +1501,55 @@
layer.alert(sMsg, { icon: 5 });
}
-
//#endregion
+ //#region 鑾峰彇缁勭粐
+ 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");
+ }
+ })
+ }
+ //#endregion
+
+ // 缁欎笉鍏佽缂栬緫鐨勬暟鎹坊鍔犳牱寮�
+ function ColumnAddNotEditableStyle() {
+ let notEditableStyle = "; background: #e2e2e2;"
+ let opt = option
+ debugger
+ for (let col of option.cols[0]) {
+ if (cancelEditStyleList.test(col.field) === true) {
+ col.style += notEditableStyle;
+ col.edit = null
+ }
+ }
+ }
+
+ // 璁剧疆鍒楅殣钘�
+ function ColumnHideColumnSetting() {
+ for (let col of option.cols[0]) {
+ if (HideColmReg.test(col.field) === true) {
+ col.hide = true
+ }
+ }
+ }
+
+ // 浠ヤ笂鏄痩ayui妯″潡
});
function GetHWHValue(obj) //杩斿洖浠撳簱
@@ -1449,6 +1610,8 @@
{
OptionData = obj;
}
+
</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_MouldProdOutBillList.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_MouldProdOutBillList.html"
index d037eea..488de2b 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_MouldProdOutBillList.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_MouldProdOutBillList.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>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -40,97 +42,116 @@
</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>
<div class="layui-inline">
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ <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">
+ <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">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
</div>
+ </div><br />
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+ </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="HDept" id="HDept" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDept"
+ id="HDept" style="width:190px;">
</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="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterNumber" id="HMaterNumber" style="width:190px;">
</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-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HWhName" id="HWhName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HWhName"
+ id="HWhName" style="width:190px;">
</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="HSupName" id="HSupName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupName"
+ id="HSupName" style="width:190px;">
</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="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>
@@ -138,26 +159,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" lay-filter="ColName1" style="width:190px;">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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>
@@ -165,26 +193,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input" value="" name="ColContent1"
+ class="ForFilteringSchemes" 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" lay-filter="ColName2" style="width:190px;">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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>
@@ -192,7 +227,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input" value="" name="ColContent2"
+ class="ForFilteringSchemes" id="ColContent2">
</div>
</div>
</div>
@@ -203,9 +239,11 @@
<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="Add"><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" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></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="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="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>
@@ -229,7 +267,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
@@ -279,14 +317,14 @@
set_ClearBill();
//#endregion
-
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
optionPage.curr = 1;
get_FastQuery(table, option);
-
+
});
//#endregion
@@ -294,7 +332,7 @@
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
get_FastQuery(table, option);
-
+
});
//#endregion
@@ -353,7 +391,7 @@
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
-
+
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -409,12 +447,12 @@
, { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 125, sort: true }
, { field: '浠撲綅', title: '浠撲綅', width: 125, sort: true }
, { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true, totalRow: true }
- , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true}
+ , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true }
, { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true, totalRow: true }
- , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true}
+ , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125, sort: true, totalRow: true }
- , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125, sort: true, totalRow: true}
- , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125, sort: true, totalRow: true}
+ , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125, sort: true, totalRow: true }
+ , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125, sort: true, totalRow: true }
, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true, totalRow: true }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
, { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125, sort: true }
@@ -470,7 +508,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"Organization": sessionStorage["Organization"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -530,7 +568,17 @@
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 });
+ }
+
}
}
}
@@ -543,8 +591,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"]);
@@ -603,7 +652,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -629,7 +678,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -689,13 +738,55 @@
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
break;
+ // 澶嶅埗鎸夐挳
+ case 'btn-Copy': set_AddCopy();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
};
});
-
+ //琛ㄦ牸鑷畾涔変簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let data = obj.data;
+ switch (obj.event) {
+ case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
+ }
+ })
+ //澶嶅埗鍗曟嵁
+ 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_MouldProdOutBillEdit.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
+ }
+ }
//棰勮
function get_ViewReport() {
var checkStatus = table.checkStatus('mainTable')
@@ -771,7 +862,22 @@
}
}
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -962,7 +1068,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
+
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
@@ -1047,7 +1153,7 @@
form.render('select');
}
//#endregion
-
+
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
@@ -1305,13 +1411,35 @@
}
//#endregion
-
+ 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_MouldProdOutBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
+
var HInterID = obj[0].hmainid;
HInterID_Choose = obj[0].hmainid;
$.ajax({
@@ -1353,4 +1481,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\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 0cfe1a6..0c5ba99 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -1375,6 +1375,8 @@
}
//#endregion
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
--
Gitblit v1.9.1