Merge remote-tracking branch 'websoft/master'

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

src/views/business/components/master-order-dispatch.vue

@@ -4,7 +4,7 @@
       <div class="overview-heading">
         <div>
           <h2>多联总单调度 <span>|</span> {{ master.masterNo }}</h2>
-          <el-tag :type="statusType(master.businessStatus)">{{ statusName(master.businessStatus) }}</el-tag>
+          <el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag>
         </div>
       </div>
       <div class="overview-content">
@@ -159,7 +159,7 @@
                 <el-col :span="6"><el-form-item label="箱号" required><el-input v-model="route.containerNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="舱位" required><el-input v-model="route.cabinNo" placeholder="请输入" /></el-form-item></el-col>
               </template>
-              <el-col :span="6"><el-form-item label="里程(km)"><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
+              <el-col :span="6"><el-form-item label="里程（km）"><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
               <el-col :span="6"><el-form-item label="备注"><el-input v-model="route.remark" maxlength="200" show-word-limit placeholder="请输入" /></el-form-item></el-col>
             </el-row>
           </el-form>