Commit 0fbc9a35 authored by dragondean@qq.com's avatar dragondean@qq.com

订单导出异常和客户延期异常

parent 2c0cf40f
...@@ -547,6 +547,7 @@ export function orderExportSearch(params){ ...@@ -547,6 +547,7 @@ export function orderExportSearch(params){
return request({ return request({
url: '/ecw/order/export/search', url: '/ecw/order/export/search',
method: 'GET', method: 'GET',
responseType: 'arraybuffer',
params params
}) })
} }
...@@ -555,6 +556,7 @@ export function orderExportSearch(params){ ...@@ -555,6 +556,7 @@ export function orderExportSearch(params){
export function orderExportMySearch(params){ export function orderExportMySearch(params){
return request({ return request({
url: '/ecw/order/export/my/search', url: '/ecw/order/export/my/search',
responseType: 'arraybuffer',
method: 'GET', method: 'GET',
params params
}) })
...@@ -565,6 +567,7 @@ export function orderExportDeptSearch(params){ ...@@ -565,6 +567,7 @@ export function orderExportDeptSearch(params){
return request({ return request({
url: '/ecw/order/export/dept/search', url: '/ecw/order/export/dept/search',
method: 'GET', method: 'GET',
responseType: 'arraybuffer',
params params
}) })
} }
\ No newline at end of file
...@@ -340,7 +340,7 @@ export default { ...@@ -340,7 +340,7 @@ export default {
path: this.processInstance.processDefinition?.formCustomViewPath 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()] return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
} }
}, },
......
<template> <template>
<div> <div>
<el-descriptions :column="4"> <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.customerName}}</el-descriptions-item>
<el-descriptions-item :label="$t('跟进客服')">{{detail.followUpSalesmanName}}</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.createTime)}}</el-descriptions-item>
<el-descriptions-item :label="$t('申请凭证')" :span="4"> <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-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>
<el-descriptions-item :label="$t('申请原因')" :span="4">{{detail.reason}}</el-descriptions-item> <el-descriptions-item :label="$t('申请原因')" :span="4">
{{ $t('客户原计划调入公海池时间:{time}', {
time: parseTime(detail.orgEstimateEnterOpenSeaTime, '{y}-{m}-{d}')
}) }}
{{ $t('申请延期后时间:{time}', {
time: parseTime(detail.estimateEnterOpenSeaTime, '{y}-{m}-{d}')
}) }}
{{$t('原因')}}{{detail.reason}}
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
</template> </template>
...@@ -16,7 +24,6 @@ ...@@ -16,7 +24,6 @@
import { getApproval } from '@/api/ecw/customer'; import { getApproval } from '@/api/ecw/customer';
import {parseTime} from '@/utils/ruoyi' import {parseTime} from '@/utils/ruoyi'
export default { export default {
filters: {parseTime},
props:{ props:{
id: [String, Number] id: [String, Number]
}, },
...@@ -36,6 +43,7 @@ export default { ...@@ -36,6 +43,7 @@ export default {
} }
}, },
created(){ created(){
parseTime,
getApproval(this.id).then(res => { getApproval(this.id).then(res => {
this.info = res.data this.info = res.data
}) })
......
...@@ -631,6 +631,7 @@ export default { ...@@ -631,6 +631,7 @@ export default {
exportExcel(func, params, fileName = null){ exportExcel(func, params, fileName = null){
this.exportLoading = true; this.exportLoading = true;
func(params).then(res => { func(params).then(res => {
console.log({res})
if(!fileName){ if(!fileName){
fileName = this.$t('订单') fileName = this.$t('订单')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment