Merge branch 'master' into debug

app/pages/declare/add.vue

@@ -41,7 +41,7 @@
 				<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>
+						<text slot="suffix">kg</text>
 					</u-input>
 				</view>
 			</view>

app/pages/disinfect/addDisinfect.vue

@@ -49,7 +49,7 @@
 				<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>
+						<text slot="suffix">kg</text>
 					</u-input>
 				</view>
 			</view>

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

@@ -81,7 +81,7 @@
 												</el-option>
 											</el-select>
 										</div>
-										<sa-item type="num" name="载重(吨)" placeholder="请输入车辆载重" v-model="m.netWeight" br>
+										<sa-item type="num" name="载重(kg)" placeholder="请输入车辆载重" v-model="m.netWeight" br>
 										</sa-item>
 										</sa-item>
 										<div class="c-item">
@@ -287,7 +287,7 @@
 						</el-table-column>
 						<el-table-column prop="carNo" label="越南车牌">
 						</el-table-column>
-						<el-table-column prop="grossWeight" label="毛重(吨)">
+						<el-table-column prop="grossWeight" label="毛重(kg)">
 						</el-table-column>
 						<el-table-column prop="createTime" width="140" label="申报时间">
 						</el-table-column>

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

@@ -77,7 +77,7 @@
 												</el-option>
 											</el-select>
 										</div>
-										<sa-item type="num" name="载重(吨)" placeholder="请输入车辆载重" v-model="m.netWeight" br>
+										<sa-item type="num" name="载重(kg)" placeholder="请输入车辆载重" v-model="m.netWeight" br>
 										</sa-item>
 
 										<div class="c-item">

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

@@ -42,7 +42,7 @@
 												<sa-info name="境外车牌号" br>{{m.cardNo}}</sa-info>
 												<sa-info name="境外车规格" br>{{m.cardSize}}（米）</sa-info>
 												<sa-info name="货物" br>{{m.goodsName}}</sa-info>
-												<sa-info name="载重" br>{{m.netWeight}}（吨）</sa-info>
+												<sa-info name="载重" br>{{m.netWeight}}（kg）</sa-info>
 												<sa-info type="enum" name="支付状态" :value="m.payStatus"
 													:jv="{1: '未支付', 2: '已支付未确认', 3: '已支付已确认'}" br></sa-info>
 												<sa-info type="img" name="核酸报告" :value="m.nucleicReport" br></sa-info>

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

@@ -58,7 +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="载重(吨)" prop="netWeight"></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>
 					<sa-td name="已支付(元)" prop="payMoney" width="140"></sa-td>

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

@@ -27,7 +27,7 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<sa-item type="text" name="产品学名" v-model="m.goodsName" br></sa-item>
-						<sa-item type="num" name="毛重(吨)" v-model="m.grossWeight" br></sa-item>
+						<sa-item type="num" name="毛重(kg)" v-model="m.grossWeight" br></sa-item>
 						<sa-item type="num" name="数量(件)" v-model="m.num" br></sa-item>
 <!--						<sa-item type="text" name="生产日期" v-model="m.productionDate" br></sa-item>-->
 						<div class="c-item br">

sp-admin/sa-view/tb-declare/tb-declare-info.html

@@ -26,7 +26,7 @@
 						<el-row>
 							<el-col span="12">
 								<sa-info name="产品学名" br>{{m.goodsName}}</sa-info>
-								<sa-info name="毛重(吨)" br>{{m.grossWeight}}</sa-info>
+								<sa-info name="毛重(kg)" br>{{m.grossWeight}}</sa-info>
 								<sa-info name="数量(件)" br>{{m.num}}</sa-info>
 								<sa-info name="生产日期" br>{{m.productionDate}}</sa-info>
 								<sa-info name="保质期(天)" br>{{m.expirationDate}}</sa-info>

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

@@ -35,7 +35,7 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 					<sa-td name="产品学名" prop="goodsName" ></sa-td>
-					<sa-td name="毛重(吨)" prop="grossWeight" type="num"  ></sa-td>
+					<sa-td name="毛重(kg)" prop="grossWeight" type="num"  ></sa-td>
 					<sa-td name="数量(件)" prop="num" type="num" ></sa-td>
 <!--					<sa-td name="生产日期" prop="productionDate" ></sa-td>-->
 <!--					<sa-td name="保质期(天)" prop="expirationDate" type="num" ></sa-td>-->

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

@@ -31,8 +31,8 @@
 						<sa-item type="text" name="品名" v-model="m.goodsName" br></sa-item>
 						<sa-item type="text" name="产地" v-model="m.origin" br></sa-item>
 						<sa-item type="num" name="数量" v-model="m.num" br></sa-item>
-						<sa-item type="num" name="重量(吨)" v-model="m.grossWeight" br></sa-item>
-						<sa-item type="num" name="规格(米)" v-model="m.unit" br></sa-item>
+						<sa-item type="num" name="重量(kg)" v-model="m.grossWeight" br></sa-item>
+						<sa-item type="text" name="规格" v-model="m.unit" br></sa-item>
 						<sa-item type="text" name="包装" v-model="m.pack" br></sa-item>
 						<sa-item type="text" name="标记" v-model="m.flag" br></sa-item>
 						<sa-item type="text" name="号码" v-model="m.phone" br></sa-item>

sp-admin/sa-view/tb-disinfect/tb-disinfect-info.html

@@ -30,7 +30,7 @@
 								<sa-info name="品名" br>{{m.goodsName}}</sa-info>
 								<sa-info name="产地" br>{{m.origin}}</sa-info>
 								<sa-info type="num" name="数量" :value="m.num" br></sa-info>
-								<sa-info name="重量(吨)" br>{{m.grossWeight}}</sa-info>
+								<sa-info name="重量(kg)" br>{{m.grossWeight}}</sa-info>
 								<sa-info name="规格(米)" br>{{m.unit}}</sa-info>
 								<sa-info name="包装" br>{{m.pack}}</sa-info>
 								<sa-info name="标记" br>{{m.flag}}</sa-info>

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

@@ -38,7 +38,7 @@
 					<sa-td name="品名" prop="goodsName" ></sa-td>
 <!--					<sa-td name="产地" prop="origin" ></sa-td>-->
 					<sa-td name="数量" prop="num" type="num"></sa-td>
-					<sa-td name="重量(吨)" prop="grossWeight" ></sa-td>
+					<sa-td name="重量(kg)" prop="grossWeight" ></sa-td>
 <!--					<sa-td name="规格" prop="unit" ></sa-td>-->
 <!--					<sa-td name="包装" prop="pack" ></sa-td>-->
 <!--					<sa-td name="标记" prop="flag" ></sa-td>-->

sp-server/src/main/resources/application-dev.yml

@@ -57,7 +57,7 @@ part-config:
     test-env: true
 car:
     max-length: 20
-    max-weight: 50
+    max-weight: 990000
 wx-config:
     title: 场站管理系统
     flush-second: 12000 #token刷新时间 秒