Merge branch 'feature/relation_type_item' of http://47.101.143.145:8090/77975466/pco into feature/relation_type_item

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

@@ -49,16 +49,16 @@
 								<el-option v-for="item in colorList" :label="item.carNoColor" :value="item.carNoColor"> </el-option>
 							</el-select>
 						</div>
-						<div class="c-item">
-							<label class="c-label">联系人：</label>
-							<el-input v-model="m.driverName" placeholder="联系人" readonly>
-							</el-input>
-						</div>
-						<div class="c-item">
-							<label class="c-label">联系号码：</label>
-							<el-input v-model="m.driverPhone" placeholder="联系人号码" readonly>
-							</el-input>
-						</div>
+<!--						<div class="c-item">-->
+<!--							<label class="c-label">联系人：</label>-->
+<!--							<el-input v-model="m.driverName" placeholder="联系人" readonly>-->
+<!--							</el-input>-->
+<!--						</div>-->
+<!--						<div class="c-item">-->
+<!--							<label class="c-label">联系号码：</label>-->
+<!--							<el-input v-model="m.driverPhone" placeholder="联系人号码" readonly>-->
+<!--							</el-input>-->
+<!--						</div>-->
 						<div class="c-item">
 							<label class="c-label">入场时间：</label>
 							<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="m.realInTime"></el-date-picker>
@@ -69,7 +69,7 @@
 							<label class="c-label">离场时间：</label>
 							<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="m.realOutTime"></el-date-picker>
 						</div>
-						<sa-item v-if="(id>0&&m.businessId!=null&&m.isLock==0&&m.pay==1) || (id>0&&m.businessId==null)" type="img" name="出场图片" v-model="m.outImage" br></sa-item>
+						<sa-item type="img" name="出场图片" v-model="m.outImage" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -119,11 +119,11 @@
 						// 表单校验 
 						let m = this.m;
 						sa.checkNull(m.carNo, '请输入 [车牌号]');
-						let phone = m.driverPhone;
-						if (phone && !sa.isPhone(phone)) {
-							sa.error('联系号码不正确')
-							return;
-						}
+						// let phone = m.driverPhone;
+						// if (phone && !sa.isPhone(phone)) {
+						// 	sa.error('联系号码不正确')
+						// 	return;
+						// }
 
 						// 开始增加或修改
 						if (this.id <= 0) { // 添加

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

@@ -107,14 +107,14 @@
 		</choose>
 	</select>
 	<select id="getFeeTypeStatics" resultType="com.pj.project.tb_fee_details.statics.FeeTypeStatics">
-		SELECT SUM(item_price*num) as price,SUM(num) as total,fee_type
+		SELECT SUM(item_price) as price,SUM(num) as total,fee_type
 		FROM tb_fee_details
 		where DATE_FORMAT(pay_day,'%Y-%m-%d') &gt;= #{startDay}
 		 and DATE_FORMAT(pay_day,'%Y-%m-%d') &lt;= #{endDay}
 		 GROUP BY fee_type order by price;
 	</select>
 	<select id="itemTypeStatics" resultType="com.pj.project.tb_fee_details.statics.FeeTypeStatics">
-			SELECT SUM(item_price*num) as price,SUM(num) as total,item_type_name as name
+			SELECT SUM(item_price) as price,SUM(num) as total,item_type_name as name
 		FROM tb_fee_details
 		where DATE_FORMAT(pay_day,'%Y-%m-%d') &gt;= #{startDay}
 		 and DATE_FORMAT(pay_day,'%Y-%m-%d') &lt;= #{endDay}