需求134后台-集运-包裹列表-转运

src/views/ecw/order/edit.vue

@@ -197,7 +197,7 @@
           <!--默认显示类型(selectedRouter==null)，如果选择路线后没开通则隐藏-->
           <el-form-item :label="$t('增值服务')"
                         v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
-            <el-checkbox-group v-model="form.type">
+            <el-checkbox-group v-model="form.type" :disabled="isConsTransform">
               <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{ $t('集运') }}</el-checkbox>
               <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1" :disabled="form.shipmentState > 0">
                 {{ $t('海外仓') }}
@@ -435,7 +435,7 @@
             </template>
             <!--241023 已起运不让修改报关方式-->
             <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable
-                           :disabled="isShipment"/>
+                           :disabled="isShipment || isConsTransform"/>
             <!--自单代报显示提示-->
             <div v-if="+form.customsType === 2" style="color:red;font-size:14px">{{ $t('报关退税，请备齐资料。') }}</div>
           </el-form-item>
@@ -482,7 +482,7 @@
                            v-model="form.isCargoControl"
                            formatter="bool"
                            form-type="radio"
-                           :disabled="!hasConsignee"
+                           :disabled="!hasConsignee || isConsTransform"
                            :filter="(item) => {
                           return selectedRouter && selectedRouter.controlStatus === 1 && item.value === 'true' ? false : true
                        }"
@@ -702,7 +702,7 @@
           <el-button type="primary" @click="submitForm(2)">{{ $t('编辑订单') }}</el-button> <!--修改-->
         </el-form>
         <template v-else>
-          <el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{ $t('保存草稿') }}</el-button><!--草稿-->
+          <el-button type="primary" @click="submitForm(0)" v-if="!isConsTransform && !form.status">{{ $t('保存草稿') }}</el-button><!--草稿-->
           <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{ $t('新建订单') }}
           </el-button> <!--待入仓-->
           <el-button type="primary" @click="submitForm(2)" v-else>{{ $t('编辑订单') }}</el-button> <!--修改-->
@@ -751,7 +751,7 @@
       </div>
     </el-dialog>
 
-    <choose-contact-dialog v-if="!!contactChooseType" :type="2" @choose="onContactChoose"
+    <choose-contact-dialog v-if="!!contactChooseType" :isConsTransform="isConsTransform" :type="2" @choose="onContactChoose"
                            @close="contactChooseType=null"/>
     <quick-create-customer v-if="quickCreateType" :type="quickCreateType" @success="onContactChoose"
                            @close="quickCreateType=null"/>
