Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/channel/edit.vue

@@ -72,7 +72,7 @@
                        <el-form-item :label="$t('快递')" prop="expressId">
                             <!-- <el-input v-model="form.expressId" placeholder="请输入快递ID" /> -->
                             <el-select v-model="form.expressId">
-                                <el-option v-for="item in expressList" :value="item.id" :label="item.companyName" :key="item.id"/>
+                                <el-option v-for="item in expressList" :value="item.id+''" :label="item.companyName" :key="item.id"/>
                             </el-select>
                         </el-form-item>
                     </el-col>

src/views/ecw/order/batchSingleApplication.vue

@@ -259,8 +259,10 @@ export default {
       this.params.orderNo = this.list[0].orderNo
       orderWarehouseInAdjustApply(this.params).then(r => {
         if (r.code === 0) {
+          this.$emit('getList')
           this.$emit('update:dialogVisible', false)
           this.$message.success(this.$t('调仓申请提交成功，请耐心等待审核'));
+
         }
       })
     },
@@ -271,6 +273,7 @@ export default {
       }).then(({ value }) => {
         warehouseApprovalCancel(this.applyStatus.orderWarehouseApprovalBackVO.id,value) .then(r => {
           if(r.data){
+            this.$emit('getList')
             this.$message.success(this.$t('取消调仓成功'))
             this.$emit('update:dialogVisible',false)
 

src/views/ecw/order/index.vue

@@ -496,7 +496,7 @@
     <print-lading-bill v-if="printLadingBillOrderId !== null" :order-id="printLadingBillOrderId" @close="printLadingBillOrderId=null" />
     <batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose"/>
     <withdrawal v-if="show" :dialog-visible="show"  :orderId="orderId" ></withdrawal>
-    <batch-single-application :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application>
+    <batch-single-application @getList="getList" :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application>
     <fee-application :order-id="orderId" :currencys="JSON.stringify(currencyList)" :dialog-visible.sync="feeApplicationBol"></fee-application>
     <merge-log :order-no="showMergedLogOrderNo" v-if="showMergedLogOrderNo !== null" @close="showMergedLogOrderNo=null" />
     <pickup-log v-if="showPickupLogOrderNo" :order-no="showPickupLogOrderNo" @close="showPickupLogOrderNo=null" @delete="getList" />