From 410a9fcefa3cfb249a1a27fdaf5d7454c8ce9fc7 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 01 九月 2021 15:20:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 14 ++++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 90bdcbc..933dd80 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,11 +5,11 @@
//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://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
- //var WEBURL = "http://localhost/API/";
+ var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 7909c4f..f7e47f0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -135,7 +135,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HSourceID" id="HSourceID" value="0">
@@ -145,7 +145,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇鐝粍</label>
+ <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇鐝粍</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HGroupName" id="HGroupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HGroupID" id="HGroupID" value="0">
@@ -157,7 +157,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">妫�楠屽憳</label>
+ <label class="layui-form-label"><span style="color:red;">*</span>妫�楠屽憳</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HCheckManName" id="HCheckManName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HCheckManID" id="HCheckManID" value="0">
@@ -575,13 +575,15 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val() },
- success: function (data1) {
- if (data1.count == 1) {
+ data: { "HInterID": $("#HInterID").val(), "HChecker": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 6 });
} else {
layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 7 });
}
}, error: function () {
layer.close(ajaxLoad);
--
Gitblit v1.9.1