diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index bb1299e..89f1c1d 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -11,6 +11,11 @@ import store from '@/store'
import {Modal} from 'ant-design-vue'
import {deleteByDepartId} from '@api/api'
+const defaultSorter = {
+ column: 'createTime',
+ order: 'desc'
+}
+
export const JeroListMixin = {
data() {
return {
@@ -138,7 +143,7 @@ export const JeroListMixin = {
getQueryField() {
//TODO 字段权限控制
var str = 'id,'
- if (this.columns && this.columns.length){
+ if (this.columns && this.columns.length) {
this.columns.forEach(function (value) {
str += ',' + value.dataIndex
})
@@ -254,7 +259,18 @@ export const JeroListMixin = {
//TODO 筛选
if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field
- this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+ if (sorter.order) {
+ // 如果当前有列选中筛选条件
+ this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+ } else {
+ // 没有筛选值则 isorter 重置为初始值
+ this.isorter.column = defaultSorter.column
+ this.isorter.order = defaultSorter.order
+ }
+
+ } else {
+ this.isorter.column = defaultSorter.column
+ this.isorter.order = defaultSorter.order
}
this.ipagination = pagination
this.loadData()
@@ -362,8 +378,8 @@ export const JeroListMixin = {
* @Date 2021-12-29
* @author fac
* */
- releaseMeeing(){
- if(this.selectedRowKeys.length === 0){
+ releaseMeeing() {
+ if (this.selectedRowKeys.length === 0) {
this.$message.warn('请至少选中一个会议')
return
}
@@ -371,24 +387,24 @@ export const JeroListMixin = {
let flag = this.selectionRows.some(item => {
return item.isRelease === 1
})
- if(flag){
+ if (flag) {
this.$message.warn('请选择未发布的会议')
return
}
const that = this
- if(this.url.releaseMeeingUrl){
+ if (this.url.releaseMeeingUrl) {
const param = {
- meetingIds:this.selectedRowKeys
+ meetingIds: this.selectedRowKeys
}
this.$confirm({
title: '确认发布',
content: '确定要发布选中的会议吗?',
onOk: function () {
- postAction(that.url.releaseMeeingUrl,param).then(res => {
- if(res.success){
+ postAction(that.url.releaseMeeingUrl, param).then(res => {
+ if (res.success) {
that.$message.success('发布成功')
that.loadData()
- }else {
+ } else {
that.$message.warn(res.message)
}
})
@@ -396,7 +412,7 @@ export const JeroListMixin = {
})
- }else {
+ } else {
this.$message.warn('请设置url.releaseMeeingUrl')
}
},
diff --git a/src/utils/formatMoney.js b/src/utils/formatMoney.js
index da07259..d8dde8c 100644
--- a/src/utils/formatMoney.js
+++ b/src/utils/formatMoney.js
@@ -47,3 +47,17 @@ export function formatMoney(money) {
}
return ___(__(_(result) + point))
}
+
+
+/* 将数字 转换成 3个数字一组,并且中间用,分隔得方式 */
+export function handleCostNumber(value) {
+ if(!value){
+ return 0.00
+ }
+ //toFixed()方法可以把Number四舍五入为指定位数的数字
+ let str=parseFloat(value).toFixed(2)
+ //"?="表示查询的要满足的条件,
+ return str&&str.toString().replace(/(\d)(?=(\d{3})+\.)/g,function ($0,$1) {
+ return $1+','
+ })
+}
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index b77970e..eaf1118 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -6,27 +6,32 @@
-
+
-
+
-
+
-
-
- 查询
- 重置
-
+
+
+
+
+
+
+
+ 查询
+ 重置
+
diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
index fa6dafd..eb42e0e 100644
--- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue
+++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
@@ -52,24 +52,9 @@
-
-
-
-
-
-
-
-
+
@@ -86,6 +71,31 @@
dictCode="pay_statistics_status"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
new file mode 100644
index 0000000..962a8ca
--- /dev/null
+++ b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
index 1b92480..25ab854 100644
--- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
@@ -19,7 +19,7 @@
-
+
@@ -29,6 +29,11 @@
dictCode="pay_statistics_status"/>
+
+
+
+
+
-
+
@@ -45,6 +45,11 @@
+
+
+
+
+
查询
@@ -182,19 +187,37 @@ export default {
align: 'center',
width: 140,
dataIndex: 'allMoney',
+ sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '实收金额',
align: 'center',
width: 140,
dataIndex: 'comeAllMoney',
+ sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '个人完成率',
align: 'center',
dataIndex: 'finishRate',
width: 140
- }
+ },
+ {
+ title: '已开票金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'billMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '确认到账金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'preComeMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
],
columnsFooter: [
{
@@ -209,23 +232,41 @@ export default {
width: 300,
dataIndex: 'principalName',
scopedSlots: { customRender: 'text' }
- }, {
+ }, {
title: '应收金额',
align: 'center',
width: 140,
dataIndex: 'allMoney',
+ sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '实收金额',
align: 'center',
width: 140,
dataIndex: 'comeAllMoney',
+ sorter: true,
scopedSlots: {customRender: 'allMoney'}
}, {
title: '个人完成率',
align: 'center',
- dataIndex: 'chargeUse_dictText',
+ dataIndex: 'finishRate',
width: 140
+ },
+ {
+ title: '已开票金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'billMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '确认到账金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'preComeMoney',
+ scopedSlots: { customRender: 'allMoney' }
}
],
footerDataSource: [],
diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
index 0223cfe..1f667f1 100644
--- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
@@ -24,7 +24,7 @@
-
+
@@ -47,6 +47,11 @@
+
+
+
+
+
@@ -227,14 +232,33 @@ export default {
align: 'center',
width: 160,
dataIndex: 'allMoney',
+ sorter: true,
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
dataIndex: 'comeAllMoney',
+ sorter: true,
scopedSlots: { customRender: 'allMoney' }
- }, {
+ },
+ {
+ title: '已开票金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'billMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '确认到账金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'preComeMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
title: '来款用途',
align: 'center',
width: 160,
@@ -278,12 +302,30 @@ export default {
align: 'center',
width: 160,
dataIndex: 'allMoney',
+ sorter: true,
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
dataIndex: 'comeAllMoney',
+ sorter: true,
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '已开票金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'billMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '确认到账金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'preComeMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
index b443706..6a54a09 100644
--- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
@@ -19,7 +19,7 @@
-
+
@@ -29,6 +29,11 @@
dictCode="pay_statistics_status"/>
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -189,12 +194,14 @@ export default {
title: '应收总金额',
align: 'center',
width: 160,
+ sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收总金额',
align: 'center',
width: 160,
+ sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
@@ -203,7 +210,24 @@ export default {
width: 160,
dataIndex: 'moneyRate',
scopedSlots: { customRender: 'text' }
- }, {
+ },
+ {
+ title: '已开票金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'billMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '确认到账金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'preComeMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
title: '操作',
dataIndex: 'action',
align: 'center',
@@ -225,16 +249,18 @@ export default {
align: 'center',
dataIndex: 'workGroup',
scopedSlots: { customRender: 'text' }
- }, {
+ }, {
title: '应收总金额',
align: 'center',
width: 160,
+ sorter: true,
dataIndex: 'allMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收总金额',
align: 'center',
width: 160,
+ sorter: true,
dataIndex: 'comeAllMoney',
scopedSlots: { customRender: 'allMoney' }
}, {
@@ -243,6 +269,22 @@ export default {
width: 160,
dataIndex: 'moneyRate',
scopedSlots: { customRender: 'text' }
+ },
+ {
+ title: '已开票金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'billMoney',
+ scopedSlots: { customRender: 'allMoney' }
+ },
+ {
+ title: '确认到账金额',
+ align: 'center',
+ width: 150,
+ sorter: true,
+ dataIndex: 'preComeMoney',
+ scopedSlots: { customRender: 'allMoney' }
}, {
title: '操作',
dataIndex: 'action',