github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-29 21:28:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #277 from jumpserver/pr@dev@hotfix_build_error

Browse Source 
fix(ticket): 修复Merge冲突造成的编译问题
This commit is contained in:
八千流
2020-07-31 11:15:48 +08:00
committed by GitHub
parent 4b3b1a723f 00cd04e103
commit e061d9eb75
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/tickets/TicketDetail/TicketDetail.vue
View File

@@ -32,23 +32,23 @@
</div>
</div>
</div>
</div>
</template>
<el-form ref="comments" :model="form" label-width="45px" style="padding-top: 20px">
<el-form-item :label="$t('tickets.reply')">
<el-input v-model="form.comments" :autosize="{ minRows: 4 }" type="textarea" />
</el-form-item>
<el-form-item style="float: right">
<template v-if="hasActionPerm">
<el-button :disabled="object.status === 'closed'" type="primary" size="small" @click="handleApprove"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="danger" size="small" @click="handleReject"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button>
</template>
<el-button :disabled="object.status === 'closed'" type="warning" size="small" @click="handleClosed"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="info" size="small" @click="handleComment"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button>
</el-form-item>
</el-form>
</div>
</DetailCard>
</template>
<el-form ref="comments" :model="form" label-width="45px" style="padding-top: 20px">
<el-form-item :label="$t('tickets.reply')">
<el-input v-model="form.comments" :autosize="{ minRows: 4 }" type="textarea" />
</el-form-item>
<el-form-item style="float: right">
<template v-if="hasActionPerm">
<el-button :disabled="object.status === 'closed'" type="primary" size="small" @click="handleApprove"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="danger" size="small" @click="handleReject"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button>
</template>
<el-button :disabled="object.status === 'closed'" type="warning" size="small" @click="handleClosed"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button>
<el-button :disabled="object.status === 'closed'" type="info" size="small" @click="handleComment"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button>
</el-form-item>
</el-form>
</div>
</DetailCard>
</el-col>
</el-row>
</template>
@@ -71,8 +71,7 @@ export default {
},
data() {
return {
: this.object.status === 'open' ? STATUS_MAP[this.object.status] : STATUS_MAP[this.object.action],
statusMap: this.object.status === 'open' ? STATUS_MAP[this.object.status] : STATUS_MAP[this.object.action],
imageUrl: require('@/assets/img/admin.png'),
form: {
comments: ''

2
src/views/tickets/TicketListTable.vue
View File

@@ -48,7 +48,7 @@ export default {
},
{
prop: 'type_display',
label: this.$t('tickets.type')
label: this.$t('tickets.type'),
width: '110px'
},
{