业务项过滤

app/components/slider-verify/slider-verify.vue

@@ -7,10 +7,10 @@
 				<view class="slider-pintu">
 					<!-- <image id="pintuImg" :src="'../../images/slider-verify/' + img + '.jpg'" class="pintu"></image> -->
 					<!-- <image id="pintuImg" :src="imgSrc" class="pintu"></image> -->
-					<image id="pintuImg" src="../../static/slider-verify/5.jpg" class="pintu"></image>
+					<image id="pintuImg" src="../../static/slider-verify/3.jpg" class="pintu"></image>
 					<view class="pintukuai" :style="{ top: top + 'px', left: oldx + 'px' }">
 						<!-- <image :src="'../../images/slider-verify/' + img + '.jpg'" :style="{ top: '-' + top + 'px', left: '-' + left + 'px'}"></image> -->
-						<image src="../../static/slider-verify/5.jpg" :style="{ top: '-' + top + 'px', left: '-' + left + 'px'}"></image>
+						<image src="../../static/slider-verify/3.jpg" :style="{ top: '-' + top + 'px', left: '-' + left + 'px'}"></image>
 					</view>
 					<view class="yinying" :style="{ top: top + 'px', left: left + 'px' }"></view>
 				</view>

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

@@ -36,7 +36,7 @@
 				<text class="title">业务录入</text>
 			</view>
 			<view class="item" v-show="customerId=='1'">
-				<view class="l">企业名称：</view>
+				<view class="l"><text style="color: red;">*</text>企业名称：</view>
 				<view class="r">
 					<picker v-if="customer.customerList.length>0" class="p-picker" id="qy"
 						@change="bindPickerChange($event)" :value="customer.index" :range="customer.customerList"
@@ -47,7 +47,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">货物：</view>
+				<view class="l"><text style="color: red;">*</text>货物：</view>
 				<view class="r">
 					<picker v-if="goods.goodsList.length>0" class="p-picker" id="hw" @change="whChange($event)"
 						:value="goods.index" :range="goods.goodsList" range-key="name">
@@ -57,7 +57,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">载重：</view>
+				<view class="l"><text style="color: red;">*</text>载重：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入载重" v-model="form.netWeight">
 						<text slot="suffix">吨</text>
@@ -65,13 +65,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">境外车牌：</view>
+				<view class="l"><text style="color: red;">*</text>境外车牌：</view>
 				<view class="r">
 					<u-input placeholder="输入车牌号" v-model="form.cardNo" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">境外车规格：</view>
+				<view class="l"><text style="color: red;">*</text>境外车规格：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入车辆规格" @blur="car.carInput=false" @input="carSizeInput"
 						v-model="form.cardSize">
@@ -81,7 +81,7 @@
 			</view>
 
 			<view class="item">
-				<view class="l">预计入场：</view>
+				<view class="l"><text style="color: red;">*</text>预计入场：</view>
 				<view class="r">
 					<view class="r">
 						<uni-datetime-picker placeholder="请选择" @change="expectDayChange" :clear-icon="false"
@@ -90,19 +90,19 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">中国车牌号：</view>
+				<view class="l"><text style="color: red;">*</text>中国车牌号：</view>
 				<view class="r">
 					<u-input placeholder="中国车牌号" v-model="form.chinaCarNo" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">中国司机：</view>
+				<view class="l"><text style="color: red;">*</text>中国司机：</view>
 				<view class="r">
 					<u-input placeholder="司机姓名" v-model="form.driverName" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系号码：</view>
+				<view class="l"><text style="color: red;">*</text>联系号码：</view>
 				<view class="r">
 					<u-input placeholder="司机联系号码" type="number" v-model="form.driverPhone" />
 				</view>

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

@@ -36,7 +36,7 @@
 				<text class="title">业务录入</text>
 			</view>
 			<view class="item" v-show="customerId=='1'">
-				<view class="l">企业名称：</view>
+				<view class="l"><text style="color: red;">*</text>企业名称：</view>
 				<view class="r">
 					<picker v-if="customer.customerList.length>0" class="p-picker" id="qy"
 						@change="bindPickerChange($event)" :value="customer.index" :range="customer.customerList"
@@ -47,7 +47,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">货物：</view>
+				<view class="l"><text style="color: red;">*</text>货物：</view>
 				<view class="r">
 					<picker v-if="goods.goodsList.length>0" class="p-picker" id="hw" @change="whChange($event)"
 						:value="goods.index" :range="goods.goodsList" range-key="name">
@@ -57,7 +57,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">载重：</view>
+				<view class="l"><text style="color: red;">*</text>载重：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入载重" @input="handler()" v-model="form.netWeight">
 						<text slot="suffix">吨</text>
