diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index ecc2013..e665515 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -58,7 +58,7 @@ export default {
required: false
},
// 当前需要转换key的属性, 悬浮显示实际具体内容信息时需要
- // paymentRecord 来款 mail -- 邮寄 bill--开票
+ // paymentRecord 来款 confirm-确认收入 mail -- 邮寄 bill--开票
statusKey: {
type: String,
required: false,
@@ -106,6 +106,9 @@ export default {
} else {
return finished
}
+ } else if(this.statusNo === 4) {
+ // 确认收入莫名其妙的出现了 4， 所以修改成 全部确认的样式
+ return finished
}
}
},
@@ -129,9 +132,16 @@ export default {
// 到账、开票、邮寄 的时候，请求接口获得相应的数据
// 判断条件 tooltip显示、 有不同的统计状态，统计状态值不为0 没有请求过详情数据
if (visible && this.statusType && this.statusNo && !this.hasInfo) {
- this.getInfoFunc({ id: this.statuObj.id }).then(res => {
+ let idKey = this.statusKey === 'confirm' && 'projectId' || 'id'
+ this.getInfoFunc({ [idKey]: this.statuObj.id }).then(res => {
if (res.success) {
- let arr = res.result[this.opeStatusKey] || []
+ let arr = []
+ if(this.statusKey === 'confirm') {
+ // 确认收入单独的实现逻辑
+ arr = res.result || []
+ } else {
+ arr = res.result[this.opeStatusKey] || []
+ }
let result = []
arr.map(tt => {
result.push(this.showTemplate(tt))
@@ -139,6 +149,7 @@ export default {
// 对tooltip中的文字进行替换
this.currentTitle = result.join('\n')
this.hasInfo = true
+
}
})
}
@@ -165,6 +176,10 @@ export default {
if (item.sendDate || item.postNo) {
result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
}
+ } else if (this.statusKey === 'confirm') {
+ if (item.paymentDate || item.amountReceived) {
+ result = `${ item.paymentDate }确认收入${ item.amountReceived }元`
+ }
}
return result
}
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 715ad52..f4a6628 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -119,6 +119,11 @@
+
+
+
+
+
@@ -146,8 +151,8 @@
:disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款
开票
-
- 确认收入
+
+ 确认收入
@@ -158,6 +163,7 @@
@ok="modalFormOk"
:project-id="selectProjectId"
:project-type="selectProjectType"
+ :need-invoice="selectNeedInvoice"
:visible.sync="arriveVisible">
@@ -214,6 +220,7 @@ import AuditProofModule from './modules/AuditProofModule'
// import AuditProofModule from "@views/financialManagement/arriveAndInvoicing/modules/AuditProofModule";
import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
import ConfirmStageModule from './modules/ConfirmStageModule'
+import {getPayConfirmList} from '../../../api/incomePaymentsApi'
// 项目类型 数据字典 的定义 和数据库的保持一致
const ProjectTypeEnums = {
@@ -330,6 +337,12 @@ export default {
width: 70,
dataIndex: 'inAccount',
scopedSlots: {customRender: 'status'}
+ }, {
+ title: '收入',
+ align: 'center',
+ width: 70,
+ dataIndex: 'affirmIncome',
+ scopedSlots: {customRender: 'status-confirm'}
}, {
title: '开票',
align: 'center',
@@ -358,6 +371,7 @@ export default {
selectProjectId: null, // 选中项目id
selectProjectType: null, // 选中项目类型
selectProjectName: null, // 选中项目名称open
+ selectNeedInvoice: null, // 选中项目是否需要发票
selectProjectChargeCompanyName: null, // 选中项目来款企业
invoicingVisible: false,
arriveVisible: false,
@@ -372,6 +386,7 @@ export default {
}
},
methods: {
+ getPayConfirmList,
/**
* 来款
* @param record
@@ -379,6 +394,7 @@ export default {
incomePayment(record) {
this.selectProjectType = record.projectType
this.selectProjectId = record.id
+ this.selectNeedInvoice = record.needInvoice
this.arriveVisible = true
},
/**
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
index 4b11113..9838300 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue
@@ -76,6 +76,18 @@ export default {
required: false,
default: null
},
+ // 项目是否需要发票
+ needInvoice: {
+ type: [Number, String],
+ required: false,
+ default: null
+ },
+ },
+ watch: {
+ // 监听是否需要发票 然后修改响应的税率值
+ needInvoice(value) {
+ this.taxRate = value ? 0.06 : 0
+ }
},
data() {
return {
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
index af920b2..6369157 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
@@ -100,7 +100,7 @@ export default {
type: String,
required: false,
default: null
- },
+ }
},
data() {
return {
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index fd0abfb..52e036f 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -111,7 +111,10 @@
-
+
+
+
+
@@ -132,7 +135,7 @@
取消打包
开票
- 确认收入
+ 确认收入
@@ -166,6 +169,7 @@
:project-type="selectProjectType"
:project-id="selectProjectId"
:visible.sync="arriveStageVisible"
+ :need-invoice="selectNeedInvoice"
@ok="modalFormOk">
@@ -205,6 +209,7 @@ import InvoicingStageModule from '../financialManagement/arriveAndInvoicing/modu
import { getPackCompanyById, batchRemovePackProject, removePackProject } from '../../api/incomePaymentsApi'
import ProjectDetailModal from '../../components/ProjectDetailModal'
import ConfirmStageModule from '../financialManagement/arriveAndInvoicing/modules/ConfirmStageModule'
+import {getPayConfirmList} from '@/api/incomePaymentsApi'
export default {
name: 'PackProjectMaintenance',
@@ -315,6 +320,12 @@ export default {
width: 80,
dataIndex: 'inAccount',
scopedSlots: { customRender: 'status' }
+ }, {
+ title: '收入',
+ align: 'center',
+ width: 80,
+ dataIndex: 'affirmIncome',
+ scopedSlots: {customRender: 'status-confirm'}
}, {
title: '开票',
align: 'center',
@@ -365,6 +376,7 @@ export default {
selectProjectId: null, // 选中项目id
selectProjectType: null, // 选中项目类型
selectProjectName: null, // 选中项目名称
+ selectNeedInvoice: null, // 选中项目是否需要发票
selectProjectChargeCompanyName: null, // 选中项目来款企业
url: {
list: '/pack/payPackCompanyProject/listAll',
@@ -379,6 +391,7 @@ export default {
})
},
methods: {
+ getPayConfirmList,
/**
* 获取企业信息
*/
@@ -515,6 +528,7 @@ export default {
incomePayment(record) {
this.selectProjectId = record.id
this.arriveStageVisible = true
+ this.selectNeedInvoice = record.needInvoice
this.selectProjectType = record.projectType
},
/**