From 6b8a9aef84d4d4ba8dd08b911ade7cfa6cc4fa4a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 26 一月 2024 16:51:07 +0800
Subject: [PATCH] 周总结
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 67 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index ed3d4d7..e1d35b8 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -62,14 +62,16 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ <div style="display:none;">
+ <div class="layui-inline" >
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
</div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding: 0 5px;">閲嶆柊鍚屾</button>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
-
+
<div class="layui-colla-content">
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
@@ -377,6 +379,7 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125, sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
, { field: '鐘舵��', title: '鐘舵��', width: 125, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: '鏄惁涓嬫帹鐢熶骇璁㈠崟', title: '鏄惁涓嬫帹鐢熶骇璁㈠崟', width: 125, sort: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
@@ -558,6 +561,8 @@
if (HMangerID) {
sWhere += " and 涓荤 like '%" + HMangerID + "%'";
}
+
+ sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -742,7 +747,8 @@
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "宸插鏍�") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
@@ -778,7 +784,8 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "鍒涘缓") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'鍒涘缓'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
@@ -816,7 +823,8 @@
if (checkStatus.data.length === 1) {
if (data[0].鐘舵�� != "宸插鏍�") {
- layer.alert("涓嬫帹澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ var err = "涓嬫帹澶辫触!鍘熷洜锛氬綋鍓嶅崟鎹姸鎬佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
@@ -854,6 +862,7 @@
if (data.length > 0) {
var dataArray = [];
var HCusName = data[0].瀹㈡埛;
+ var HEmpName = data[0].涓氬姟鍛�;
for (var i = 0; i < data.length; i++) {
var temp = {
"hmainid": data[i].hmainid
@@ -863,11 +872,22 @@
}
dataArray.push(temp);
if (data[i].鐘舵�� != "宸插鏍�") {
- layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ layer.alert(err, { icon: 5 });
return;
}
+
+ if (data[i].琛岀姸鎬� == "宸插叧闂�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ return;
+ }
+
if (data[i].瀹㈡埛 != HCusName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ return;
+ }
+ if (data[i].涓氬姟鍛� != HEmpName) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓涓氬姟鍛�!");
return;
}
}
@@ -1219,6 +1239,33 @@
}
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ }
+ return addSWhere;
+ }
+ //#endregion
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1