diff --git a/src/views/bank_account/edit.vue b/src/views/bank_account/edit.vue index 9cad0c2..b7ca528 100644 --- a/src/views/bank_account/edit.vue +++ b/src/views/bank_account/edit.vue @@ -6,17 +6,21 @@ - + - + - + - + @@ -26,33 +30,39 @@ - + - + - + - - + + - + diff --git a/src/views/finance_payment_apply/edit.vue b/src/views/finance_payment_apply/edit.vue index e8941ac..eb99ec0 100644 --- a/src/views/finance_payment_apply/edit.vue +++ b/src/views/finance_payment_apply/edit.vue @@ -157,7 +157,7 @@ - + @@ -187,7 +187,9 @@ - + + + @@ -203,6 +205,7 @@ import subcontractingDialog from '@/components/procurementsubcontracting_selecto import paylistDialog from '@/components/paylist/index.vue' const active = ref(0) +import bankaccountDialog from '@/components/bankaccount/index.vue' import { paymentapplyAdd, paymentapplyEdit, paymentapplyDetail } from '@/api/paymentrequest' import { toChinesNum } from "@/utils/util"; @@ -284,6 +287,7 @@ const amount_daxie = ref('') const showDialog = ref(false) const showDialog1 = ref(false) const showDialog2 = ref(false) +const showDialog3 = ref(false) const customEvent = (e: any) => { formData.supplier_id = e.id; @@ -310,6 +314,12 @@ const customEvent2 = (e: any) => { showDialog2.value = false; }; +const customEvent3 = (e: any) => { + formData.bank = e.deposit_bank + formData.account_name = e.account_name + formData.account = e.account + showDialog3.value = false; +}; //监听输入 const amountinput = (e) => { diff --git a/src/views/finance_receipt_record/index.vue b/src/views/finance_receipt_record/index.vue index 4304706..d4c7527 100644 --- a/src/views/finance_receipt_record/index.vue +++ b/src/views/finance_receipt_record/index.vue @@ -9,7 +9,8 @@ - + diff --git a/src/views/finance_refund_record/detail.vue b/src/views/finance_refund_record/detail.vue index ec70627..e50c7ad 100644 --- a/src/views/finance_refund_record/detail.vue +++ b/src/views/finance_refund_record/detail.vue @@ -7,11 +7,9 @@ - {{ formData.contract.contract_name }} + {{ formData.contract_name }} - - {{ formData.project ? formData.project.name : '暂无数据' @@ -21,17 +19,10 @@ - {{ formData.project.project_code + {{ formData.project_code }} - - {{ formData.reason @@ -115,15 +106,45 @@ const datas = reactive({ // 表单数据 -const formData = reactive({ +const formData = reactive({} + // { + // "id": 0, + // "supplier_id": 1, + // "project_id": 1, + // "contract_type": 1, + // "contract_id": 2, + // "refund_amount": "", + // "refund_date": "2024-01-16", + // "refund_type": 1, + // "reason": "", + // "remark": "", + // "annex": [ -}) + // ], + // "bank_account_id": 3, + // "supplier_name": "某某供应商", + // "supplier_code": "SC-20240108-564041", + // "project_name": "测试工程test", + // "project_code": "P-20240113-600036", + // "contract_no": "CGHT-20240110-412306", + // "contract_name": "11", + // "contract_type_text": "采购合同", + // "refund_type_text": "支票", + // "bank_account_info": { + // "account_sn": "BANK-20240116-881909", + // "deposit_bank": "邮政", + // "account_name": "龙马邮政支行", + // "account": "26263515351565" + // } + // } +) // 获取详情 const setFormData = async (data: Record) => { Object.assign(formData, data) + console.log(formData, 'formdata') @@ -145,8 +166,9 @@ const handleSubmit = async () => { //打开弹窗 const open = () => { - console.log('1111111') popupRef.value?.open() + console.log('1111111') + } // 关闭回调 diff --git a/src/views/finance_refund_record/edit.vue b/src/views/finance_refund_record/edit.vue index b9c44fc..92874db 100644 --- a/src/views/finance_refund_record/edit.vue +++ b/src/views/finance_refund_record/edit.vue @@ -20,7 +20,7 @@ + value-format="YYYY-MM-DD" placeholder="选择日期"> @@ -144,7 +144,7 @@ + clearable type="datetime" value-format="YYYY-MM-DD" placeholder="选择日期"> @@ -273,6 +273,14 @@ const customEvent1 = (e: any) => { +const customEvent2 = (e) => { + formData.invoicing_company_name = e.account_sn + formData.deposit_bank = e.deposit_bank + formData.bank_accnout = e.account_name + formData.bank_account_id = e.id + showDialog2.value = false +} + //监听输入 const amountinput = (e) => { // console.log(e) @@ -299,7 +307,9 @@ const formData = reactive({ annex: [], bank_account_id: 0, is_calculate_interest: '', - interest_calculation_start_date: "" + interest_calculation_start_date: "", + "contract_cate": 1, + }) diff --git a/src/views/project/components/budget.vue b/src/views/project/components/budget.vue index 540c6d8..133f433 100644 --- a/src/views/project/components/budget.vue +++ b/src/views/project/components/budget.vue @@ -14,7 +14,7 @@ const props = defineProps({ const baseData = reactive({ fetchFun: subpackagdetailLists, - tit: "竞争对手", + tit: "竞争SDSD对手", queryParams: { project_id: props.project_id }, columnList: [ { label: '工作类型', prop: 'work_type' },