Merge branch 'master' into 2023年7月变更

# Conflicts:
#	src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
This commit is contained in:
fengchenchen
2023-07-20 18:05:53 +08:00
34 changed files with 159 additions and 174 deletions
@@ -299,7 +299,7 @@ export default {
dataIndex: 'contactsTemporaryNameOne',
scopedSlots: { customRender: 'text' }
}, {
title: '收金额',
title: '待确收金额',
align: 'center',
dataIndex: 'receivableAmount',
width: 180,