@@ -904,7 +904,8 @@ export default {
       selectedRouter: null,
       // 发货人默认付款
       defaultPay: false,
-      showDestCityList: []
+      showDestCityList: [],
+      isConsTransform: false,
     };
   },
   computed: {
@@ -1357,26 +1358,100 @@ export default {
       })
     }
     if (this.$route.query.hasOwnProperty('consIds')){
-      console.log("有没有包裹")
-      this.getTempOrderByConsIds()
+      this.$set(this, 'isConsTransform', true);
+      await this.getTempOrderByConsIds()
     }
   },
   methods: {
     async getTempOrderByConsIds(){
       //把传过来的consIds 2,3,4转成数组
       this.consIds= this.$route.query.consIds.split(',')
-      getTempOrderByConsIds({ids: this.consIds.join(',')}).then(res=>{
+      getTempOrderByConsIds({ids: this.consIds.join(',')}).then(async res => {
         this.form = Object.assign({}, {...res.data}, {orderItemVOList: []})
+        if (this.$route.query.hasOwnProperty('consIds')) {
+          // 复制订单，需要将数据初始化
+          this.form.orderId = null
+          this.form.orderNo = null
+          this.form.containerNumber = null
+          this.form.tidanNo = null
+          this.form.parentOrderId = null
+          this.form.parentNumber = null
+          this.form.number = null
+          this.form.initialParentOrderId = null
+          this.form.initialParentOrderNo = null
+          this.form.noChargeRecord = null
+          this.form.oldNumbers = null
+          this.form.userId = 0
+          this.form.sumNum = null
+          this.form.sumQuantity = null
+          this.form.sumVolume = null
+          this.form.sumWeight = null
+          this.form.pickleType = null
+          this.form.pickRatio = null
+          this.form.pickNum = null
+          this.form.releaseRatio = null
+          this.form.releaseNum = null
+          this.form.cost = null
+          this.form.packingListUrl = null
+          this.form.commissionPayable = null
+          this.form.specialVWeight = null
+          this.form.handlerChannelAttrException = null
+          this.form.weightBeforePack = null
+          this.form.weightAfterPack = null
+          this.form.stockOverWeightLimit = null
+          this.form.firstStockedTime = null
+          this.form.isLimitUpdateConsignee = null
+          this.form.lockConsigneeDay = null
+          this.form.lockConsigneeTime = null
+          this.form.firstStockedTime = null
+          this.form.adjustToStartWarehouseId = null
+          this.form.adjustToDestWarehouseId = null
+          this.form.destAdjustToStartWarehouseId = null
+          this.form.destAdjustToDestWarehouseId = null
+          // 状态重置
+          this.form.status = 0
+          this.form.cargoControlStatus = 0
+          this.form.abnormalState = 0
+          this.form.inWarehouseState = 0
+          this.form.shipmentState = 0
+          this.form.auditType = 0
+          this.form.auditResult = null
+          this.form.airShipment = null
+          this.form.splitSeparateOrder = null
+          this.form.pickState = null
+          this.form.guanLianOrderStatus = null
+          this.form.oldInWarehouseState = null
+          this.form.oldStatus = null
+          this.form.oldShipmentState = null
+          this.form.orderType = null
+          // 时间重置
+          this.form.takeTime = null
+          this.form.unloadTime = null
+          this.form.rucangTime = null
+          this.form.loadTime = null
+          this.form.preLoadTime = null
+          this.form.daogangTime = null
+          this.form.qingguanTime = null
+          this.form.splitTime = null
+          this.form.isException = null
+          this.form.exceptionReason = null
+          this.form.externalWarehouseJson = null
+          this.form.hasExitAndEntry = null
+          this.form.hasSendRucangSms = null
+          this.form.hasSendWarehouseInNotice = null
+
+        }
         this.getOfferData()
-        this.getTradeCity()
-        this.getOpenedRouterList()
-        console.log("未找到选择的路线111111",this.routerList)
+        await this.getTradeCity()
+        await this.getOpenedRouterList()
+        console.log("未找到选择的路线111111", this.routerList)
         this.selectedRouter = this.routerList.find(item => item.id === this.form.lineId)
         if (this.selectedRouter) {
           this.form.destCountryId = this.selectedRouter.destCountryId
         } else console.log("未找到选择的路线", this.routerList, this.selectedRouter)
         console.log("国家ID", this.form.destCountryId)
-        console.log("res",res)
+        console.log("res", res)
+        this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
         // 是否有收货人
         this.hasConsignee = !!res.data.consigneeVO
         // 每次编辑订单详情需要实时获取发货人当前信息
@@ -1411,7 +1486,7 @@ export default {
           console.log('nextTick 订单渲染完成')
           res.data.orderItemVOList.forEach(item => {
             let newItem = {}
-            if (this.$route.query.copy && this.$route.query.copy == 1) {
+            if (this.$route.query.hasOwnProperty('consIds')) {
               newItem.link = item.link
               newItem.prodId = item.prodId
               newItem.prodTitleEn = item.prodTitleEn
@@ -1425,7 +1500,8 @@ export default {
               newItem.worth = item.worth
               newItem.boxGauge = item.boxGauge
               newItem.brandType = item.brandType
-            }else {
+              newItem.expressNo = item.expressNo
+            } else {
               newItem = item
             }
             newItem.prodAttrArr = newItem.prodAttrIds?.split(',').filter(item => item != '').map(attrId => +attrId) || []
@@ -1433,7 +1509,7 @@ export default {
           })
 
           // 已入仓后，必填字段修改则需要显示审批流
-          if (this.updateWorth == 1){
+          if (this.updateWorth == 1) {
             this.showWorkFlow = false
           } else if (this.inWarehouse) {
             Object.keys(this.rules).forEach(field => {
@@ -1478,6 +1554,9 @@ export default {
         lineId: this.form.lineId
       }
       this.channelList = (await getChannelList(query)).data
+      if (this.isConsTransform){
+        //过滤掉渠道没有集运的TODO
+      }
     },
     onTableMounted(e) {
       // console.warn('onTableMounted', e)
@@ -1888,6 +1967,9 @@ export default {
       if (!params.startCityId && !params.destCountryId && !params.destCityId && !params.transportType) return false
       return getOpenedRouterList(params).then(res => {
         this.routerList = res.data.filter(item => {
+          if (this.isConsTransform && (item.otherService==null || item.otherService.indexOf(1)<0)){
+            return false;
+          }
           return this.exportCityIds.indexOf(item.startCityId) > -1 && this.importCountryIds.indexOf(item.destCountryId) > -1 && (this.importCityIds && this.importCityIds.indexOf(item.destCityId) > -1)
         })
         console.log(`已获取到路线${res.data?.length}条，有效路线${this.routerList.length}条,参数:${JSON.stringify(params)}`)
@@ -2052,6 +2134,14 @@ export default {
           });
           return;
         }
+        if (this.isConsTransform){
+          this.form.transferSource = 1
+          if (this.form.transportId=== 1){
+            this.form.transferPriceConfirmationStatus = 2
+          }else if (this.form.transportId=== 3){
+            this.form.transferPriceConfirmationStatus = 0
+          }
+        }
         let data = Object.assign({
           consigneeId: this.consigneeContact.customerId,
           consignorId: this.consignorContact.customerId,