LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
zhaoxiao
2021-10-13 15:24:35 +08:00
parent 896ad36e6a
commit e274635dc5
10 changed files with 109 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/incomePaymentsApi.js
+4 -1
View File
@@ -74,6 +74,8 @@ const homePageDataStatistics = (param) => getAction('/home/dataStatistics', para
const sysReminders = (param) => postAction('/reminders/edit', param)
// 检测企业审核是否通过
const checkCompanyAduit = (param) => getAction('/payMailContract/payMailContract/check', param)
// 获取全部部门
const getAllDepartTreeList = (param) => getAction('/sys/sysDepart/queryTreeAllList', param)
export {
getWorkingGroupById,
@@ -112,5 +114,6 @@ export {
homePageStatistics,
homePageDataStatistics,
sysReminders,
checkCompanyAduit
checkCompanyAduit,
getAllDepartTreeList
}
src/components/ProjectDetailModal.vue
+52 -39
View File
@@ -10,17 +10,17 @@
<section class="base-info">
<h3 class="title">基本信息</h3>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>项目负责人：</label>
<span><j-ellipsis :value="basicInfo.principalName" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>应收金额：</label>
<span><j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col>
<a-col class="detail-item">
<label>备注：</label>
<span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
</a-col>
@@ -33,21 +33,21 @@
</a-row>
<!-- 来款方式为合同的显示-->
<a-row :gutter="24" v-if="!!basicInfo.contractNum">
<a-col :span="12">
<label>{{createIncomeType(basicInfo.projectType)}}：</label>
<a-col :span="12" class="detail-item">
<label>{{ createIncomeType(basicInfo.projectType) }}：</label>
<span>{{ basicInfo.chargeWay_dictText }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>合同编号：</label>
<span class="contract-num" @click="toContractDetail">{{ basicInfo.contractNum }}</span>
</a-col>
</a-row>
<a-row :gutter="24" v-if="basicInfo.chargeWay === 3">
<a-col :span="12" >
<a-col :span="12" class="detail-item">
<label>收费通知号：</label>
<span><j-ellipsis :value="basicInfo.chargeNoticeNo" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>收费通知：</label>
<span><preview-file :file-id="basicInfo.chargeNoticeId"></preview-file></span>
</a-col>
@@ -58,11 +58,11 @@
<section class="enterprise-info">
<h3 class="title">企业信息</h3>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>来款企业：</label>
<span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人：</label>
<span>{{ basicInfo.name }}</span>
</a-col>
@@ -72,47 +72,47 @@
<label>企业联系人性别：</label>
<span>{{ basicInfo.gender_dictText }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人职务：</label>
<span>{{ basicInfo.post }}</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人电话：</label>
<span>{{ basicInfo.phone }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人邮箱：</label>
<span>{{ basicInfo.email }}</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人邮编：</label>
<span>{{ basicInfo.postalCodeContacts }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人地址：</label>
<span><j-ellipsis :value="basicInfo.contactAddress" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>是否需要发票：</label>
<span>{{ basicInfo.needInvoice_dictText }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>是否打包：</label>
<span>{{ basicInfo.pack_dictText }}</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业邮编：</label>
<span>{{ basicInfo.postalCodeCompany }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业地址：</label>
<span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
</a-col>
@@ -158,7 +158,7 @@
</template>
<script>
import {queryCommonProjectById} from '@api/incomePaymentsApi'
import { queryCommonProjectById } from '@api/incomePaymentsApi'
import JEllipsis from '@comp/jero/JEllipsis'
import PreviewFile from './jero/PreviewFile'
// import {getAction} from "@api/manage";
@@ -177,7 +177,7 @@ const paymentInfoList = [
id: 1003,
year: '2021',
money: '200'
},
}
]
const logisticsInfoList = [
{
@@ -197,49 +197,49 @@ const columns = [
{
title: '开票人',
align: 'center',
dataIndex: 'createBy',
dataIndex: 'createBy'
},
{
title: '日期',
align: 'center',
dataIndex: 'billDate',
dataIndex: 'billDate'
},
{
title: '金额(元)',
align: 'center',
dataIndex: 'invoiceAmount',
dataIndex: 'invoiceAmount'
},
{
title: '票号',
align: 'center',
dataIndex: 'billNo',
dataIndex: 'billNo'
},
{
title: '项目',
align: 'center',
dataIndex: 'chargeCompanyName',
dataIndex: 'chargeCompanyName'
},
{
title: '邮寄人',
align: 'center',
dataIndex: 'contactName',
dataIndex: 'contactName'
},
{
title: '快递',
align: 'center',
dataIndex: 'sendMethod',
dataIndex: 'sendMethod'
},
{
title: '快递单号',
align: 'center',
dataIndex: 'postNo',
dataIndex: 'postNo'
},
{
title: '操作',
align: 'center',
dataIndex: '',
scopedSlots: {customRender: 'action'}
},
scopedSlots: { customRender: 'action' }
}
]
export default {
name: 'ProjectDetailModal',
@@ -269,7 +269,7 @@ export default {
// 到账信息
paymentInfoList,
// 开票邮寄信息
logisticsInfoList,
logisticsInfoList
}
},
computed: {},
@@ -287,7 +287,7 @@ export default {
this.currentProjectId = record.id
}
// 通过id查询项目详情
queryCommonProjectById({id: this.currentProjectId}).then(res => {
queryCommonProjectById({ id: this.currentProjectId }).then(res => {
if (res.success) {
console.log(res.result, 'res.result')
// 项目信息
@@ -319,7 +319,7 @@ export default {
}
})
}
return `${item.person}于${item.time}开票，金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}`
return `${ item.person }于${ item.time }开票，金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }`
},
/*
* 查看物流
@@ -331,13 +331,13 @@ export default {
* 去合同详情 传入合同id
* */
toContractDetail() {
if(this.basicInfo.contractId){
if (this.basicInfo.contractId) {
this.$router.push({
path: '/contractManagement/RevenueContractDetail', query: {
revenueId: this.basicInfo.contractId
}
})
}else {
} else {
this.$message.warn('该项目未与合同关联')
}
},
@@ -346,9 +346,9 @@ export default {
* */
createIncomeType(val) {
if (val === 1 || val === 2 || val === 4) {
return '来款方式'
}else {
return '缴费方式'
return '来款方式'
} else {
return '缴费方式'
}
@@ -370,6 +370,19 @@ label {
color: #666;
}
.detail-item {
display: flex;
label {
flex-shrink: 0;
}
span {
word-break: break-all;
display: block;
}
}
.contract-num {
color: #42b983;
cursor: pointer;
src/components/company/SelectContacts.vue
+1 -1
View File
@@ -150,7 +150,7 @@ export default {
* 新建联系人
*/
addContacts() {
if (this.selectedCompany && Object.keys(this.selectedCompany).length > 0) {
if (this.selectedCompany && Object.keys(this.selectedCompany).length > 0 && this.selectedCompany.id) {
// 传入是否调用无权限接口的参数 去判断
this.$refs.contactForm.add(this.isLimit)
this.$refs.contactForm.title = '新增'
src/views/businessManagement/modules/ContactManagementModule.vue
+33 -27
View File
@@ -199,9 +199,9 @@ export default {
methods: {
add(limit) {
// true 是调用无权限接口
if(limit){
if (limit) {
this.url.add = '/company/payContactsManagement/addMeeting'
}else {
} else {
this.url.add = '/company/payContactsManagement/add'
}
this.edit({})
@@ -305,33 +305,39 @@ export default {
* @param callback
*/
checkName(rules, value, callback) {
if (value) {
// 是否编辑
if (this.model.id) {
// 编辑前后姓名是否一致，一致则不进行验重
if (value === this.model.name) {
callback()
return
}
this.selectedCompanyId = this.model.company.id
}
if (this.isCompanyDisabled) {
this.selectedCompanyId = this.selectedCompany.id
}
let param = {
companyId: this.selectedCompanyId,
name: value
}
queryContactByName(param).then(res => {
if (res.success) {
callback()
} else {
callback(res.message)
}
})
let company = this.form.getFieldValue('company')
if (!value) {
callback('请输入姓名')
return
}
callback('请输入姓名')
if (!company.id) {
callback('请先选择企业再输入姓名')
return
}
// 是否编辑
if (this.model.id) {
// 编辑前后姓名是否一致，一致则不进行验重
if (value === this.model.name) {
callback()
return
}
this.selectedCompanyId = this.model.company.id
}
if (this.isCompanyDisabled) {
this.selectedCompanyId = this.selectedCompany.id
}
let param = {
companyId: this.selectedCompanyId,
name: value
}
queryContactByName(param).then(res => {
if (res.success) {
callback()
} else {
callback(res.message)
}
})
},
/**
* 手机号校验
src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+8 -3
View File
@@ -794,13 +794,14 @@ export default {
this.$refs.selectProjectModule.departChange(this.departId)
// 打开弹窗
this.$refs.selectProjectModule.open()
}).catch((err) => {
this.$message.warn(err)
})
break
// 工作组项目
case 2:
this.$refs.selectWorkingGroupProjectModule.filters = {
companyId: this.selectedCompany.id,
contractId: this.contractId
}
this.$refs.selectWorkingGroupProjectModule.open()
@@ -829,9 +830,13 @@ export default {
let param = {
id: this.model.principalId
}
return new Promise(resolve => {
return new Promise((resolve, reject) => {
queryUserByDepartId(param).then(res => {
resolve(res.result[0].departIds)
if (res.success) {
resolve(res.result[0].departIds)
} else {
reject(res.message)
}
})
})
},
src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
+2 -2
View File
@@ -106,7 +106,7 @@ import JYearDate from '../../../../components/jero/JYearDate'
import GeneralProjectModule from '../../../projectManagement/modules/GeneralProjectModule'
import StatusSlot from '../../../../components/tools/StatusSlot'
import { associatedProject, queryUserByDepartId } from '../../../../api/incomePaymentsApi'
import { queryDepartTreeList } from '../../../../api/api'
import { getAllDepartTreeList } from '../../../../api/incomePaymentsApi'
export default {
name: 'SelectProjectModule',
@@ -262,7 +262,7 @@ export default {
* 获取科室（部门）数据
*/
loadDepartTreeData() {
queryDepartTreeList().then((res) => {
getAllDepartTreeList().then((res) => {
if (res.success) {
this.treeDepartData = []
let treeList = res.result
src/views/projectManagement/modules/GeneralProjectModule.vue
+3 -3
View File
@@ -84,7 +84,7 @@
<a-row>
<a-col :xl="12" :sm="24">
<a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-row :gutter="10">
<a-col :span="20">
<a-input placeholder="请输入应收金额"
v-decorator="['receivableAmount',validatorRules.receivableAmount]"
@@ -263,7 +263,7 @@ export default {
},
validatorRules: {
chargeProject: {
rules: [{ required: true, message: '请输入项目名称' }],
rules: [{ required: true, message: '请输入来款项目' }],
validateTrigger: 'blur'
},
year: {
@@ -463,7 +463,7 @@ export default {
callback()
return
}
callback('请选择企业')
callback('请选择来款企业')
},
/**
* 在新增成功后重新获取联系人列表
src/views/statisticalReport/WholeInstituteStatisticsList.vue
+2 -2
View File
@@ -158,7 +158,7 @@
import IconImg from '@/assets/imgs/icon/icon_statistical_report.png'
import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
import { JeroListMixin } from '../../mixins/JeroListMixin'
import { queryDepartTreeList } from '../../api/api'
import { getAllDepartTreeList } from '../../api/incomePaymentsApi'
import SelectPrincipal from '../../components/company/SelectPrincipal'
import JYearDate from '../../components/jero/JYearDate'
import { getAction } from '../../api/manage'
@@ -318,7 +318,7 @@ export default {
* 获取科室（部门）数据
*/
loadDepartTreeData() {
queryDepartTreeList().then((res) => {
getAllDepartTreeList().then((res) => {
if (res.success) {
this.treeDepartData = []
let treeList = res.result
src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
+2 -2
View File
@@ -121,7 +121,7 @@ import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
import { JeroListMixin } from '../../../mixins/JeroListMixin'
import JYearDate from '../../../components/jero/JYearDate'
import SelectPrincipal from '../../../components/company/SelectPrincipal'
import { queryDepartTreeList } from '../../../api/api'
import { getAllDepartTreeList } from '../../../api/incomePaymentsApi'
import { getAction } from '@api/manage'
export default {
@@ -256,7 +256,7 @@ export default {
* 获取科室（部门）数据
*/
loadDepartTreeData() {
queryDepartTreeList().then((res) => {
getAllDepartTreeList().then((res) => {
if (res.success) {
this.treeDepartData = []
let treeList = res.result
src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+2 -2
View File
@@ -143,7 +143,7 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin'
import JYearDate from '../../../components/jero/JYearDate'
import { getAction } from '@api/manage'
import SelectPrincipal from '@comp/company/SelectPrincipal'
import { queryDepartTreeList } from '@api/api'
import { getAllDepartTreeList } from '../../../api/incomePaymentsApi'
import ProjectDetailModal from '../../../components/ProjectDetailModal'
export default {
@@ -284,7 +284,7 @@ export default {
* 获取科室（部门）数据
*/
loadDepartTreeData() {
queryDepartTreeList().then((res) => {
getAllDepartTreeList().then((res) => {
if (res.success) {
this.treeDepartData = []
let treeList = res.result