diff --git a/src/api/bs/paymentApply.js b/src/api/bs/paymentApply.js
index 949403d..c5718c3 100644
--- a/src/api/bs/paymentApply.js
+++ b/src/api/bs/paymentApply.js
@@ -61,10 +61,11 @@ export function getByPlanDetail(id) {
}
// 确认申请
-export function confirmApi(id) {
+export function confirmApi(data) {
return request({
- url: '/bs/payment-apply/paymentAffirm?id=' + id,
- method: 'get',
+ url: '/bs/payment-apply/paymentAffirm',
+ method: 'post',
+ data
})
}
// 取消确认
diff --git a/src/components/MyPayListCard/index.vue b/src/components/MyPayListCard/index.vue
index 2923c6c..63ca4bc 100644
--- a/src/components/MyPayListCard/index.vue
+++ b/src/components/MyPayListCard/index.vue
@@ -17,6 +17,9 @@
合同名称:{{itemData.contractName}}
+
+ 分期说明:{{itemData.periodName}}
+
供应商名称:{{itemData.supplierName}}
@@ -43,17 +46,20 @@
修改
删除
付款确认
+
取消确认
{{ itemData.payMentStatus == 1 && itemData.status == 2 ? '查看凭证' : itemData.files.length ? '修改凭证' : '上传凭证'}}
+
+
+
\ No newline at end of file
diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue
index cbb02db..6b32a57 100644
--- a/src/components/UploadFile/index.vue
+++ b/src/components/UploadFile/index.vue
@@ -1,13 +1,13 @@
-
@@ -77,13 +77,13 @@ export default {
return true;
},
handleToShow(item) {
+ this.$emit('onShow')
this.$router.push({
path: '/fileShow',
query: {
url: item.url
}
})
- console.log('val...', item);
},
handleDel(index) {
this.list.splice(index, 1)
@@ -152,5 +152,9 @@ export default {
// border
}
}
+ .mrNone {
+ margin: 0;
+ justify-content: flex-end;
+ }
}
\ No newline at end of file
diff --git a/src/views/company/claim/index.vue b/src/views/company/claim/index.vue
index 694b6cf..05918bb 100644
--- a/src/views/company/claim/index.vue
+++ b/src/views/company/claim/index.vue
@@ -594,8 +594,8 @@ export default {
let count = '';
for (let key in obj) {
if (Array.isArray(obj[key])) {
- obj[key].forEach(function (item){
- count = !count?item:count+ `、${item}`
+ obj[key].forEach(function (item) {
+ count = !count ? item : count + `、${item}`
})
}
}
@@ -780,7 +780,7 @@ export default {
getExpenseApplyMyPage({
pageNo: 1,
pageSize: 1000,
- billType: 'CLSQ',
+ billType: this.$route.query.billType === 'RCBX' ? 'RCSQ' : 'CLSQ',
expenseFlag: 0,
ids: [],
sortingFieldStr: encodeURIComponent(JSON.stringify([{ field: 'id', order: "desc" }]))
diff --git a/src/views/contract/corporateReceipts/components/HeaderFilter.vue b/src/views/contract/corporateReceipts/components/HeaderFilter.vue
index e2dcab3..6569e1d 100644
--- a/src/views/contract/corporateReceipts/components/HeaderFilter.vue
+++ b/src/views/contract/corporateReceipts/components/HeaderFilter.vue
@@ -2,7 +2,7 @@