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

src/components/RoutersSelector/index.vue

@@ -315,7 +315,7 @@ export default {
                 if(this.getSelectedIndex(router) > -1) return
                 this.selectedRoutes.push({
                     lineId: router.id,
-                    channelId: router.channel.channelId,
+                    shippingChannelId: router.channel.channelId,
                     transportId: router.transportType
                 })
             }else{

src/views/ecw/order/edit.vue

@@ -85,7 +85,8 @@
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('运输方式')" prop="transportId">
-                    <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number" :disabled2="inWarehouse"/>
+                    <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"
+                                   clearable/>
                 </el-form-item>
 
                 <el-form-item :label="$t('出货渠道')" prop="channelId" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'">
@@ -96,18 +97,19 @@
                       :options="channelList"
                       value-field="channelId"
                       :label-field="$l(null, 'name')"
+                      clearable
                       ></selector>
                   </el-form>
                 </el-form-item>
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('始发城市')" prop="departureId" :disabled="false">
-                    <el-select v-model="form.departureId" :placeholder="$t('请选择始发地')" :disabled="false">
+                    <el-select v-model="form.departureId" :placeholder="$t('请选择始发地')" :disabled="false" clearable>
                         <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item :label="$t('目的城市')" prop="objectiveId">
-                    <el-select v-model="form.objectiveId" :placeholder="$t('请选择目的地')" :disabled2="inWarehouse">
+                    <el-select v-model="form.objectiveId" :placeholder="$t('请选择目的地')" :disabled2="inWarehouse" clearable>
                         <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>

src/views/ecw/order/penddingList.vue

@@ -50,7 +50,8 @@
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" >
-        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
+        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"
+                       :prepend="{ id: 0, nickname: $t('未分配客户经理')}"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"

src/views/ecw/order/stockingList.vue

@@ -50,7 +50,8 @@
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" >
-        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
+        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"
+                       :prepend="{ id: 0, nickname: $t('未分配客户经理')}"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"