From 226b08b8a5f3ecab663d6b0e02b48c3e16e644e0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckNoteItem.html | 168 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 139 insertions(+), 29 deletions(-)
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/Add_Edit_Gy_CheckNoteItem.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/Add_Edit_Gy_CheckNoteItem.html"
index f99f469..86c9459 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/Add_Edit_Gy_CheckNoteItem.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/Add_Edit_Gy_CheckNoteItem.html"
@@ -8,6 +8,12 @@
<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>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
@@ -18,17 +24,17 @@
<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 class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
</div>
-
</div>
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-
- <h1 style="text-align:center;"><b>鍚姩妫�鏌ラ」鐩�</b></h1>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-tab layui-tab-brief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -53,23 +59,34 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
- <div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- </select>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+ </select>
+ </div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
<div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" readonly>
<option value="鏈娴�" selected>鏈娴�</option>
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
</div>
</div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">纭鑰呰鑹�</label>
+ <label class="layui-form-label" style="width: 85px;">纭鑰呭矖浣�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HCheckPostName" id="HCheckPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCheckPostID" id="HCheckPostID" value="0">
@@ -78,12 +95,10 @@
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="" readonly>
</div>
</div>
</div>
@@ -92,6 +107,52 @@
<label class="layui-form-label"> 澶囨敞锛�</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" 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="HStopEmp" id="HStopEmp" 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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime" 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="HStopTime" id="HStopTime" 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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
</div>
@@ -105,11 +166,6 @@
</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>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
var params = get_UrlVars();
@@ -142,8 +198,17 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
- else if (OperationType == 3) {//缂栬緫
+ else if (OperationType == 2) {//澶嶅埗
+ set_AddFNew();
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ set_EditForm(linterid);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
}
else {
@@ -195,7 +260,12 @@
Pub_Close(1);
}
});
-
+
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -212,7 +282,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '瀹㈡埛鍒楄〃',
+ title: '宀椾綅鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -249,8 +319,38 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BadReason/AuditGy_CheckNoteItem',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ $("#HUSEORGID").attr("disabled", true);
+ $("#HCREATEORGID").attr("disabled", true);
+ $("#HStopflag").attr("disabled", true);
+ $("#HUseFlag").attr("disabled", true);
+ layui.form.render('checkbox');
Organ();
}
//鏃犳簮鍗曟柊澧�
@@ -269,22 +369,30 @@
$.ajax({
url: GetWEBURL() + "GetGy_CheckNoteItemDetail",
type: "GET",
+ async: false,
data: {
"HID": linterid
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Gy_CheckNoteItem[0];
- $("#HItemID").val(data.HItemID);//浠ｇ爜ID
+ $("#HItemID").val(OperationType == 2 ? "0" : data.HItemID);//浠ｇ爜ID
$("#HNumber").val(data.鍚姩妫�鏌ラ」鐩唬鐮�);//浠ｇ爜
$("#HName").val(data.鍚姩妫�鏌ラ」鐩悕绉�);//鍚嶇О
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
- $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+ $("#HCheckPostID").val(data.HCheckPostID);//澶囨敞
+ $("#HCheckPostName").val(data.纭鑰呭矖浣�);
+ $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+ $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
$("#HRemark").val(data.澶囨敞);//澶囨敞
- $("#HCheckPostID").val(data.HCheckPostID);//HCheckPostID
- $("#HCheckPostName").val(data.纭鑰呰鑹�);//纭鑰呰鑹�
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ $("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
+ $("#HMakeTime").val(data.鍒涘缓鏃堕棿 == null ? "" : Format(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd"));
+ $("#HStopEmp").val(data.绂佺敤浜�);
+ $("#HStopTime").val(data.绂佺敤鏃堕棿 == null ? "" : Format(new Date(data.绂佺敤鏃堕棿), "yyyy-MM-dd"));
+ $("#HCheckEmp").val(data.瀹℃牳浜�);
+ $("#HCheckTime").val(data.瀹℃牳鏃堕棿 == null ? "" : Format(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd"));
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
} else {
@@ -314,7 +422,9 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HUSEORGID").append(Organization);
- $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+ $("#HCREATEORGID").append(Organization);
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
form.render('select');
}
layer.closeAll("loading");
--
Gitblit v1.9.1