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

src/api/ecw/box.js

@@ -257,6 +257,7 @@ export function downloadAgentListFiles(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadAgentListFiles",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -266,6 +267,7 @@ export function downloadSoncapFiles(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadSoncapFiles",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -275,6 +277,7 @@ export function downloadCustomFiles(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadCustomFiles",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -284,6 +287,7 @@ export function downloadLoadGoodsList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadLoadGoodsList",
     responseType: "blob",
+    timeout: 3*60*1000,
     method: "get",
     params,
   });
@@ -294,6 +298,7 @@ export function downloadPreloadGoodsList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadPreloadGoodsList",
     responseType: "blob",
+    timeout: 3*60*1000,
     method: "get",
     params,
   });
@@ -304,6 +309,7 @@ export function downloadReceivableList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadReceivableList",
     responseType: "blob",
+    timeout: 3*60*1000,
     method: "get",
     params,
   });
@@ -314,6 +320,7 @@ export function downloadLadingCopy(params) {
   return request({
     url: "/ecw/box-lading-copy/downloadLadingCopy",
     method: "get",
+    timeout: 3*60*1000,
     params,
   });
 }
@@ -334,4 +341,4 @@ export function updateUrl(data) {
     method: "put",
     data,
   });
-}
+}
\ No newline at end of file

src/api/ecw/order.js

 import request from '@/utils/request'
-import {param} from "@/utils";
 
 // 创建订单
 export function createOrder(data) {
@@ -676,3 +675,12 @@ export function operateLogPage(params){
     params: params
   })
 }
+
+// 取消拆单申请
+export function splitCancelApply(data){
+  return request({
+    url: '/order/split/cancel-apply',
+    method: 'put',
+    data
+  })
+}

src/i18n/languages/en_US.json

@@ -204,8 +204,8 @@
     "未来计划方数": "CBM of future plans",
     "未来实际方数": " Actual CBM in the future",
     "创建人": "founder",
-    "未来": "future",
-    "天货柜数": "Number of containers per day",
+    "未来": "Number of containers in the next",
+    "天货柜数": "days",
     "未来{futureNumber}天计划方数": "Planned cbm in the future {futureNumber} days",
     "未来{futureNumber}天实际方数": "Actual cbm  in the future {futureNumber} days",
     "添加预定舱计划": "Add booking plan",

src/views/ecw/order/index.vue

@@ -316,6 +316,12 @@
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
 
+                <!--撤销拆单，拆单的子订单,预装前显示，预装后变灰不可点击-->
+                <template v-if="scope.row.parentOrderId">
+                  <el-dropdown-item @click.native="cancelSplit(scope.row)" v-hasPermi="['ecw:order:cancel_split']">{{$t('撤销拆单')}}</el-dropdown-item>
+                </template>
+
+
                 <!-- 合单日志，提货日志 -->
                 <template v-if="(
                   scope.row.status > 2 &&
@@ -491,7 +497,7 @@ import {
   exportCustomsDatas,
   exportShippingDatas,
   exportShipFee,
-  exportUnload
+  exportUnload, splitCancelApply
 } from "@/api/ecw/order";
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from './components/PrintTag'
@@ -652,6 +658,15 @@ export default {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
   },
   methods: {
+    // 取消拆单申请
+    cancelSplit(row){
+      this.$prompt('请输入撤销理由').then(res =>{
+        console.log("res", res)
+        return splitCancelApply({ orderId: row.orderId, reason: res.value})
+      }).then(() => {
+        this.getList()
+      })
+    },
     // 获得导出函数
     getExportFunc(){
       let func = orderExportSearch
@@ -744,10 +759,10 @@ export default {
         return this.$alert('不支持此操作')
       }
       this.$confirm(action.confirm)
-        .then(res => {
+        .then(() => {
           return action.callable(orderId)
         })
-        .then(res => {
+        .then(() => {
           this.getList()
         })
     },
@@ -844,14 +859,13 @@ export default {
     specialRendering(val){
       if(val !== undefined){
         let i = val.split(',')
-       let special = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
+        return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
            return i.indexOf(e.value) > -1
         })
-        return special
       }
     },
     deleteSpecial(id,orderId){
-      this.$confirm(this.$t('确定删除此特需么?')).then(res => {
+      this.$confirm(this.$t('确定删除此特需么?')).then(() => {
         return orderSpecialNeed({orderId:orderId,advanceType:id})
       }).then(() => {
         this.getList()