Commit d6cc85ce authored by huai.li's avatar huai.li

更新列表字段、并修复新建待办事项bug

parent 3b1b6c5e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="24"> <el-col :span="24">
<router-link :to="{ app: 'client', name: 'viewClient', params: {id: item.id} }"> <router-link :to="{ app: 'client', name: 'viewClient', params: {id: item.id} }">
<i class="fa fa-star" aria-hidden="true"></i>客户名称{{ isNullClient ? '未设置' : item.client.name }} <i class="fa fa-star" aria-hidden="true"></i>客户名称({{ isNullClient ? '未设置' : item.client.name }})
</router-link> </router-link>
</el-col> </el-col>
<el-col :span="24" style="padding-left: 3px;"> <el-col :span="24" style="padding-left: 3px;">
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
<span>待办时间:{{ item.schedule_week_display }}</span> <span>待办时间:{{ item.schedule_week_display }}</span>
</el-col> </el-col>
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span>开始时间:{{ item.start_at }}</span> <span>开始时间:{{ !item.start_at ? '(未设置)' : item.start_at }}</span>
</el-col> </el-col>
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span>结束时间:{{ item.end_at }}</span> <span>结束时间:{{ !item.end_at ? '(未设置)' : item.end_at }}</span>
</el-col> </el-col>
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span>重复:</span> <span>重复:{{ item.repeat_type_display }}</span>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<span>图片:</span><span></span> <span>图片:</span><span></span>
</el-col> </el-col>
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span>创建时间:{{ item.created_at }}</span><span></span> <span>创建时间:{{ !item.created_at ? '(未设置)' : item.created_at }}</span><span></span>
</el-col> </el-col>
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span>创建人:{{ item.scheduleCreator.name }}</span><span></span> <span>创建人:{{ item.scheduleCreator.name }}</span><span></span>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span class="obear-schedule-right__content">内容</span><span>123</span> <span class="obear-schedule-right__content">内容</span><span>{{ item.schedule_title }}</span>
</el-col> </el-col>
<el-col :span="6" :xs="24"> <el-col :span="6" :xs="24">
<span class="obear-schedule-right__content">情况说明</span><span>{{ item.complete_description }}</span> <span class="obear-schedule-right__content">情况说明</span><span>{{ item.complete_description }}</span>
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
computed: { computed: {
isNullClient () { isNullClient () {
return !this.item.client return !(this.item.client && this.item.client.name)
}, },
isPublic () { isPublic () {
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
methods: { methods: {
show (model) { show (model) {
model && UTIL.flatten(this.model, model) model && UTIL.flatten(this.model, model)
this.model.client_name = model.client.name model && (this.model.client_name = model.client.name)
this.diaVis = true this.diaVis = true
}, },
......
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