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

ff906390 · dragondean@qq.com · 36cecb35 · 7e17a235 · ff906390
Commit ff906390 authored Apr 02, 2023 by dragondean@qq.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

customerLog.vue src/views/ecw/customer/customerLog.vue +1 -1

No files found.
--- a/src/views/ecw/customer/customerLog.vue
+++ b/src/views/ecw/customer/customerLog.vue
@@ -86,7 +86,7 @@
     </el-table-column>
     <el-table-column label="老的预计入公海时间" >
       <template v-slot="{row}">
-         {{parseTime(row.oldEstimateEnterOpenSeaTime || '/')}}
+         {{parseTime(row.oldEstimateEnterOpenSeaTime) || '/'}}
       </template>
     </el-table-column>
     <el-table-column label="备注" prop="remark" >