From 9da23a4b968effeb281bf24217a94c9491465efe Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 22 一月 2024 12:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
index 3fc7fae..f24480b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
@@ -166,16 +166,6 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">閿�鍞富绠�</label>
- <div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鐗规壒绫诲瀷</label>
<div class="layui-input-inline">
<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
@@ -365,6 +355,18 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞富绠�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -518,7 +520,7 @@
var HSourceBillData = getSourceBillStatus_SeOrderChangeBill(); //鑾峰彇婧愬崟鏁版嵁
} else {
HSourceBillData = "none";
- layer.alert("淇濆瓨澶辫触!璇锋簮鍗曠被鍨嬩笉涓洪攢鍞鍗曟垨閿�鍞嚭搴撳崟!", { icon: 5 });
+ layer.alert("淇濆瓨澶辫触!婧愬崟绫诲瀷涓嶄负閿�鍞鍗曘�侀攢鍞嚭搴撳崟鎴栭攢鍞鍗曞彉鏇村崟!", { icon: 5 });
return;
}
if (HSourceBillData != "none") {
@@ -526,7 +528,8 @@
layer.alert("淇濆瓨澶辫触!鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
return;
} else if (HSourceBillData[0]["鐘舵��"] != "鍒涘缓") {
- layer.alert("淇濆瓨澶辫触!婧愬崟鍗曟嵁鐘舵�佹湭涓�'鍒涘缓'鐘舵��!", { icon: 5 });
+ var err = "淇濆瓨澶辫触!鍘熷洜锛氭簮鍗曞崟鎹姸鎬佷负鈥�" + HSourceBillData[0]["鐘舵��"] + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+ layer.alert(err, { icon: 5 });
return;
}
} else {
--
Gitblit v1.9.1