This commit is contained in:
weiz 2024-03-21 11:30:29 +08:00
parent 7acb298ca6
commit 4ae88f7406
5 changed files with 37 additions and 173 deletions

View File

@ -2,26 +2,22 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="开票公司名称" prop="invoicing_company_name">
<el-form-item label="关联合同" prop="contract_id">
<selectRemote :formData="queryParams" model="contract_id" :api="apiContractSearch" />
</el-form-item>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
</el-form-item>
<el-form-item label="客户名称" prop="custom_id">
<selectRemote :formData="queryParams" model="custom_id" :api="apiCustomSearch" />
</el-form-item>
<el-form-item label="开票编号" prop="invoicing_code">
<el-input class="w-[280px]" v-model="queryParams.invoicing_code" clearable placeholder="请输入开票编号" />
</el-form-item>
<el-form-item label="开票公司" prop="invoicing_company_name">
<el-input class="w-[280px]" v-model="queryParams.invoicing_company_name" clearable
placeholder="请输入开票公司名称" />
</el-form-item>
<el-form-item label="客户" prop="customer_id">
<el-select class="w-[280px]" v-model="queryParams.customer_id" clearable placeholder="请选择客户">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, i) in list1" :key="i" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="合同" prop="contract_id">
<el-select class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请选择合同">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in list" :key="index" :label="item.contract_name"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -46,18 +42,18 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
<el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
<el-table-column label="开票编号" prop="invoicing_code" show-overflow-tooltip />
<el-table-column label="开票公司" prop="invoicing_company_name" show-overflow-tooltip />
<el-table-column label="开票日期" prop="invoicing_date" show-overflow-tooltip />
<el-table-column label="期次" prop="period" show-overflow-tooltip />
<el-table-column label="发票类型" prop="invoice_type" show-overflow-tooltip />
<el-table-column label="开票金额(含税)" prop="invoicing_amount" show-overflow-tooltip />
<el-table-column label="开票金额(非税)" prop="amount_including_tax" show-overflow-tooltip />
<el-table-column label="税率(%)" prop="tax_rate" show-overflow-tooltip />
<!-- <el-table-column label="开票金额(税额)" prop="tax" show-overflow-tooltip /> -->
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link
@click="handleEdit(row)">
@ -88,10 +84,9 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiinvoiceapplyLists, apiinvoiceapplyDelete, apiinvoiceapplyDetail } from '@/api/InvoicingRequests'
import { timeFormat } from '@/utils/util'
import { apiContractLists } from '@/api/contract'
import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype'
import { apiContractSearch } from '@/api/contract'
import { apiProjectSearch } from '@/api/project'
import { apiCustomSearch } from '@/api/custom'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -111,11 +106,11 @@ const list1 = ref([])
//
const queryParams = reactive({
invoicing_code: '',
invoicing_company_name: '',
contract_id: '',
customer_id: '',
project_id: ''
})
//
@ -166,24 +161,6 @@ const handledetail = async (data: any) => {
detailRef.value?.setFormData(res)
}
//
const getlist1 = () => {
apiContractLists().then((res) => {
list.value = res.lists
})
}
//
const getlist2 = () => {
apiCustomLists().then((res) => {
list1.value = res.lists
})
}
getlist1()
getlist2()
if (route.query?.listId) {
handledetail({ id: route.query.listId })

View File

@ -2,10 +2,6 @@
<div class="detail-popup">
<popup ref="popupRef" title="银行账户详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-descriptions :column="3" border>
<el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{
formData.org_name }}</el-descriptions-item>
<el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{
formData.dept_name }}</el-descriptions-item>
<el-descriptions-item label="账户编码" label-align="left" align="left" label-class-name="my-label">{{
formData.account_sn }}</el-descriptions-item>
<el-descriptions-item label="开户银行" label-align="left" align="left" label-class-name="my-label">{{
@ -28,7 +24,6 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCustomDetail } from '@/api/custom'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
@ -57,14 +52,6 @@ const formData = reactive({
//
const setFormData = async (data: Record<any, any>) => {
// for (const key in formData) {
// if (data[key] != null && data[key] != undefined) {
// //@ts-ignore
// formData[key] = data[key]
// }
// }
if (data.annex && data.annex.length > 0) {
const arry1 = data.annex.map((item: any, index: any) => {
@ -106,12 +93,6 @@ const handleClose = () => {
}
defineExpose({
open,
setFormData,

View File

@ -5,26 +5,6 @@
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="组织名称" prop="org_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt"
class="flex-1">
<el-option v-for="(item, index) in list1" :key="index" :label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部门名称" prop="dept_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-select v-model="formData.dept_id" clearable placeholder="请选择部门" class="flex-1">
<el-option v-for="( item, index ) in list2 " :key="index" :label="item.name"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="账户编码">
<el-input v-model="bank_no" clearable disabled placeholder="系统自动生成" />
@ -73,17 +53,7 @@
<el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-dialog v-model="showDialog3" title="选择收款人信息" width="70%">
<bankaccountDialog @customEvent="customEvent3"></bankaccountDialog>
</el-dialog> -->
</el-form>
</popup>
@ -91,24 +61,10 @@
</template>
<script lang="ts" setup name="projectEdit">
import porjectDialog from '@/components/project/index.vue'
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { bankaccountAdd, bankaccountEdit, bankaccountDetail } from '@/api/bank_account'
import { toChinesNum } from "@/utils/util";
import { getAllProjectTypes } from '@/api/projecttype'
import { timeFormat } from '@/utils/util'
import { isEmail, isIdCard, isPhone } from '@/utils/validate'
import type { PropType } from 'vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
const list1 = reactive([])
const list2 = reactive([])
const showDialog = ref(false)
const bank_no = ref('')
import { deptAll } from '@/api/org/department'
import { getAll } from '@/api/org/organization'
const emit = defineEmits(['success', 'close'])
@ -117,27 +73,6 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog3 = ref(false)
//
const getlist = () => {
getAll().then((res) => {
Object.assign(list1, res)
})
}
//
const deptrmt = (e: any) => {
formData.dept_id = ''
getlist1(e)
}
//
const getlist1 = (id: any) => {
deptAll({ 'org_id': id }).then((res) => {
list2.splice(0, list2.length, ...res)
})
}
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑质量目标表' : '新增质量目标表'
@ -146,8 +81,6 @@ const popupTitle = computed(() => {
//
const formData = reactive({
id: '',
org_id: '',
dept_id: '',
deposit_bank: '',
account_name: '',
account: '',
@ -171,22 +104,13 @@ const formRules = reactive<any>({
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
if (data.dept_id) {
getlist1(data.org_id)
}
bank_no.value = data.account_sn
}
const getDetail = async (row: Record<string, any>) => {
const data = await bankaccountDetail({
@ -198,7 +122,6 @@ const getDetail = async (row: Record<string, any>) => {
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData }
mode.value == 'edit'
@ -210,11 +133,8 @@ const handleSubmit = async () => {
//
const open = (type = 'add') => {
getlist()
mode.value = type
popupRef.value?.open()
}
//
@ -222,8 +142,6 @@ const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,

View File

@ -37,22 +37,12 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="组织名称" prop="org_name" show-overflow-tooltip />
<el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
<el-table-column label="账户编码" prop="account_sn" show-overflow-tooltip />
<el-table-column label="开户银行" prop="deposit_bank" show-overflow-tooltip />
<el-table-column label="开户名称" prop="account_name" show-overflow-tooltip />
<el-table-column label="账号" prop="account" show-overflow-tooltip />
<el-table-column label="开户日期" prop="account_opening_date" show-overflow-tooltip />
<el-table-column label="期初金额" prop="opening_amount" show-overflow-tooltip />
<!-- <el-table-column label="入账金额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="出账金额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="账户余额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="账户资金余额" prop="bidder_amount" show-overflow-tooltip />
<el-table-column label="汇票账户余额" prop="bidder_amount" show-overflow-tooltip /> -->
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
@ -82,11 +72,6 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { bankaccountLists, bankaccountDelete, bankaccountDetail } from '@/api/bank_account'
import {
apiBidDocumentExaminationLists
} from '@/api/bid_document_examination'
import { timeFormat } from '@/utils/util'
import { apiProjectLists } from '@/api/project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'

View File

@ -2,6 +2,15 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="关联合同" prop="contract_id">
<selectRemote :formData="queryParams" model="contract_id" :api="apiContractSearch" />
</el-form-item>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiProjectSearch" />
</el-form-item>
<el-form-item label="客户名称" prop="custom_id">
<selectRemote :formData="queryParams" model="custom_id" :api="apiCustomSearch" />
</el-form-item>
<el-form-item label="期次" prop="project_name">
<el-select class="flex-1" v-model="queryParams.period" clearable placeholder="请选择期次">
<el-option v-for="(item, index) in dictData.pay_period" :key="index" :label="item.name"
@ -14,7 +23,6 @@
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@ -39,11 +47,10 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
<el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
<el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
<el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
<el-table-column label="期次" prop="period" show-overflow-tooltip />
<el-table-column label="计划回款日期" prop="return_date" show-overflow-tooltip />
<el-table-column label="状态" prop="return_status" show-overflow-tooltip />
@ -53,7 +60,6 @@
<el-table-column label="回款责任人" prop="return_duty" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="150" fixed="right">
<template #default="{ row }">
<el-button v-perms="['remittance.remittance/edit']" type="primary" link
@click="handleEdit(row)">
@ -66,7 +72,6 @@
<el-button v-perms="['remittance.remittance/detail']" link @click="handledetail(row)">
详情
</el-button>
</template>
</el-table-column>
</el-table>
@ -84,8 +89,9 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apireturnedLists, apireturnedDelete, apireturnedDetail } from '@/api/remittance'
import { timeFormat } from '@/utils/util'
import { getAllProjectTypes } from '@/api/projecttype'
import { apiContractSearch } from '@/api/contract'
import { apiProjectSearch } from '@/api/project'
import { apiCustomSearch } from '@/api/custom'
const protype = reactive([])
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -100,12 +106,9 @@ const showDtail = ref(false)
const queryParams = reactive({
period: '',
return_status: '',
})
//
const selectData = ref<any[]>([])