diff --git a/src/api/contract_ledger.ts b/src/api/contract_ledger.ts index 97a1643..2f38610 100644 --- a/src/api/contract_ledger.ts +++ b/src/api/contract_ledger.ts @@ -7,3 +7,19 @@ export function apiContractLedgerLists(params: any) { params, }); } + +// 财务管理--合同台账列表 +export function apiMarketingContract(params: any) { + return request.get({ + url: "/marketing.MarketingContract/info", + params, + }); +} + +// 财务管理--合同台账列表 +export function apiMarketingContractdownload(params: any) { + return request.get({ + url: "/marketing.marketing_contract/download?export=2", + params, + }); +} diff --git a/src/views/build_plan/edit.vue b/src/views/build_plan/edit.vue index aad6836..ba9a7b9 100644 --- a/src/views/build_plan/edit.vue +++ b/src/views/build_plan/edit.vue @@ -73,7 +73,8 @@ - + @@ -112,6 +113,7 @@ + @@ -205,6 +207,7 @@ const formData = reactive({ plan_start_date: '', plan_end_date: '', work_user: "", + work_user_name: "", work_content: "", unit: "", price: "", @@ -213,6 +216,22 @@ const formData = reactive({ file: "" }) +// + +//打开弹窗 +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} + // 表单验证 diff --git a/src/views/consult_demand/edit.vue b/src/views/consult_demand/edit.vue index 7792bb7..de8fcbd 100644 --- a/src/views/consult_demand/edit.vue +++ b/src/views/consult_demand/edit.vue @@ -1,7 +1,6 @@ @@ -62,14 +87,15 @@ diff --git a/src/views/custom_service/edit.vue b/src/views/custom_service/edit.vue index bab87fe..1c3fb4f 100644 --- a/src/views/custom_service/edit.vue +++ b/src/views/custom_service/edit.vue @@ -69,12 +69,12 @@ - + :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="userclick('receiver')"> + - @@ -137,7 +137,6 @@ import peojectDialog from '@/components/project/index.vue' const showDialog = ref(false) const showDialog1 = ref(false) const showDialog2 = ref(false) -const personnel = ref() const customEvent = (e: any) => { formData.project_id = e.id @@ -173,15 +172,17 @@ const popupRef = shallowRef>() const mode = ref('add') //打开弹窗 - -const userclick = () => { +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals personnel.value.open() } //确认 const submituser = (e: any) => { - formData.processed_user = e.id; - formData.processed_user_name = e.name + formData[val] = e.id; + formData[val + '_name'] = e.name } @@ -215,7 +216,8 @@ const formData = reactive({ contract_code: "", contract_id: "", custom_name: "", - custom_id: "" + custom_id: "", + receiver_name: "" }) diff --git a/src/views/data_reception/index.vue b/src/views/data_reception/index.vue index fc773d1..337132d 100644 --- a/src/views/data_reception/index.vue +++ b/src/views/data_reception/index.vue @@ -41,7 +41,7 @@ - + diff --git a/src/views/finance_payment_apply/edit.vue b/src/views/finance_payment_apply/edit.vue index 4e4936c..8fd5106 100644 --- a/src/views/finance_payment_apply/edit.vue +++ b/src/views/finance_payment_apply/edit.vue @@ -86,8 +86,8 @@ - - + @@ -215,6 +215,8 @@ + + @@ -333,6 +335,7 @@ const formData = reactive({ "pay_type": '', period: "", "apply_user": "", + "apply_user_name": "", "invoice_status": '', "amount": '', "desc": "", @@ -349,6 +352,19 @@ const formData = reactive({ "account": "" }, }) +//打开弹窗 +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} // 表单验证 diff --git a/src/views/finance_receipt_record/edit.vue b/src/views/finance_receipt_record/edit.vue index a0c5d7d..4b1d824 100644 --- a/src/views/finance_receipt_record/edit.vue +++ b/src/views/finance_receipt_record/edit.vue @@ -91,7 +91,7 @@ + class=" flex-1"> diff --git a/src/views/financial_invoice/detail.js b/src/views/financial_invoice/detail.js index a743901..4751a31 100644 --- a/src/views/financial_invoice/detail.js +++ b/src/views/financial_invoice/detail.js @@ -91,7 +91,11 @@ const detailConfig = { label: "创建时间", value: "create_time", }, - + { + label: "发票", + value: "annex", + column: 1 + }, ] } diff --git a/src/views/financial_invoice/edit.vue b/src/views/financial_invoice/edit.vue index 25d81e1..d0d2983 100644 --- a/src/views/financial_invoice/edit.vue +++ b/src/views/financial_invoice/edit.vue @@ -117,6 +117,11 @@ + + + + + @@ -181,7 +186,8 @@ const formData = reactive({ "sign_money": "", "sign_time": "", "total_invoice_amount": 0, - "total_refund_amount": 0 + "total_refund_amount": 0, + annex: [] }) const customEvent = (e) => { diff --git a/src/views/financial_invoice/index.vue b/src/views/financial_invoice/index.vue index 2a776e1..90d6418 100644 --- a/src/views/financial_invoice/index.vue +++ b/src/views/financial_invoice/index.vue @@ -40,7 +40,6 @@ - @@ -50,6 +49,8 @@ + + diff --git a/src/views/financial_refund/detail.js b/src/views/financial_refund/detail.js index f982537..172baf8 100644 --- a/src/views/financial_refund/detail.js +++ b/src/views/financial_refund/detail.js @@ -58,6 +58,12 @@ const detailConfig = { label: "创建时间", value: "create_time", }, + { + label: "到账回单", + value: "annex", + column: 1 + }, + ] diff --git a/src/views/financial_refund/edit.vue b/src/views/financial_refund/edit.vue index ae33b94..53b4849 100644 --- a/src/views/financial_refund/edit.vue +++ b/src/views/financial_refund/edit.vue @@ -43,6 +43,9 @@ + + + @@ -108,7 +111,8 @@ const formData = reactive({ "sign_money": "", "apply_amount": "", "total_invoice_amount": 0, - "total_refund_amount": 0 + "total_refund_amount": 0, + annex: [] }) const customEvent = (e) => { diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue index 133de4a..6f77fcb 100644 --- a/src/views/project/edit.vue +++ b/src/views/project/edit.vue @@ -76,7 +76,8 @@ - + @@ -91,12 +92,17 @@ - + + + + + - + @@ -221,6 +227,8 @@ + + @@ -275,10 +283,12 @@ const formData = reactive({ bidding_time: '', bidding_method: '', contacts: '', + contacts_name: "", position: '', telephone: '', department: '', person: '', + person_name: "", relationship: '', discovery_time: '', information_sources: '', @@ -296,6 +306,8 @@ const formData = reactive({ }) + + // 表单验证 const formRules = reactive({ telephone: [ @@ -362,7 +374,35 @@ const handleClose = () => { emit('close') } +import { deptLists } from "@/api/org/department" +// +// +// +// +// + +//打开弹窗 +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} + + +const deptList = ref([]) +const getDeptList = async () => { + let res = await deptLists() + deptList.value = res.lists +} +getDeptList() defineExpose({ open, diff --git a/src/views/project_cost_adjustment/edit.vue b/src/views/project_cost_adjustment/edit.vue index ced7458..fdc2fcc 100644 --- a/src/views/project_cost_adjustment/edit.vue +++ b/src/views/project_cost_adjustment/edit.vue @@ -15,7 +15,7 @@ - + diff --git a/src/views/project_estimate/edit.vue b/src/views/project_estimate/edit.vue index 55c2fe3..91af46f 100644 --- a/src/views/project_estimate/edit.vue +++ b/src/views/project_estimate/edit.vue @@ -44,7 +44,8 @@ - + @@ -76,7 +77,7 @@ --> - @@ -160,6 +161,7 @@ const formData = reactive({ customer_demand_id: '', estimate_source: '', create_user: '', + create_user_name: '', recording_time: "", quotation_date: '', invoice_type: '', @@ -209,7 +211,9 @@ const customEvent2 = (e: any) => { }; -const openUserList = async () => { +let val = '' +const openUserList = async (vals) => { + val = vals showDialog3.value = true; await nextTick(); personnel.value.open(); @@ -218,9 +222,8 @@ const openUserList = async () => { //确认 const submituser = (e: any) => { - - formData.technician_name = e.name - formData.technician = e.id + formData[val + '_name'] = e.name + formData[val] = e.id console.log(e) showDialog3.value = false; }; diff --git a/src/views/project_expense_reimbursement/edit.vue b/src/views/project_expense_reimbursement/edit.vue index f29ad07..3171508 100644 --- a/src/views/project_expense_reimbursement/edit.vue +++ b/src/views/project_expense_reimbursement/edit.vue @@ -33,7 +33,8 @@ - + @@ -209,6 +210,7 @@ + @@ -312,6 +314,7 @@ const formData = reactive({ "loan_apply_code": "", //借款单id，当报销类型包含借款冲抵选项时必填 "offset_loan_amount": "", //冲抵借款金额，当报销类型包含借款冲抵选项时必填 "apply_user": "", //必填，报销人 + "apply_user_name": "", //必填，报销人 "apply_date": "", //必填，报销日期 "payee_name": "", //必填，收款人姓名 "payee_bank": "", //必填，收款银行 @@ -347,7 +350,19 @@ const formData = reactive({ "account": "" }, }) +//打开弹窗 +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} const invoiceIndex = ref(0) // 上传文件 diff --git a/src/views/project_follow_up/edit.vue b/src/views/project_follow_up/edit.vue index 57a04ed..ef164a1 100644 --- a/src/views/project_follow_up/edit.vue +++ b/src/views/project_follow_up/edit.vue @@ -20,10 +20,12 @@ - + - + @@ -102,6 +104,8 @@ + + @@ -125,6 +129,21 @@ const project_name = ref('') const project_code = ref('') const custom_name = ref('') +//打开弹窗 +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} + + // dialog const showDialog = ref(false) @@ -138,7 +157,9 @@ const formData = reactive({ id: '', project_id: '', executor: '', + executor_name: '', contacts: '', + contacts_name: '', contact_information: '', project_role: '', position: '', diff --git a/src/views/project_loan_apply/edit.vue b/src/views/project_loan_apply/edit.vue index e93d152..6c24615 100644 --- a/src/views/project_loan_apply/edit.vue +++ b/src/views/project_loan_apply/edit.vue @@ -8,7 +8,8 @@ @click="showDialog = true" /> - + - + @@ -49,6 +50,8 @@ + + @@ -99,6 +102,7 @@ const formData = reactive({ "project_id": '', project_name: "", "apply_user": "", + "apply_user_name": "", "loan_date": "", "loan_amount": 0, "payee_name": "", @@ -204,6 +208,21 @@ const getDetail = async (row: Record) => { } +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} + + + // 提交按钮 const handleSubmit = async () => { await formRef.value?.validate() diff --git a/src/views/project_logs/edit.vue b/src/views/project_logs/edit.vue index 3685ec1..ab11ff2 100644 --- a/src/views/project_logs/edit.vue +++ b/src/views/project_logs/edit.vue @@ -18,7 +18,8 @@ - + @@ -41,7 +42,8 @@ - + @@ -63,6 +65,8 @@ + + @@ -122,6 +126,22 @@ const popupTitle = computed(() => { return mode.value == 'edit' ? '编辑项目日志管理' : '新增项目日志管理' }) + +//打开弹窗 +const personnel = ref() +let val = '' +const userclick = (vals) => { + val = vals + personnel.value.open() + +} +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name +} + + // 表单数据 const formData = reactive({ id: '', @@ -129,9 +149,11 @@ const formData = reactive({ theme: '', wbs_code: '', contacts: '', + contacts_name: '', date: '', follow_type: '', executor: '', + executor_name: '', content: '', annex: [], next_follow_up_date: [] diff --git a/src/views/project_profit_set/edit.vue b/src/views/project_profit_set/edit.vue index e6c318b..b575d03 100644 --- a/src/views/project_profit_set/edit.vue +++ b/src/views/project_profit_set/edit.vue @@ -1,10 +1,10 @@