From 0d4c424ddf9101128e6e4cf606bf9004cf179a36 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 16 八月 2022 18:46:03 +0800
Subject: [PATCH] 维护
---
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 10 +++++-----
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 2 +-
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
WebTM/views/index.html | 8 ++++----
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 3 +++
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 4 +++-
6 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ced9ad9..d75e26b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,10 +7,10 @@
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
- var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
+ //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e90c419..c757a5f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -573,7 +573,7 @@
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。缁存姢</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">鍣ㄥ叿淇濆吇瑙勭▼鍗�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">鍣ㄥ叿淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
- <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻</a></dd>
+ <!--<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻</a></dd>-->
</dl>
</dd>
<dd>
@@ -646,7 +646,7 @@
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">鐗╂枡鏀跺彂鏄庣粏鍙婃眹鎬�</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">搴撳瓨鍙拌处</a></dd>
- <dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻琛�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">鐩樼偣璁板綍琛�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd>
@@ -668,7 +668,7 @@
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">璁惧鐐规瑙勭▼鍗曠淮鎶�</a></dd>
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">璁惧淇濆吇瑙勭▼鍗�</a></dd>
<dd><a lay-href="璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">璁惧淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
- <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileBillResume.html">璁惧灞ュ巻</a></dd>
+ <!--<dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileBillResume.html">璁惧灞ュ巻</a></dd>-->
</dl>
</dd>
<dd>
@@ -700,7 +700,7 @@
<dd>
<a>璁惧鎶ヨ〃</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">璁惧灞ュ巻琛╪</a></dd>
+ <dd><a lay-href="璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileBillResume.html">璁惧灞ュ巻琛�</a></dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index f9082f6..7765167 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -285,7 +285,7 @@
{ field: 'ColumnName', title: '鍒楀悕', width: 100 }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
- , { field: 'ColumnWidth', title: '鍒楀', width: 100, templet: '#ColumnWidth', edit: 'text' }
+ , { field: 'ColumnWidth', title: '鍒楀', width: 100,edit: 'text' }
]]
};
}
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/Sc_Add_MouldMaintainBillList.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/Sc_Add_MouldMaintainBillList.html"
index 375887c..ba25ded 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/Sc_Add_MouldMaintainBillList.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/Sc_Add_MouldMaintainBillList.html"
@@ -412,6 +412,9 @@
table.render(option);
table.render(option2);
+ $("#HMouldMaintainRuleInterID").val(BYData[0].HInterID);
+ $("#HMouldMaintainRuleInterNo").val(BYData[0].HBillNo);
+
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 3bf26e7..493d465 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -270,10 +270,10 @@
if (result.count == 1) {
var BYData = result;//
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
$("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
- $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo)
+ $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo);
if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
@@ -281,7 +281,7 @@
var checkrow = {
"HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
"HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
- "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+ "HManagerName": BYData.data[i].HManagerName
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -345,7 +345,7 @@
if (result.count == 1) {
var BYData = result;//
var rowdate1 = layui.table.cache["mainTable"];
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
@@ -355,7 +355,7 @@
var checkrow = {
"HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
"HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
- "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+ "HManagerName": BYData.data[i].HManagerName
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index a7e8687..9227e57 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -272,6 +272,7 @@
set_GridDelete1(obj); //琛屽唴鍒犻櫎
set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
});
+
//琛ㄥご淇℃伅璁惧寮圭獥
form.on('submit(ProductModulList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -323,7 +324,8 @@
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
-
+ $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
+ $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
--
Gitblit v1.9.1