整车业务表显示中国车、作业订单查询优化、收费明细查询优化

sp-admin/sa-view/tb-business/tb-business-list.html

@@ -58,6 +58,7 @@
 					<sa-td name="客户名称" width="150" prop="customerName"></sa-td>
 					<sa-td name="业务单号" prop="no" width="160"></sa-td>
 					<sa-td name="境外车牌号" width="130" prop="cardNo"></sa-td>
+					<sa-td name="中国车牌号" width="130" prop="chinaCarNo"></sa-td>
 					<sa-td name="载重(kg)" prop="netWeight"></sa-td>
 					<sa-td name="确认" prop="adminConfirmInput" type="enum" :jv="{1: '已确认', 0: '未确认'}"></sa-td>
 					<sa-td name="总用费(元)" prop="totalMoney"></sa-td>

sp-admin/sa-view/tb-fee-statistics/tb-fee-details-list.html

@@ -38,7 +38,14 @@
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<div class="c-item">
-						<sa-item type="text" name="车牌号" v-model="p.carNo"></sa-item>
+						<label class="c-label">类型：</label>
+						<el-select v-model="p.type" placeholder="请选择" filterable>
+							<el-option label="停车费" value="4"></el-option>
+							<el-option label="业务费" value="1,2,3,5,6,7"></el-option>
+						</el-select>
+					</div>
+					<sa-item type="text" name="车牌号" v-model="p.carNo"></sa-item>
+					<div class="c-item">
 						<label class="c-label">收费项目：</label>
 						<el-select v-model="p.feeType" placeholder="请选择" filterable>
 							<el-option label="核酸检测" value="1"></el-option>
@@ -212,7 +219,8 @@
 						createTime: '',		// 创建时间 
 						pageNo: 1,		// 当前页 
 						pageSize: 10,	// 页大小
-						sortType: 11		// 排序方式
+						sortType: 11,		// 排序方式
+						type: ''
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合

sp-admin/sa-view/tb-fee-statistics/tb-fee-statistics-list.html

@@ -20,8 +20,13 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-<!--					<sa-item type="enum" name="收费类型" v-model="p.feeType" -->
-<!--						:jv="{1: '核酸检测', 3: '装卸作业', 4: '停车费', 5: '过磅费'}" jtype="2" def="不限"></sa-item>-->
+					<div class="c-item">
+						<label class="c-label">类型：</label>
+						<el-select v-model="p.type" placeholder="请选择" filterable>
+							<el-option label="停车费" value="4"></el-option>
+							<el-option label="业务费" value="1,2,3,5,6,7"></el-option>
+						</el-select>
+					</div>
 					<div class="c-item">
 						<label class="c-label">收费项目：</label>
 						<el-select v-model="p.feeType" placeholder="请选择" filterable>

sp-admin/sa-view/tb-partner/tb-business-item-list.html

@@ -21,13 +21,25 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
+					<div class="c-item">
+						<label class="c-label">业务类型：</label>
+						<el-select v-model="p.businessType">
+							<el-option label="其他业务" value="1"></el-option>
+							<el-option label="整车业务" value="2"></el-option>
+						</el-select>
+					</div>
 					<sa-item type="text" name="项目名称" v-model="p.itemName"></sa-item>
+					<sa-item type="text" name="越南车" v-model="p.cardNo"></sa-item>
+					<sa-item type="text" name="中国车" v-model="p.chinaCarNo"></sa-item>
+					<sa-item type="text" name="货物" v-model="p.goodsName"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
-					<el-button style="display: inline;" type="info" icon="el-icon-refresh" @click="sa.f5()">重置
-					</el-button>
+					<el-button style="display: inline;" type="info" icon="el-icon-refresh" @click="sa.f5()">刷新</el-button>
+					<br>
+
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
 				<div class="fast-btn">
+
 					<el-button type="warning" icon="el-icon-download" @click="exportFn()">导出</el-button>
 					<slot></slot>
 				</div>
@@ -95,7 +107,11 @@
 				data: {
 					p: { // 查询参数  
 						id: '', // 主键 
-						itemName: '', // 项目名称 
+						itemName: '', // 项目名称
+						cardNo: '',
+						chinaCarNo: '',
+						businessType: '',
+						goodsName: '',
 						pageNo: 1, // 当前页 
 						pageSize: 10, // 页大小 
 						sortType: 10 // 排序方式

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemMapper.xml

@@ -55,7 +55,7 @@
 	
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultType="com.pj.project.tb_business_item.TbBusinessItem">
-		select a.*,b.goods_name,b.card_no,b.china_car_no
+		select a.*,b.goods_name,b.card_no,b.china_car_no,b.business_type
 		from tb_business_item a,tb_business b where a.business_id=b.id
 			<if test=' this.has("id") '> and a.id = #{id} </if>
 			<if test=' this.has("businessId") '> and a.business_id = #{businessId} </if>
@@ -71,6 +71,10 @@
                  and date_format(a.create_time,'%Y-%m-%d') >= #{beginTime}
                  and date_format(a.create_time,'%Y-%m-%d')  &lt;= #{endTime}
             </if>
+        <if test=' this.has("cardNo") '> and b.card_no like concat('%',#{cardNo},'%') </if>
+        <if test=' this.has("chinaCarNo") '> and b.china_car_no like concat('%',#{chinaCarNo},'%') </if>
+        <if test=' this.has("businessType") '> and b.business_type = #{businessType} </if>
+        <if test=' this.has("goodsName") '> and b.goods_name like concat('%',#{goodsName},'%') </if>
 		order by
 		<choose>
 			<when test='sortType == 1'> a.id desc </when>

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsMapper.xml

@@ -88,6 +88,7 @@
                 and pay_day >= #{beginTime}
                 and pay_day  <= #{endTime}
             </if>
+            <if test=' this.has("type")'> and fee_type in (${type}) </if>
 		</where>
 		order by
 		<choose>

sp-server/src/main/java/com/pj/project/tb_fee_statistics/TbFeeStatisticsMapper.xml

@@ -86,6 +86,7 @@
                 and day_time >= #{beginDay}
                 and day_time  <= #{endDay}
             </if>
+            <if test=' this.has("type")'> and fee_type in (${type}) </if>
 		</where>
 		order by
 		<choose>