Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/api/ecw/order.js

@@ -547,6 +547,7 @@ export function orderExportSearch(params){
   return request({
     url: '/ecw/order/export/search',
     method: 'GET',
+    responseType: 'arraybuffer',
     params
   })
 }
@@ -555,6 +556,7 @@ export function orderExportSearch(params){
 export function orderExportMySearch(params){
   return request({
     url: '/ecw/order/export/my/search',
+    responseType: 'arraybuffer',
     method: 'GET',
     params
   })
@@ -565,6 +567,7 @@ export function orderExportDeptSearch(params){
   return request({
     url: '/ecw/order/export/dept/search',
     method: 'GET',
+    responseType: 'arraybuffer',
     params
   })
 }
\ No newline at end of file

src/views/bpm/processInstance/detail.vue

@@ -340,7 +340,7 @@ export default {
           path: this.processInstance.processDefinition?.formCustomViewPath
         },
       }
-      console.log(this.processInstance.processDefinition.formCustomViewPath.trim())
+      console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
     }
   },

src/views/ecw/customer/components/Delay.vue

 <template>
     <div>
         <el-descriptions :column="4">
-            <el-descriptions-item :label="$t('客户编号')">{{detail.customerId}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('客户编号')">{{detail.customerNumber}}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户名称')">{{detail.customerName}}</el-descriptions-item>
             <el-descriptions-item :label="$t('跟进客服')">{{detail.followUpSalesmanName}}</el-descriptions-item>
-            <el-descriptions-item :label="$t('创建时间')">{{detail.createTime|parseTime}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('创建时间')">{{parseTime(detail.customerCreateTime)}}</el-descriptions-item>
+
+            <el-descriptions-item :span="2" :label="$t('客户原计划掉入公海池时间')">{{parseTime(detail.orgEstimateEnterOpenSeaTime)}}</el-descriptions-item>
+            <el-descriptions-item :span="2" :label="$t('申请延期后时间')">{{parseTime(detail.estimateEnterOpenSeaTime)}}</el-descriptions-item>
             <el-descriptions-item :label="$t('申请凭证')" :span="4">
                 <el-image v-for="(item, index) in pictures" :key="index" :src="item" style="width:100px; height:100px" :preview-src-list="pictures"></el-image>
             </el-descriptions-item>
+
             <el-descriptions-item :label="$t('申请原因')" :span="4">{{detail.reason}}</el-descriptions-item>
         </el-descriptions>
     </div>
@@ -16,7 +20,6 @@
 import { getApproval } from '@/api/ecw/customer';
 import {parseTime} from '@/utils/ruoyi'
 export default {
-    filters: {parseTime},
     props:{
         id: [String, Number]
     },
@@ -36,6 +39,7 @@ export default {
         }
     },
     created(){
+        parseTime,
         getApproval(this.id).then(res => {
             this.info = res.data
         })

src/views/ecw/order/index.vue

@@ -631,6 +631,7 @@ export default {
     exportExcel(func, params, fileName = null){
       this.exportLoading = true;
       func(params).then(res => {
+        console.log({res})
         if(!fileName){
           fileName = this.$t('订单')
         }