From 1245bf79b7b56a13b9368af14eccdb91cf8e2b1e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 19 十一月 2024 10:04:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBill.html | 2
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html | 40 +++++++++++++++++++-
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2 +
WebTM/layuiadmin/Scripts/webConfig.js | 8 ++--
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 8 ++-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 3 +
WebTM/views/车间管理/报表分析/Sc_PlanAchievementRateReport.html | 2
7 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f58049f..cf381c1 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,12 +5,12 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
/*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/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
-/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index ec3f0fc..bc597b1 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -605,9 +605,11 @@
if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
}
- if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
- table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
- }
+ if ("HPinfan" in table.cache["mainTable"][i]) {
+ if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ }
}
var sSubStr = JSON.stringify(table.cache['mainTable']);
HMaterInfo = table.cache['mainTable'];
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
index 5cc50ff..487357a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBill.html"
@@ -727,7 +727,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
//, page: true
- //, limit: 500
+ , limit: 50
//, limits: [50, 500, 5000, 50000]
, totalRow: true
, cellMinWidth: 120
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
index 70b76f6..1291efd 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
@@ -60,6 +60,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGetOAData" id="btnGetOAData" style="padding:0 5px">閽夐拤鍚屾</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -472,10 +473,10 @@
}
}
}
- table.render(option);
+ ins=table.render(option);
} else {
- table.render(option);
+ ins=table.render(option);
}
//鍒锋柊鎸夐挳鏄剧ず
@@ -836,6 +837,41 @@
//#endregion
+ //#region 鍚屾閽夐拤鏁版嵁
+ form.on('submit(btnGetOAData)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ get_OAData();
+ });
+
+ //閲嶇疆杩囨护鏉′欢
+ function get_OAData() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/DD_DataSynchronization/DataSynchronization_DingDing_OA",
+ async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "startTime": $("#HBeginDate").val(), "endTime": $("#HEndDate").val(), "user": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(ajaxLoad);
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.close(ajaxLoad);
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+ }
+ });
+ }
+
+ //#endregion
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index a3435e7..2372bd9 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -793,6 +793,7 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
}
});
}
@@ -1981,6 +1982,7 @@
$("#hmakers").val(sessionStorage["HUserName"]);
$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
//璁剧疆hinterid
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 78ce1ec..194b1c7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -886,7 +886,8 @@
sWhere += " and 鍗曟嵁绫诲瀷 like ''%" + HOrderProcNO + "%''";
}
if (HMaterName) {
- sWhere += "and 鐗╂枡鍚嶇О like ''%" + HMaterName + "%''";
+ //sWhere += "and 鐗╂枡鍚嶇О like ''%" + HMaterName + "%''";
+ sWhere += "and REPLACE(鐗╂枡鍚嶇О, CHAR(10), '''') like ''%" + HMaterName + "%''";
}
if (HMaterNumber) {
sWhere += "and 鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%''";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
index 9e0f8cc..f68d195 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_PlanAchievementRateReport.html"
@@ -429,7 +429,7 @@
//璁＄畻骞冲潎鍊�
var data = $(".layui-table-total div:eq(9)").html();
var trArr = $(".layui-table-body.layui-table-main tr").length * 100;
- content = (data / trArr * 100).toFixed(2);
+ content = ($(".layui-table-total div:eq(8)").html() / $(".layui-table-total div:eq(9)").html() * 100).toFixed(2);
divHtml.html(content);
}
});
--
Gitblit v1.9.1