xtywms.git - Gitblit

parent: 3cc2632f | 补丁 | 提交 | ignore whitespace

18516761980

2022-07-26 2ef92e67e6d0ea80cf893b8d4938f27549192513

2个文件已修改

	src/main/webapp/static/js/salesOrder/salsesOrder.js	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/salesOrder/salesOrder.html	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/webapp/static/js/salesOrder/salsesOrder.js

@@ -17,10 +17,16 @@
        , {field: 'inQty', align: 'center', title: '入库数量', width: 110}
        , {field: 'disQty', align: 'center', title: '通知单', width: 110}
        , {field: 'outQty', align: 'center', title: '出库数量', width: 110}
        , {field: 'invoiceQty', align: 'center', title: '开票数量'}
        , {field: 'unInvoiceQty', align: 'center', title: '未开票数量'}
        , {field: 'deliveryDate', align: 'center', title: '交货日期'}
        , {field: 'personName', align: 'center', title: '业务员'}
        , {field: 'invoiceQty', align: 'center', title: '开票数量', width: 110}
        , {field: 'unInvoiceQty', align: 'center', title: '未开票数量', width: 110}
        , {field: 'deliveryDate', align: 'center', title: '交货日期', width: 110}
        , {field: 'personName', align: 'center', title: '业务员', width: 110}
        , {field: 'outDate', align: 'center', title: '出库日期', width: 110}
        , {field: 'outPrice', align: 'center', title: '出库单价', width: 110}
        , {field: 'outAmount', align: 'center', title: '出库金额', width: 110}
        , {field: 'invoiceDate', align: 'center', title: '开票日期', width: 110}
        , {field: 'invoiceAmount', align: 'center', title: '开票金额', width: 110}
        , {field: 'custName', align: 'center', title: '客户名称', width: 110}
    );
    return cols;
}
@@ -88,10 +94,26 @@

    // 时间选择器
    layDate.render({
        elem: '.layui-laydate-range'
        elem: '#orderTimeRange'
        ,style: 'width: 150px'
        , range: true
    });
    layDate.render({
        elem: '#orderTimeDeliveryRange'
        ,style: 'width: 150px'
        , range: true
    });
    layDate.render({
        elem: '#orderTimeOutRange'
        ,style: 'width: 150px'
        , range: true
    });

    // layDate.render({
    //     elem: '.layui-laydate-range'
    //     ,style: 'width: 150px'
    //     , range: true
    // });
});

