From 01e01d7b9db711176a6e0548228e0afce9ab2e28 Mon Sep 17 00:00:00 2001
From: 123456 <13063093621@163.com>
Date: Sun, 24 Mar 2024 22:48:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=9C=AC=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/CorporatePaymentCard/index.vue | 6 +++---
src/components/CorporateReceiptsCard/index.vue | 6 +++---
src/components/MyClaimListCard/index.vue | 12 ++++--------
src/components/MyCustomerListCard/index.vue | 4 ++--
src/components/MyPayListCard/index.vue | 8 ++++----
src/components/MySupplierListCard/index.vue | 6 +++---
src/components/MyTripsListCard/index.vue | 10 +++++-----
7 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/components/CorporatePaymentCard/index.vue b/src/components/CorporatePaymentCard/index.vue
index 8c5a1cc..21e44ea 100644
--- a/src/components/CorporatePaymentCard/index.vue
+++ b/src/components/CorporatePaymentCard/index.vue
@@ -43,9 +43,9 @@
-
-
-
+
+
+
diff --git a/src/components/CorporateReceiptsCard/index.vue b/src/components/CorporateReceiptsCard/index.vue
index 52cf94d..396d156 100644
--- a/src/components/CorporateReceiptsCard/index.vue
+++ b/src/components/CorporateReceiptsCard/index.vue
@@ -43,9 +43,9 @@
-
-
-
+
+
+
diff --git a/src/components/MyClaimListCard/index.vue b/src/components/MyClaimListCard/index.vue
index a1aea47..81667e6 100644
--- a/src/components/MyClaimListCard/index.vue
+++ b/src/components/MyClaimListCard/index.vue
@@ -35,13 +35,9 @@
-
-
-
-
-
+
+
+
@@ -97,7 +93,7 @@ export default {
})
},
handleEdit(obj) {
- const { id, status, billType } = obj
+ const { id, status, billType, creator } = obj
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
return
}
diff --git a/src/components/MyCustomerListCard/index.vue b/src/components/MyCustomerListCard/index.vue
index c67ce15..0575aec 100644
--- a/src/components/MyCustomerListCard/index.vue
+++ b/src/components/MyCustomerListCard/index.vue
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/src/components/MyPayListCard/index.vue b/src/components/MyPayListCard/index.vue
index 2923c6c..60b9bf0 100644
--- a/src/components/MyPayListCard/index.vue
+++ b/src/components/MyPayListCard/index.vue
@@ -36,12 +36,12 @@
+
+ -->
查看
- 修改
- 删除
+ 修改
+ 删除
付款确认
取消确认
{{ itemData.payMentStatus == 1 && itemData.status == 2 ? '查看凭证' : itemData.files.length ? '修改凭证' : '上传凭证'}}
diff --git a/src/components/MySupplierListCard/index.vue b/src/components/MySupplierListCard/index.vue
index ec6b742..dba2d42 100644
--- a/src/components/MySupplierListCard/index.vue
+++ b/src/components/MySupplierListCard/index.vue
@@ -36,9 +36,9 @@
-
-
-
+
+
+
diff --git a/src/components/MyTripsListCard/index.vue b/src/components/MyTripsListCard/index.vue
index f8dba39..8ebba43 100644
--- a/src/components/MyTripsListCard/index.vue
+++ b/src/components/MyTripsListCard/index.vue
@@ -38,11 +38,11 @@
-
-
-
+
+
@@ -94,7 +94,7 @@ export default {
})
},
handleEdit(obj) {
- const { id, status, billType } = obj
+ const { id, status, billType, creator } = obj
if (!(status==0 || (status ==3 && this.userInfo.id ==creator))) {
return
}
From 0a4373fba92274a00b17a76cf929ebe249507c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=A4=AB=E7=90=B3?=
<5356169+zhaofulin@user.noreply.gitee.com>
Date: Tue, 26 Mar 2024 11:54:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=94=B6=E4=BB=98=E6=AC=BE=E8=B4=A6=E6=88=B7=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/contract/payment/index.vue | 7 +--
src/views/contract/receipts/index.vue | 2 +-
src/views/contract/supplier/index.vue | 80 ++++++++++++++-------------
3 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/src/views/contract/payment/index.vue b/src/views/contract/payment/index.vue
index 683ddb4..f64657a 100644
--- a/src/views/contract/payment/index.vue
+++ b/src/views/contract/payment/index.vue
@@ -39,8 +39,7 @@
import { createVendorPayment, getVendorPayment, updateVendorPayment } from "@/api/bs/vendorPayment";
import VerifyFunc from '@/utils/verify'
import { getDictDatas, DICT_TYPE } from "@/utils/dict";
-import { getVendorPage } from "@/api/bs/vendor";
-import { getBankAccountInfoPage } from "@/api/bs/bankAccountInfo";
+import { vendorBankPage } from "@/api/bs/vendor";
import { listUser } from "@/api/system/user";
export default {
//import引入组件才能使用
@@ -216,13 +215,13 @@ export default {
this.$loading(true, 'demo1')
return new Promise((resolve) => {
Promise.all([
- getVendorPage({ pageNo: 1, pageSize: 999 }),
+ vendorBankPage({ pageNo: 1, pageSize: 999 }),
]).then(responses => {
// 处理每个请求的结果
this.allGysList = (responses[0].data.list || []).map(item => {
return {
id: item.id,
- title: item.vendorName
+ title: `${item.vendorName}-付款账户:${item.bankNumber}`
}
});
this.$loading(false, 'demo1')
diff --git a/src/views/contract/receipts/index.vue b/src/views/contract/receipts/index.vue
index feedb0d..3c6a747 100644
--- a/src/views/contract/receipts/index.vue
+++ b/src/views/contract/receipts/index.vue
@@ -197,7 +197,7 @@ export default {
this.allBankList = (responses[1].data.list || []).map(item => {
return {
id: item.id,
- title: `${item.bankName}-${item.bankAccount}`
+ title: `${item.bankName}-收款账户:${item.bankAccount}`
}
});
resolve()
diff --git a/src/views/contract/supplier/index.vue b/src/views/contract/supplier/index.vue
index a0c3fa2..9ab81ae 100644
--- a/src/views/contract/supplier/index.vue
+++ b/src/views/contract/supplier/index.vue
@@ -7,8 +7,8 @@
-
-
+
+
@@ -28,23 +28,23 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
@@ -108,7 +108,7 @@ import {
listUser,
} from "@/api/system/user";
import { getCustomerContractTypeListAll } from '@/api/bs/contractType'
-import {getProjectPage} from "@/api/bs/project";
+import { getProjectPage } from "@/api/bs/project";
import { queryFieldTemplate } from '@/api/bs/template'
export default {
//import引入组件才能使用
@@ -160,8 +160,8 @@ export default {
isRereset: false,
VerifyFunc,
typeList: [],
- capitalSource:[],
- projectList:[],
+ capitalSource: [],
+ projectList: [],
signatoryList: [],
departmentList: [],
dayjs,
@@ -190,9 +190,9 @@ export default {
other: null,
},
oaReimburseFeeitemList: [],
- dateType:'',
- fieldType:'',
- fieldTemplateList:[]
+ dateType: '',
+ fieldType: '',
+ fieldTemplateList: []
};
},
@@ -393,6 +393,10 @@ export default {
}),
// proposerPerson:this.userInfo.id
}
+ if (!this.oaReimburseFeeitemList.length) {
+ this.$loading(false, 'form')
+ return this.$fm('暂无付款计划,无法提交!')
+ }
this.$loading(true, 'form')
createSupplierContract(newForm).then((res) => {
this.$loading(false, 'form')
@@ -405,10 +409,6 @@ export default {
this.$loading(false, 'form')
})
// })
- if (!this.oaReimburseFeeitemList.length) {
- this.$loading(false, 'form')
- return this.$fm('暂无付款计划,无法提交!')
- }
}).catch((err) => {
this.$loading(false, 'form')
if (err && err.length > 0 && err[0].name) {
@@ -463,23 +463,23 @@ export default {
this.$set(this.form, 'proposerTime1', `${dayjs(this.form.proposerTime).format('YYYY/MM/DD')}`)
this.$set(this.form, 'startTime1', `${dayjs(this.form.startTime).format('YYYY/MM/DD')}`)
this.$set(this.form, 'endTime1', `${dayjs(this.form.endTime).format('YYYY/MM/DD')}`)
- res.data.fieldTemplateList.forEach(function (item){
- if(item.type == 3){
+ res.data.fieldTemplateList.forEach(function (item) {
+ if (item.type == 3) {
_this.$set(item, `${item.field}1`, `${dayjs(item.value).format('YYYY/MM/DD')}`)
}
- if(item.type == 2){
- item.value =item.value? Boolean(item.value):false
+ if (item.type == 2) {
+ item.value = item.value ? Boolean(item.value) : false
}
})
console.log('this.form..', this.form);
}).finally(() => {
this.$loading(false, 'loadingSb')
})
- }else {
+ } else {
queryFieldTemplate(2).then((res) => {
- res.data.forEach(function (item){
- if(item.type == 6){
- item.value = item.value?item.value:[]
+ res.data.forEach(function (item) {
+ if (item.type == 6) {
+ item.value = item.value ? item.value : []
}
})
this.fieldTemplateList = res.data
@@ -566,8 +566,10 @@ export default {
}).then((res) => {
this.typeList = res.data || []
})
- getProjectPage({type:2,pageNo: 1,
- pageSize: 500}).then(res=>{
+ getProjectPage({
+ type: 2, pageNo: 1,
+ pageSize: 500
+ }).then(res => {
this.projectList = res.data.list || []
})
listData({
@@ -579,12 +581,12 @@ export default {
});
})
},
- handleDateShow(dateType,type) {
+ handleDateShow(dateType, type) {
let _this = this
if (this.disabled) return
_this.dateType = dateType
_this.fieldType = type
- if(type){
+ if (type) {
_this.$nextTick(() => {
let date = _this.form.fieldTemplateList[type][dateType] || ''
_this.$refs.vanCalendar && _this.$refs.vanCalendar.reset()
@@ -594,9 +596,9 @@ export default {
_this.defaultDate = new Date(time)
}
})
- }else {
+ } else {
_this.$nextTick(() => {
- let date = dateType == 'dateSigning'?_this.form.dateSigning:dateType=='proposerTime'?_this.form.proposerTime:dateType=='startTime'?_this.form.startTime:dateType=='endTime'?_this.form.endTime:''
+ let date = dateType == 'dateSigning' ? _this.form.dateSigning : dateType == 'proposerTime' ? _this.form.proposerTime : dateType == 'startTime' ? _this.form.startTime : dateType == 'endTime' ? _this.form.endTime : ''
_this.$refs.vanCalendar && _this.$refs.vanCalendar.reset()
_this.dateShow = true
if (date) {
@@ -608,25 +610,25 @@ export default {
},
handleDateSelect(val) {
- if(this.fieldType){
+ if (this.fieldType) {
this.$set(this.form.fieldTemplateList[this.fieldType], `${this.dateType}1`, `${dayjs(val).format('YYYY/MM/DD')}`)
this.$set(this.form.fieldTemplateList[this.fieldType], 'value', `${dayjs(val).valueOf()}`)
this.dateShow = false
return;
}
- if(this.dateType == 'dateSigning'){
+ if (this.dateType == 'dateSigning') {
this.$set(this.form, 'dateSigning1', `${dayjs(val).format('YYYY/MM/DD')}`)
this.$set(this.form, 'dateSigning', `${dayjs(val).valueOf()}`)
}
- if(this.dateType == 'proposerTime'){
+ if (this.dateType == 'proposerTime') {
this.$set(this.form, 'proposerTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
this.$set(this.form, 'proposerTime', `${dayjs(val).valueOf()}`)
}
- if(this.dateType == 'startTime'){
+ if (this.dateType == 'startTime') {
this.$set(this.form, 'startTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
this.$set(this.form, 'startTime', `${dayjs(val).valueOf()}`)
}
- if(this.dateType == 'endTime'){
+ if (this.dateType == 'endTime') {
this.$set(this.form, 'endTime1', `${dayjs(val).format('YYYY/MM/DD')}`)
this.$set(this.form, 'endTime', `${dayjs(val).valueOf()}`)
}