Skip to content

J
jiedao-app-operator-master
Commit 8160dba1 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

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

parents 5888aaf4 1ce42139
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
src/views/ecw/customer/index.vue
View file @ 8160dba1
......@@ -113,8 +113,8 @@
</template>
</el-table-column>
<el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
<template v-slot = {row}>
<span>{{ parseTime(row.enterOpenSeaTime ? row.enterOpenSeaTime : row.estimateEnterOpenSeaTime ) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
......
src/views/ecw/oceanCustomer/index.vue
View file @ 8160dba1
......@@ -104,6 +104,11 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" >
</el-table-column>
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
......
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