Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
f4915b3716
  1. 10
      anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
  2. 41
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
  3. 12
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
  4. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
  5. 31
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaixiaoxinxiguanli.vue
  6. 15
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapply.vue
  7. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
  8. 7
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue
  9. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/paymentticket.vue
  10. 23
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
  11. 23
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

10
anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js

@ -125,3 +125,13 @@ export function getTypeValueList(data) {
params: data
})
}
// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
export function getButtonPermissions(data) {
return request({
url: '/portal/v1/sysfunction/getButtonPermissions',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

41
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue

@ -117,7 +117,7 @@
<script>
import { delBySids, pagerList, revokeProcess } from '@/api/chukuguanli/chukubanli'
import { typeValues, selectHaveMessage } from '@/api/dictcommons/dictcommons'
import { typeValues, selectHaveMessage, getButtonPermissions } from '@/api/dictcommons/dictcommons'
import { getStorage } from '@/utils/auth'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -149,6 +149,7 @@ export default {
payType: [],
list: [],
sids: [], // SIDs
multipleSelection: [],
FormLoading: false,
listLoading: false,
//
@ -163,7 +164,9 @@ export default {
applySid: '', // sid
contractNo: '', //
name: '', //
paymentMethodKey: ''
paymentMethodKey: '',
menuUrl: '',
orgPath: ''
}
},
btnList: [
@ -199,7 +202,18 @@ export default {
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
async handleMessage(event) {
@ -289,6 +303,7 @@ export default {
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@ -300,6 +315,8 @@ export default {
getList() {
this.listLoading = true
this.listQuery.params.applySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
pagerList(this.listQuery).then(response => { //
this.listLoading = false
if (response.success) {
@ -329,7 +346,9 @@ export default {
applySid: '', // sid
contractNo: '', //
name: '', //
paymentMethodKey: ''
paymentMethodKey: '',
menuUrl: '',
orgPath: ''
}
}
this.getList()
@ -344,8 +363,12 @@ export default {
},
//
toEdit(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
if (row.allowModify) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
} else {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
}
},
//
toInfo(row) {
@ -358,6 +381,12 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
for (var i = 0; i < this.multipleSelection.length; i++) {
if (!this.multipleSelection[i].allowModify) {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
return
}
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',

12
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js

@ -158,3 +158,15 @@ export function saveGeren(data) {
})
}
// 查看款、票情况详情
export function deliveredFinSelect(data) {
return request({
url: '/buscenter/v1/busdeliveredapply/deliveredFinSelect',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@ -754,9 +754,6 @@ export default {
paymentVoucherUrl_list.push(this.formobj.paymentVoucherAppendixs[i].filePath)
}
this.formobj.paymentVoucherUrl = paymentVoucherUrl_list.join(',')
} else {
this.$message({ showClose: true, type: 'error', message: '请上传打款凭证' })
return
}
if (this.formobj.remittanceConfirmationAppendixs.length > 0) {
var remittanceConfirmationUrl_list = []
@ -764,13 +761,6 @@ export default {
remittanceConfirmationUrl_list.push(this.formobj.remittanceConfirmationAppendixs[b].filePath)
}
this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',')
} else {
for (var k = 0; k < this.formobj.finSelectedReceivablesDetaileds.length; k++) {
if (this.formobj.finSelectedReceivablesDetaileds[k].customerName !== this.formobj.payerName) {
this.$message({ showClose: true, type: 'error', message: '请上传汇款确认书' })
return
}
}
}
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.$refs['form_obj'].validate((valid) => {

31
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaixiaoxinxiguanli.vue

@ -91,7 +91,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import kaipiaoxinxiAdd from './kaipiaoxinxiAdd.vue'
import { selectOrgByLevel, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
import { selectOrgByLevel, getListDeptByOrgSid, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'kaipiaoxinxiguanli',
@ -134,6 +134,7 @@ export default {
tableKey: 0,
list: [],
sids: [],
multipleSelection: [],
org_list: [],
orgDept_list: [],
FormLoading: false,
@ -159,7 +160,18 @@ export default {
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
init() {
@ -202,6 +214,7 @@ export default {
},
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach((element) => {
aa.push(element.sid)
})
@ -257,14 +270,24 @@ export default {
this.$refs['divAdd'].showAdd()
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
if (row.isCZ) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
} else {
this.$message({ showClose: true, type: 'error', message: '非本人创建的记录,无权限操作' })
}
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
for (var i = 0; i < this.multipleSelection.length; i++) {
if (!this.multipleSelection[i].isCZ) {
this.$message({ showClose: true, type: 'error', message: '因包含非本人创建的记录,无权限操作' })
return
}
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',

15
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapply.vue

@ -222,7 +222,8 @@ export default {
modelName: '',
openTickUnitName: '',
saleTypeKey: '',
useOrgSid: ''
useOrgSid: '',
menuUrl: ''
}
}
}
@ -321,6 +322,7 @@ export default {
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
listPage(this.listQuery).then(response => {
this.listLoading = false
if (response.success) {
@ -354,14 +356,19 @@ export default {
modelName: '',
openTickUnitName: '',
saleTypeKey: '',
useOrgSid: ''
useOrgSid: '',
menuUrl: ''
}
}
this.init()
},
toEdit(row) {
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
if (row.isCZ) {
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
} else {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
}
},
toInfo(row) {
this.viewState = 3

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@ -704,9 +704,6 @@ export default {
paymentVoucherUrl_list.push(this.formobj.paymentVoucherAppendixs[i].filePath)
}
this.formobj.paymentVoucherUrl = paymentVoucherUrl_list.join(',')
} else {
this.$message({ showClose: true, type: 'error', message: '请上传打款凭证' })
return
}
if (this.formobj.remittanceConfirmationAppendixs.length > 0) {
var remittanceConfirmationUrl_list = []
@ -714,13 +711,6 @@ export default {
remittanceConfirmationUrl_list.push(this.formobj.remittanceConfirmationAppendixs[b].filePath)
}
this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',')
} else {
for (var k = 0; k < this.formobj.finSelectedReceivablesDetaileds.length; k++) {
if (this.formobj.finSelectedReceivablesDetaileds[k].customerName !== this.formobj.payerName) {
this.$message({ showClose: true, type: 'error', message: '请上传汇款确认书' })
return
}
}
}
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.$refs['form_obj'].validate((valid) => {

7
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue

@ -146,7 +146,8 @@ export default {
createStartTime: '',
createEndTime: '',
createBySid: '',
orgPath: ''
orgPath: '',
menuUrl: ''
},
total: 0
}
@ -190,6 +191,7 @@ export default {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.createBySid = window.sessionStorage.getItem('staffSid')
this.listQuery.params.menuUrl = this.$route.path
customerBillDetailedListPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@ -218,7 +220,8 @@ export default {
createStartTime: '',
createEndTime: '',
createBySid: '',
orgPath: ''
orgPath: '',
menuUrl: ''
},
total: 0
}

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/paymentticket.vue

@ -143,7 +143,7 @@
</template>
<script>
import { deliveredFinSelect } from '@/api/chukuguanli/chukubanli'
import { deliveredFinSelect } from '@/api/anruifinmanagement/finwaitinvoiceapply'
export default {
name: 'PaymentTicket',

23
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue

@ -91,7 +91,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './cheliangpaichanAdd'
import divInfo from './cheliangpaichanInfo'
import { selectHaveMessage } from '@/api/cheliang/dictcommons'
import { getButtonPermissions, selectHaveMessage } from '@/api/cheliang/dictcommons'
import { getStorage } from '@/utils/auth'
export default {
@ -175,7 +175,18 @@ export default {
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
async handleMessage(event) {
@ -327,9 +338,11 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
if (!this.multipleSelection[0].allowModify) {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
return
for (var i = 0; i < this.multipleSelection.length; i++) {
if (!this.multipleSelection[i].allowModify) {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
return
}
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {

23
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@ -278,7 +278,7 @@ import cunfangdidianbiangengAdd from '@/views/supplychain/cunfangdidianbiangeng/
import cunfangdidianbiangengInfo from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo'
import upload from '../../../components/uploadFile/upload_cunfang'
import { getStorage } from '@/utils/auth'
import { selectHaveMessage } from '@/api/cheliang/dictcommons'
import { getButtonPermissions, selectHaveMessage } from '@/api/cheliang/dictcommons'
export default {
name: 'cunfangdidianbiangeng',
@ -367,7 +367,18 @@ export default {
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
async handleMessage(event) {
@ -436,9 +447,11 @@ export default {
})
return
}
if (!this.multipleSelection[0].allowModify) {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
return
for (var i = 0; i < this.multipleSelection.length; i++) {
if (!this.multipleSelection[i].allowModify) {
this.$message({ showClose: true, type: 'error', message: '非本人发起的申请,无权限操作' })
return
}
}
const _this = this
const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'

Loading…
Cancel
Save