Merge remote-tracking branch 'origin/feature/relation_type_item' into feature/relation_type_item

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

@@ -20,12 +20,21 @@
 			<div class="c-panel">
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<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.pay" placeholder="请选择" @change="payChange">-->
+<!--							<el-option label="-全部-" value=""> </el-option>-->
+<!--							<el-option label="未支付" value="0"> </el-option>-->
+<!--							<el-option label="已支付" value="1"> </el-option>-->
+<!--						</el-select>-->
+<!--					</div>-->
 					<div class="c-item">
 						<label class="c-label">支付状态：</label>
-						<el-select v-model="p.pay" placeholder="请选择">
+						<el-select v-model="p.payType" placeholder="请选择">
 							<el-option label="-全部-" value=""> </el-option>
-							<el-option label="未支付" value="0"> </el-option>
-							<el-option label="已支付" value="1"> </el-option>
+							<el-option label="未支付" value="未支付"> </el-option>
+							<el-option label="已支付" value="已支付"> </el-option>
+							<el-option label="免费" value="免费"> </el-option>
 						</el-select>
 					</div>
 					<div class="c-item" style="width: 120px;">
@@ -134,6 +143,7 @@
 						carNo: '', //  
 						leave: '1',
 						pay: '',
+						payType: '',
 						leaveStart: '',
 						leaveEnd: '',
 						pageNo: 1, // 当前页 
@@ -145,7 +155,9 @@
 					colorList: []
 				},
 				methods: {
-					
+					payChange(value) {
+						console.log(e);
+					},
 					getCarColor() {
 						sa.ajax('/TbCarNoColor/getList', {
 							pageNo: 1,

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

@@ -212,7 +212,7 @@
 				</div>
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="emodel.visible = false">取 消</el-button>
-					<el-button type="primary" @click="sureExport">确 定</el-button>
+					<el-button type="primary" @click="">确 定</el-button>
 				</span>
 			</el-dialog>
 		</div>
@@ -392,41 +392,66 @@
 							cancelButtonText: '取消',
 							type: 'warning'
 						}).then(() => {
-
 							sa.showIframe('打印申报信息表', 'detailPrint.html?beginTime='+beginTime+"&endTime="+endTime+"&feeType="+feeType+"&itemTypeName="+itemTypeName , '1000px', '100%');
 						}).catch(() => {
 
 						});
 					},
 					exportFn() {
-						Object.assign(this.emodel, {
-							visible: true,
-						})
-						this.exportTime = [];
-						this.emodel.form.feeType = '';
-						this.emodel.form.itemTypeName = '';
-						this.emodel.form.beginTime = '';
-						this.emodel.form.endTime = '';
-					},
-					sureExport() {
-						if ( this.exportTime != null && this.exportTime.length != 0) {
-							this.emodel.form.beginTime = this.exportTime[0];
-							this.emodel.form.endTime = this.exportTime[1];
+						if ( this.selectTime != null && this.selectTime.length != 0) {
+							this.selectTimeRange.beginTime = this.selectTime[0];
+							this.selectTimeRange.endTime = this.selectTime[1];
 						}
-						if (this.emodel.form.beginTime == '' || this.emodel.form.endTime == '') {
-							sa.msg("请选择日期范围");
-							return;
+
+						var beginTime = this.selectTimeRange.beginTime;
+						var endTime = this.selectTimeRange.endTime;
+						var feeType = this.p.feeType;
+						var itemTypeName = this.p.itemTypeName;
+						var str = '';
+						if(beginTime === '' && endTime === ''){
+							str += '所有时间';
+						}else {
+							str += beginTime + "至" + endTime
+						}
+						if(feeType === ''){
+							str += "、所有收费项目";
+						}else{
+							var feeTypeName = '';
+							if(feeType == 1){
+								feeTypeName = "核酸检测";
+							}else if(feeType == 2){
+								feeTypeName = "消杀作业";
+							}else if(feeType == 3){
+								feeTypeName = "装卸作业";
+							}else if(feeType == 4){
+								feeTypeName = "停车费";
+							}else if(feeType == 5){
+								feeTypeName = "过磅费";
+							}else if(feeType == 6){
+								feeTypeName = "入场管理费";
+							}else if(feeType == 7){
+								feeTypeName = "充电打冷作业";
+							}
+							str += "、收费项目为" + feeTypeName;
 						}
-						const begin = new Date(this.emodel.form.beginTime);
-						const end = new Date(this.emodel.form.endTime);
-						if(end.getTime()-begin.getTime() > 3600 * 1000 * 24 * 31) {
-							sa.msg("日期范围不可超过一个月");
-							return;
+						if(itemTypeName === ''){
+							str += "、所有业务类型";
+						}else{
+							str += "、业务类型为" + itemTypeName;
 						}
-						sa.ajax('/TbFeeDetails/export/details', this.emodel.form,  function(resp) {
-							window.open(resp.data);
-							this.emodel.visible = false;
-						}.bind(this));
+
+						this.$confirm('确定打印'+str+'的数据?', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							sa.ajax('/TbFeeDetails/export/details?beginTime='+this.selectTimeRange.beginTime+'&endTime='+this.selectTimeRange.endTime
+									, sa.removeNull(this.p),  function(resp) {
+								window.open(resp.data);
+							}.bind(this));
+						}).catch(() => {
+
+						});
 					},
 					// 刷新
 					f5: function() {

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarMapper.xml

@@ -50,6 +50,7 @@
             <if test=' this.has("startDay") '>and date_format(time_update,'%Y-%m-%d') &gt;= #{startDay}</if>
             <if test=' this.has("endDay") '>and date_format(time_update,'%Y-%m-%d') &lt;= #{endDay}</if>
             <if test=' this.has("pay") '>and pay = #{pay}</if>
+            <if test=' this.has("payType") '>and pay_type = #{payType}</if>
             <if test='leave==2 '>
               and   real_out_time is not null and real_in_time is not null
             </if>