diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
new file mode 100644
index 0000000..e4818e0
--- /dev/null
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -0,0 +1,392 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}:
+ {{ detailData[item.fieldName] }}%
+ {{ detailData[item.fieldName] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}:
+ {{ detailData[item.fieldName] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}:
+ {{ detailData[item.fieldName] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}:
+ 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}阶段:
+ {{ item.phaseName }}
+
+
+
+
+ {{ index + 1 }}阶段应收:
+ {{ item.accountsReceivableAmount }}
+
+
+
+
+ {{ index + 1 }}阶段应收时间:
+ {{ item.accountsReceivableTime }}
+
+
+
+
+ {{ index + 1 }}阶段实收:
+ {{ item.paidAmount }}
+
+
+
+
+ {{ index + 1 }}阶段实收时间:
+ {{ item.paidTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.createBy }}
+ {{ item.createTime }}
+ {{ item.contractStatus_dictText }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.createBy }}
+ {{ item.createTime }}
+ {{ item.contractStatus_dictText }}
+ {{ item.explainRemarks }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 审核
+
+
+ 存档
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index 0e3dbe8..cc633cf 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -75,6 +75,14 @@
@change="handleTableChange"
class="j-table-force-nowrap">
+
+
+
+
@@ -135,7 +143,7 @@ export default {
align: 'center',
dataIndex: 'contractNum',
width: 280,
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'projectName' }
}, {
title: '合同名称',
align: 'center',
@@ -197,6 +205,15 @@ export default {
contractId: id
}
})
+ },
+ toContractDetail(id) {
+ console.log(id)
+ this.$router.push({
+ path: '/contractManagement/ExpenditureContractDetail',
+ query: {
+ revenueId: id
+ }
+ })
}
}
}
diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 0c9ef2b..802fede 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -146,8 +146,8 @@
-
-
+ {e.target.value = (e.target.value + '').trim()}">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -659,7 +660,7 @@ export default {
callback('请输入签订合同总金额')
break
case 'accountsReceivableAmount':
- callback('请输入应收金额')
+ callback('请输入应付金额')
break
case 'noTaxAmount':
callback('请输入未税金额')
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index 398d655..813c8b7 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -6,28 +6,46 @@
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -208,7 +209,7 @@
{
- this.form.setFieldsValue({ rate: 6 })
+ this.form.setFieldsValue(pick(obj, 'rate', 'amountReceived'))
})
+ this.amountReceivedNum = 0
this.rateNum = 6 / 100
},
edit(id) {