@@ -65,13 +65,13 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">境外车牌：</view>
+				<view class="l"><text style="color: red;">*</text>境外车牌：</view>
 				<view class="r">
 					<u-input placeholder="输入车牌号" @input="handler()" v-model="form.cardNo" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">境外车规格：</view>
+				<view class="l"><text style="color: red;">*</text>境外车规格：</view>
 				<view class="r">
 					<u-input type="number" placeholder="输入车辆规格" @blur="car.carInput=false" @input="carSizeInput"
 						v-model="form.cardSize">
@@ -81,7 +81,7 @@
 			</view>
 
 			<view class="item">
-				<view class="l">预计入场：</view>
+				<view class="l"><text style="color: red;">*</text>预计入场：</view>
 				<view class="r">
 					<view class="r">
 						<uni-datetime-picker placeholder="请选择" @change="expectDayChange" :clear-icon="false"
@@ -90,19 +90,19 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">中国车牌号：</view>
+				<view class="l"><text style="color: red;">*</text>中国车牌号：</view>
 				<view class="r">
 					<u-input placeholder="中国车牌号" @input="handler()" v-model="form.chinaCarNo" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">中国司机：</view>
+				<view class="l"><text style="color: red;">*</text>中国司机：</view>
 				<view class="r">
 					<u-input placeholder="司机姓名" @input="handler()" v-model="form.driverName" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系号码：</view>
+				<view class="l"><text style="color: red;">*</text>联系号码：</view>
 				<view class="r">
 					<u-input placeholder="司机联系号码" @input="handler()" type="number" v-model="form.driverPhone" />
 				</view>

app/pages/business-order/createOrder.vue

@@ -27,7 +27,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">境外车预计离场：</view>
+				<view class="l" style="flex: 6;"><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" />
@@ -47,7 +47,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">中国车预计离场：</view>
+				<view class="l" style="flex: 6;"><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;">境外车入场时间：</view>
+				<view class="l" style="flex: 6;"><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;">中国车入场时间：</view>
+				<view class="l" style="flex: 6;"><text style="color: red;">*</text>中国车入场时间：</view>
 				<view class="r">
 					<uni-datetime-picker placeholder="入场时间" type="datetime" v-model="form.chinaCarInTime" />
 				</view>

app/pages/business-order/sureOut.vue

@@ -14,14 +14,14 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" style="flex: 6;">境外车离场：</view>
+				<view class="l" style="flex: 6;"><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;">中国车离场：</view>
+				<view class="l" style="flex: 6;"><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/customer-management/customer-info.vue

@@ -5,19 +5,19 @@
 				<text class="title">信息管理</text>
 			</view>
 			<view class="item">
-				<view class="l">企业名称：</view>
+				<view class="l"><text style="color: red;">*</text>企业名称：</view>
 				<view class="r">
 					<u-input v-model="form.name" placeholder="输入企业名称" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系人：</view>
+				<view class="l"><text style="color: red;">*</text>联系人：</view>
 				<view class="r">
 					<u-input v-model="form.dutyPeople" placeholder="输入联系人" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系电话：</view>
+				<view class="l"><text style="color: red;">*</text>联系电话：</view>
 				<view class="r">
 					<u-input maxlength="11" v-model="form.phone" placeholder="输入电话号码" />
 				</view>

app/pages/customer-management/customer-management.vue

@@ -17,11 +17,11 @@
 				</view>
 				<view class="c">
 					<view class="item">
-						<text class="p1">联系人:</text>
+						<text class="p1"><text style="color: red;">*</text>联系人:</text>
 						<text class="p2">{{customerItem.dutyPeople}}</text>
 					</view>
 					<view class="item">
-						<text class="p1">联系电话:</text>
+						<text class="p1"><text style="color: red;">*</text>联系电话:</text>
 						<text class="p2">{{customerItem.phone}}</text>
 					</view>
 					<view class="item">

app/pages/enterprise-reg/enterprise-reg.vue

@@ -5,19 +5,19 @@
 				<text class="title">企业注册</text>
 			</view>
 			<view class="item">
-				<view class="l">企业名称：</view>
+				<view class="l"><text style="color: red;">*</text>企业名称：</view>
 				<view class="r">
 					<u-input v-model="form.name" placeholder="输入企业名称" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系人：</view>
+				<view class="l"><text style="color: red;">*</text>联系人：</view>
 				<view class="r">
 					<u-input v-model="form.dutyPeople" placeholder="输入联系人" />
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系电话：</view>
+				<view class="l"><text style="color: red;">*</text>联系电话：</view>
 				<view class="r">
 					<u-input maxlength="11" v-model="form.phone" placeholder="输入电话号码" />
 				</view>

sp-admin/sa-frame/com/sa-item.vue

