diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index ab5b167..3e3bb2a 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -91,25 +91,25 @@
- {{ index + 1 }}阶段应收:
+ {{ index + 1 }}阶段应付:
{{ item.accountsReceivableAmount }}
- {{ index + 1 }}阶段应收时间:
+ {{ index + 1 }}阶段应付时间:
{{ item.accountsReceivableTime }}
- {{ index + 1 }}阶段实收:
+ {{ index + 1 }}阶段实付:
{{ item.paidAmount }}
- {{ index + 1 }}阶段实收时间:
+ {{ index + 1 }}阶段实付时间:
{{ item.paidTime }}
@@ -267,10 +267,10 @@ export default {
title: '应付金额'
}, {
fieldName: 'amountReceived',
- title: '已收金额'
+ title: '已付金额'
}, {
fieldName: 'amountReceived',
- title: '未收金额'
+ title: '未付金额'
}, {
fieldName: 'accountStatus_dictText',
title: '赊账状态'
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index c63247a..c1c145e 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -128,11 +128,17 @@
-
+
+ {{ text }}
+ {{ text }}
+
-
+
+ {{ text }}
+ {{ text }}
+
@@ -233,6 +239,13 @@ export default {
// width: 280,
// scopedSlots: { customRender: 'text' }
// },
+ {
+ title: '负责人',
+ align: 'center',
+ dataIndex: 'principalName',
+ width: 120,
+ scopedSlots: { customRender: 'text' }
+ },
{
title: '签订单位',
align: 'center',
@@ -404,4 +417,9 @@ export default {
color: red !important;
}
+.table-text {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
index 03bced7..c7d9180 100644
--- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -55,7 +55,10 @@
@change="handleTableChange"
class="j-table-force-nowrap">
-
+
+ {{ text }}
+ {{ text }}
+
@@ -77,7 +80,10 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, columnWidth: 80}"
class="j-table-force-nowrap">
-
+
+ {{ text }}
+ {{ text }}
+
@@ -193,7 +199,7 @@ export default {
}
],
dataSource: [],
- expandedRowKeys: [], // 展开数据的id
+ expandedRowKeys: [] // 展开数据的id
}
},
methods: {
@@ -339,4 +345,10 @@ export default {
\ No newline at end of file
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 0b77b71..ecd004c 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -18,6 +18,21 @@
+
+
+
+
+
+
+
@@ -198,7 +213,7 @@ export default {
ProjectDetailModal,
BatchInvoicingModule,
AuditProofModule,
- AuditModal,
+ AuditModal
},
mixins: [JeroListMixin],
data() {
@@ -282,7 +297,7 @@ export default {
width: 80,
dataIndex: 'needInvoice',
scopedSlots: { customRender: 'status-pack' }
- },{
+ }, {
title: '到账',
align: 'center',
width: 70,
@@ -322,9 +337,9 @@ export default {
selectedProject: [],
batchInvoicingVisible: false,
selectedCompany: {}, // 选中项目的企业信息
- mailContactsId: null ,// 项目邮寄联系人id
- meetingType:undefined, // 会议项目的会议类型
- situationId:undefined // 参会人id
+ mailContactsId: null,// 项目邮寄联系人id
+ meetingType: undefined, // 会议项目的会议类型
+ situationId: undefined // 参会人id
}
},
@@ -345,7 +360,7 @@ export default {
invoicing(record) {
// 标协会员项目必须先到账后开票
if ((Number(record.projectType) === 5 || Number(record.projectType) === 6) && record.paymentStatus !== 'completed') {
- this.$message.warn(`标协${Number(record.projectType) === 5 ? '会员' : '证书'}项目必须先审核通过才可开票。`)
+ this.$message.warn(`标协${ Number(record.projectType) === 5 ? '会员' : '证书' }项目必须先审核通过才可开票。`)
return
}
this.mailContactsId = record.mailContactsId
@@ -450,6 +465,52 @@ export default {
return
}
},
+ /**
+ * 搜索金额校验
+ * @param type 起始范围--start,终止范围--end
+ */
+ checkMoney(type) {
+ if (type === 'start') {
+ this.queryParam.startAmount = this.queryParam.startAmount.replace(/[^0-9.]/g, '')
+ let pointIndex = this.queryParam.startAmount.indexOf('.')
+ // 包含小数点,保留小数点后两位
+ if (pointIndex > -1) {
+ this.queryParam.startAmount = this.queryParam.startAmount.substr(0, pointIndex + 3)
+ // 截取整数部分
+ let str = this.queryParam.startAmount.slice(0, pointIndex)
+ // 整数部分大于十位则去掉十位之后的整数部门,并将小数部分拼接
+ if (str.length > 10) {
+ str = str.substr(0, 10)
+ this.queryParam.startAmount = str + this.queryParam.startAmount.substr(pointIndex, 3)
+ }
+ }
+ // 不包含小数点且输入数字超过十位保留前十位数据
+ if (pointIndex === -1 && this.queryParam.startAmount.length > 10) {
+ this.queryParam.startAmount = this.queryParam.startAmount.substr(0, 10)
+ }
+ return
+ }
+ if (type === 'end') {
+ this.queryParam.endAmount = this.queryParam.endAmount.replace(/[^0-9.]/g, '')
+ let pointIndex = this.queryParam.endAmount.indexOf('.')
+ // 包含小数点,保留小数点后两位
+ if (pointIndex > -1) {
+ this.queryParam.endAmount = this.queryParam.endAmount.substr(0, pointIndex + 3)
+ // 截取整数部分
+ let str = this.queryParam.endAmount.slice(0, pointIndex)
+ // 整数部分大于十位则去掉十位之后的整数部门,并将小数部分拼接
+ if (str.length > 10) {
+ str = str.substr(0, 10)
+ this.queryParam.endAmount = str + this.queryParam.endAmount.substr(pointIndex, 3)
+ }
+ }
+ // 不包含小数点且输入数字超过十位保留前十位数据
+ if (pointIndex === -1 && this.queryParam.endAmount.length > 10) {
+ this.queryParam.endAmount = this.queryParam.endAmount.substr(0, 10)
+ }
+ return
+ }
+ }
}
}
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index b3d6206..6253971 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -101,7 +101,10 @@
-
+
+ {{ text }}
+ {{ text }}
+
@@ -316,13 +319,13 @@ export default {
}, {
title: '企业联系人',
align: 'center',
- width: 280,
+ width: 100,
dataIndex: 'contactsTemporaryName',
scopedSlots: { customRender: 'text' }
}, {
title: '联系人电话',
align: 'center',
- width: 160,
+ width: 100,
dataIndex: 'phone',
scopedSlots: { customRender: 'text' }
}, {
@@ -601,4 +604,10 @@ export default {
background-color: #F2F2F2;
margin: 15px 0px;
}
+
+.table-text {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
\ No newline at end of file
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index eb34078..808cef2 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -140,7 +140,10 @@
-
+
+ {{ text }}
+ {{ text }}
+
@@ -268,7 +271,7 @@ export default {
}, {
title: '企业联系人',
align: 'center',
- width: 280,
+ width: 120,
dataIndex: 'contactsTemporaryNameOne',
scopedSlots: { customRender: 'text' }
}, {
@@ -547,4 +550,9 @@ export default {
}
}
+.table-text {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}