Merge remote-tracking branch 'origin/dev' into dev

app/pages/business-entering/business-detail.vue

@@ -68,21 +68,21 @@
 				业务项
 			</view>
 			<view class="item" v-for="item in form.items" :key="item.id">
-				<view class="l" style="flex: 6;">{{item.itemTypeName}}：</view>
+				<view class="l" style="flex: 7;">{{item.itemTypeName}}：</view>
 				<view class="r">
 					{{item.itemName}}({{item.itemPrice}}x{{item.num}}={{item.total}}元)
 				</view>
 			</view>
 			
 			<view class="item" >
-				<view class="l" style="flex: 6;">境外车停车费：</view>
+				<view class="l" style="flex: 7;">境外车停车费：</view>
 				<view class="r">
 					{{form.partMoney}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">中国车停车费：</view>
+				<view class="l" style="flex: 7;">中国车停车费：</view>
 				<view class="r">
 					{{form.chinaPartMoney}}
 					<text>(元)</text>

app/pages/business-order/createOrder.vue

@@ -21,13 +21,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">境外车入场：</view>
+				<view class="l" style="flex: 7;">境外车入场：</view>
 				<view class="r">
 					{{form.realInTime}}
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;"><text style="color: red;">*</text>境外车预计离场：</view>
+				<view class="l" style="flex: 7;"><text style="color: red;">*</text>境外车预计离场：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="离场时间" :start="new Date().getTime()" type="datetime" @change="jwCaroTimeChange"
 						v-model="form.outDayTime" />
@@ -41,13 +41,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">中国车入场：</view>
+				<view class="l" style="flex: 7;">中国车入场：</view>
 				<view class="r">
 					{{form.chinaCarInTime}}
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;"><text style="color: red;">*</text>中国车预计离场：</view>
+				<view class="l" style="flex: 7;"><text style="color: red;">*</text>中国车预计离场：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="离场时间" :start="new Date().getTime()" type="datetime" @change="chinaCaroTimeChange"
 						v-model="form.chinaCarOutTime" />

app/pages/business-order/sureIn.vue

@@ -8,13 +8,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;"><text style="color: red;">*</text>境外车入场时间：</view>
+				<view class="l" style="flex: 7;"><text style="color: red;">*</text>境外车入场时间：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="入场时间" type="datetime" v-model="form.realInTime" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;"><text style="color: red;">*</text>中国车入场时间：</view>
+				<view class="l" style="flex: 7;"><text style="color: red;">*</text>中国车入场时间：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="入场时间" type="datetime" v-model="form.chinaCarInTime" />
 				</view>

app/pages/business-order/sureOrder.vue

@@ -11,34 +11,34 @@
 				业务项
 			</view>
 			<view class="item" v-for="item in form.items" :key="item.id">
-				<view class="l" style="flex: 6;">{{item.itemTypeName}}：</view>
+				<view class="l" style="flex: 7;">{{item.itemTypeName}}：</view>
 				<view class="r">
 					{{item.itemName}}({{item.itemPrice}}x{{item.num}}={{item.total}}元)
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">业务费：</view>
+				<view class="l" style="flex: 7;">业务费：</view>
 				<view class="r">
 					{{form.itemPrice}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item" >
-				<view class="l" style="flex: 6;">境外车停车费：</view>
+				<view class="l" style="flex: 7;">境外车停车费：</view>
 				<view class="r">
 					{{form.partMoney}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">中国车停车费：</view>
+				<view class="l" style="flex: 7;">中国车停车费：</view>
 				<view class="r">
 					{{form.chinaPartMoney}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">合计费用：</view>
+				<view class="l" style="flex: 7;">合计费用：</view>
 				<view class="r">
 					{{form.totalMoney}}元
 				</view>

app/pages/business-order/sureOut.vue

@@ -14,14 +14,14 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;"><text style="color: red;">*</text>境外车离场：</view>
+				<view class="l" style="flex: 7;"><text style="color: red;">*</text>境外车离场：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="离场时间" :start="new Date().getTime()" type="datetime" 
 						v-model="form.outDayTime" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;"><text style="color: red;">*</text>中国车离场：</view>
+				<view class="l" style="flex: 7;"><text style="color: red;">*</text>中国车离场：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="离场时间" :start="new Date().getTime()" type="datetime"
 						v-model="form.chinaCarOutTime" />

app/pages/declare/add.vue

@@ -125,13 +125,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">代理商电话：</view>
+				<view class="l" style="flex: 7;">代理商电话：</view>
 				<view class="r">
 					<u-input placeholder="代理商电话" @input="handler()" v-model="form.agentPhone" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">运输车车牌：</view>
+				<view class="l" style="flex: 7;">运输车车牌：</view>
 				<view class="r">
 					<u-input placeholder="运输车车牌" @input="handler()" v-model="form.chinaCarNo" />
 				</view>
@@ -143,13 +143,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">海关报关单据：</view>
+				<view class="l" style="flex: 7;">海关报关单据：</view>
 				<view class="r">
 					<u-input placeholder="海关报关单据" @input="handler()" v-model="form.customProof" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">检验检疫证：</view>
+				<view class="l" style="flex: 7;">检验检疫证：</view>
 				<view class="r">
 					<u-input placeholder="检验检疫证" @input="handler()" v-model="form.quarantineProof" />
 				</view>

app/pages/disinfect/addDisinfect.vue

@@ -5,26 +5,20 @@
 				<text class="title">消毒申报单录入</text>
 			</view>
 			<view class="item">
-				<view class="l"><text style="color: red;">*</text>申报人：</view>
-				<view class="r">
-					<u-input placeholder="申报人" @input="handler()" v-model="form.declarePeople">
-					</u-input>
-				</view>
-			</view>
-			<view class="item">
-				<view class="l"><text style="color: red;">*</text>申报电话：</view>
+				<view class="l"  style="flex: 7;">发货人名称：</view>
 				<view class="r">
-					<u-input type="number" placeholder="申报电话" @input="handler()" v-model="form.declarePhone">
+					<u-input placeholder="发货人名称" @input="handler()" v-model="form.sendPeople">
 					</u-input>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">申报单位：</view>
+				<view class="l"  style="flex: 7;">收货人名称：</view>
 				<view class="r">
-					<u-input placeholder="申报单位" @input="handler()" v-model="form.applyUnit">
+					<u-input placeholder="收货人名称" @input="handler()" v-model="form.receivePeople">
 					</u-input>
 				</view>
 			</view>
+		
 
 			<view class="item">
 				<view class="l"><text style="color: red;">*</text>品名：</view>
@@ -34,14 +28,6 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l"><text style="color: red;">*</text>重量：</view>
-				<view class="r">
-					<u-input type="number" placeholder="输入毛重" @input="handler()" v-model="form.grossWeight">
-						<text slot="suffix">吨</text>
-					</u-input>
-				</view>
-			</view>
-			<view class="item">
 				<view class="l">数量：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入数量" @input="handler()" v-model="form.num">
@@ -49,26 +35,22 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">产地：</view>
-				<view class="r">
-					<u-input placeholder="输入产地" @input="handler()" v-model="form.origin">
-					</u-input>
-				</view>
-			</view>
-			<view class="item">
-				<view class="l"  style="flex: 6;">发货人名称：</view>
+				<view class="l"><text style="color: red;">*</text>重量：</view>
 				<view class="r">
-					<u-input placeholder="发货人名称" @input="handler()" v-model="form.sendPeople">
+					<u-input type="number" placeholder="输入毛重" @input="handler()" v-model="form.grossWeight">
+						<text slot="suffix">吨</text>
 					</u-input>
 				</view>
 			</view>
+			
 			<view class="item">
-				<view class="l"  style="flex: 6;">收货人名称：</view>
+				<view class="l">产地：</view>
 				<view class="r">
-					<u-input placeholder="收货人名称" @input="handler()" v-model="form.receivePeople">
+					<u-input placeholder="输入产地" @input="handler()" v-model="form.origin">
 					</u-input>
 				</view>
 			</view>
+		
 			<view class="item">
 				<view class="l">规格：</view>
 				<view class="r">
@@ -122,7 +104,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">国内运输工具：</view>
+				<view class="l" style="flex: 7;">国内运输工具：</view>
 				<view class="r">
 					<u-input placeholder="国内运输工具" @input="handler()" v-model="form.chinaCarName" />
 				</view>
@@ -134,7 +116,28 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">其他要求：</view>
+				<view class="l"><text style="color: red;">*</text>申报人：</view>
+				<view class="r">
+					<u-input placeholder="申报人" @input="handler()" v-model="form.declarePeople">
+					</u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="l"><text style="color: red;">*</text>申报电话：</view>
+				<view class="r">
+					<u-input type="number" placeholder="申报电话" @input="handler()" v-model="form.declarePhone">
+					</u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">申报单位：</view>
+				<view class="r">
+					<u-input placeholder="申报单位" @input="handler()" v-model="form.applyUnit">
+					</u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="l" style="flex: 7;">其他要求：</view>
 				<view class="r">
 					<u--textarea @input="handler()" v-model="form.remark" placeholder="其他要求及备注">
 					</u--textarea>

app/pages/wx/payOrder.vue

@@ -11,34 +11,34 @@
 				业务项
 			</view>
 			<view class="item" v-for="item in form.items" :key="item.id">
-				<view class="l" style="flex: 6;">{{item.itemTypeName}}：</view>
+				<view class="l" style="flex: 7;">{{item.itemTypeName}}：</view>
 				<view class="r">
 					{{item.itemName}}({{item.itemPrice}}x{{item.num}}={{item.total}}元)
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">业务费：</view>
+				<view class="l" style="flex: 7;">业务费：</view>
 				<view class="r">
 					{{form.itemPrice}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">境外车停车费：</view>
+				<view class="l" style="flex: 7;">境外车停车费：</view>
 				<view class="r">
 					{{form.partMoney}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">中国车停车费：</view>
+				<view class="l" style="flex: 7;">中国车停车费：</view>
 				<view class="r">
 					{{form.chinaPartMoney}}
 					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">合计费用：</view>
+				<view class="l" style="flex: 7;">合计费用：</view>
 				<view class="r">
 					{{form.totalMoney}}元
 				</view>

sp-admin/index.html

@@ -61,7 +61,7 @@
 		<!-- js本地库 -->
 		<script src="sa-frame/index/admin-util.js"></script>
 		<script src="sa-frame/index/index.js"></script>
-		<script src="sa-frame/menu-list.js"></script>
+		<script src="sa-frame/menu-list.js?v=32432764"></script>
 		<script src="sa-frame/menu-list-sp.js"></script>
 		<script src="static/sa.js"></script>
 		<script src="sa-frame/sa-code.js"></script>

sp-admin/sa-view-sp/sp-role/menu-list.html

@@ -40,7 +40,7 @@
 				<br><br><br>
 			</div>
 		</div>
-		<script src="../../sa-frame/menu-list.js"></script>
+		<script src="../../sa-frame/menu-list.js?v=1257632"></script>
 		<script src="../../sa-frame/menu-list-sp.js"></script>
 		<script src="../../sa-frame/index/admin-util.js"></script>
         <script>

sp-admin/sa-view-sp/sp-role/menu-setup.html

@@ -58,7 +58,7 @@
 				<el-button @click="sa.closeCurrIframe()">取消</el-button>
 			</div>
 		</div>
-		<script src="../../sa-frame/menu-list.js"></script> 
+		<script src="../../sa-frame/menu-list.js?v=232167483"></script> 
 		<script src="../../sa-frame/menu-list-sp.js"></script> 
 		<script src="../../sa-frame/index/admin-util.js"></script>
         <script>

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

@@ -19,7 +19,7 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<div class="fast-btn">
-					<el-button size="mini" type="primary"  @click="add()">
+					<el-button size="mini" type="primary"  @click="add()" v-if="payStatus==1">
 						新增</el-button>
 						<el-button size="mini" type="info" @click="sa.f5()">刷新</el-button>
 				</div>
@@ -72,6 +72,7 @@
 				},
 				el: '.vue-box',
 				data: {
+					payStatus:sa.p('payStatus',1),
 					p: { // 查询参数  
 						id: '', //  
 						businessId: sa.p('id', ''), //  

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

@@ -67,15 +67,6 @@
 											</el-select>
 										</div>
 										<div class="c-item">
-											<label class="c-label">申报单：</label>
-											<el-input v-model="m.declareNo" placeholder="选择申报单">
-												<div slot="suffix" style="cursor: pointer;color: blue;"
-													@click="handlerDeclare">
-													<i class="el-icon-folder-add"></i>
-												</div>
-											</el-input>
-										</div>
-										<div class="c-item">
 											<label class="c-label"><span style="color: red;">*</span>运输货品：</label>
 											<el-select v-model="m.goodsName" placeholder="请选择" @change="goodsChange">
 												<el-option v-for="item in goodsList" :key="item.id" :label="item.name"
@@ -85,15 +76,9 @@
 										</div>
 										<sa-item type="num" name="载重(吨)" placeholder="请输入车辆载重" v-model="m.netWeight" br>
 										</sa-item>
-										<!-- <sa-item type="text" name="境外车牌号" placeholder="请输入境外车牌号" v-model="m.cardNo" br>
-										</sa-item> -->
-										<div class="c-item">
-											<label class="c-label"><span style="color: red;">*</span>境外车牌号：</label>
-											<el-autocomplete v-model="m.cardNo" placeholder="请输入境外车牌号"
-												@select="handleSelectCar" value-key='carNo'
-												:fetch-suggestions="queryCarAsync">
-											</el-autocomplete>
-										</div>
+										<sa-item type="text" name="境外车牌号" placeholder="请输入境外车牌号" v-model="m.cardNo" br>
+										</sa-item>
+										</sa-item>
 										<div class="c-item">
 											<label class="c-label"><span style="color: red;">*</span>境外车规格：</label>
 											<el-autocomplete v-model="m.cardSize" placeholder="请输入车规格"
@@ -236,17 +221,10 @@
 			<el-dialog title="添加中国车" :visible.sync="car.visible" width="300">
 				<span>
 					<el-form label-position="left">
-						<!-- <div class="c-item">
+						<div class="c-item">
 							<label class="c-label"><span style="color: red;">*</span>车牌号：</label>
 							<el-input v-model="car.form.carNo" placeholder="车牌号">
 							</el-input>
-						</div> -->
-						<div class="c-item">
-							<label class="c-label"><span style="color: red;">*</span>车牌号：</label>
-							<el-autocomplete v-model="car.form.carNo" placeholder="请输入车牌号"
-								@select="handleSelectChinaCar" value-key='carNo'
-								:fetch-suggestions="queryChinaCarAsync">
-							</el-autocomplete>
 						</div>
 						<div class="c-item">
 							<label class="c-label"><span style="color: red;">*</span>车辆规格：</label>
@@ -270,48 +248,6 @@
 					<el-button type="primary" @click="confirmAddCar">确 定</el-button>
 				</span>
 			</el-dialog>
-			<el-dialog title="申报单" :visible.sync="declare.visible" width="90%">
-				<div class="delect-search">
-					申报人：
-					<el-input style="width: 140px;" v-model="declare.p.delcarePeople" placeholder="申报人">
-					</el-input>
-					<el-button type="primary" @click="getDeclareList">搜索</el-button>
-					<el-button type="info" @click="resetDclare">重置</el-button>
-				</div>
-				<el-card class="box-card" style="margin-top: 20px;">
-					<div slot="header">
-						<span>列表</span>
-					</div>
-					<el-table :data="declare.list" ref="declareTable">
-						<el-table-column type="selection">
-						</el-table-column>
-						<el-table-column prop="declarePeople" label="申报人">
-						</el-table-column>
-						<el-table-column prop="declarePhone" label="申报电话">
-						</el-table-column>
-						<el-table-column prop="declareNo" width="180" label="申报单号">
-						</el-table-column>
-						<el-table-column prop="goodsName" label="产品学名">
-						</el-table-column>
-						<el-table-column prop="carNo" label="越南车牌">
-						</el-table-column>
-						<el-table-column prop="grossWeight" label="毛重(吨)">
-						</el-table-column>
-						<el-table-column prop="createTime" width="140" label="申报时间">
-						</el-table-column>
-					</el-table>
-					<div class="block">
-						<el-pagination layout="prev, pager, next" @current-change="getDeclareList"
-							:page-size="declare.p.pageSize" :total="declare.p.dataCount"
-							:current-page="declare.p.pageNo">
-						</el-pagination>
-					</div>
-				</el-card>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="declare.visible = false">取 消</el-button>
-					<el-button type="primary" @click="confirmSelectDeclare">确 定</el-button>
-				</span>
-			</el-dialog>
 		</div>
 		<script>
 			var app = new Vue({
@@ -341,7 +277,7 @@
 					}, // 实体对象 
 					checkItem: '',
 					customerList: [],
-					carList: [],
+					cardList: [],
 					driverList: [],
 					currentCustomerId: 1,
 					itemTypeList: [],
@@ -382,18 +318,6 @@
 							driverPhone: '',
 							carSize: ''
 						}
-					},
-					declare: {
-						visible: false,
-						list: [],
-						declareNo: '',
-						p: {
-							pageNo: 1,
-							pageSize: 8,
-							dataCount: 0,
-							delcarePeople: '',
-							production: ''
-						}
 					}
 				},
 				computed: {
@@ -416,83 +340,27 @@
 					}
 				},
 				methods: {
-					resetDclare() {
-						this.declare.p = {
-							pageNo: 1,
-							pageSize: 8,
-							declarePeople: '',
-							production: ''
-						}
-						this.getDeclareList();
-					},
-					handlerDeclare() {
-						this.declare.visible = true;
-						this.getDeclareList();
-					},
-					getDeclareList() {
-						sa.ajax('/TbDeclare/getNotBindList', sa.removeNull(this.declare.p), function(resp) {
-							let list = resp.data;
-							this.declare.list = list;
-							this.declare.p.pageNo = resp.pageNo;
-							this.declare.p.dataCount = resp.dataCount;
-							list.forEach(row => {
-								if (row.declareNo == this.m.declareNo) {
-									this.$refs.declareTable.toggleRowSelection(row, true)
-								}
-							})
-						}.bind(this))
-					},
-					confirmSelectDeclare() {
-						// 获取选中元素的id列表
-						let selection = this.$refs['declareTable'].selection;
-						let declareNo = sa.getArrayField(selection, 'declareNo');
-						if (selection.length == 0) {
-							return sa.msg('请至少选择一条数据')
-						}
-						if (selection.length > 1) {
-							return sa.msg('只能选择一条数据')
-						}
-
-						let declare = selection[0];
-						if (this.m.declareNo !== declare.declareNo) {
-							this.m.declareNo = declare.declareNo;
-							this.m.cardNo = declare.carNo;
-							this.m.chinaCarNo = declare.chinaCarNo;
-							this.m.netWeight = declare.grossWeight;
-							let chinaCarNo = declare.chinaCarNo;
-							if (chinaCarNo) {
-								let list = [];
-								chinaCarNo.replace("，", ",").split(",").forEach(carNo => {
-									let obj = {
-										carNo: carNo
-									}
-									list.push(obj);
-									this.china.list = list;
-								})
-							}
-						}
-						this.declare.visible = false;
-					},
-					findInAndNoBusinessCar() {
-						sa.ajax('/TbBusinessCar/findInAndNoBusinessCar', function(resp) {
-							this.carList = resp.data;
+					findInAndNoBusinessCar(){
+						sa.ajax('/TbBusinessCar/findInAndNoBusinessCar',function(resp){
+							this.carList=resp.data;
 						}.bind(this))
 					},
-					handleSelectCar(data) {
-						this.m.cardNo = data.carNo;
+					handleSelectCar(data){
+						this.m.cardNo=data.carNo;
+						this.m.cardSize=data.carSize;
 					},
-					queryCarAsync(queryStr, cb) {
+					queryCarAsync(queryStr,cb){
 						let list = this.carList;
 						let filterList = list.filter(obj => obj.carNo.indexOf(queryStr) !== -1);
 						cb(filterList)
 					},
-					handleSelectChinaCar(data) {
-						this.car.form.carNo = data.carNo;
+					handleSelectChinaCar(data){
+						this.car.form.carNo=data.carNo;
+						this.car.form.cardSize=data.carSize;
 					},
-					queryChinaCarAsync(queryStr, cb) {
+					queryChinaCarAsync(queryStr,cb){
 						let list = this.carList;
-						let filterList = list.filter(obj => obj.carNo.indexOf(queryStr) !== -1 && obj.carNo !== this.m
-							.cardNo);
+						let filterList = list.filter(obj => obj.carNo.indexOf(queryStr) !== -1&&obj.carNo!==this.m.cardNo);
 						cb(filterList)
 					},
 					cleanItem(type) {
@@ -670,7 +538,7 @@
 							sa.ajax('/TbBusiness/getById?id=' + this.id, function(res) {
 								let m = res.data;
 								let items = m.items;
-								this.china.list = m.cars.filter(obj => obj.carNo !== m.cardNo);
+								this.china.list = m.cars.filter(obj=>obj.carNo!==m.cardNo);
 								let hsItem = items.filter(obj => obj.itemTypeName.indexOf('人') !== -1 &&
 									obj.itemTypeName.indexOf('核酸') !== -1);
 								if (hsItem.length > 0) {
@@ -740,7 +608,7 @@
 						}
 						sa.checkNull(m.goodsName, '请选择运输货物');
 						sa.checkNull(m.cardNo, '请输入 [车牌号]');
-						if (!!m.cardSize || !sa.isNum(m.cardSize)) {
+						if (!m.cardSize||!sa.isNum(m.cardSize)) {
 							sa.error('车辆规格只能输入数字')
 							return;
 						}
@@ -818,7 +686,6 @@
 					this.getItemTypeList();
 					this.getGoods();
 					this.getUnitList();
-					this.findInAndNoBusinessCar();
 				},
 				beforeDestroy() {
 					parent.app.f5();

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

@@ -269,7 +269,7 @@
 				},
 				methods: {
 					carFn(data) {
-						sa.showIframe('车辆管理', '../car/tb-business-car-list.html?id=' + data.id, '1050px', '95%');
+						sa.showIframe('车辆管理', '../car/tb-business-car-list.html?id=' + data.id+'&payStatus='+data.payStatus, '1050px', '95%');
 					},
 					blurFn() {
 						console.log(123)

sp-admin/static/sa.js

@@ -22,7 +22,7 @@ var sa = {
 		api_url: 'https://dxkaa1.bgigc.com/pro',
 		web_url: 'http://www.baidu.com'
 	}
-	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境
+	sa.cfg = cfg_prod; // 最终环境 , 上线前请选择正确的环境
 })();
 
 

sp-server/src/main/java/com/pj/api/wx/WxService.java

@@ -84,8 +84,8 @@ public class WxService {
         params.put("body", "支付中心-业务订单支付");
         params.put("out_trade_no", out_trade_no+"_"+System.currentTimeMillis()/1000);
         params.put("attach", JSONUtil.toJsonStr(atchMap));
-        String total_free = Integer.parseInt(money) * 100 + "";
-//        String total_free = "1";
+//        String total_free = Integer.parseInt(money) * 100 + "";
+        String total_free = "1";
         log.info("pay free:{}", total_free);
         params.put("total_fee", total_free);
         // params.put("total_fee", "1");

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -60,6 +60,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -69,6 +70,7 @@ import javax.annotation.Resource;
  * @author qzy
  */
 @Service
+@Transactional
 public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness> implements IService<TbBusiness> {
     private final List<String> CAR_LIST = StrUtil.splitTrim("浙,粤,京,津,冀,晋,蒙,辽,黑,沪,吉,苏,皖,赣,鲁,豫,鄂,湘,桂,琼,渝,川,贵,云,藏, 陕, 甘, 青, 宁", ",");
 

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

@@ -40,7 +40,7 @@ public class TbBusinessCarController {
 	@RequestMapping("delete")
 	@SaCheckPermission(TbBusiness.PERMISSION_CODE)
 	public AjaxJson delete(String id) {
-		tbBusinessCarService.removeById(id);
+		tbBusinessCarService.deleteCar(id);
 		return AjaxJson.getSuccess();
 	}
 

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

@@ -8,15 +8,18 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pj.current.config.PartConfig;
 import com.pj.project.tb_business.TbBusiness;
 import com.pj.project.tb_business.TbBusinessService;
 import com.pj.project.tb_business_item.TbBusinessItem;
 import com.pj.project.tb_business_item.TbBusinessItemService;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -26,6 +29,7 @@ import javax.annotation.Resource;
  * @author qzy
  */
 @Service
+@Transactional
 public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBusinessCar> implements IService<TbBusinessCar> {
 
     /**
@@ -33,6 +37,11 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
      */
     @Autowired
     TbBusinessCarMapper tbBusinessCarMapper;
+    @Resource
+    @Lazy
+    private TbBusinessService tbBusinessService;
+    @Resource
+    PartConfig partConfig;
 
 
     /**
@@ -55,6 +64,7 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
                 .isNull("real_out_time");
         return getOne(ew);
     }
+
     public List<TbBusinessCar> findInAndNoBusinessCar() {
         QueryWrapper<TbBusinessCar> ew = new QueryWrapper<>();
         ew.isNotNull("real_in_time")
@@ -75,10 +85,9 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
     }
 
 
-
     public List<TbBusinessCar> searchPartCar(String carNo) {
         QueryWrapper<TbBusinessCar> ew = new QueryWrapper<>();
-        ew.like("car_no", carNo.toUpperCase()).and(j->j.eq("pay", "0").or(i->i.isNull("real_out_time").isNotNull("real_in_time")));
+        ew.like("car_no", carNo.toUpperCase()).and(j -> j.eq("pay", "0").or(i -> i.isNull("real_out_time").isNotNull("real_in_time")));
         return list(ew);
     }
 
@@ -97,23 +106,31 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
         return getOne(ew);
     }
 
-    public TbBusinessCar check(String carNo){
+    public TbBusinessCar check(String carNo) {
         QueryWrapper<TbBusinessCar> ew = new QueryWrapper<>();
         ew.eq("car_no", carNo.toUpperCase())
-                .and(i->i.isNull("real_in_time").or().isNull("real_out_time"));
+                .and(i -> i.isNull("real_in_time").or().isNull("real_out_time"));
         return getOne(ew);
     }
 
-    public void add(TbBusinessCar t) throws Exception{
-        String carNo=t.getCarNo();
-        TbBusinessCar db=  this.check(carNo);
-        if (db!=null){
+    public void add(TbBusinessCar t) throws Exception {
+        String carNo = t.getCarNo();
+        TbBusinessCar db = this.check(carNo);
+        String businessId = t.getBusinessId();
+        if (db != null) {
             throw new Exception("该车有未完成业务");
         }
-        TbBusinessCar businessCar=  this.findByBusinessIdAndCarNo(t.getBusinessId(),carNo);
-        if (businessCar!=null){
+        TbBusinessCar businessCar = this.findByBusinessIdAndCarNo(businessId, carNo);
+        if (businessCar != null) {
             throw new Exception("车辆已存在");
         }
+        TbBusiness tbBusiness = tbBusinessService.getById(businessId);
+        if (tbBusiness!=null){
+            tbBusiness.setChinaPartMoney(tbBusiness.getChinaPartMoney().add(partConfig.getBasePrice()));
+            tbBusinessService.updateById(tbBusiness);
+        }
+
+
         this.save(t);
     }
 
@@ -121,12 +138,13 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
         this.updateById(t);
     }
 
-    public void adminIn(String businessId, String carNo, Date realInTime){
+    public void adminIn(String businessId, String carNo, Date realInTime) {
         TbBusinessCar car = this.findByBusinessIdAndCarNo(businessId, carNo);
         car.setRealInTime(realInTime);
         this.updateById(car);
     }
-    public void adminOut(String businessId, String carNo, Date realOutTime){
+
+    public void adminOut(String businessId, String carNo, Date realOutTime) {
         TbBusinessCar car = this.findByBusinessIdAndCarNo(businessId, carNo);
         car.setRealOutTime(realOutTime);
         this.updateById(car);
@@ -139,4 +157,14 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
                 .isNotNull("real_in_time").eq("pay", "0");
         return getOne(ew);
     }
+
+    public void deleteCar(String id) {
+        TbBusinessCar db=this.getById(id);
+        this.removeById(id);
+        TbBusiness tbBusiness = tbBusinessService.getById(db.getBusinessId());
+        if (tbBusiness!=null){
+            tbBusiness.setChinaPartMoney(tbBusiness.getChinaPartMoney().subtract(partConfig.getBasePrice()));
+            tbBusinessService.updateById(tbBusiness);
+        }
+    }
 }

sp-server/src/main/java/com/pj/project/tb_business_people/TbBusinessPeopleService.java

@@ -10,12 +10,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: tb_business_people -- 核酸检测人员
  * @author qzy 
  */
 @Service
+@Transactional
 public class TbBusinessPeopleService extends ServiceImpl<TbBusinessPeopleMapper,TbBusinessPeople>  implements IService<TbBusinessPeople> {
 
 	/** 底层 Mapper 对象 */

sp-server/src/main/java/com/pj/project/tb_car/TbCarService.java

@@ -10,12 +10,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: tb_car -- 
  * @author qzy 
  */
 @Service
+@Transactional
 public class TbCarService extends ServiceImpl<TbCarMapper,TbCar>implements IService<TbCar> {
 
 	/** 底层 Mapper 对象 */

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerService.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -34,6 +35,7 @@ import javax.annotation.Resource;
  * @author qzy
  */
 @Service
+@Transactional
 public class TbCostomerService extends ServiceImpl<TbCostomerMapper, TbCostomer> implements IService<TbCostomer> {
 
     /**

sp-server/src/main/java/com/pj/project/tb_declare/TbDeclareService.java

@@ -10,12 +10,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: tb_declare -- 
  * @author lzm 
  */
 @Service
+@Transactional
 public class TbDeclareService extends ServiceImpl<TbDeclareMapper, TbDeclare> implements IService<TbDeclare> {
 
 	/** 底层 Mapper 对象 */

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectService.java

@@ -11,12 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.pj.utils.sg.*;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service: tb_disinfect -- 消毒申请单
  * @author qzy 
  */
 @Service
+@Transactional
 public class TbDisinfectService extends ServiceImpl<TbDisinfectMapper, TbDisinfect> implements IService<TbDisinfect>  {
 
 	/** 底层 Mapper 对象 */