@@ -9,17 +9,17 @@
 	</div>
 	<!-- 普通input -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'text' || type == 'link'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
 		<el-input type="text" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 	</div>
 	<!-- 数字input -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'num'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
 		<el-input type="number" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 	</div>
 	<!-- 密码input -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'password'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
 		<el-input type="password" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-input>
 	</div>
 	<!-- 多行文本域 -->
@@ -126,12 +126,12 @@
 	</div>
 	<!-- 日期选择器 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'date'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
 		<el-date-picker type="date" value-format="yyyy-MM-dd" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-date-picker>
 	</div>
 	<!-- 日期时间选择器 -->
 	<div class="c-item" :class="{br: br}" v-else-if="type == 'datetime'">
-		<label class="c-label">{{name}}：</label> 
+		<label class="c-label"><span style="color: red;">*</span>{{name}}：</label> 
 		<el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :value="value" @input="onInput" :placeholder="placeholder" :disabled="disabled"></el-date-picker>
 	</div>
 	<!-- 时间选择器 -->

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

@@ -59,7 +59,7 @@
 									</div>
 									<div>
 										<div class="c-item" v-show="currentCustomerId==1">
-											<label class="c-label">选择客户：</label>
+											<label class="c-label"><span style="color: red;">*</span>选择客户：</label>
 											<el-select v-model="m.customerId" placeholder="请选择" filterable>
 												<el-option v-for="item in customerList" :key="item.id"
 													:label="item.name" :value="item.id">
@@ -67,7 +67,7 @@
 											</el-select>
 										</div>
 										<div class="c-item">
-											<label class="c-label">运输货品：</label>
+											<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"
 													:value="item.name">
@@ -81,7 +81,7 @@
 										</sa-item>
 										</sa-item>
 										<div class="c-item">
-											<label class="c-label">境外车规格：</label>
+											<label class="c-label"><span style="color: red;">*</span>境外车规格：</label>
 											<el-autocomplete v-model="m.cardSize" placeholder="请输入车规格"
 												@select="handleSelectCarSize" value-key='unit'
 												:fetch-suggestions="queryCaSizerAsync">

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

@@ -59,7 +59,7 @@
 									</div>
 									<div>
 										<div class="c-item" v-show="currentCustomerId==1">
-											<label class="c-label">选择客户：</label>
+											<label class="c-label"><span style="color: red;">*</span>选择客户：</label>
 											<el-select v-model="m.customerId" placeholder="请选择" filterable>
 												<el-option v-for="item in customerList" :key="item.id"
 													:label="item.name" :value="item.id">
@@ -67,7 +67,7 @@
 											</el-select>
 										</div>
 										<div class="c-item">
-											<label class="c-label">运输货品：</label>
+											<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"
 													:value="item.name">
@@ -80,7 +80,7 @@
 										</sa-item>
 										</sa-item>
 										<div class="c-item">
-											<label class="c-label">境外车规格：</label>
+											<label class="c-label"><span style="color: red;">*</span>境外车规格：</label>
 											<el-autocomplete v-model="m.cardSize" placeholder="请输入车规格"
 												@select="handleSelectCarSize" value-key='unit'
 												:fetch-suggestions="queryCaSizerAsync">
@@ -110,10 +110,9 @@
 											<label slot="label"><label v-if="needTypeId.indexOf(type.id)!==-1"
 													style="color: red;">*</label>{{type.name}}</label>
 											<el-select v-model="type.itemId" style="width: 120px;" placeholder="请选择">
-												<el-option v-for="item in type.items"
-													v-if="m.netWeight >= item.minWeight && m.netWeight < item.maxWeight
-													&&m.cardSize<=item.carLength&&m.cardSize>=item.minLength"
-													:key="item.id" :label="item.itemName" :value="item.id">
+												<el-option v-for="item in type.items" v-if="m.netWeight >= item.minWeight && m.netWeight < item.maxWeight
+													&&m.cardSize<=item.carLength&&m.cardSize>=item.minLength" :key="item.id" :label="item.itemName"
+													:value="item.id">
 												</el-option>
 											</el-select>
 											<el-input-number style="margin-left: 60px;" class="item-num"
@@ -500,11 +499,12 @@
 					},
 					// 添加/修改 完成后的动作
 					clean: function() {
+						parent.app.f5(); // 刷新父页面列表
 						this.modal.list = [];
 						if (this.id == 0) {
 							this.m = this.createModel();
 						} else {
-							parent.app.f5(); // 刷新父页面列表
+
 							sa.closeCurrIframe(); // 关闭本页 
 						}
 					}
@@ -514,6 +514,10 @@
 					this.getItemTypeList();
 					this.getGoods();
 					this.getUnitList();
