Merge remote-tracking branch 'origin/main'

main
weitingdong 11 months ago
commit 32244a7366
  1. 14
      src/views/spares/inbound.vue
  2. 14
      src/views/spares/material.vue
  3. 14
      src/views/spares/materialclasscode.vue
  4. 14
      src/views/spares/outbound.vue

@ -137,14 +137,14 @@
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
this.option.column = this.option.column.filter(v => { // this.option.column = this.option.column.filter(v => {
return this.permission['inbound_col_' + v.prop] // return this.permission['inbound_col_' + v.prop]
}) // })
return { return {
addBtn: this.validData(this.permission.inbound_add, false), addBtn: this.vaildData(this.permission.inbound_add, false),
viewBtn: this.validData(this.permission.inbound_view, false), viewBtn: this.vaildData(this.permission.inbound_view, false),
delBtn: this.validData(this.permission.inbound_delete, false), delBtn: this.vaildData(this.permission.inbound_delete, false),
editBtn: this.validData(this.permission.inbound_edit, false) editBtn: this.vaildData(this.permission.inbound_edit, false)
}; };
}, },
ids() { ids() {

@ -164,14 +164,14 @@
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
this.option.column = this.option.column.filter(v => { // this.option.column = this.option.column.filter(v => {
return this.permission['material_col_' + v.prop] // return this.permission['material_col_' + v.prop]
}) // })
return { return {
addBtn: this.validData(this.permission.material_add, false), addBtn: this.vaildData(this.permission.material_add, false),
viewBtn: this.validData(this.permission.material_view, false), viewBtn: this.vaildData(this.permission.material_view, false),
delBtn: this.validData(this.permission.material_delete, false), delBtn: this.vaildData(this.permission.material_delete, false),
editBtn: this.validData(this.permission.material_edit, false) editBtn: this.vaildData(this.permission.material_edit, false)
}; };
}, },
ids() { ids() {

@ -92,14 +92,14 @@
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
this.option.column = this.option.column.filter(v => { // this.option.column = this.option.column.filter(v => {
return this.permission['materialclasscode_col_' + v.prop] // return this.permission['materialclasscode_col_' + v.prop]
}) // })
return { return {
addBtn: this.validData(this.permission.materialclasscode_add, false), addBtn: this.vaildData(this.permission.materialclasscode_add, false),
viewBtn: this.validData(this.permission.materialclasscode_view, false), viewBtn: this.vaildData(this.permission.materialclasscode_view, false),
delBtn: this.validData(this.permission.materialclasscode_delete, false), delBtn: this.vaildData(this.permission.materialclasscode_delete, false),
editBtn: this.validData(this.permission.materialclasscode_edit, false) editBtn: this.vaildData(this.permission.materialclasscode_edit, false)
}; };
}, },
ids() { ids() {

@ -137,14 +137,14 @@
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
this.option.column = this.option.column.filter(v => { // this.option.column = this.option.column.filter(v => {
return this.permission['outbound_col_' + v.prop] // return this.permission['outbound_col_' + v.prop]
}) // })
return { return {
addBtn: this.validData(this.permission.outbound_add, false), addBtn: this.vaildData(this.permission.outbound_add, false),
viewBtn: this.validData(this.permission.outbound_view, false), viewBtn: this.vaildData(this.permission.outbound_view, false),
delBtn: this.validData(this.permission.outbound_delete, false), delBtn: this.vaildData(this.permission.outbound_delete, false),
editBtn: this.validData(this.permission.outbound_edit, false) editBtn: this.vaildData(this.permission.outbound_edit, false)
}; };
}, },
ids() { ids() {
Loading…
Cancel
Save