/* 表格数据重载 */
@@ -103,6 +125,14 @@
            searchData.startTime = this.value.substring(0, 10);
            searchData.endTime = this.value.substring(13, this.value.length);
        }
        if (this.name == 'orderTimeDelivery') {
            searchData.startTimeDelivery = this.value.substring(0, 10);
            searchData.endTimeDelivery = this.value.substring(13, this.value.length);
        }
        if (this.name == 'orderTimeOut') {
            searchData.startTimeOut = this.value.substring(0, 10);
            searchData.endTimeOut = this.value.substring(13, this.value.length);
        }
    });
    (child ? parent.tableIns : tableIns).reload({
        where: searchData,

 src/main/webapp/views/salesOrder/salesOrder.html

@@ -10,6 +10,11 @@
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/css/print.css" media="all">
<!--    <style>-->
<!--        .layui-table-body.layui-table-main {-->
<!--            overflow: scroll;-->
<!--        }-->
<!--    </style>-->
</head>
<style>
    #search-box {
@@ -37,7 +42,7 @@
        width: 300px;
    }
    .layui-table-body.layui-table-main{
        overflow: auto;
        overflow: scroll;
    }
</style>
<body>
@@ -72,17 +77,31 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                <input class="layui-input" type="text" name="custName" placeholder="客户" autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline">-->
<!--            <div class="layui-input-inline">-->
<!--                <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->

        <!-- 日期范围 -->
        <div class="layui-inline" style="width: 300px">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" name="orderTime" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                <input class="layui-input layui-laydate-range" id="orderTimeRange" name="orderTime" type="text" placeholder="订单日期" autocomplete="off" style="width: 300px">
            </div>
        </div>

        <div class="layui-inline" style="width: 300px">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" id="orderTimeDeliveryRange" name="orderTimeDelivery" type="text" placeholder="交货日期" autocomplete="off" style="width: 300px">
            </div>
        </div>
        <div class="layui-inline" style="width: 300px">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" id="orderTimeOutRange" name="orderTimeOut" type="text" placeholder="出库日期" autocomplete="off" style="width: 300px">
            </div>
        </div>
        <!--<div class="layui-inline" style="width: 150px">-->
            <!--<select id="orderState" name="orderState">-->
                <!--<option value="">订单状态</option>-->
@@ -102,7 +121,7 @@
    </div>

    <!-- 表格 -->
    <div class="layui-form">
    <div class="layui-form" style="width: 100%">
        <table class="layui-hide" id="salesOrder" lay-filter="salesOrder"></table>
    </div>

			@@ -17,10 +17,16 @@
			, {field: 'inQty', align: 'center', title: '入库数量', width: 110}
			, {field: 'disQty', align: 'center', title: '通知单', width: 110}
			, {field: 'outQty', align: 'center', title: '出库数量', width: 110}
			, {field: 'invoiceQty', align: 'center', title: '开票数量'}
			, {field: 'unInvoiceQty', align: 'center', title: '未开票数量'}
			, {field: 'deliveryDate', align: 'center', title: '交货日期'}
			, {field: 'personName', align: 'center', title: '业务员'}
			, {field: 'invoiceQty', align: 'center', title: '开票数量', width: 110}
			, {field: 'unInvoiceQty', align: 'center', title: '未开票数量', width: 110}
			, {field: 'deliveryDate', align: 'center', title: '交货日期', width: 110}
			, {field: 'personName', align: 'center', title: '业务员', width: 110}
			, {field: 'outDate', align: 'center', title: '出库日期', width: 110}
			, {field: 'outPrice', align: 'center', title: '出库单价', width: 110}
			, {field: 'outAmount', align: 'center', title: '出库金额', width: 110}
			, {field: 'invoiceDate', align: 'center', title: '开票日期', width: 110}
			, {field: 'invoiceAmount', align: 'center', title: '开票金额', width: 110}
			, {field: 'custName', align: 'center', title: '客户名称', width: 110}
			);
			return cols;
			}
			@@ -88,10 +94,26 @@

			// 时间选择器
			layDate.render({
			elem: '.layui-laydate-range'
			elem: '#orderTimeRange'
			,style: 'width: 150px'
			, range: true
			});
			layDate.render({
			elem: '#orderTimeDeliveryRange'
			,style: 'width: 150px'
			, range: true
			});
			layDate.render({
			elem: '#orderTimeOutRange'
			,style: 'width: 150px'
			, range: true
			});

			// layDate.render({
			// elem: '.layui-laydate-range'
			// ,style: 'width: 150px'
			// , range: true
			// });
			});

			/* 表格数据重载 */
			@@ -103,6 +125,14 @@
			searchData.startTime = this.value.substring(0, 10);
			searchData.endTime = this.value.substring(13, this.value.length);
			}
			if (this.name == 'orderTimeDelivery') {
			searchData.startTimeDelivery = this.value.substring(0, 10);
			searchData.endTimeDelivery = this.value.substring(13, this.value.length);
			}
			if (this.name == 'orderTimeOut') {
			searchData.startTimeOut = this.value.substring(0, 10);
			searchData.endTimeOut = this.value.substring(13, this.value.length);
			}
			});
			(child ? parent.tableIns : tableIns).reload({
			where: searchData,

			@@ -10,6 +10,11 @@
			<link rel="stylesheet" href="../../static/css/cool.css" media="all">
			<link rel="stylesheet" href="../../static/css/common.css" media="all">
			<link rel="stylesheet" href="../../static/css/print.css" media="all">
			<!-- <style>-->
			<!-- .layui-table-body.layui-table-main {-->
			<!-- overflow: scroll;-->
			<!-- }-->
			<!-- </style>-->
			</head>
			<style>
			#search-box {
			@@ -37,7 +42,7 @@
			width: 300px;
			}
			.layui-table-body.layui-table-main{
			overflow: auto;
			overflow: scroll;
			}
			</style>
			<body>
			@@ -72,17 +77,31 @@
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
			<input class="layui-input" type="text" name="custName" placeholder="客户" autocomplete="off">
			</div>
			</div>
			<!-- <div class="layui-inline">-->
			<!-- <div class="layui-input-inline">-->
			<!-- <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
			<!-- </div>-->
			<!-- </div>-->

			<!-- 日期范围 -->
			<div class="layui-inline" style="width: 300px">
			<div class="layui-input-inline">
			<input class="layui-input layui-laydate-range" name="orderTime" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
			<input class="layui-input layui-laydate-range" id="orderTimeRange" name="orderTime" type="text" placeholder="订单日期" autocomplete="off" style="width: 300px">
			</div>
			</div>

			<div class="layui-inline" style="width: 300px">
			<div class="layui-input-inline">
			<input class="layui-input layui-laydate-range" id="orderTimeDeliveryRange" name="orderTimeDelivery" type="text" placeholder="交货日期" autocomplete="off" style="width: 300px">
			</div>
			</div>
			<div class="layui-inline" style="width: 300px">
			<div class="layui-input-inline">
			<input class="layui-input layui-laydate-range" id="orderTimeOutRange" name="orderTimeOut" type="text" placeholder="出库日期" autocomplete="off" style="width: 300px">
			</div>
			</div>
			<!--<div class="layui-inline" style="width: 150px">-->
			<!--<select id="orderState" name="orderState">-->
			<!--<option value="">订单状态</option>-->
			@@ -102,7 +121,7 @@
			</div>

			<!-- 表格 -->
			<div class="layui-form">
			<div class="layui-form" style="width: 100%">
			<table class="layui-hide" id="salesOrder" lay-filter="salesOrder"></table>
			</div>