Skip to content
GitLab
Commit 931cdb73 authored by 季圣华's avatar 季圣华
Browse files

增加仓库和角色类型的数据权限控制

parent f1fa71d3
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/components/layouts/TabLayout.vue
View file @ 931cdb73
......@@ -150,7 +150,7 @@
// 将首页添加到第一位
addIndexToFirst() {
this.pageList.splice(0, 0, {
name: 'dashboard-analysis',
name: '首页',
path: indexKey,
fullPath: indexKey,
meta: {
......
jshERP-web/src/components/tools/Breadcrumb.vue
View file @ 931cdb73
<template>
<a-breadcrumb class="breadcrumb">
<a-breadcrumb-item v-for="(item, index) in breadList" :key="index">
<router-link v-if="item.name != name" :to="{ path: item.path }">
{{ item.meta.title }}
</router-link>
<span v-else>{{ item.meta.title }}</span>
</a-breadcrumb-item>
</a-breadcrumb>
</template>
<script>
export default {
data() {
return {
name: '',
breadList: [],
}
},
created () {
this.getBreadcrumb()
},
methods: {
getBreadcrumb() {
console.log('this.$route.matched', this.$route.matched)
this.breadList = []
this.breadList.push({ name: 'dashboard-analysis', path: '/dashboard/analysis', meta: { title: '首页' } })
this.name = this.$route.name
this.$route.matched.forEach((item) => {
// item.meta.name === 'dashboard' ? item.path = '/dashboard' : this.$route.path === item.path
this.breadList.push(item)
})
}
},
watch: {
$route() {
this.getBreadcrumb()
}
}
}
</script>
<style scoped>
<template>
<a-breadcrumb class="breadcrumb">
<a-breadcrumb-item v-for="(item, index) in breadList" :key="index">
<router-link v-if="item.name != name" :to="{ path: item.path }">
{{ item.meta.title }}
</router-link>
<span v-else>{{ item.meta.title }}</span>
</a-breadcrumb-item>
</a-breadcrumb>
</template>
<script>
export default {
data() {
return {
name: '',
breadList: [],
}
},
created () {
this.getBreadcrumb()
},
methods: {
getBreadcrumb() {
console.log('this.$route.matched', this.$route.matched)
this.breadList = []
this.breadList.push({ name: '首页', path: '/dashboard/analysis', meta: { title: '首页' } })
this.name = this.$route.name
this.$route.matched.forEach((item) => {
// item.meta.name === 'dashboard' ? item.path = '/dashboard' : this.$route.path === item.path
this.breadList.push(item)
})
}
},
watch: {
$route() {
this.getBreadcrumb()
}
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
jshERP-web/src/components/tools/HeaderNotice.vue
View file @ 931cdb73
......@@ -107,7 +107,7 @@
// this.heartCheckFun();
},
destroyed: function () { // 离开页面生命周期函数
this.websocketclose();
//this.websocketclose();
},
methods: {
timerFun() {
......
jshERP-web/src/store/modules/user.js
View file @ 931cdb73
......@@ -137,7 +137,6 @@ const user = {
// }
// }
// })
console.log(" menu show json ", menuData)
//update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
commit('SET_PERMISSIONLIST', menuData)
} else {
......
jshERP-web/src/views/bill/AllocationOutList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "AllocationOutList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "出库",
subType: "调拨"
subType: "调拨",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/AssembleList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "AssembleList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "其它",
subType: "组装单"
subType: "组装单",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/DisassembleList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "DisassembleList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "其它",
subType: "拆卸单"
subType: "拆卸单",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/OtherInList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "OtherInList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "入库",
subType: "其它"
subType: "其它",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/OtherOutList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "OtherOutList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "出库",
subType: "其它"
subType: "其它",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/PurchaseBackList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "PurchaseBackList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "出库",
subType: "采购退货"
subType: "采购退货",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/PurchaseInList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "PurchaseInList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "入库",
subType: "采购"
subType: "采购",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @ 931cdb73
......@@ -107,7 +107,8 @@
number: "",
materialParam: "",
type: "其它",
subType: "采购订单"
subType: "采购订单",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/RetailBackList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "RetailBackList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "入库",
subType: "零售退货"
subType: "零售退货",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/RetailOutList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "RetailOutList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "出库",
subType: "零售"
subType: "零售",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/SaleBackList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "SaleBackList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "入库",
subType: "销售退货"
subType: "销售退货",
roleType: Vue.ls.get('roleType')
},
// 表头
columns: [
......
jshERP-web/src/views/bill/SaleOrderList.vue
View file @ 931cdb73
......@@ -91,6 +91,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "SaleOrderList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -106,7 +107,8 @@
number: "",
searchMaterial: "",
type: "其它",
subType: "销售订单"
subType: "销售订单",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/SaleOutList.vue
View file @ 931cdb73
......@@ -84,6 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { BillListMixin } from './mixins/BillListMixin'
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
export default {
name: "SaleOutList",
mixins:[JeecgListMixin,BillListMixin],
......@@ -99,7 +100,8 @@
number: "",
searchMaterial: "",
type: "出库",
subType: "销售"
subType: "销售",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },
......
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View file @ 931cdb73
......@@ -70,9 +70,6 @@ export const BillModalMixin = {
}
})
})
this.$nextTick(() => {
this.form.setFieldsValue({'payType': '现付'})
})
this.accountIdList = []
this.accountMoneyList = []
this.manyAccountBtnStatus = false
......@@ -152,6 +149,19 @@ export const BillModalMixin = {
this.manyAccountBtnStatus = false
}
},
onAdded(event) {
const { row, target } = event
getAction('/depot/findDepotByCurrentUser').then((res) => {
if (res.code === 200) {
let arr = res.data
for (let i = 0; i < arr.length; i++) {
if(arr[i].isDefault){
target.setValues([{rowKey: row.id, values: {depotId: arr[i].id+''}}])
}
}
}
})
},
//单元值改变一个字符就触发一次
onValueChange(event) {
let that = this
......@@ -285,7 +295,6 @@ export const BillModalMixin = {
},
//改变优惠率
onKeyUpDiscount(e) {
debugger
const value = e.target.value-0
let discountMoney = this.form.getFieldValue('discountMoney')-0
let discountLastMoney = this.form.getFieldValue('discountLastMoney')-0
......
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View file @ 931cdb73
......@@ -38,6 +38,7 @@
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted" />
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="24" :sm="24">
......
jshERP-web/src/views/bill/modules/AssembleModal.vue
View file @ 931cdb73
......@@ -56,6 +56,7 @@
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
import { getAction } from '@/api/manage'
import { getMpListShort } from "@/utils/util"
import JDate from '@/components/jeecg/JDate'
import Vue from 'vue'
......@@ -168,8 +169,17 @@
}
},
onAdded(event) {
let that = this
const { row, target } = event
getAction('/depot/findDepotByCurrentUser').then((res) => {
if (res.code === 200) {
let arr = res.data
for (let i = 0; i < arr.length; i++) {
if(arr[i].isDefault){
target.setValues([{rowKey: row.id, values: {depotId: arr[i].id+''}}])
}
}
}
})
if(target.rows.length>=2) {
target.setValues([{rowKey: row.id, values: {mType: '普通子件'}}])
} else {
......
Supports Markdown
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