Commit 5afe224e authored by 邓春圆's avatar 邓春圆

添加备注

parent 65a94bfc
...@@ -81,14 +81,16 @@ ...@@ -81,14 +81,16 @@
</el-table-column> </el-table-column>
<el-table-column label="新的预计入公海时间"> <el-table-column label="新的预计入公海时间">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.newEstimateEnterOpenSeaTime)}} {{parseTime(row.newEstimateEnterOpenSeaTime) || '/'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="老的预计入公海时间" > <el-table-column label="老的预计入公海时间" >
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.oldEstimateEnterOpenSeaTime)}} {{parseTime(row.oldEstimateEnterOpenSeaTime || '/')}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" prop="remark" >
</el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template v-slot="{row}"> <template v-slot="{row}">
<el-button type="text" @click="getCustomerLog(row.id)"> <el-button type="text" @click="getCustomerLog(row.id)">
...@@ -102,7 +104,7 @@ ...@@ -102,7 +104,7 @@
<el-dialog title="客户日志" :visible.sync="show"> <el-dialog title="客户日志" :visible.sync="show">
<el-form> <el-form>
<el-form-item label="订单编号:"> <el-form-item label="订单编号:">
{{dataLog.dataLog ? dataLog.dataLog :'/'}} {{dataLog.orderNo ? dataLog.orderNo :'/'}}
</el-form-item> </el-form-item>
<el-form-item label="客户编号:"> <el-form-item label="客户编号:">
{{dataLog.number}} {{dataLog.number}}
...@@ -111,10 +113,10 @@ ...@@ -111,10 +113,10 @@
{{dataLog.name}} {{dataLog.name}}
</el-form-item> </el-form-item>
<el-form-item label="新客户经理:"> <el-form-item label="新客户经理:">
{{dataLog.newEstimateEnterOpenSeaTime ? dataLog.newEstimateEnterOpenSeaTime : '/'}} {{dataLog.newCustomerService ? operatorFn(dataLog.newCustomerService) : '/'}}
</el-form-item> </el-form-item>
<el-form-item label="老客户经理:"> <el-form-item label="老客户经理:">
{{dataLog.oldEstimateEnterOpenSeaTime ? dataLog.oldEstimateEnterOpenSeaTime : '/'}} {{dataLog.oldCustomerService ? operatorFn(dataLog.oldCustomerService) : '/'}}
</el-form-item> </el-form-item>
<el-form-item label="操作类型:"> <el-form-item label="操作类型:">
<dict-tag :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" :value="dataLog.operateType"></dict-tag> <dict-tag :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" :value="dataLog.operateType"></dict-tag>
...@@ -123,17 +125,14 @@ ...@@ -123,17 +125,14 @@
{{operatorFn(dataLog.operator)}} {{operatorFn(dataLog.operator)}}
</el-form-item> </el-form-item>
<el-form-item label="新预计进入公海时间:"> <el-form-item label="新预计进入公海时间:">
{{parseTime(dataLog.newEstimateEnterOpenSeaTime)}} {{parseTime(dataLog.newEstimateEnterOpenSeaTime) || '/'}}
</el-form-item> </el-form-item>
<el-form-item label="老的预计进入公海时间:"> <el-form-item label="老的预计进入公海时间:">
{{parseTime(dataLog.oldEstimateEnterOpenSeaTime)}} {{parseTime(dataLog.oldEstimateEnterOpenSeaTime) || '/'}}
</el-form-item> </el-form-item>
<el-form-item label="备注:"> <el-form-item label="备注:">
{{dataLog.remark}} {{dataLog.remark}}
</el-form-item> </el-form-item>
<el-form-item label="更新json:">
{{dataLog.updateBody}}
</el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
...@@ -160,7 +159,7 @@ export default { ...@@ -160,7 +159,7 @@ export default {
}, },
operatorFn(){ operatorFn(){
return (val)=>{ return (val)=>{
return this.allSimplList.find(item => item.id == val)?.nickname return this.allSimplList.find(item => item.id == val)?.nickname || '/'
} }
} }
}, },
......
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