bugs

src/api/ecw/orderCargoControl.js

@@ -37,7 +37,7 @@ export function createPick(data){
 }
 
 //获得控货订单放货编辑详情
-export function getRleaseInfo(orderId){
+export function getReleaseInfo(orderId){
   return request({
     url:'/ecw/order-cargo-control/release/info/' + orderId,
     method:'get'
@@ -117,9 +117,9 @@ export function seasoningCondimentsSelect(params){
 }
 
 // 根据放货ID查询控货订单放货修改审核详情
-export function getPpickUpdateInfo(id){
+export function getPickUpdateInfo(id){
   return request({
-    url: '/ecw/order-cargo-control-pick/update/info/{id}/' + id,
+    url: '/ecw/order-cargo-control-pick/update/info/' + id,
     method: 'get'
   })
 }
@@ -131,4 +131,11 @@ export function getPickUpdateApproveInfo(params){
     method: 'get',
     params
   })
+}
+
+export function getCondimentsIno(cargoControlPickId){
+  return request({
+    url: '/ecw/order-cargo-control-pick/seasoning/condiments/info/' + cargoControlPickId,
+    method: 'get'
+  })
 }
\ No newline at end of file

src/components/DictSelector/index.vue

@@ -107,7 +107,7 @@ export default {
                 return this.valueSync = this.multiple ? [] : this.value   
             }
             if(this.multiple){
-                let value = []
+                let value = this.value || []
                 if(typeof this.value == 'string'){
                     value = this.value.split(',').filter(item => item && item != '')
                 }

src/views/ecw/offer/edit.vue

@@ -764,6 +764,7 @@ export default {
         this.$set(this.form, 'objectiveId', router.destCityId)
     },
     'form.transportVO.packageTypeArr'(val){
+        console.log('form.transportVO.packageTypeArr', val)
         this.$set(this.form.transportVO, 'packageType', val.join(','))
     },
     // 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
@@ -799,7 +800,10 @@ export default {
             let formData = res.data
             formData.type = formData.type ? formData.type.split(',').filter(item => item != '') : []
             formData.prodCreateReqVOList = []
-
+            if(formData.transportVO && formData.transportVO.packageType){
+                formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter(item => item && item != '')
+                console.log(formData.transportVO.packageType, formData.transportVO.packageTypeArr)
+            }
             if(res.data.offerProdRespVOList){
                 res.data.offerProdRespVOList.forEach(item => {
                     formData.prodCreateReqVOList.push({

src/views/ecw/order/cargoControl.vue

@@ -121,7 +121,7 @@
           <!--已完成放货-->
           <template v-if="scope.row.cargoControlStatus == 1">
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button>
-            <el-button type="text"  size="mini" @click="showTransferCargoOrderId=scope.row.orderId" >{{$t('调货')}}</el-button>
+            <el-button type="text"  size="mini" @click="cargoTransfer(scope.row)" >{{$t('调货')}}</el-button>
             <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods">{{$t('反复核')}}</el-button>
           </template>
 
@@ -139,7 +139,7 @@
 
     <transfer       v-if="showTransferOrder"          v-bind="showTransferOrder"            @close="showTransferOrder=null" />
     <release        v-if="showReleaseOrderId"         :order-id="showReleaseOrderId"        @close="showReleaseOrderId=null"        @success="onReleaseSuccess" />
-    <transfer-cargo v-if="showTransferCargoOrderId"   :order-id="showTransferCargoOrderId"  @close="showTransferCargoOrderId=null"  @success="onTransferCargoSuccess" />
+    <transfer-cargo v-if="showTransferCargoOrderId"   :order-id="showTransferCargoOrderId"  @close="showTransferCargoOrderId=null"  @success="onTransferCargoSuccess" :cargoControlPickId="pickInfo ? pickInfo.id : 0" />
     <fallback       v-if="showFallbackOrder !== null" :order="showFallbackOrder"            @close="showFallbackOrder=null"         @success="onFallbackSuccess" :index="null"   />
   </div>
 </template>
@@ -153,7 +153,7 @@ import { getTradeCityList } from '@/api/ecw/region'
 import Transfer from '@/views/ecw/order/components/Transfer'
 import Release from './components/Release'
 import CargoControlEdit from './components/CargoControlEdit'
-import { getCargoControlOrderPage, batchReview, orderReview } from "@/api/ecw/orderCargoControl"
+import { getCargoControlOrderPage, batchReview, orderReview, getPickRleaseInfo } from "@/api/ecw/orderCargoControl"
 import TransferCargo from '@/views/ecw/order/components/TransferCargo'
 import Fallback from './components/Fallback'
 
@@ -197,6 +197,7 @@ export default {
       showReleaseOrderId: null, // 放货ID
       showTransferCargoOrderId: null, // 调货ID
       showFallbackOrder: null, // 调货订单
+      pickInfo: null, // 当前操作的提货信息
     };
   },
   computed: {
@@ -288,6 +289,15 @@ export default {
         this.handleQuery()
       })
     },
+    cargoTransfer(row){
+      getPickRleaseInfo(row.orderId).then(res => {
+        if(res.data.cargoControlPickBackVOList && res.data.cargoControlPickBackVOList.length > 1){
+          this.toDetail(row)
+        }
+        this.pickInfo = res.data.cargoControlPickBackVOList[0]
+        this.showTransferCargoOrderId=row.orderId
+      })
+    },
     onReleaseSuccess(){
       this.showReleaseOrderId = null
       this.handleQuery()

src/views/ecw/order/components/TransferCargo.vue

@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('收货人电话')">
-              {{detail.consigneeCountryCode}} {{detail.consigneePhone}}
+              +{{detail.consigneeCountryCode}} {{detail.consigneePhone}}
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -59,7 +59,7 @@
           <el-input v-model="formData.remarks" clearable></el-input>
         </el-form-item>
         <el-form-item :label="$t('控货手机号')" prop="field117" style="margin-top:20px">
-          {{detail.consigneeCountryCode}} {{detail.phone}}
+          +{{detail.consigneeCountryCode}} {{detail.phone}}
         </el-form-item>
         <el-form-item :label="$t('手机验证码')" prop="code">
           <el-input v-model="formData.code" :placeholder="$t('请输入手机验证码')" clearable class="w-150 mr-10"></el-input>
@@ -76,7 +76,7 @@
     </el-dialog>
 </template>
 <script>
-import {createPick, getRleaseInfo, seasoningCondimentsSelect, updateApply} from '@/api/ecw/orderCargoControl'
+import {createPick, getReleaseInfo, seasoningCondimentsSelect, updateApply, getCondimentsIno} from '@/api/ecw/orderCargoControl'
 import AreaCodeSelector from '@/components/AreaCodeSelector'
 import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
 import WorkFlow from '@/components/WorkFlow'
@@ -126,11 +126,14 @@ export default {
     },
     created(){
         this.show = true
+        getCondimentsIno(this.cargoControlPickId).then(res => {
+
+        })
         this.loadData()
     },
     methods:{
         loadData(){
-          getRleaseInfo(this.orderId).then(res => this.detail = res.data)
+          getReleaseInfo(this.orderId).then(res => this.detail = res.data)
           seasoningCondimentsSelect({orderId: this.orderId}).then(res => {
             this.orders = res.data
           })

src/views/ecw/order/index.vue

@@ -227,15 +227,17 @@
               <template v-if="
                 exclude(scope.row.status, [0,2]) &&
                 exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
-                scope.row.shipmentState > 320
+                scope.row.shipmentState < 320
                 ">
                 <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
                 <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"  >{{$t('拆单申请')}}</el-dropdown-item>
               </template>
 
               <!-- 合单日志，提货日志 -->
-              <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
+              <template v-if="scope.row.status > 2">
+                <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
+                <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
+              </template>
             </el-dropdown-menu>
           </el-dropdown>