合单拆单

src/api/ecw/orderHandle.js

+import request from '@/utils/request'
+// 根据合并订单编号(或订单号)获得已合单列表和待合单列表
+export function getMergeListByOrderNo(query){
+  return request({
+    url:'/order/merge/getMergeListByOrderNo',
+    method: 'get',
+    params: query,
+  })
+}
+//创建订单合单申请
+export function createMerge(data) {
+  return request({
+    url: '/order/merge/create',
+    method: 'post',
+    data: data
+  })
+}
+// 取消订单拆单
+export function cancelMerge(data) {
+  return request({
+    url: '/order/merge/cancel',
+    method: 'delete',
+    data:data
+  })
+}
+
+//拆单申请提交
+export function splitApply(data) {
+  return request({
+    url: '/order/split/apply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建订单拆单
+export function createSplit(data) {
+  return request({
+    url: '/order/split/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新订单拆单
+export function updateSplit(data) {
+  return request({
+    url: '/order/split/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单拆单
+export function deleteSplit(id) {
+  return request({
+    url: '/order/split/delete?id=' + id,
+    method: 'delete'
+  })
+}
+//取消申请拆单
+
+export function cancelApply(data) {
+  return request({
+    url: '/order/split/cancel-apply',
+    method: 'put',
+    data:data
+  })
+}
+
+// 获得订单拆单
+export function getSplit(id) {
+  return request({
+    url: '/order/split/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得订单拆单分页
+export function getSplitPage(query) {
+  return request({
+    url: '/order/split/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出订单拆单 Excel
+export function exportSplitExcel(query) {
+  return request({
+    url: '/order/split/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+//通过订单号获取拆单列表和拆单项明细
+export function getSplitList(query) {
+  return request({
+    url: '/order/split/list-by-order-id',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建订单拆单项 - 放入
+export function createSplitItem(data) {
+  return request({
+    url: '/order/split-item/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除订单拆单项
+export function deleteSplitItem(id) {
+  return request({
+    url: '/order/split-item/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/views/ecw/order/pending.vue

@@ -14,7 +14,8 @@
               <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
             </el-descriptions-item>
             <el-descriptions-item label="送货日期">
-              <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?orderData.orderItemVOList[0].warehouseInInfoVO.firstInTime:'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span>
+               {{orderData.consigneeVO?orderData.consigneeVO.deliveryDate||'无':'无'}}
+              <!-- <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?parseTime(orderData.orderItemVOList[0].warehouseInInfoVO.firstInTime):'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span> -->
             </el-descriptions-item>
             <el-descriptions-item label="运输方式">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
@@ -82,7 +83,11 @@
           </template>
         </el-table-column>
         <el-table-column label="处理人" align="center" prop="userName" />
-        <el-table-column label="处理时间" align="center" prop='handlerTime' />
+        <el-table-column label="处理时间" align="center">
+          <template slot-scope="scope">
+             <span>{{parseTime(scope.row.handlerTime)}}</span>
+            </template>
+          </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.orderExceptionStatus>0">已完成</el-tag>

src/views/ecw/order/prepayDeal.vue

@@ -26,7 +26,7 @@
        <el-row>
            <el-form-item label="运输路线:" >
                <span v-if="orderData">【<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />】</span>
-                {{orderData?getRouterNameById(orderData.lineId):''}}
+                {{orderData?getRouterNameById():''}}
            </el-form-item>
        </el-row>
        <div v-if="orderExceptionData.orderExceptionType!=3||orderExceptionData.orderExceptionType!=9||orderExceptionData.orderExceptionType!=10||orderExceptionData.orderExceptionType!=11">
@@ -174,7 +174,6 @@
 <script>
   import FileUpload from '@/components/FileUpload'
   import {getDictData, getDictDatas} from  '@/utils/dict'
-  import {openedRouterList as getOpenedRouterList} from '@/api/ecw/warehouse'
   import {getOrder} from '@/api/ecw/order'
   import {getExceptionById,handlerExceptionByExceptionId,getOrderItemById} from "@/api/ecw/orderException"
 
@@ -240,27 +239,12 @@
       handleSelectionChange(val) {
          this.multipleSelection = val;
        },
-      // 获取路线
-      getOpenedRouterList(){
-          let params = {}
-          if(this.list.departureId){
-              params.startCityId = this.list.departureId
-          }
-          if(this.list.objectiveId){
-              params.destCityId = this.list.objectiveId
-          }
-          getOpenedRouterList(params).then(res => this.routerList = res.data)
-      },
       // 根据线路id显示线路名称
-      getRouterNameById(routerId){
-          // return routerId => {
-              let router = this.routerList.find(item => item.id == routerId)
-              console.log({router})
-              if(router){
-                  return ' 从【'+router.startTitleZh + '】发往【' + router.destTitleZh+'】'
+      getRouterNameById(){
+              if(this.orderData.logisticsInfoDto) {
+                  return ' 从【'+this.orderData.logisticsInfoDto.startTitleZh + '】发往【' + this.orderData.logisticsInfoDto.destTitleZh+'】'
               }
               return '无'
-          // }
       },
       submitForm(){
         console.log(this.handlerParams)