Quellcode durchsuchen

企业缴费流水

guomengjiao vor 2 Wochen
Ursprung
Commit
b58d956662

+ 5 - 1
renren-admin/src/main/resources/mapper/qyh/EnterpriseDao.xml

@@ -93,9 +93,13 @@
             <if test="params.licenseNo != null and params.licenseNo != ''">
                 AND qe.`license_no` LIKE CONCAT('%',#{params.licenseNo},'%')
             </if>
-            <if test="params.startTime != null and params.endTime != null">
+            <if test="params.startTime != null and params.startTime != ''">
                 <![CDATA[
                     AND qo.pay_time >= #{params.startTime}
+                ]]>
+            </if>
+            <if test="params.endTime != null and params.endTime != ''">
+                <![CDATA[
                     AND qo.pay_time <= #{params.endTime}
                 ]]>
             </if>

+ 4 - 9
renren-admin/src/main/resources/statics/js/modules/qyh/enterpriseOrder.js

@@ -68,16 +68,12 @@ function initdate(){
 var vm = new Vue({
 	el:'#rrapp',
 	data:{
-		showList: true,
 		title: null,
-        wjxyEnterprise: {
-		    state: ''
-        },
         queryParam: {
             enterpriseName:'',
             licenseNo:'',
-            startTime: '',
-            endTime: ''
+            startTime: null,
+            endTime: null
         },
         gender: [],
         state: '',
@@ -87,8 +83,8 @@ var vm = new Vue({
         init: function () {
             vm.queryParam.enterpriseName = ''
             vm.queryParam.licenseNo = ''
-            vm.queryParam.startTime = ''
-            vm.queryParam.endTime = ''
+            vm.queryParam.startTime = null
+            vm.queryParam.endTime = null
         },
 		query: function () {
 			vm.reload(1);
@@ -98,7 +94,6 @@ var vm = new Vue({
             vm.reload(1);
         },
 		reload: function (event) {
-			vm.showList = true;
             var page;
             if (event == 1){
                 page = 1;

+ 3 - 4
renren-admin/src/main/resources/templates/modules/qyh/enterpriseOrder.html

@@ -6,8 +6,7 @@
 </head>
 <body>
 <div id="rrapp" v-cloak>
-    <div v-show="showList">
-
+    <div>
         <div class="grid-btn">
             <div class="form-group col-sm-12 div-Gay">
                 <input type="text" style="display: inline-block" class="form-control" v-model="queryParam.licenseNo" @keyup.enter="query" placeholder="营业执照号">
@@ -16,9 +15,9 @@
                        readonly placeholder="起始时间" />
                 <input type="text" class="form-control layui-input" id="endTime" v-model="queryParam.endTime"
                        readonly placeholder="终止时间" />
-                <a class="btn btn-query" @click="query"><i class="fa fa-search"></i>&nbsp;查询</a>
-                <a class="btn btn-success" @click="reset"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
             </div>
+            <a class="btn btn-query" @click="query"><i class="fa fa-search"></i>&nbsp;查询</a>
+            <a class="btn btn-success" @click="reset"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
         </div>
         <table id="jqGrid"></table>
         <div id="jqGridPager"></div>