From 9546f77e31dd67e86f2f51237e34974390ddf9d1 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 27 六月 2025 16:22:14 +0800
Subject: [PATCH] 工程阶段 修复工程类别不能正常显示 工程阶段 修复工程类别不能正常显示 职员编辑 添加 岗位清单 PNL布局 添加修改/审核/禁用 信息和控制 PNL检验信息 添加修改/审核 信息和控制
---
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html | 137 ++++++++-
WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit.html | 180 ++++++++++---
WebTM/views/项目管理/工程项目/PM_ProjectTaskFeesQuery.html | 5
WebTM/views/项目管理/工程项目/PM_ProjectTaskStepsQuery.html | 5
WebTM/views/基础资料/公用基础资料/Gy_PNLInfoList.html | 154 +++++++++--
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList1.html | 0
WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempList.html | 101 +++++--
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 169 +++++++++++-
9 files changed, 598 insertions(+), 155 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index cbf1153..2f7c57c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
index 3080310..6c1864c 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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
@@ -16,6 +16,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style>
.layui-form-item .layui-inline {
@@ -856,7 +857,9 @@
</div>
</div>
</div>
-
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script>
//#region 鎶樺彔娉ㄩ噴
//#endregion
@@ -880,6 +883,8 @@
var month = date.getMonth() + 1;
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
+ var option = [];
+ var HModName = "Gy_Employee_Add_Edit"
//#endregion
@@ -900,6 +905,8 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+
+ btnAddLine({ HEmpID: $('#HItemID').val(), HEmpName: $("#HName").val(), HPostID: 0, HPostName: "" })
// 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
document.getElementById('testList').addEventListener('click', function () {
// 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
@@ -925,14 +932,14 @@
});
$("#HAge").val(0);
- $("#HGradDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
- $("#HInComDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
- $("#HInsuranceDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
- $("#HContractEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
- $("#HContractBDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HGradDate").val(Format("9999-13-01", "yyyy-MM-dd"));
+ $("#HInComDate").val(Format("9999-13-01", "yyyy-MM-dd"));
+ $("#HInsuranceDate").val(Format("9999-13-01", "yyyy-MM-dd"));
+ $("#HContractEDate").val(Format("9999-13-01", "yyyy-MM-dd"));
+ $("#HContractBDate").val(Format("9999-13-01", "yyyy-MM-dd"));
$("#HContractYear").val(0);
- $("#HDimissionDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
- $("#HStayCardEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HDimissionDate").val(Format("9999-13-01", "yyyy-MM-dd"));
+ $("#HStayCardEDate").val(Format("9999-13-01", "yyyy-MM-dd"));
} else if (OperationType == 2) {//澶嶅埗
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -972,9 +979,10 @@
//澶村伐鍏锋爮
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;;
+ , data = checkStatus.data;
var AddRow = table.cache['mainTable'];
- var NewRow = { HEmpID: $('#HItemID').val(), HEmpName: $("#HName").val(), HPostID: 0, HPostName: "" };
+ debugger
+ var NewRow = { HEmpID: $('#HItemID').val(), HEmpName: $("#HName").val(), HPostID: 0, HPostName: "", HRemark: "" };
console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
@@ -1064,6 +1072,13 @@
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(data);
});
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //#endregion
//#endregion
//瀹℃牳
@@ -1412,6 +1427,7 @@
, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
});
+ RoadBillSub(linterid)
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1435,6 +1451,53 @@
if (day.length < 2) day = '0' + day;
return [year, month, day].join('-');
+ }
+
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ debugger
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ //rows++;
+ // layer.msg('澧炲姞涓�琛屾寜閽紒')
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ //obj.del();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
}
//#region 淇濆瓨鏂规硶
@@ -1627,11 +1690,12 @@
// layer.msg("璇疯緭鍏ヨ亴鍛樺悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Employee/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
+ data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ";" + sSubStr },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -1661,6 +1725,30 @@
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
}
//#endregion
+
+ function RoadBillSub(linterid) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Gy_Employee/listSub",
+ type: "GET",
+ data: {
+ sWhere: " and HEmpID = " + linterid,
+ user: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ option.data = result.data;
+ table.render(option);
+ }
+
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
+ layer.close(ajaxLoad);
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
function AllowLoadData(sSubStr) {
var Result = true;
@@ -1705,13 +1793,13 @@
, totalRow: true
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'HItemID', title: '宀椾綅淇℃伅ID', width: 100, hide: true}
- , { type: 'HEmpID', title: 'HEmpID', width: 100} // 鑱屽憳鍐呯爜
- , { type: 'HEmpName', title: '鑱屽憳鍚嶇О', width: 100} // 鑱屽憳鍐呯爜
- , { type: 'HPostID', title: 'HPostID', width: 100} // 鑱屽憳鍐呯爜
- , { type: 'HPostName', title: '宀椾綅鍚嶇О', width: 100} // 鑱屽憳鍐呯爜
+ , { field: 'HItemID', title: '宀椾綅淇℃伅ID', width: 100, hide: true }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true, width: 100 } // 鑱屽憳鍐呯爜
+ , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', width: 100 } // 鑱屽憳鍐呯爜
+ , { field: 'HPostID', title: 'HPostID', hide: true, width: 100 } // 鑱屽憳鍐呯爜
+ , { field: 'HPostName', title: '宀椾綅鍚嶇О', edit: true, width: 100, event: "HPostNameSelect" } // 鑱屽憳鍐呯爜
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ , { title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -1825,6 +1913,53 @@
}
//#endregion
+ //琛屽唴蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HPostNameSelect') {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宀椾綅鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html?Type=2', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ let data = checkStatus.data[0]
+ obj.update({
+ HPostID: data["HItemID"],
+ HPostName: data["宀椾綅鍚嶇О"]
+ })
+ table.render(option);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+ }
+ })
+ }
+
+ $("#HName").on("blur", function () {
+ let val = $(this).val()
+ let data = table.cache['mainTable'];
+ for (let dOne of data) {
+ dOne["HEmpName"] = val;
+ }
+
+ table.reload("mainTable", {
+ data: data
+ })
+ })
+
//#endregion
});
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_PNLInfoEdit.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_PNLInfoEdit.html"
index 1303f84..a315250 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_PNLInfoEdit.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_PNLInfoEdit.html"
@@ -1,12 +1,13 @@
-锘�
-<!DOCTYPE html>
+锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫PNL甯冨眬</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>
@@ -24,10 +25,11 @@
background: #eeeeee;
border-radius: 5px;
/*zoom: 1.10;*/
- box-shadow: rgba(0,0,0,0.4) 3px 3px;
+ box-shadow: rgba(0, 0, 0, 0.4) 3px 3px;
}
</style>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
@@ -37,8 +39,12 @@
<form id="form" 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" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Checker">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -54,14 +60,16 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PNL甯冨眬: </label>
+ <label class="layui-form-label"
+ style="width: 85px;padding: 9px 18px;">PNL甯冨眬: </label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" lay-verify="HLayOutName" name="HLayOutName"
- id="HLayOutName"
- style="background-color:#efefef4d;display: inline-block;">
- <input type="hidden" class="layui-input" lay-verify="HInterID" name="HInterID"
- id="HInterID"
- style="background-color:#efefef4d;display: inline-block;">
+ <input type="text" class="layui-input"
+ lay-verify="HLayOutName" name="HLayOutName"
+ id="HLayOutName"
+ style="background-color:#efefef4d;display: inline-block;">
+ <input type="hidden" class="layui-input"
+ lay-verify="HInterID" name="HInterID" id="HInterID"
+ style="background-color:#efefef4d;display: inline-block;">
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
lay-filter="HLayoutList" id="HLayoutList"
style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -71,15 +79,17 @@
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PCS鍥炬爣: </label>
+ <label class="layui-form-label"
+ style="width: 85px;padding: 9px 18px;">PCS鍥炬爣: </label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HIcon" name="HIcon"
- id="HIcon"
- style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="HIconFile" id="HIconFile"
- style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ <input type="text" class="layui-input" lay-verify="HIcon"
+ name="HIcon" id="HIcon"
+ style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button"
+ lay-submit="" lay-filter="HIconFile" id="HIconFile"
+ style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i
+ class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
</div>
@@ -88,7 +98,7 @@
<label class="layui-form-label">琛屾暟:</label>
<div class="layui-input-inline">
<input type="number" name="HRowCount" id="HRowCount"
- class="layui-input">
+ class="layui-input">
</div>
</div>
@@ -96,23 +106,23 @@
<label class="layui-form-label">鍒楁暟:</label>
<div class="layui-input-inline">
<input type="number" name="HColCount" id="HColCount"
- class="layui-input">
+ class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">PNL浜岀淮鐮佺儳铓�x鍧愭爣:</label>
<div class="layui-input-inline">
- <input type="number" name="HPNLPosition_x" id="HPNLPosition_x"
- class="layui-input">
+ <input type="number" name="HPNLPosition_x"
+ id="HPNLPosition_x" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">PNL浜岀淮鐮佺儳铓�y鍧愭爣:</label>
<div class="layui-input-inline">
- <input type="number" name="HPNLPosition_y" id="HPNLPosition_y"
- class="layui-input">
+ <input type="number" name="HPNLPosition_y"
+ id="HPNLPosition_y" class="layui-input">
</div>
</div>
@@ -127,7 +137,30 @@
<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="HModifyMan"
+ id="HModifyMan" 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="HCheckMan"
+ id="HCheckMan" 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="HStopMan"
+ id="HStopMan" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -135,7 +168,31 @@
<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="HModifyDate"
+ id="HModifyDate" 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="HStopDate"
+ id="HStopDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -219,7 +276,7 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
-
+
}
else if (OperationType == 2) {//澶嶅埗
set_AddFNew();
@@ -284,12 +341,41 @@
set_GridDelete(obj); //琛屽唴鍒犻櫎
});
+ // 瀹℃牳
+ form.on("submit(Checker)", function () {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PNLInfoController/CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": linterid, "IsAudit": 0, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true)
+ $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true)
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
//var isEndCheck = document.getElementById("HStopflag").checked;
//isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainStr = JSON.stringify(data.field) + ";" + sSubStr + ';'+ sessionStorage["HUserName"]
+ var sMainStr = JSON.stringify(data.field) + ";" + sSubStr + ';' + sessionStorage["HUserName"]
let url = GetWEBURL()
if (OperationType == 3) {
url += "/Gy_PNLInfoController/EditBill"
@@ -311,7 +397,7 @@
//set_EditForm(linterid)
//鍏抽棴椤电
//Pub_Close(1);
-
+
}
else {
f_alert(data.Message);
@@ -395,7 +481,6 @@
//鐩戝惉鎻愪氦
form.verify({
- // TODO: 鍒ゆ柇 鏉＄爜缂栧彿鐨勮緭鍏ユ槸鍚︾鍚堟爣鍑�
numberOrEmpty: function (value, item) {
// if (value != '') {
if (!/^\d+$/.test(value)) {
@@ -436,11 +521,11 @@
, { templet: '#xuhao', field: "搴忓彿", title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
, { field: 'HInterID', title: '涓昏〃ID', hide: true, width: 100 }
, { field: 'HEntryID', title: '瀛愯〃ID', hide: true, width: 100 }
- , { field: 'HLayOutName', title: 'PNL甯冨眬鍚嶇О', width: 100, event: 'onHLayoutNameKeyDownHandler'}
+ , { field: 'HLayOutName', title: 'PNL甯冨眬鍚嶇О', width: 100, event: 'onHLayoutNameKeyDownHandler' }
, { field: 'HSetNo', title: 'set鍙�', width: 100, edit: 'text' }
, { field: 'HPCSNo', title: 'PCS鍙�', width: 100, edit: 'text' }
, { field: 'HPosition_x', title: 'PCS琛岀储寮�', width: 100, totalRow: true, edit: 'text' }
- , { field: 'HPosition_y', title: 'PCS鍒楃储寮�', width: 100, totalRow: true, edit: 'text' }
+ , { field: 'HPosition_y', title: 'PCS鍒楃储寮�', width: 100, totalRow: true, edit: 'text' }
, { field: 'HSetPosition_x', title: 'Set浜岀淮鐮佺儳铓�x鍧愭爣', width: 120 }
, { field: 'HSetPosition_y', title: 'Set浜岀淮鐮佺儳铓�y鍧愭爣', width: 120 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -542,10 +627,19 @@
$("#HPNLPosition_y").val(Number(data['PNL浜岀淮鐮佺儳铓�y鍧愭爣']))
$("#HMaker").val(data['鍒涘缓浜�'])
$("#HMakeDate").val(isEmpty(data['鍒涘缓鏃堕棿']) === true ? "" : util.toDateString(data['鍒涘缓鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
-
+ $("#HModifyMan").val(data['淇敼浜�'])
+ $("#HModifyDate").val(isEmpty(data['淇敼鏃堕棿']) === true ? "" : util.toDateString(data['淇敼鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
+ $("#HCheckMan").val(data['瀹℃牳浜�'])
+ $("#HCheckDate").val(isEmpty(data['瀹℃牳鏃堕棿']) === true ? "" : util.toDateString(data['瀹℃牳鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
+ $("#HStopMan").val(data['绂佺敤浜�'])
+ $("#HStopDate").val(isEmpty(data['绂佺敤鏃堕棿']) === true ? "" : util.toDateString(data['绂佺敤鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�
layer.close(load)
-
+ if(isEmpty(data['瀹℃牳浜�']) !== true) {
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ }else {
+ $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
layer.close(load)
@@ -573,9 +667,9 @@
if (isEmpty(oldData[obj.tr.data('index')].HEntryID) === false, true, true) {
delEntryIDList.push(oldData[obj.tr.data('index')].HEntryID) // 淇濆瓨鍒犻櫎琛� HEntryID(闈炵┖锛岄潪0)
}
-
+
oldData.splice(obj.tr.data('index'), 1);
-
+
table.reload('mainTable', { data: oldData });
layer.close(index);
}
@@ -650,7 +744,13 @@
}
//#endregion
-
+ document.addEventListener('DOMContentLoaded', function () {
+ $("#check-btn").addClass("layui-btn-disabled").attr('disabled', true)
+ });
+
+
+
</script>
</body>
+
</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_PNLInfoList.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_PNLInfoList.html"
index 8d763fa..1d76004 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_PNLInfoList.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_PNLInfoList.html"
@@ -37,7 +37,7 @@
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
- lay-filter="HInitTimeCycle" style="width:190px;">
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
@@ -45,38 +45,38 @@
<label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
- id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
- placeholder="yyyy-MM-dd">
+ id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
- id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
- placeholder="yyyy-MM-dd">
+ id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 8rem;">PNL甯冨眬鍚嶇О:</label>
<div class="layui-input-inline">
<input class="layui-input ForFilteringSchemes" name="HBarCode"
- lay-verify="HLayOutName" id="HLayOutName" autocomplete="off">
+ lay-verify="HLayOutName" id="HLayOutName" autocomplete="off">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnSearch" id="btnSearch">
+ lay-filter="btnSearch" id="btnSearch">
鏌ヨ
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnReSearch" id="btnReSearch">
+ lay-filter="btnReSearch" id="btnReSearch">
閲嶇疆
</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>
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
@@ -84,13 +84,13 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName" id="ColName" class="ForFilteringSchemes"
- lay-filter="ColName" style="width:190px;">
+ 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;">
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -110,7 +110,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent" id="ColContent">
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -118,23 +118,21 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName1" id="ColName1" lay-filter="ColName1"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=
- </option>
+ <= </option>
<option value="<">
- <
- </option>
+ < </option>
<option value="<>">
<>
</option>
@@ -146,7 +144,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent1" id="ColContent1">
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -154,23 +152,21 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName2" id="ColName2" lay-filter="ColName2"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=
- </option>
+ <= </option>
<option value="<">
- <
- </option>
+ < </option>
<option value="<>">
<>
</option>
@@ -182,7 +178,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent2" id="ColContent2">
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -203,12 +199,14 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_StopBill" id="set_StopBill"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonStop" id="set_AbandonStop"><i class="layui-icon layui-icon-circle"></i>鍙嶇鐢�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>-->
+ <!-- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button> -->
+ <!-- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button> -->
+ <!-- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button> -->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
@@ -249,7 +247,7 @@
var sWhere = "";
var option = [];
var titleData = ['sorderid', 'hmainid', 'HInterid'];
-
+
var ins;
var HModName = "Gy_PNLInfo";
var HBillType = "10003";
@@ -303,11 +301,19 @@
break;
//瀹℃牳
case 'set_CheckBill':
- set_CheckBill(1);
+ set_CheckBill(0);
break;
//鍙嶅鏍�
case 'set_AbandonCheck':
- set_CheckBill(2);
+ set_CheckBill(1);
+ break;
+ //绂佺敤
+ case 'set_StopBill':
+ set_StopBill(0);
+ break;
+ //鍙嶇鐢�
+ case 'set_AbandonStop':
+ set_StopBill(1);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -538,6 +544,78 @@
});
}
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PNLInfoController/CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_StopBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PNLInfoController/StopBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//蹇�熻繃婊�
function get_FastQuery() {
@@ -725,7 +803,7 @@
success: function (layero, index) {
}
- ,end: function () {
+ , end: function () {
//鍒锋柊椤甸潰,
get_FastQuery();
},
@@ -757,8 +835,10 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
-
+ if (checkStatus.data.length === 1) {
+ if (isEmpty(data[0]['瀹℃牳浜�']) === false) {
+ return layer.alert("宸插鏍哥殑鏁版嵁涓嶈兘鍒犻櫎!", { icon: 5 })
+ }
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList1.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList1.html"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList1.html"
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
index 264b53c..26e24c0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempEdit.html"
@@ -1,12 +1,13 @@
-锘�
-<!DOCTYPE html>
+锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>鏂板/缂栬緫PNL妫�楠屼俊鎭�</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>
@@ -19,6 +20,7 @@
<script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
</head>
+
<body>
<div id="layout1" class="layui-fluid">
@@ -28,8 +30,12 @@
<form id="form" 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" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="Checker">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Exit">閫�鍑�</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -49,9 +55,9 @@
<label class="layui-form-label">鏉＄爜缂栧彿:</label>
<div class="layui-input-inline">
<input type="text" name="HBarCode" id="HBarCode"
- class="layui-input">
+ class="layui-input">
<input type="hidden" name="HItemID" id="HItemID"
- class="layui-input" />
+ class="layui-input" />
</div>
</div>
@@ -59,7 +65,7 @@
<label class="layui-form-label">set鍙�:</label>
<div class="layui-input-inline">
<input type="text" name="HSetNo" id="HSetNo"
- class="layui-input">
+ class="layui-input">
</div>
</div>
@@ -67,7 +73,7 @@
<label class="layui-form-label">PCS鍙�:</label>
<div class="layui-input-inline">
<input type="text" name="HPCSNo" id="HPCSNo"
- class="layui-input">
+ class="layui-input">
</div>
</div>
@@ -75,7 +81,7 @@
<label class="layui-form-label">PCS琛岀储寮�:</label>
<div class="layui-input-inline">
<input type="number" name="HPosition_x" id="HPosition_x"
- class="layui-input">
+ class="layui-input">
</div>
</div>
@@ -83,7 +89,7 @@
<label class="layui-form-label">PCS鍒楃储寮�:</label>
<div class="layui-input-inline">
<input type="number" name="HPosition_y" id="HPosition_y"
- class="layui-input">
+ class="layui-input">
</div>
</div>
@@ -91,8 +97,10 @@
<div class="layui-inline">
<label class="layui-form-label">妫�楠屽伐搴�:</label>
<div class="layui-input-inline">
- <select name="HCheckProc" lay-filter="HCheckProc" id="HCheckProc">
- <option value="鐐．VRS鍐呭眰" selected="selected">鐐．VRS鍐呭眰</option>
+ <select name="HCheckProc" lay-filter="HCheckProc"
+ id="HCheckProc">
+ <option value="鐐．VRS鍐呭眰" selected="selected">鐐．VRS鍐呭眰
+ </option>
<option value="鐐．VRS澶栧眰">鐐．VRS澶栧眰</option>
<option value="AVI">AVI</option>
<option value="鐢垫祴">鐢垫祴</option>
@@ -103,8 +111,10 @@
<div class="layui-inline">
<label class="layui-form-label">姝ｅ弽闈�:</label>
<div class="layui-input-inline">
- <select name="HPageIndex" lay-filter="HPageIndex" id="HPageIndex">
- <option value="姝ｉ潰" data-value="1" selected="selected">姝ｉ潰</option>
+ <select name="HPageIndex" lay-filter="HPageIndex"
+ id="HPageIndex">
+ <option value="姝ｉ潰" data-value="1" selected="selected">姝ｉ潰
+ </option>
<option value="鍙嶉潰" data-value="0">鍙嶉潰</option>
</select>
</div>
@@ -115,7 +125,8 @@
<div class="layui-inline">
<label class="layui-form-label">涓嶈壇鍘熷洜:</label>
<div class="layui-input-inline">
- <textarea name="HPNLPosition_y" id="HPNLPosition_y" class="layui-textarea"></textarea>
+ <textarea name="HPNLPosition_y" id="HPNLPosition_y"
+ class="layui-textarea"></textarea>
</div>
</div>
</div>
@@ -130,7 +141,23 @@
<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="HModifyMan"
+ id="HModifyMan" 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="HCheckMan"
+ id="HCheckMan" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -138,7 +165,24 @@
<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="HModifyDate"
+ id="HModifyDate" 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>
@@ -198,7 +242,7 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
-
+
}
else if (OperationType == 2) {//澶嶅埗
set_AddFNew();
@@ -221,7 +265,7 @@
//var isEndCheck = document.getElementById("HStopflag").checked;
//isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
data.field['HPageIndex'] = $("#HPageIndex option:selected").data('value');
-/* data.field['HCheckProc'] = $("#HCheckProc option:selected").data('value');*/
+ /* data.field['HCheckProc'] = $("#HCheckProc option:selected").data('value');*/
var sMainStr = JSON.stringify(data.field) + ';' + sessionStorage["HUserName"]
debugger
@@ -245,7 +289,7 @@
//set_EditForm(linterid)
//鍏抽棴椤电
//Pub_Close(1);
-
+
}
else {
f_alert(data.Message);
@@ -275,6 +319,36 @@
form.on('submit(HLayoutList)', function () {
get_layoutPanel()
})
+
+ // 瀹℃牳
+ form.on("submit(Checker)", function () {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": linterid, "IsAudit": 0, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true)
+ $("#check-btn").addClass("layui-btn-disabled").attr("disabled", true)
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+
//鐩戝惉鎻愪氦
form.verify({
@@ -306,11 +380,12 @@
function roadBillMain() {
set_EditForm(linterid)
}
-
+
//缂栬緫鍔犺浇琛ㄥご
function set_EditForm(linterid) {
+ let load = layer.load()
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
$.ajax({
url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/GetQC_CheckNote_PNL_TempList",
@@ -334,8 +409,17 @@
$("#HPosition_y").val(Number(data['PCS鎵�鍦ㄥ垪鐨勭储寮�']))
$("#HMaker").val(data['鍒涘缓浜�'])
$("#HMakeDate").val(isEmpty(data['鍒涘缓鏃堕棿']) === true ? "" : util.toDateString(data['鍒涘缓鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
-
+ $("#HModifyMan").val(data['淇敼浜�'])
+ $("#HModifyDate").val(isEmpty(data['淇敼鏃堕棿']) === true ? "" : util.toDateString(data['淇敼鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
+ $("#HCheckMan").val(data['瀹℃牳浜�'])
+ $("#HCheckDate").val(isEmpty(data['瀹℃牳鏃堕棿']) === true ? "" : util.toDateString(data['瀹℃牳鏃堕棿'], 'yyyy-MM-dd HH:mm:ss'))
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�
+ layer.close(load)
+ if (isEmpty(data['瀹℃牳浜�']) !== true) {
+ $("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
+ } else {
+ $("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -345,7 +429,7 @@
}
});
}
-
+
//
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -361,6 +445,11 @@
}
//#endregion
+
+ document.addEventListener('DOMContentLoaded', function () {
+ $("#check-btn").addClass("layui-btn-disabled").attr('disabled', true)
+ });
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html"
index c5c1d5e..5a5b738 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/PNL\346\243\200\351\252\214\344\277\241\346\201\257/QC_CheckNote_PNL_TempList.html"
@@ -37,7 +37,7 @@
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
- lay-filter="HInitTimeCycle" style="width:190px;">
+ lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
@@ -45,38 +45,38 @@
<label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate"
- id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
- placeholder="yyyy-MM-dd">
+ id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
<div class="layui-input-inline">
<input type="date" class="layui-input ForFilteringSchemes" name="HEndDate"
- id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
- placeholder="yyyy-MM-dd">
+ id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+ placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 8rem;">PNL鏉＄爜缂栧彿:</label>
<div class="layui-input-inline">
<input class="layui-input ForFilteringSchemes" name="HBarCode"
- lay-verify="HBarCode" id="HBarCode" autocomplete="off">
+ lay-verify="HBarCode" id="HBarCode" autocomplete="off">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnSearch" id="btnSearch">
+ lay-filter="btnSearch" id="btnSearch">
鏌ヨ
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
- lay-filter="btnReSearch" id="btnReSearch">
+ lay-filter="btnReSearch" id="btnReSearch">
閲嶇疆
</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>
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
@@ -84,13 +84,13 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName" id="ColName" class="ForFilteringSchemes"
- lay-filter="ColName" style="width:190px;">
+ 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;">
+ lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -110,7 +110,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent" id="ColContent">
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -118,23 +118,21 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName1" id="ColName1" lay-filter="ColName1"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=
- </option>
+ <= </option>
<option value="<">
- <
- </option>
+ < </option>
<option value="<>">
<>
</option>
@@ -146,7 +144,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent1" id="ColContent1">
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -154,23 +152,21 @@
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
<select name="ColName2" id="ColName2" lay-filter="ColName2"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
- class="ForFilteringSchemes" style="width:190px;">
+ class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=
- </option>
+ <= </option>
<option value="<">
- <
- </option>
+ < </option>
<option value="<>">
<>
</option>
@@ -182,7 +178,7 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value=""
- name="ColContent2" id="ColContent2">
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -203,8 +199,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>-->
@@ -303,11 +299,11 @@
break;
//瀹℃牳
case 'set_CheckBill':
- set_CheckBill(1);
+ set_CheckBill(0);
break;
//鍙嶅鏍�
case 'set_AbandonCheck':
- set_CheckBill(2);
+ set_CheckBill(1);
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -538,6 +534,42 @@
});
}
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//蹇�熻繃婊�
function get_FastQuery() {
@@ -757,8 +789,10 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
-
+ if (checkStatus.data.length === 1) {
+ if (isEmpty(data[0]["瀹℃牳浜�"]) !== true) {
+ return layer.alert("宸茶瀹℃牳鐨勬暟鎹笉鑳借鍒犻櫎!", { icon: 5 })
+ }
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
@@ -1287,5 +1321,8 @@
}
});
}
+
//#endregion
+
+
</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskFeesQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskFeesQuery.html"
index 8370e58..d6a174f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskFeesQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskFeesQuery.html"
@@ -159,8 +159,8 @@
<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="HProcType"
- lay-verify="HProcType" id="HProcType" disabled>
+ <input type="text" class="layui-input" name="HBillSubType"
+ lay-verify="HBillSubType" id="HBillSubType" disabled>
</div>
</div>
<div class="layui-inline">
@@ -1099,6 +1099,7 @@
form.val("formData", {
HInterID: data["HInterID"], // 闅愯棌瀛楁
HProNumber: data["宸ョ▼缂栧彿"], // 瀵瑰簲鍓嶇name="HProNumber"
+ HBillSubType: data["宸ョ▼绫诲瀷"],
HReDate: isEmpty(data["鍙楃悊鏃ユ湡"]) === true ? "" : util.toDateString(data["鍙楃悊鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HReDate"
HPicNo: data["浠诲姟鍗曠紪鍙�"], // 瀵瑰簲name="HPicNo"
HProName: data["宸ョ▼鍚嶇О"], // 瀵瑰簲name="HProName"
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskStepsQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskStepsQuery.html"
index 56a8a12..24e1f93 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskStepsQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskStepsQuery.html"
@@ -168,8 +168,8 @@
<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="HProcType"
- lay-verify="HProcType" id="HProcType" disabled>
+ <input type="text" class="layui-input" name="HBillSubType"
+ lay-verify="HBillSubType" id="HBillSubType" disabled>
</div>
</div>
<div class="layui-inline">
@@ -952,6 +952,7 @@
// 鍩虹瀛楁锛堥敭鍚嶄笌鍓嶇name瀹屽叏涓�鑷达級
HInterID: data.HInterID, // 闅愯棌瀛楁
HProNumber: data.宸ョ▼缂栧彿, // 瀵瑰簲鍓嶇name="HProNumber"
+ HBillSubType: data["宸ョ▼绫诲瀷"],
HReDate: isEmpty(data["鍙楃悊鏃ユ湡"]) === true ? "" : util.toDateString(data["鍙楃悊鏃ユ湡"], "yyyy-MM-dd"), // 瀵瑰簲name="HReDate"
HPicNo: data.浠诲姟鍗曠紪鍙�, // 瀵瑰簲name="HPicNo"
HProName: data.宸ョ▼鍚嶇О, // 瀵瑰簲name="HProName"
--
Gitblit v1.9.1