diff --git a/src/components/biddocument/index.vue b/src/components/biddocument/index.vue index adb1c98..bc13f9f 100644 --- a/src/components/biddocument/index.vue +++ b/src/components/biddocument/index.vue @@ -46,10 +46,15 @@ import { usePaging } from "@/hooks/usePaging" import { useDictData } from "@/hooks/useDictOptions" import { apiBidBuyBiddingDocumentLists } from '@/api/bid_buy_bidding_document' import { defineEmits } from "vue" +const props = defineProps({ + project_id: { + type: String + } +}) // 查询条件 const queryParams = reactive({ - custom_name: '' + project_id: props.project_id, }); // 获取字典数据 diff --git a/src/components/contract/index.vue b/src/components/contract/index.vue index 09fadbc..6f07b33 100644 --- a/src/components/contract/index.vue +++ b/src/components/contract/index.vue @@ -90,12 +90,16 @@ import { timeFormat } from '@/utils/util' const props = defineProps({ productid: { type: String - } + }, + custom_id: { + type: String + }, }) -console.log(props.productid) + // 查询条件 const queryParams = reactive({ project_id: props.productid, + custom_id: props.custom_id }); const { dictData } = useDictData('contract_type,contract_pricing_method,contract_status') // 选中数据 diff --git a/src/components/pending_paymentplan/index.vue b/src/components/pending_paymentplan/index.vue index cad6040..616a359 100644 --- a/src/components/pending_paymentplan/index.vue +++ b/src/components/pending_paymentplan/index.vue @@ -19,30 +19,18 @@ - - - + - - - + - - - + - - - + + + @@ -61,10 +49,16 @@ import { apireturnedLists } from '@/api/remittance' import { defineEmits } from "vue" import { timeFormat } from '@/utils/util' +const props = defineProps({ + contract_id: { + type: String + }, +}) // 查询条件 const queryParams = reactive({ contract_no: '', + contract_id: props.contract_id }); // 获取字典数据 diff --git a/src/components/project/index.vue b/src/components/project/index.vue index b2c24dd..b89f085 100644 --- a/src/components/project/index.vue +++ b/src/components/project/index.vue @@ -56,15 +56,14 @@ import { apiProjectLists } from '@/api/project' import { defineEmits } from "vue" import { timeFormat } from '@/utils/util' const props = defineProps({ - customer_id: { + custom_id: { type: String } }) // 查询条件 const queryParams = reactive({ name: '', - - customer_id: props.customer_id + custom_id: props.custom_id }); const { dictData } = useDictData('project_type,project_content,bidding_method,relationship,information_sources,construction_funds_sources,construction_financial_status,construction_recognition,my_construction_recognition,strategic_significance,industry,unit_nature') diff --git a/src/components/project_contract/index.vue b/src/components/project_contract/index.vue index 23fa27a..5bfc6e0 100644 --- a/src/components/project_contract/index.vue +++ b/src/components/project_contract/index.vue @@ -87,14 +87,16 @@ import { projectcontracts } from '@/api/common' import { defineEmits } from "vue" import { timeFormat } from '@/utils/util' const props = defineProps({ - productid: { + + project_id: { type: String - } + }, }) -console.log(props.productid) +// console.log(props.productid) // 查询条件 const queryParams = reactive({ - project_id: props.productid, + project_id: props.project_id || '', + }); const { dictData } = useDictData('contract_type,contract_pricing_method,contract_status') // 选中数据 diff --git a/src/components/salescontract/index.vue b/src/components/salescontract/index.vue index 1bc9f57..fa9a02c 100644 --- a/src/components/salescontract/index.vue +++ b/src/components/salescontract/index.vue @@ -2,8 +2,8 @@
- - + + 查询 @@ -15,24 +15,20 @@
- - - - - + + + - + - - - - + + + +
@@ -49,6 +45,9 @@ import { useDictData } from "@/hooks/useDictOptions" import { apiContractLists } from '@/api/contract' import { defineEmits } from "vue" const props = defineProps({ + project_id: { + type: String + }, contract_type: { type: String } @@ -57,8 +56,8 @@ const props = defineProps({ // 查询条件 const queryParams = reactive({ - contract_name: '', contract_code: '', + project_id: props.project_id, contract_type: props.contract_type, }); const { dictData } = useDictData('contract_type') diff --git a/src/views/InvoicingRequests/detail.vue b/src/views/InvoicingRequests/detail.vue index 5901820..d90886a 100644 --- a/src/views/InvoicingRequests/detail.vue +++ b/src/views/InvoicingRequests/detail.vue @@ -3,173 +3,74 @@
- - - - - {{ formData.project_name }} - - - - - {{ formData.custom.name }} - - - - - - {{ formData.project_code - }} - - - - - - {{ formData.contract.contract_name }} - - - - - {{ formData.contract ? formData.contract.contract_code : '暂无数据' }} - - - - - {{ formData.contract.amount - }} - - - - - - - - - - {{ formData.accumulate_amount }} - - - - - {{ formData.accumulated_payments_received }} - - - - - {{ formData.tax_rate }} - - - - - - - - - - - - {{ formData.invoicing_amount }} - - - - - {{ formData.invoicing_amount_daxie }} - - - - - - {{ formData.invoicing_amount }} - - - - - - {{ formData.amount_including_tax }} - - - - - {{ formData.content }} - - - - - {{ formData.invoice_no }} - - - - - {{ formData.invoicing_company_name }} - - - - - {{ formData.taxpayer_identification_number }} - - - - - - {{ formData.deposit_bank }} - - - - - {{ formData.bank_accnout }} - - - - - {{ formData.address_phone }} - - - - - {{ formData.receiving_address }} - - - - {{ formData.contacts }} - - - - - {{ formData.phone }} - - - - - {{ formData.mailing_time }} - - - - - {{ formData.mailing_type }} - - - - - {{ formData.mailing_no }} - - - - - {{ formData.remark }} - - - - -
- {{ item.name }} - x -
- - + + {{ formData.contract_name }} + {{ formData.contract_code }} + {{ formData.project_name }} + {{ formData.project_code }} + {{ formData.custom_name }} + + {{ formData.contract_amount }} + + {{ formData.period_text }} + {{ formData.tax_rate_text }} + {{ formData.invoice_type_text }} + {{ formData.amount_including_tax }} + + {{ formData.content }} + {{ formData.invoice_no }} - - + + + + + +
+ 暂无文件 +
+ + + + + + {{ formData.invoicing_company_name }} + {{ formData.taxpayer_identification_number }} + {{ formData.deposit_bank }} + {{ formData.bank_accnout }} + + + {{ formData.address_phone }} + + + + + + + + + + + {{ formData.receiving_address }} + {{ formData.contacts }} + {{ formData.phone }} + {{ formData.mailing_type }} + {{ formData.mailing_type }} + + {{ formData.mailing_no }} + + + + + + + + +
diff --git a/src/views/InvoicingRequests/edit.vue b/src/views/InvoicingRequests/edit.vue index e80c0b6..cf50901 100644 --- a/src/views/InvoicingRequests/edit.vue +++ b/src/views/InvoicingRequests/edit.vue @@ -11,26 +11,14 @@ - - - - - - - - - - - - - + - + @@ -43,7 +31,19 @@ + + + + + + + + + + + + @@ -57,19 +57,22 @@ - + - + + + + @@ -86,19 +89,19 @@ - + - + + @@ -194,7 +197,7 @@ - + @@ -214,7 +217,7 @@ - + @@ -227,7 +230,7 @@ import customDialog from '@/components/custom-dialog/index.vue' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { toChinesNum } from "@/utils/util"; -import salescontractDialog from '@/components/salescontract/index.vue' +import contractDialog from '@/components/contract/index.vue' import { apiinvoiceapplyAdd, apiinvoiceapplyEdit, apiinvoiceapplyDetail } from '@/api/InvoicingRequests' import { getAllProjectTypes } from '@/api/projecttype' import { timeFormat } from '@/utils/util' @@ -235,7 +238,7 @@ import { isEmail, isIdCard, isPhone } from '@/utils/validate' import type { PropType } from 'vue' import configs from "@/config" import useUserStore from "@/stores/modules/user"; -const protype = reactive([]) + const base_url = configs.baseUrl + configs.urlPrefix const userStore = useUserStore(); const active = ref(0) @@ -246,6 +249,7 @@ const project_code = ref('') const project_amount = ref('') const contract_no = ref('') const custom_name = ref('') +const invoicing_amount_daxie = ref('') const next = () => { if (active.value++ > 3) active.value = 0 } @@ -294,7 +298,7 @@ const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) const amountinput = (e) => { // console.log(e) if (e && e > 0) { - formData.invoicing_amount_daxie = toChinesNum(e) + invoicing_amount_daxie.value = toChinesNum(e) } } // 删除上传的文件 @@ -321,6 +325,7 @@ const customEvent = (e: any) => { }; const customEvent1 = (e: any) => { formData.contract_id = e.id; + custom_name.value = e.custom_name; project_name.value = e.project_name; project_code.value = e.project_code; contract_name.value = e.contract_name; @@ -337,18 +342,15 @@ const popupTitle = computed(() => { // 表单数据 const formData = reactive({ id: '', - customer_id: '', contract_id: '', - approve_id: '', + invoicing_date: "", period: "", - accumulate_amount: '', - accumulated_payments_received: '', + tax_rate: "", invoice_type: '', invoicing_amount: '', - invoicing_amount_daxie: "", - tax: '', + amount_including_tax: '', content: "", invoice_no: "", @@ -398,12 +400,12 @@ const setFormData = async (data: Record) => { if (formData.invoicing_amount) { toChinesNum(formData.invoicing_amount) } - custom_name.value = data.custom.name + custom_name.value = data.custom_name project_name.value = data.contract_name; project_code.value = data.contract_code - project_amount.value = data.contract.amount - contract_name.value = data.contract.contract_name; - contract_no.value = data.contract.contract_code + project_amount.value = data.contract_amount + contract_name.value = data.contract_name; + contract_no.value = data.contract_code } @@ -438,10 +440,7 @@ const open = (type = 'add') => { mode.value = type popupRef.value?.open() - getAllProjectTypes().then((res) => { - protype.splice(0, protype.length, ...res); - }) } // 关闭回调 diff --git a/src/views/InvoicingRequests/index.vue b/src/views/InvoicingRequests/index.vue index efc1254..0b35299 100644 --- a/src/views/InvoicingRequests/index.vue +++ b/src/views/InvoicingRequests/index.vue @@ -41,27 +41,19 @@ - + - - - - - - + + - - + + diff --git a/src/views/recordsPayment/detail.vue b/src/views/recordsPayment/detail.vue index 4b07f38..53bcd76 100644 --- a/src/views/recordsPayment/detail.vue +++ b/src/views/recordsPayment/detail.vue @@ -2,95 +2,66 @@ diff --git a/src/views/recordsPayment/edit.vue b/src/views/recordsPayment/edit.vue index d0ac92e..c78c4aa 100644 --- a/src/views/recordsPayment/edit.vue +++ b/src/views/recordsPayment/edit.vue @@ -5,41 +5,41 @@ - - - - - + - - - + + - - - + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + @@ -64,7 +64,7 @@ - + @@ -83,9 +83,9 @@ - + - + @@ -128,63 +128,41 @@ - - + + - + - - + + - - - - - - - - - - {{ item.name }} - - - - - - - - - - - - - + - + - + @@ -196,7 +174,7 @@ import customDialog from '@/components/custom-dialog/index.vue' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' -import salescontractDialog from '@/components/salescontract/index.vue' +import contractDialog from '@/components/contract/index.vue' import bankaccountDialog from '@/components/bankaccount/index.vue' import pendingDialog from '@/components/pending_paymentplan/index.vue' import { apireturnedrecordAdd, apireturnedrecordEdit, apireturnedrecordDetail } from '@/api/recordsPayment' @@ -210,7 +188,7 @@ import useUserStore from "@/stores/modules/user"; const protype = reactive([]) const base_url = configs.baseUrl + configs.urlPrefix const userStore = useUserStore(); - +const return_total_amount = ref('') const formDataannex = reactive([]) const contract_name = ref('') const project_name = ref('') @@ -218,6 +196,10 @@ const project_code = ref('') const project_amount = ref('') const contract_no = ref('') const custom_name = ref('') +const account_sn = ref('') +const account = ref('') +const deposit_bank = ref('') + // 上传文件 const handleAvatarSuccess_four = ( @@ -234,31 +216,7 @@ const handleAvatarSuccess_four = ( ); }; -//验证 -const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => { - if (value && !/^1\d{10}$/.test(value)) { - callback(new Error('请输入正确的手机号码')); - } else { - callback() - } - -} -const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => { - - // const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/ - // // if (!value) { - // // return callback(new Error('邮箱不能为空')) - // // } - - - if (value && !mailReg.test(value)) { - callback(new Error('请输入正确的邮箱格式')) - } else { - callback() - } - -}; // 删除上传的文件 const delFileFn = (index: number) => { formDataannex.splice(index, 1) @@ -287,10 +245,18 @@ const customEvent1 = (e: any) => { formData.contract_id = e.id; project_name.value = e.project_name; project_code.value = e.project_code; + custom_name.value = e.custom_name; contract_name.value = e.contract_name; contract_no.value = e.contract_code showDialog1.value = false; }; +const customEvent2 = (e: any) => { + formData.bank_account_id = e.id; + account_sn.value = e.account_sn; + account.value = e.account; + deposit_bank.value = e.deposit_bank; + showDialog2.value = false; +} const customEvent3 = (e: any) => { formData.finance_returned_money_id = e.id; @@ -317,7 +283,6 @@ const popupTitle = computed(() => { // 表单数据 const formData = reactive({ id: '', - customer_id: '', contract_id: '', finance_returned_money_id: 0, return_date: "", @@ -326,12 +291,10 @@ const formData = reactive({ collection_type: '', invoice_status: '', pay_type: '', - return_total_amount: 0, return_desc: "", receiver: "", - payee_id: "", - is_interest: 0, - interest_date: "", + bank_account_id: "", + remark: "", annex: "" }) @@ -364,12 +327,15 @@ const setFormData = async (data: Record) => { formData[key] = data[key] } } - custom_name.value = data.custom.name - project_name.value = data.project.name - project_code.value = data.project.project_code - project_amount.value = data.contract.amount - contract_name.value = data.contract.contract_name; - contract_no.value = data.contract.contract_code + custom_name.value = data.custom_name + project_name.value = data.project_name + project_code.value = data.project_code + project_amount.value = data.contract_amount + contract_name.value = data.contract_name; + contract_no.value = data.contract_code + account_sn.value = data.bank_account_info.account_sn; + account.value = data.bank_account_info.account; + deposit_bank.value = data.bank_account_info.deposit_bank; if (data.amount) { amount_daxie.value = toChinesNum(data.amount) } diff --git a/src/views/recordsPayment/index.vue b/src/views/recordsPayment/index.vue index dfd1d7c..e8488fe 100644 --- a/src/views/recordsPayment/index.vue +++ b/src/views/recordsPayment/index.vue @@ -43,24 +43,11 @@ - - - - - - - - - - + + + - + diff --git a/src/views/subcontracting_contract_detail/index.vue b/src/views/subcontracting_contract_detail/index.vue index 77b120a..de470a9 100644 --- a/src/views/subcontracting_contract_detail/index.vue +++ b/src/views/subcontracting_contract_detail/index.vue @@ -1,19 +1,6 @@