+				},
+				beforeDestroy() {
+					console.log(111)
+					parent.app.f5();
 				}
 			})
 		</script>

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

@@ -128,7 +128,7 @@
 					<el-button type="primary" @click="surePayFn">确 定</el-button>
 				</span>
 			</el-dialog>
-			<el-dialog title="确认账单" :visible.sync="confirm.visible" width="30%">
+			<el-dialog title="确认账单" :visible.sync="confirm.visible" width="400px">
 				<div class="confirm-info">
 					<sa-info name="订单号" br>{{confirm.form.no}}</sa-info>
 					<sa-info :name="item.itemTypeName" br v-for="item in confirm.form.items">
@@ -143,14 +143,16 @@
 					<el-button type="primary" @click="sureConfirmFn">确 认</el-button>
 				</span>
 			</el-dialog>
-			<el-dialog title="生成账单" :visible.sync="complete.visible" width="40%">
+			<el-dialog title="生成账单" :visible.sync="complete.visible" width="600px">
 				<div class="complete-modal">
 					<sa-info name="客户名称" br>{{complete.form.customerName}}</sa-info>
 					<sa-info name="业务单号" br>{{complete.form.no}}</sa-info>
 					<sa-info name="业务费用（元）" br>{{complete.form.itemPrice}}</sa-info>
+					<sa-info name="境外车入场时间" br>{{complete.form.realInTime}}</sa-info>
 					<sa-item type="datetime" @input="jwCaroTimeChange" name="境外车预计离场" v-model="complete.form.outDayTime"
 						br></sa-item>
 					<sa-info name="停车费用（元）" br>{{complete.form.partMoney}}</sa-info>
+					<sa-info name="中国车入场时间" br>{{complete.form.realInTime}}</sa-info>
 					<sa-item type="datetime" @input="chinaCaroTimeChange" name="中国车预计离场"
 						v-model="complete.form.chinaCarOutTime" br></sa-item>
 					<sa-info name="停车费用（元）" br>{{complete.form.chinaPartMoney}}</sa-info>
@@ -161,7 +163,7 @@
 					<el-button type="primary" @click="sureCompleteFn">确 认</el-button>
 				</span>
 			</el-dialog>
-			<el-dialog title="支付确认" :visible.sync="pay.visible" width="30%">
+			<el-dialog title="支付确认" :visible.sync="pay.visible" width="400px">
 				<sa-info name="业务单号" br>{{pay.form.no}}</sa-info>
 				<sa-info name="总计费用" br>{{pay.form.totalMoney}}元</sa-info>
 				<sa-item type="img-list" name="支付凭据" v-model="pay.form.payTicket" br></sa-item>
@@ -170,7 +172,7 @@
 					<el-button type="primary" @click="surePayirmFn">确 认</el-button>
 				</span>
 			</el-dialog>
-			<el-dialog title="确认入场" :visible.sync="rc.visible" width="30%">
+			<el-dialog title="确认入场" :visible.sync="rc.visible" width="600px">
 				<el-form label-position="left">
 					<div class="confirm-in">
 						<sa-item type="datetime" name="境外车入场时间" v-model="rc.form.realInTime" br></sa-item>
@@ -182,7 +184,7 @@
 					<el-button type="primary" @click="sureRcFn">确 认</el-button>
 				</span>
 			</el-dialog>
-			<el-dialog title="确认离场" :visible.sync="out.visible" width="30%">
+			<el-dialog title="确认离场" :visible.sync="out.visible" width="600px">
 				<el-form label-position="left">
 					<div class="confirm-in">
 						<sa-item type="datetime" name="境外车离场" v-model="out.form.outDayTime" br></sa-item>

sp-admin/sa-view/tb-costomer/customer-admin-add.html

@@ -29,12 +29,13 @@
 					<sa-item type="text" name="用户名" v-model="m.name" placeholder="请输入用户名" br></sa-item>
 					<sa-item type="password" name="密码" v-model="m.password" placeholder="请输入密码" br></sa-item>
 					<sa-item type="password" name="再输一次" v-model="m.againPassword" placeholder="请再输一次密码" br></sa-item>
-					<sa-item name="角色" br>
-						<el-select v-model="m.roleIds" multiple>
-							<el-option label="请选择" :value="0" disabled></el-option>
-							<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
-						</el-select>
-					</sa-item>
+					<div class="c-item">
+						<label class="c-label"><span style="color: red;">*</span>角色：</label>
+					<el-select v-model="m.roleIds" multiple>
+						<el-option label="请选择" :value="0" disabled></el-option>
+						<el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
+					</el-select>
+					</div>
 					<sa-item name="" br>
 						<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 					</sa-item>

sp-admin/static/sa.js

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

sp-server/app.pid

@@ -1 +0,0 @@
-6124