From 931cdb736bc6360c656cc899b327980285a9a6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 19 May 2021 23:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E5=92=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/layouts/TabLayout.vue | 2 +- .../src/components/tools/Breadcrumb.vue | 94 +++++++++---------- .../src/components/tools/HeaderNotice.vue | 2 +- jshERP-web/src/store/modules/user.js | 1 - .../src/views/bill/AllocationOutList.vue | 4 +- jshERP-web/src/views/bill/AssembleList.vue | 4 +- jshERP-web/src/views/bill/DisassembleList.vue | 4 +- jshERP-web/src/views/bill/OtherInList.vue | 4 +- jshERP-web/src/views/bill/OtherOutList.vue | 4 +- .../src/views/bill/PurchaseBackList.vue | 4 +- jshERP-web/src/views/bill/PurchaseInList.vue | 4 +- .../src/views/bill/PurchaseOrderList.vue | 3 +- jshERP-web/src/views/bill/RetailBackList.vue | 4 +- jshERP-web/src/views/bill/RetailOutList.vue | 4 +- jshERP-web/src/views/bill/SaleBackList.vue | 4 +- jshERP-web/src/views/bill/SaleOrderList.vue | 4 +- jshERP-web/src/views/bill/SaleOutList.vue | 4 +- .../src/views/bill/mixins/BillModalMixin.js | 17 +++- .../views/bill/modules/AllocationOutModal.vue | 1 + .../src/views/bill/modules/AssembleModal.vue | 12 ++- .../views/bill/modules/DisassembleModal.vue | 12 ++- .../src/views/bill/modules/OtherInModal.vue | 1 + .../src/views/bill/modules/OtherOutModal.vue | 1 + .../views/bill/modules/PurchaseBackModal.vue | 1 + .../views/bill/modules/PurchaseInModal.vue | 2 + .../views/bill/modules/PurchaseOrderModal.vue | 1 + .../views/bill/modules/RetailBackModal.vue | 1 + .../src/views/bill/modules/RetailOutModal.vue | 4 + .../src/views/bill/modules/SaleBackModal.vue | 1 + .../src/views/bill/modules/SaleOrderModal.vue | 1 + .../src/views/bill/modules/SaleOutModal.vue | 1 + jshERP-web/src/views/system/UserList.vue | 9 +- .../views/system/modules/RolePushBtnModal.vue | 1 + jshERP-web/src/views/user/Login.vue | 1 + 34 files changed, 142 insertions(+), 75 deletions(-) diff --git a/jshERP-web/src/components/layouts/TabLayout.vue b/jshERP-web/src/components/layouts/TabLayout.vue index 807a589a..612f3409 100644 --- a/jshERP-web/src/components/layouts/TabLayout.vue +++ b/jshERP-web/src/components/layouts/TabLayout.vue @@ -150,7 +150,7 @@ // 将首页添加到第一位 addIndexToFirst() { this.pageList.splice(0, 0, { - name: 'dashboard-analysis', + name: '首页', path: indexKey, fullPath: indexKey, meta: { diff --git a/jshERP-web/src/components/tools/Breadcrumb.vue b/jshERP-web/src/components/tools/Breadcrumb.vue index 3bd067fa..2ec256e4 100644 --- a/jshERP-web/src/components/tools/Breadcrumb.vue +++ b/jshERP-web/src/components/tools/Breadcrumb.vue @@ -1,48 +1,48 @@ - - - - - \ No newline at end of file diff --git a/jshERP-web/src/components/tools/HeaderNotice.vue b/jshERP-web/src/components/tools/HeaderNotice.vue index 8a7ab1ff..9e7126ff 100644 --- a/jshERP-web/src/components/tools/HeaderNotice.vue +++ b/jshERP-web/src/components/tools/HeaderNotice.vue @@ -107,7 +107,7 @@ // this.heartCheckFun(); }, destroyed: function () { // 离开页面生命周期函数 - this.websocketclose(); + //this.websocketclose(); }, methods: { timerFun() { diff --git a/jshERP-web/src/store/modules/user.js b/jshERP-web/src/store/modules/user.js index a361f19c..23a158b5 100644 --- a/jshERP-web/src/store/modules/user.js +++ b/jshERP-web/src/store/modules/user.js @@ -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 { diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index a1e99174..3a1a381d 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index 13fe1f87..b01a271d 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 7a2bcffd..386219de 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index 0a16aa1a..3c0da4e0 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index dce11730..e845e05a 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index cc18a4d9..8c00da35 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 45184c76..9f5055f0 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 1dd693eb..74d7f850 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -107,7 +107,8 @@ number: "", materialParam: "", type: "其它", - subType: "采购订单" + subType: "采购订单", + roleType: Vue.ls.get('roleType') }, labelCol: { xs: { span: 24 }, diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index efe1bea6..9f569315 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 20d8fa38..2f7fc202 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 2c1ef6f8..9a096150 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -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: [ diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 145743df..6386ad56 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index b7174bd7..5e0d3ffd 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -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 }, diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 09f58c38..102c7462 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -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 diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index b9ee4c8e..ceb9d4cb 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -38,6 +38,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index d00966b8..02ff4c99 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -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 { diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index bd75183d..19708c0c 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -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 { diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 8e95f68f..877fee67 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -46,6 +46,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 7dcf7f58..02074521 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -46,6 +46,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 942eb334..90644382 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -47,6 +47,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 3aeb7298..97e2ae24 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -51,6 +51,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> @@ -207,6 +208,7 @@ //调用完edit()方法之后会自动调用此方法 editAfter() { if (this.action === 'add') { + let that = this this.addInit("CGRK") } else { this.model.operTime = this.model.operTimeStr diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 19aa7136..530cf5fb 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -46,6 +46,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 9970c52b..6d8b957c 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -48,6 +48,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 15f92cf9..8cff5457 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -55,6 +55,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> @@ -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 diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 949abf7d..3bb500f6 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -47,6 +47,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index d1367288..ceb5e16d 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -50,6 +50,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index e47baae3..b50fb1ff 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -51,6 +51,7 @@ :rowSelection="true" :actionButton="true" @valueChange="onValueChange" + @added="onAdded" @deleted="onDeleted" /> diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index 0f6186bd..8833dc90 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -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 } }) }, diff --git a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue index b1c4c986..37d48ee1 100644 --- a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue +++ b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue @@ -64,6 +64,7 @@ visible: false, model: {}, checked: false, + disableMixinCreated: true, confirmLoading: false, form: this.$form.createForm(this), /* 数据源 */ diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue index 91819c6d..d37cd435 100644 --- a/jshERP-web/src/views/user/Login.vue +++ b/jshERP-web/src/views/user/Login.vue @@ -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 = '用户不存在';