From d054d104a5abb43cb3209cceb2c574b84df6393e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 03 八月 2023 10:18:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 119 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 97 insertions(+), 22 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 38741a9..73fa400 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"
@@ -17,6 +17,8 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -67,29 +69,52 @@
</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-inline">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <label class="layui-form-label">瀹㈡埛</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HCusID" id="HCusID" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓荤</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMangerID" id="HMangerID" style="width:190px;">
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HCusID" id="HCusID" style="width:190px;">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">涓荤</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HMangerID" id="HMangerID" style="width:190px;">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
</div>
@@ -121,7 +146,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -131,6 +156,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
@@ -240,6 +266,9 @@
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
]]
+ , done: function () {
+ soulTable.render(this);
+ }
};
}
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -254,6 +283,10 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -327,8 +360,8 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "Xs_SeOrderBill/DeltetSeOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -379,6 +412,31 @@
var HCusID = $("#HCusID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
@@ -409,15 +467,19 @@
$("#HCusID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
sWhere = "";
}
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
var HBillno2 = $('#HBillno2').val();
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ url: GetWEBURL() + '/Xs_SeOrderBill/Xs_SeOrderBillViewApi',
type: "GET",
- data: { "HBillNo": HBillno2, "HBillType": 1401 },
+ data: { "BillNo": HBillno2, "BillType": 1401 },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -577,6 +639,19 @@
})
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1