Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/components/business-crud-page.vue

src/views/business/loading-manage.vue

@@ -395,7 +395,7 @@
             <div class="loading-detail__summary">
               <div class="loading-detail__heading">配载单详情</div>
               <div>{{ dialogForm.loadingNo || '-' }}</div>
-              <div><el-tag :type="detailStatusType">{{ statusText(dialogForm) }}</el-tag></div>
+              <div><el-tag :type="detailStatusType" class="status-text">{{ statusText(dialogForm) }}</el-tag></div>
               <div><el-tag type="warning">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag></div>
             </div>
             <div class="loading-detail__task-row">
@@ -871,7 +871,7 @@
             <el-form-item v-if="dialogForm.carrierType !== '承运商'" label="押运人手机号">
               <el-input v-model="dialogForm.escortPhone" clearable placeholder="请输入" />
             </el-form-item>
-            <el-form-item label="里程(km)">
+            <el-form-item label="里程（km）">
               <el-input
                 v-model="dialogForm.mileage"
                 clearable
@@ -2474,6 +2474,7 @@ export default {
 
 <style lang="scss" scoped>
 .loading-manage-page {
+  margin-bottom: 60px;
   .loading-manage-page__search {
     padding: 12px 12px 4px;
     margin-bottom: 20px;