From eb7896c830308dcc07ec11621fdcdc6c92ad0515 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 27 十一月 2025 08:08:48 +0800
Subject: [PATCH] 器具增加五个字段 长 HMouldLength、宽 HMouldWidth、 高 HMouldHeight、 折叠高度 HMouldFoldHeight、周转容器标记HTransPackFlag、发货容器标记HSendPackFlag
---
WebTM/WebTM.csproj.user | 4
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 188 ++++++++++++++++++++++++++++++++++------------
WebTM/layuiadmin/Scripts/webConfig.js | 3
3 files changed, 142 insertions(+), 53 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..ed38634 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a1995cc..29b1562 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,8 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
// var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 7400c03..3429d3e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -134,6 +134,46 @@
</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="HMouldLength" id="HMouldLength">
+ </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="HMouldWidth" id="HMouldWidth">
+ </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="HMouldHeight" id="HMouldHeight">
+ </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="HMouldFoldHeight" id="HMouldFoldHeight">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 90px;">
+ <input type="checkbox" name="checkboxHTransPackFlag" id="checkboxHTransPackFlag" lay-skin="primary" lay-filter="checkboxHTransPackFlag" checked title="鏄惁鍛ㄨ浆瀹瑰櫒鏍囪">
+ <input type="hidden" value="true" name="HTransPackFlag" id="HTransPackFlag" lay-verify="HTransPackFlag">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 150px;">
+ <input type="checkbox" name="checkboxHSendPackFlag" id="checkboxHSendPackFlag" lay-skin="primary" lay-filter="checkboxHSendPackFlag" checked title="鏄惁鍙戣揣瀹瑰櫒鏍囪">
+ <input type="hidden" value="true" name="HSendPackFlag" id="HSendPackFlag" lay-verify="HSendPackFlag">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" readonly>
@@ -367,7 +407,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">涓嬫淇濆吇/鏍℃鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="date" class="layui-input" lay-verify="HNextMainDate" name="HNextMainDate" id="HNextMainDate">
+ <input type="date" class="layui-input" lay-verify="HNextMainDate" name="HNextMainDate" id="HNextMainDate">
</div>
</div>
<div class="layui-inline" style="margin-left:10px;">
@@ -710,7 +750,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID , 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1074,6 +1114,15 @@
}
});
+ });
+
+ //鏄惁榛樿鍛ㄨ浆瀹瑰櫒鏍囪
+ form.on('checkbox(checkboxHTransPackFlag)', function (data) {
+ $("#HTransPackFlag").val(data.elem.checked);
+ });
+ //鏄惁榛樿鍙戣揣瀹瑰櫒鏍囪
+ form.on('checkbox(checkboxHSendPackFlag)', function (data) {
+ $("#HSendPackFlag").val(data.elem.checked);
});
//榛樿浠撲綅缁�
@@ -1728,12 +1777,26 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
$.ajax({
url: GetWEBURL() + "/Gy_Mould_Edit/xg",
- async:false,
+ async: false,
type: "GET",
data: {
"HInterID": linterid
},
success: function (d) {
+ var IsHTransPackFlag = d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪; //鍒ゆ柇瀹瑰櫒鏄惁琚爣璁�
+ if (IsHTransPackFlag == 1) {
+ $("input[name='checkboxHTransPackFlag']").prop("checked", true);
+ }
+ else {
+ $("input[name='checkboxHTransPackFlag']").prop("checked", false);
+ }
+ var IsHSendPackFlag = d.data[0].鍙戣揣瀹瑰櫒鏍囪;
+ if (IsHSendPackFlag == 1) {
+ $("input[name='checkboxHSendPackFlag']").prop("checked", true);
+ }
+ else {
+ $("input[name='checkboxHSendPackFlag']").prop("checked", false);
+ }
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
var tableSub = d.data;
$("#HInterID").val(d.data[0].hmainid);
@@ -1765,6 +1828,15 @@
$("#HSaveLife").val(d.data[0].瀹夊叏瀵垮懡);
$("#HWHID").val(d.data[0].HWhID);
$("#HWHName").val(d.data[0].榛樿浠撳簱);
+ $("#HMouldLength").val(d.data[0].闀�);
+ $("#HMouldWidth").val(d.data[0].瀹�);
+ $("#HMouldHeight").val(d.data[0].楂�);
+ $("#HMouldFoldHeight").val(d.data[0].鎶樺彔楂樺害);
+ $("#checkboxHTransPackFlag").prop("checked", d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1); // 璁剧疆鍛ㄨ浆瀹瑰櫒鏍囪
+ $("#HTransPackFlag").val(d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1 ? "true" : "false");
+ $("#checkboxHSendPackFlag").prop("checked", d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1); // 璁剧疆鍙戣揣瀹瑰櫒鏍囪
+ $("#HSendPackFlag").val(d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1 ? "true" : "false";
+ layui.form.render('checkbox'); // 鏇存柊Layui鐨勬樉绀虹姸鎬侊紝鍔ㄦ�佹樉绀哄閫夋鐨勭姸鎬�
//$("#HRoutingID").val(d.data[0].HRoutingID);
//$("#HBomID").val(d.data[0].HBomID);
$("#HVersion").val(d.data[0].鐗堟湰);
@@ -2289,6 +2361,22 @@
layer.msg("鍣ㄥ叿瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (!/^[1-9]\d*$/.test($("#HMouldLength").val())) {
+ layer.msg("闀匡細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
+ if (!/^[1-9]\d*$/.test($("#HMouldWidth").val())) {
+ layer.msg("瀹� 锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
+ if (!/^[1-9]\d*$/.test($("#HMouldHeight").val())) {
+ layer.msg("楂橈細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
+ if (!/^[1-9]\d*$/.test($("#HMouldFoldHeight").val())) {
+ layer.msg("鎶樺彔楂樺害锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+ return Result = false;
+ }
if ($("#HMouleTypeID").val() == '' || $("#HMouleTypeID").val() == null) {
layer.msg("鍣ㄥ叿鍒嗙被涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -2326,63 +2414,63 @@
return Result = false;
}
return Result;
- }
+ }
- function GetGyMaterial(obj) { //鐗╂枡
- $("#HName").val(obj.鐗╂枡鍚嶇О);
- $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
- $("#HMaterID").val(obj.HItemID);
- }
+ function GetGyMaterial(obj) { //鐗╂枡
+ $("#HName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterID").val(obj.HItemID);
+ }
- function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
- $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
- $("#HMouleTypeID").val(obj[0].HItemID);
- }
+ function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
+ $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
+ $("#HMouleTypeID").val(obj[0].HItemID);
+ }
- function GetUnitValue(obj) { //璁￠噺鍗曚綅
- $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
- $("#HUnitID").val(obj[0].HItemID);
- }
+ function GetUnitValue(obj) { //璁￠噺鍗曚綅
+ $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HUnitID").val(obj[0].HItemID);
+ }
- function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
- $("#HDeptID").val(obj[0].HItemID);
- $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
- }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ }
- function GetHSupNameValue(obj) { //杩斿洖渚涘簲鍟�
- $("#HSupID").val(obj[0].HItemID);//渚涘簲鍟唅d
- $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
- }
+ function GetHSupNameValue(obj) { //杩斿洖渚涘簲鍟�
+ $("#HSupID").val(obj[0].HItemID);//渚涘簲鍟唅d
+ $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
+ }
- function GetHWHValue(obj) { //浠撳簱
- $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HWHID").val(obj[0].HItemID);
- }
+ function GetHWHValue(obj) { //浠撳簱
+ $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(obj[0].HItemID);
+ }
- function GetGyStockPlace(obj) { //浠撲綅
- $("#HSPName").val(obj.浠撲綅鍚嶇О);
- $("#HSPID").val(obj.HMainID);
- }
+ function GetGyStockPlace(obj) { //浠撲綅
+ $("#HSPName").val(obj.浠撲綅鍚嶇О);
+ $("#HSPID").val(obj.HMainID);
+ }
- function GetMouldMaintainRuleValue(obj) { //淇濆吇瑙勭▼
- $("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
- $("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
- OptionData = obj[0];
- }
+ function GetMouldMaintainRuleValue(obj) { //淇濆吇瑙勭▼
+ $("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
+ $("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
+ OptionData = obj[0];
+ }
- function GetHAccSupNameValue(obj) { //杩斿洖鍒堕�犲巶鍟�
- $("#HMadeSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
- $("#HMadeSupID").val(obj[0].HItemID);
- }
- //瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
- function GetMouldFileValue(obj) {
- OptionData = obj[0];
+ function GetHAccSupNameValue(obj) { //杩斿洖鍒堕�犲巶鍟�
+ $("#HMadeSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+ $("#HMadeSupID").val(obj[0].HItemID);
+ }
+ //瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
+ function GetMouldFileValue(obj) {
+ OptionData = obj[0];
- HDataEmp = obj[0];
- }
- function GetMouldDotCheckRuleValue(obj) {
- OptionData = obj[0];
- }
+ HDataEmp = obj[0];
+ }
+ function GetMouldDotCheckRuleValue(obj) {
+ OptionData = obj[0];
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1