This commit is contained in:
2023-11-07 15:49:07 +08:00
parent 876f7d8f3c
commit 6e1bf994c2
19 changed files with 165 additions and 76 deletions

View File

@@ -165,10 +165,10 @@ export default {
color: 'primary'
},
{
type: 'separate'
type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
},
{
type: 'button',
type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
btnName: '新增',
name: 'add',
color: 'success',
@@ -188,31 +188,31 @@ export default {
list: [],
tableH: this.tableHeight(260),
tableBtn: [
this.$auth.hasPermi('base:group-team:update')
this.$auth.hasPermi('base:order-manage:addWorkOrder')
? {
type: 'add',
btnName: '新增工单'
}
: undefined,
this.$auth.hasPermi('base:group-team:update')
this.$auth.hasPermi('base:order-manage:bindWorkOrder')
? {
type: 'bind',
btnName: '绑定工单'
}
: undefined,
this.$auth.hasPermi('base:group-team:update')
this.$auth.hasPermi('base:order-manage:detail')
? {
type: 'detail',
btnName: '详情'
}
: undefined,
this.$auth.hasPermi('base:group-team:update')
this.$auth.hasPermi('base:order-manage:edit')
? {
type: 'edit',
btnName: '编辑'
}
: undefined,
this.$auth.hasPermi('base:group-team:delete')
this.$auth.hasPermi('base:order-manage:delete')
? {
type: 'delete',
btnName: '删除'
@@ -292,7 +292,7 @@ export default {
this.handleDelete(val.data)
break
case 'detail':
this.$router.push({ name: 'OrderDetailData', params: { orderId: val.data.id }})
this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
break
case 'add':
this.workIssueTitle = '新增工单'

View File

@@ -222,7 +222,7 @@ export default {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(510) / 2
})
this.orderId = this.$route.params.orderId
this.orderId = location.href.split('?')[1].split('=')[1]
this.getMsg()
},
watch: {
@@ -231,7 +231,7 @@ export default {
methods: {
initData(to) {
if (to.name === 'OrderDetailData') {
this.orderId = this.$route.params.orderId
this.orderId = location.href.split('?')[1].split('=')[1]
this.getMsg()
}
},