From 4e2f1038ed8d48a057e3a44e0d9a223dca993179 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 07 五月 2025 16:11:38 +0800
Subject: [PATCH] 排产页面调整
---
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 230 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 175 insertions(+), 55 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_WorkCenter_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_WorkCenter_Add_Edit.html"
index 8ef5ea3..d78e3fc 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_WorkCenter_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_WorkCenter_Add_Edit.html"
@@ -13,6 +13,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/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -42,6 +43,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -63,20 +65,29 @@
<div class="layui-input-inline" style="margin-bottom: -15px;">
<input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
</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="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
- </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 class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
+ </div>
+ </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <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 class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <option value="鏈娴�" selected>鏈娴�</option>
+ <option value="鏈娇鐢�">鏈娇鐢�</option>
+ <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
</div>
</div>
</div>
@@ -90,11 +101,11 @@
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+ <label class="layui-form-label" style="width: 12.5%;">浣跨敤缁勭粐</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
<div class="layui-form">
<div class="layui-form-item" style=" width: 375%;">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" >
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -102,45 +113,97 @@
</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-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item" style=" width: 375%;">
+ <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
</div>
-
- <div class="layui-tab-item">
-
+ <div class="layui-tab-item">
+ <div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宸ヤ綔鏃堕棿</label>
<div class="layui-input-inline">
<input class="layui-input" name="HWorkTimes" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
</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 class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="0">
- </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁惧鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="0">
</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 class="layui-input" name="HDayMoney" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
- </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">琛屼笟鏍囧噯</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDayMoney" lay-verify="HDayMoney" id="HDayMoney" value="0">
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" 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-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-tab-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="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="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>
@@ -177,9 +240,15 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+ //绂佺敤閫夐」
+ $("#HUSEORGID").attr("disabled", true);
+ $("#HCREATEORGID").attr("disabled", true);
+ $("#HStopflag").attr("disabled", true);
+ $("#HUseFlag").attr("disabled", true);
+ layui.form.render('checkbox');
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
+ //鍒濆鍖栫粍缁�
Organ();
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -193,12 +262,16 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
- //绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
+ $("#HMaker").val(sessionStorage["HMaker"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
- else if (OperationType == 3) {//缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
+ else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HMaker").val(sessionStorage["HMaker"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -288,7 +361,7 @@
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HNumber": data.HNumber
- , "HItemID": data.HItemID
+ , "HItemID": OperationType == 2 ? 0 : data.HItemID
, "HName": data.HName
, "HDeptName": data.HDeptName
, "HWorkTimes": data.HWorkTimes
@@ -300,6 +373,14 @@
, "HStopflag": data.HStopflag
, "HRemark": data.HRemark
, "HUSEORGID": data.HUSEORGID
+ , "HCreateORGID": data.HCreateORGID
+ , "HUseFlag": data.HUseFlag
+ , "HMaker": data.HMaker == "" ? sessionStorage["HMaker"] : data.HMaker
+ , "HMakeTime": data.HMakeTime == null ? "" : Format(new Date(data.HMakeTime), "yyyy-MM-dd")
+ , "HStopEmp": data.HStopEmp
+ , "HStopTime": data.HStopTime == null ? "" : Format(new Date(data.HStopTime), "yyyy-MM-dd")
+ , "HCheckEmp": data.HCheckEmp
+ , "HCheckTime": data.HCheckTime == null ? "" : Format(new Date(data.HCheckTime), "yyyy-MM-dd")
});
layer.close(ajaxLoad);
} else {
@@ -337,6 +418,43 @@
// layer.msg("璇疯緭鍏ヨ澶囨暟閲忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
+
+ var HWorkTimes = $('#HWorkTimes').val();
+ if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
+ layer.msg("宸ヤ綔鏃堕棿鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWorkTimes)) {
+ layer.msg("宸ヤ綔鏃堕棿璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HQty = $('#HQty').val();
+ if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+ layer.msg("璁惧鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HQty)) {
+ layer.msg("璁惧鏁伴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HDayMoney = $('#HDayMoney').val();
+ if (HDayMoney.substring(HDayMoney.length - 1, HDayMoney.length) == ".") {
+ layer.msg("琛屼笟鏍囧噯鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HDayMoney)) {
+ layer.msg("琛屼笟鏍囧噯璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
@@ -379,7 +497,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");
@@ -395,7 +515,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -403,7 +523,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
$("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -421,7 +541,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/DeptInformation.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -429,9 +549,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
- $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+ $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -447,7 +567,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヤ綔涓績鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -455,7 +575,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+ $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
$("#HCenterID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -472,7 +592,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/GroupInformation.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -480,7 +600,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroup").val(checkStatus.data[0].HName);
+ $("#HGroup").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
--
Gitblit v1.9.1