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/基础资料/公用基础资料/Gy_TechnologyParameterUnit_Add_Edit_.html | 287 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 219 insertions(+), 68 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/Gy_TechnologyParameterUnit_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_TechnologyParameterUnit_Add_Edit_.html"
index 78b6f01..131645c 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_TechnologyParameterUnit_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_TechnologyParameterUnit_Add_Edit_.html"
@@ -1,11 +1,13 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
- <title>鏂板/缂栬緫宸ュ崟鍒楄〃</title>
+ <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>
@@ -13,6 +15,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -25,6 +28,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 15px;">
@@ -32,72 +36,151 @@
<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="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="set_SaveBill">
+ 淇濆瓨
+ </button>
+ <button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius"
+ lay-submit="" lay-filter="set_CheckBill">
+ 瀹℃牳
+ </button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+ lay-filter="Cancel">
+ 閫�鍑�
+ </button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ュ崟浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ュ崟鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍔╄鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
- </div>
- </div>
+ <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-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヨ壓鍙傛暟浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber"
+ autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヨ壓鍙傛暟鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName"
+ autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode"
+ autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <!-- <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒涘缓浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓浜�</label>
- <div class="layui-input-inline">
- <input type="text" name="HMakeEmp" id="HMakeEmp" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ </div> -->
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣跨敤鐘舵��</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag"
+ style="background-color:#efefef4d;" autocomplete="off" placeholder="" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" disabled
+ lay-skin="primary" lay-filter="HStopflag" value="true" title="鏄惁绂佺敤">
+ <!--<input type="hidden" value="false" name="HStopflag" id="HStopflag">-->
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark"
+ autocomplete="off" style=" width: 26%;">
+ </div>
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浣跨敤鐘舵��</label>
- <div class="layui-input-inline">
- <input type="text" name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="HStopflag" value="true" title="鏄惁绂佺敤">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 26%;">
+ <!--鍏朵粬淇℃伅-->
+ <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>
</div>
</div>
</div>
- </div>
- <input id="HItemID" name="HItemID" type="hidden" value="0" />
- <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
- <input id="HParentID" name="HParentID" type="hidden" value="0" />
- <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
- <input id="HShortNumber" name="HShortNumber" type="hidden" />
- </form>
+ <input id="HItemID" name="HItemID" type="hidden" value="0" />
+ <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
+ <input id="HParentID" name="HParentID" type="hidden" value="0" />
+ <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
+ <input id="HShortNumber" name="HShortNumber" type="hidden" />
+ <input id="HUSEORGID" name="HUSEORGID" type="hidden" />
+ <input id="HCREATEORGID" name="HCREATEORGID" type="hidden" />
+</form>
</div>
</div>
</div>
@@ -109,7 +192,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element','util'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -117,7 +200,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
var sWhere = "";
var date = new Date();
var day = date.getDate();
@@ -141,9 +225,18 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
+ $('#set_CheckBill').addClass('layui-btn-disabled').attr('disabled', true);
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ $("#HMakeTime").val(util.toDateString(new Date(), 'yyyy-MM-dd'))
+ $('#HCREATEORGID').val(sessionStorage['OrganizationID'])
+ $('#HUSEORGID').val(sessionStorage['OrganizationID'])
+ }
+ else if (OperationType == 2) {//澶嶅埗
+ $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -176,6 +269,35 @@
$("#HStopflag").val(data.elem.checked);
});
+
+ form.on('submit(set_CheckBill)', function () {
+ var InterID = linterid
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_TechnologyParameterUnit/AuditGy_TechnologyParameterUnit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ $('#set_CheckBill').addClass('layui-btn-disabled').attr('disabled', true);
+ $('#set_SaveBill').addClass('layui-btn-disabled').attr('disabled', true);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //$("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
////閫夋嫨宸ュ簭鎸夐挳
//form.on('submit(HProc-BT)', function () {
// get_checkProc();
@@ -229,7 +351,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + "Gy_TechnologyParameterUnit/cx",
+ url: GetWEBURL() + "/Gy_TechnologyParameterUnit/cx",
type: "GET",
data: {
"HInterID": linterid
@@ -239,12 +361,14 @@
var data = result.data[0];
var IsHStopflag = data.绂佺敤鏍囪;
var IsHTypeFlow = data.鏄庣粏鏍囪;
+ let hstopisempty = isEmpty(IsHStopflag)
+ debugger
//绂佺敤鏍囪
- if (IsHStopflag) {
- $("input[name='HStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+ if (isEmpty(IsHStopflag) === false) {
+ $("#HStopflag").attr("checked", true);
}
//鏄庣粏鏍囪
- if (IsHTypeFlow) {
+ if (isEmpty(IsHTypeFlow) === false) {
$("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -252,10 +376,36 @@
, "HItemID": data.HItemID
, "HName": data.宸ヨ壓鍙傛暟鍗曚綅鍚嶇О
, "HUseFlag": data.浣跨敤鏍囪
- , "HStopflag": data.绂佺敤鏍囪
+ //, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
-
+ , "HMakeEmp": data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�
+ , "HMakeTime": data.鍒涘缓鏃堕棿 == null ? "" : util.toDateString(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd")
+ , "HStopEmp": data.绂佺敤浜�
+ , "HStopTime": data.绂佺敤鏃堕棿 == null ? "" : util.toDateString(new Date(data.绂佺敤鏃堕棿), "yyyy-MM-dd")
+ , "HCheckEmp": data.瀹℃牳浜�
+ , "HCheckTime": data.瀹℃牳鏃堕棿 == null ? "" : util.toDateString(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd")
+ , 'HUSEORGID': data.HUSEORGID
+ , 'HCREATEORGID': data.HCREATEORGID
+
});
+
+ if (OperationType != 2) {
+ if (isEmpty(data['瀹℃牳浜�']) === false) {
+ $('#set_SaveBill').addClass('layui-btn-disabled').attr('disabled', true)
+ } else {
+ $('#set_CheckBill').removeClass('layui-btn-disabled').attr('disabled', false)
+ }
+ } else {
+ debugger
+ $("#HMakeEmp").val(sessionStorage["HMaker"])
+ $("#HMakeTime").val(util.toDateString(new Date(), 'yyyy-MM-dd'))
+ $("#HStopEmp").val('')
+ $("#HStopTime").val('')
+ $("#HCheckEmp").val('')
+ $("#HCheckTime").val('')
+ $("#HItemID").val(0)
+ }
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -287,7 +437,7 @@
}
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_TechnologyParameterUnit/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Gy_TechnologyParameterUnit/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
dataType: "json",
@@ -352,4 +502,5 @@
});
</script>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1