purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
季圣华
2021-05-19 23:29:15 +08:00
parent f1fa71d3cc
commit 931cdb736b
34 changed files with 142 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-web/src/components/layouts/TabLayout.vue
View File

@@ -150,7 +150,7 @@
// 将首页添加到第一位
addIndexToFirst() {
this.pageList.splice(0, 0, {
name: 'dashboard-analysis',
name: '首页',
path: indexKey,
fullPath: indexKey,
meta: {

2
jshERP-web/src/components/tools/Breadcrumb.vue
View File

@@ -26,7 +26,7 @@ export default {
console.log('this.$route.matched', this.$route.matched)
this.breadList = []
this.breadList.push({ name: 'dashboard-analysis', path: '/dashboard/analysis', meta: { title: '首页' } })
this.breadList.push({ name: '首页', path: '/dashboard/analysis', meta: { title: '首页' } })
this.name = this.$route.name
this.$route.matched.forEach((item) => {

2
jshERP-web/src/components/tools/HeaderNotice.vue
View File

@@ -107,7 +107,7 @@
// this.heartCheckFun();
},
destroyed: function () { // 离开页面生命周期函数
this.websocketclose();
//this.websocketclose();
},
methods: {
timerFun() {

1
jshERP-web/src/store/modules/user.js
View File

@@ -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 {

4
jshERP-web/src/views/bill/AllocationOutList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/AssembleList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/DisassembleList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/OtherInList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/OtherOutList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/PurchaseBackList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/PurchaseInList.vue
View File

@@ -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 },

3
jshERP-web/src/views/bill/PurchaseOrderList.vue
View File

@@ -107,7 +107,8 @@
number: "",
materialParam: "",
type: "其它",
subType: "采购订单"
subType: "采购订单",
roleType: Vue.ls.get('roleType')
},
labelCol: {
xs: { span: 24 },

4
jshERP-web/src/views/bill/RetailBackList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/RetailOutList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/SaleBackList.vue
View File

@@ -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: [

4
jshERP-web/src/views/bill/SaleOrderList.vue
View File

@@ -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 },

4
jshERP-web/src/views/bill/SaleOutList.vue
View File

@@ -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 },

17
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View File

@@ -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

1
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

@@ -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">

12
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

@@ -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 {

12
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

@@ -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'
@@ -167,8 +168,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 {

1
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -46,6 +46,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">

1
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -46,6 +46,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">

1
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -47,6 +47,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">

2
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -51,6 +51,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">
@@ -207,6 +208,7 @@
//调用完edit()方法之后会自动调用此方法
editAfter() {
if (this.action === 'add') {
let that = this
this.addInit("CGRK")
} else {
this.model.operTime = this.model.operTimeStr

1
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -46,6 +46,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">

1
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -48,6 +48,7 @@
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted" />
</a-col>
<a-col :lg="6" :md="12" :sm="24">

4
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -55,6 +55,7 @@
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted" />
</a-col>
<a-col :lg="6" :md="12" :sm="24">
@@ -177,6 +178,9 @@
editAfter() {
if (this.action === 'add') {
this.addInit("LSCK")
this.$nextTick(() => {
this.form.setFieldsValue({'payType': '现付'})
})
} else {
this.model.operTime = this.model.operTimeStr
this.model.getAmount = this.model.changeAmount

1
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -47,6 +47,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">

1
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -50,6 +50,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">

1
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -51,6 +51,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">

9
jshERP-web/src/views/system/UserList.vue
View File

@@ -135,12 +135,9 @@
methods: {
getSystemConfig() {
getCurrentSystemConfig().then((res) => {
if(res.code === 200){
let systemConfig = res.data
this.depotFlag = systemConfig.depotFlag
this.customerFlag = systemConfig.customerFlag
} else {
this.$message.warning(res.data);
if(res.code === 200 && res.data){
this.depotFlag = res.data.depotFlag
this.customerFlag = res.data.customerFlag
}
})
},

1
jshERP-web/src/views/system/modules/RolePushBtnModal.vue
View File

@@ -64,6 +64,7 @@
visible: false,
model: {},
checked: false,
disableMixinCreated: true,
confirmLoading: false,
form: this.$form.createForm(this),
/* 数据源 */

1
jshERP-web/src/views/user/Login.vue
View File

@@ -226,6 +226,7 @@
let err = {};
if(res.data.msgTip == 'user can login'){
Vue.ls.set('winBtnStrList', res.data.userBtn, 7 * 24 * 60 * 60 * 1000);
Vue.ls.set('roleType', res.data.roleType, 7 * 24 * 60 * 60 * 1000);
this.loginSuccess()
} else if(res.data.msgTip == 'user is not exist'){
err.message = '用户不存在';