mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打包bug处理

Browse Source
This commit is contained in:
jia 2023-12-28 09:54:30 +08:00
parent 9e11316ccb
commit 0732996993
12 changed files with 193 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/project_personnel.ts
View File

@ -46,3 +46,7 @@ export function personnelbuildworks(params: any) {
return request.get({ url: '/project.project_personnel/buildworks', params }) return request.get({ url: '/project.project_personnel/buildworks', params })
} }
//某个人员下的工资付款列表
export function personnelpayments(params: any) {
return request.get({ url: '/project.project_personnel/payments', params })
}

31
src/api/project_salary_payment.ts Normal file
View File

@ -0,0 +1,31 @@
import request from '@/utils/request'
// 工资付款记录表列表
export function projectsalarypaymentLists(params: any) {
return request.get({ url: '/project.project_salary_payment/lists', params })
}
// 添加工资付款记录
export function projectsalarypaymentAdd(params: any) {
return request.post({ url: '/project.project_salary_payment/add', params })
}
// 编辑工资付款记录
export function projectsalarypaymentEdit(params: any) {
return request.post({ url: '/project.project_salary_payment/edit', params })
}
// 删除工资付款记录
export function projectsalarypaymentDelete(params: any) {
return request.post({ url: '/project.project_salary_payment/delete', params })
}
// 工资付款记录详情
export function projectsalarypaymentDetail(params: any) {
return request.get({ url: '/project.project_salary_payment/detail', params })
}
//获取所有工资付款记录
export function getAllProjectRoles(params: any) {
return request.post({ url: '/project.project_salary_payment/getAllProjectRoles', params })
}

2
src/views/build/build_report_detail/index.vue
View File

@ -6,7 +6,7 @@
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="55" /> <el-table-column type="index" label="序号" width="55" />
<el-table-column label="施工汇报单号" prop="zy_code" show-overflow-tooltip /> <el-table-column label="施工汇报单号" prop="report_code" show-overflow-tooltip />
<el-table-column label="作业编码" prop="zy_code" show-overflow-tooltip /> <el-table-column label="作业编码" prop="zy_code" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip /> <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="分项工程" prop="subentry_engineering" show-overflow-tooltip /> <el-table-column label="分项工程" prop="subentry_engineering" show-overflow-tooltip />

8
src/views/division_subdivision/index.vue
View File

@ -80,8 +80,8 @@
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" /> <detail-popup v-if="showDtail" ref="detailRef" :dict-data="dictData" @close="showDtail = false" /> -->
</div> </div>
</template> </template>
@ -95,8 +95,8 @@ import { apiCustomLists } from '@/api/custom'
import { getAllProjectTypes } from '@/api/projecttype' import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([]) const protype = reactive([])
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import EditPopup from './edit.vue' // import EditPopup from './edit.vue'
import DetailPopup from './detail.vue' // import DetailPopup from './detail.vue'
const detailRef = shallowRef<InstanceType<typeof DetailPopup>>() const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框

6
src/views/financialManagement/draft/Cash/detail.vue
View File

@ -116,12 +116,6 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({

8
src/views/financialManagement/draft/MoneyOrderTransfer/detail.vue
View File

@ -160,13 +160,6 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const datas = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
});
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
@ -176,7 +169,6 @@ const formData = reactive({
// 获取详情 // 获取详情
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data: Record<any, any>) => {
Object.assign(formData, data)
Object.assign(formData, data) Object.assign(formData, data)
if (data.annex && data.annex.length > 0) { if (data.annex && data.annex.length > 0) {

16
src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue
View File

@ -19,15 +19,13 @@
</el-select></el-form-item> </el-col> </el-select></el-form-item> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应商名称" prop="supplier_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true"> <el-form-item label="供应商名称" prop="supplier_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="supplier_name" readonly clearable placeholder="请选择供应商" /> <el-input v-model="supplier_name" readonly clearable placeholder="请选择供应商" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应商编码" prop="supplier_id"> <el-form-item label="供应商编码">
<el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" /> <el-input v-model="supplier_code" clearable readonly placeholder="系统自动填写" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -37,9 +35,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同编码" prop="reimburser"> <el-form-item label="合同编码" prop="contract_no">
<el-input v-model="contract_no" clearable placeholder="请输入合同编码" /> <el-input v-model="contract_no" clearable placeholder="请输入合同编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -47,7 +44,8 @@
<el-select v-model="contract_type" clearable placeholder="请选择合同类型"> <el-select v-model="contract_type" clearable placeholder="请选择合同类型">
<el-option v-for="(item, index) in dictData.contract_type" :key="index" :label="item.name" :value="parseInt(item.value)" /> <el-option v-for="(item, index) in dictData.contract_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
</el-select> </el-select>
</el-form-item></el-col> </el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="项目名称" prop="reimburser"> <el-form-item label="项目名称" prop="reimburser">
<el-input v-model="project_name" clearable placeholder="请输入项目名称" /> <el-input v-model="project_name" clearable placeholder="请输入项目名称" />
@ -55,7 +53,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="项目编码" prop="reimburser"> <el-form-item label="项目编码" prop="project_code">
<el-input v-model="project_code" clearable placeholder="请输入项目编码" /> <el-input v-model="project_code" clearable placeholder="请输入项目编码" />
</el-form-item> </el-form-item>

2
src/views/project_job_type/index.vue
View File

@ -57,7 +57,7 @@
<script lang="ts" setup name="projectLists"> <script lang="ts" setup name="projectLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { projectjobtypeLists, projectjobtypeDelete, projectjobtypeDetail } from '@/api/project_labor_contract' import { projectjobtypeLists, projectjobtypeDelete, projectjobtypeDetail } from '@/api/project_job_type'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import { getAllProjectTypes } from '@/api/projecttype' import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([]) const protype = reactive([])

32
src/views/project_personnel/detail.vue
View File

@ -149,19 +149,18 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工资付款" name="six"> <el-tab-pane label="工资付款" name="six">
<el-table :data="buildworksList"> <el-table :data="paymentList">
<el-table-column label="ID" prop="id" show-overflow-tooltip /> <el-table-column label="ID" prop="id" show-overflow-tooltip />
<el-table-column label="工资付款单号" prop="project_name" show-overflow-tooltip /> <el-table-column label="工资付款单号" prop="payment_code" show-overflow-tooltip />
<el-table-column label="日期" prop="project_code" show-overflow-tooltip /> <el-table-column label="日期" prop="apply_date" show-overflow-tooltip />
<el-table-column label="姓名" prop="name" show-overflow-tooltip /> <el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
<el-table-column label="身份证号" prop="idcard" show-overflow-tooltip /> <el-table-column label="身份证号" prop="person_idcard" show-overflow-tooltip />
<el-table-column label="工种" prop="work_type_text" show-overflow-tooltip /> <el-table-column label="工种" prop="person_work_type_text" show-overflow-tooltip />
<el-table-column label="总收入" prop="total_income" show-overflow-tooltip />
<el-table-column label="总收入" prop="unit_price" show-overflow-tooltip /> <el-table-column label="总支出" prop="total_pay_out" show-overflow-tooltip />
<el-table-column label="总支出" prop="bank_no" show-overflow-tooltip />
<el-table-column label="未发放" prop="deposit_bank" show-overflow-tooltip /> <el-table-column label="未发放" prop="deposit_bank" show-overflow-tooltip />
<el-table-column label="本次付款金额" prop="remark" show-overflow-tooltip /> <el-table-column label="本次付款金额" prop="balance" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip /> <el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-table> </el-table>
@ -178,7 +177,7 @@
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import { personnelbuildworks, personnelattendances, personneinsurances, personnelaborContracts } from '@/api/project_personnel' import { personnelbuildworks, personnelattendances, personneinsurances, personnelaborContracts, personnelpayments } from '@/api/project_personnel'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue' import type { PropType } from 'vue'
defineProps({ defineProps({
@ -196,6 +195,8 @@ const laborContractsList = ref([])
const insurancesList = ref([]) const insurancesList = ref([])
const attendancesList = ref([]) const attendancesList = ref([])
const buildworksList = ref([]) const buildworksList = ref([])
const paymentList = ref([])
const datas = reactive({ const datas = reactive({
provinceOptions: [], provinceOptions: [],
cityOptions: [], cityOptions: [],
@ -236,6 +237,14 @@ const buildworks = async (id: any) => {
buildworksList.value = res.lists buildworksList.value = res.lists
}
//某个人员下的施工记录列表
const payment = async (id: any) => {
let res = await personnelpayments({ person_id: id, page_no: 1, page_size: 9999 })
paymentList.value = res.lists
} }
@ -245,6 +254,7 @@ const setFormData = async (data: Record<any, any>) => {
attendances(data.id) attendances(data.id)
insurances(data.id) insurances(data.id)
buildworks(data.id) buildworks(data.id)
payment(data.id)
Object.assign(formData, data) Object.assign(formData, data)
} }

56
src/views/project_salary/list/detail.vue
View File

@ -1,10 +1,15 @@
<template> <template>
<div class="detail-popup"> <div class="detail-popup">
<popup ref="popupRef" title="保险管理详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose"> <popup ref="popupRef" title="工资付款详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px"> <el-form ref="formRef" :model="formData" label-width="120px">
<el-card class="mb-2"> <el-card class="mb-2">
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="工资付款单号">
{{ formData.payment_code }}
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="项目名称"> <el-form-item label="项目名称">
{{ formData.project_name }} {{ formData.project_name }}
@ -21,30 +26,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号"> <el-form-item label="付款类型">
{{ formData.person_idcard }} {{ formData.payment_type }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="投保日期"> <el-form-item label="申请日期">
{{ formData.insurance_date }} {{ formData.apply_date }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合计金额">
{{ formData.total_amount }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="到期日期"> <el-form-item label="合计金额大写">
{{ formData.due_date }} {{ formData.total_amount_uppercase }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保费（元）">
{{ formData.insurance }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投保金额（万元）">
{{ formData.insured_amount }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -70,7 +71,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合同附件"> <el-form-item label="附件">
<div v-if="formDataannex.length > 0"> <div v-if="formDataannex.length > 0">
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;"> <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a> <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
@ -82,6 +83,25 @@
</el-col> </el-col>
</el-row> </el-row>
<div>
<el-table :data="formData.payment_detail">
<el-table-column label="序号" type="index" show-overflow-tooltip />
<el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
<el-table-column label="工种" prop="person_work_type_text" show-overflow-tooltip />
<el-table-column label="银行卡号" prop="person_bank_no" show-overflow-tooltip />
<el-table-column label="总收入" prop="total_income" show-overflow-tooltip />
<el-table-column label="总支出" prop="total_pay_out" show-overflow-tooltip />
<el-table-column label="未发放" prop="total_amount_uppercase" show-overflow-tooltip />
<el-table-column label="本次申请付款金额" prop="apply_amount" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</el-card> </el-card>
</el-form> </el-form>
</popup> </popup>

103
src/views/project_salary/list/edit.vue
View File

@ -13,9 +13,9 @@
</el-form-item> </el-col> </el-form-item> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="付款类型" prop="insurance_date"> <el-form-item label="付款类型" prop="payment_type">
<el-radio-group v-model="formData.insurance_date" placeholder="请选择付款类型"> <el-radio-group v-model="formData.payment_type" placeholder="请选择付款类型">
<el-radio v-for="( item, index ) in dictData.pay_type " :key="index" :label="parseInt(item.value)"> <el-radio v-for="( item, index ) in dictData.payment_type " :key="index" :label="parseInt(item.value)">
{{ item.name }} {{ item.name }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
@ -26,22 +26,22 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请日期" prop="insurance_date"> <el-form-item label="申请日期" prop="apply_date">
<el-date-picker class="flex-1 !flex" v-model="formData.insurance_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择申请日期"> <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择申请日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-col> </el-form-item> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合计金额(元)" prop="insurance"> <el-form-item label="合计金额(元)" prop="total_amount">
<el-input v-model="formData.insurance" clearable type="number" @input="amountinput" placeholder="请输入合计金额(元)" /> <el-input v-model="formData.total_amount" clearable type="number" @input="amountinput" placeholder="请输入合计金额(元)" />
</el-form-item> </el-col> </el-form-item> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合计金额大写(元)" prop="amount_daxie"> <el-form-item label="合计金额大写(元)" prop="total_amount_uppercase">
<el-input v-model="formData.amount_daxie" clearable disabled placeholder="请输入合计金额大写(元)" /> <el-input v-model="formData.total_amount_uppercase" clearable disabled placeholder="请输入合计金额大写(元)" />
</el-form-item> </el-col> </el-form-item> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="备注" prop="handler"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.handler" clearable placeholder="请输入备注" /> <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item> </el-col> </el-form-item> </el-col>
@ -65,27 +65,24 @@
</el-row> </el-row>
<div style="margin-bottom: 30px;">工资支付明细</div> <div style="margin-bottom: 30px;">工资支付明细</div>
<div style="margin-bottom: 30px;"> <div style="margin-bottom: 30px;">
<el-table :data="formData.pay_plan"> <el-table :data="paymentlist">
<el-table-column label="序号"> <el-table-column label="序号">
<template #default="{ row }"> <template #default="{ row }">
<el-button @click="handleAdd(row)">+</el-button> <el-button @click="handleAdd(row)">+</el-button>
<el-button @click="handleDelete(row)">-</el-button> <el-button @click="handleDelete(row)">-</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" prop="name1"> <el-table-column label="姓名" prop="name">
<template #default="{ row }"> <template #default="{ row, $index }">
<el-select v-model="row.period" clearable placeholder="请选择期次"> <el-input v-model="row.name" @click="paymentdetail(row, $index)" />
<el-option v-for="(item, index) in dictData.pay_period " :key="index" :label="item.name" :value="item.id" />
</el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工种" prop="pay_date"> <el-table-column label="工种" prop="work_type_text">
<template #default="{ row }"> <template #default="{ row }">
<el-date-picker v-model="row.pay_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期"> <el-input v-model="row.work_type_text" />
</el-date-picker>
</template></el-table-column> </template></el-table-column>
<el-table-column label="银行卡号" prop="pay_amount"> <el-table-column label="银行卡号" prop="bank_no">
<template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column> <template #default="{ row }"> <el-input v-model="row.bank_no" /> </template></el-table-column>
<el-table-column label="总收入" prop="pay_amount"> <el-table-column label="总收入" prop="pay_amount">
<template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column> <template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column>
@ -97,7 +94,7 @@
<template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column> <template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column>
<el-table-column label="本次申请付款金额" prop="pay_amount"> <el-table-column label="本次申请付款金额" prop="pay_amount">
<template #default="{ row }"> <el-input v-model="row.pay_amount" /> </template></el-table-column> <template #default="{ row }"> <el-input v-model="row.apply_amount" /> </template></el-table-column>
@ -124,7 +121,7 @@ import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue' import Popup from '@/components/popup/index.vue'
import projectDialog from '@/components/project/index.vue' import projectDialog from '@/components/project/index.vue'
import { toChinesNum } from "@/utils/util"; import { toChinesNum } from "@/utils/util";
import { insurancemanagementAdd, insurancemanagementEdit, insurancemanagementDetail } from '@/api/project_insurance_management' import { projectsalarypaymentAdd, projectsalarypaymentEdit, projectsalarypaymentDetail } from '@/api/project_salary_payment'
import customDialog from '@/components/project_personnel/index.vue' import customDialog from '@/components/project_personnel/index.vue'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue' import type { PropType } from 'vue'
@ -145,7 +142,7 @@ const project_name = ref('')
const project_code = ref('') const project_code = ref('')
const person_name = ref('') const person_name = ref('')
const idcard = ref('') const idcard = ref('')
const num = ref(0)
import configs from "@/config" import configs from "@/config"
import useUserStore from "@/stores/modules/user"; import useUserStore from "@/stores/modules/user";
const base_url = configs.baseUrl + configs.urlPrefix const base_url = configs.baseUrl + configs.urlPrefix
@ -153,6 +150,7 @@ const userStore = useUserStore();
const formDataannex = reactive([]) const formDataannex = reactive([])
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
const userInfo = userStore.userInfo const userInfo = userStore.userInfo
const paymentlist = ref([{}])
//获取值 //获取值
const customEvent = (e) => { const customEvent = (e) => {
formData.project_id = e.id formData.project_id = e.id
@ -162,27 +160,35 @@ const customEvent = (e) => {
} }
const customEvent1 = (e) => { const customEvent1 = (e) => {
formData.project_person_id = e.id paymentlist.value[num.value].person_id = e.id
idcard.value = e.idcard paymentlist.value[num.value].name = e.name
person_name.value = e.name
paymentlist.value[num.value].bank_no = e.bank_no
paymentlist.value[num.value].work_type_text = e.work_type_text
showDialog1.value = false showDialog1.value = false
} }
//摊开人员弹窗
const paymentdetail = (row, index) => {
num.value = index
showDialog1.value = true
}
const handleAdd = (row: any) => { const handleAdd = (row: any) => {
// 在 row 后面插入一行数据 // 在 row 后面插入一行数据
const index = formData.pay_plan.indexOf(row); const index = paymentlist.value.indexOf(row);
formData.pay_plan.splice(index + 1, 0, {}); paymentlist.value.splice(index + 1, 0, {});
}; };
const handleDelete = (row: any) => { const handleDelete = (row: any) => {
// 删除 row // 删除 row
const index = formData.pay_plan.indexOf(row); const index = paymentlist.value.indexOf(row);
formData.pay_plan.splice(index, 1); paymentlist.value.splice(index, 1);
}; };
// 弹窗标题 // 弹窗标题
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑保险管理' : '新增保险管理' return mode.value == 'edit' ? '编辑工资付款' : '新增工资付款'
}) })
// 上传文件 // 上传文件
const handleAvatarSuccess_four = ( const handleAvatarSuccess_four = (
@ -207,19 +213,14 @@ const delFileFn = (index: number) => {
const formData = reactive({ const formData = reactive({
id: '', id: '',
project_id: '', project_id: '',
project_person_id: '', payment_type: '',
insurance_date: '', apply_date: '',
due_date: '', total_amount: '',
type: '', total_amount_uppercase: '',
insurance_no: '', payment_detail: '',
insurance: '', remark: '',
insured_amount: '',
insurance_company: '',
insurance_detail: '',
invoice_no: '',
handler: '',
amount_daxie: '',
annex: '', annex: '',
}) })
@ -232,7 +233,7 @@ const formRules = reactive<any>({
const amountinput = (e) => { const amountinput = (e) => {
// console.log(e) // console.log(e)
if (e && e > 0) { if (e && e > 0) {
formData.amount_daxie = toChinesNum(e) formData.total_amount_uppercase = toChinesNum(e)
} }
} }
@ -265,7 +266,7 @@ const setFormData = async (data: Record<any, any>) => {
} }
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
const data = await insurancemanagementDetail({ const data = await projectsalarypaymentDetail({
id: row.id id: row.id
}) })
setFormData(data) setFormData(data)
@ -274,14 +275,18 @@ const getDetail = async (row: Record<string, any>) => {
// 提交按钮 // 提交按钮
const handleSubmit = async () => { const handleSubmit = async () => {
if (paymentlist.value.length > 0) {
const arr1 = paymentlist.value.map(({ name, bank_no, work_type_text, ...rest }) => rest)
formData.payment_detail = JSON.stringify(arr1)
}
if (formDataannex.length > 0) { if (formDataannex.length > 0) {
formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri)) formData.annex = JSON.stringify(formDataannex.map((item: any) => item.uri))
} }
await formRef.value?.validate() await formRef.value?.validate()
const data = { ...formData, } const data = { ...formData, }
mode.value == 'edit' mode.value == 'edit'
? await insurancemanagementEdit(data) ? await projectsalarypaymentEdit(data)
: await insurancemanagementAdd(data) : await projectsalarypaymentAdd(data)
popupRef.value?.close() popupRef.value?.close()
emit('success') emit('success')
} }

58
src/views/project_salary/list/index.vue
View File

@ -3,21 +3,20 @@
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="保单号" prop="insurance_no"> <el-form-item label="工资付款单号" prop="payment_code">
<el-input v-model="queryParams.insurance_no" clearable placeholder="请输入保单号" /> <el-input v-model="queryParams.payment_code" clearable placeholder="请输入工资付款单号" />
</el-form-item> </el-form-item>
<el-form-item label="保险种类" prop="type"> <el-form-item label="付款类型" prop="payment_type">
<el-input v-model="queryParams.type" clearable placeholder="请输入保险种类" /> <el-select class="flex-1" v-model="queryParams.payment_type" clearable placeholder="请选择客户">
<el-option v-for="(item, index) in dictData.pay_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="保险公司" prop="insurance_company">
<el-input v-model="queryParams.insurance_company" clearable placeholder="请输入保险公司" /> <el-form-item label="申请日期" prop="apply_date">
</el-form-item> <el-date-picker class="flex-1 !flex" v-model="queryParams.apply_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择申请日期">
<el-form-item label="发票编号" prop="invoice_no"> </el-date-picker>
<el-input v-model="queryParams.invoice_no" clearable placeholder="请输入发票编号" />
</el-form-item>
<el-form-item label="经办人" prop="handler">
<el-input v-model="queryParams.handler" clearable placeholder="请输入经办人" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
@ -41,14 +40,16 @@
<el-table-column label="序号" type="index" show-overflow-tooltip /> <el-table-column label="序号" type="index" show-overflow-tooltip />
<el-table-column label="处理流程" prop="person_idcard" show-overflow-tooltip /> <el-table-column label="处理流程" prop="person_idcard" show-overflow-tooltip />
<el-table-column label="流程步骤" prop="person_idcard" show-overflow-tooltip /> <el-table-column label="流程步骤" prop="person_idcard" show-overflow-tooltip />
<el-table-column label="工资付款单号" prop="person_idcard" show-overflow-tooltip /> <el-table-column label="工资付款单号" prop="payment_code" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip /> <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="姓名" prop="person_name" show-overflow-tooltip /> <el-table-column label="姓名" prop="person_name" show-overflow-tooltip />
<el-table-column label="付款类型" prop="person_idcard" show-overflow-tooltip /> <el-table-column label="付款类型" prop="payment_type" show-overflow-tooltip />
<el-table-column label="申请日期" prop="insurance_date" show-overflow-tooltip />
<el-table-column label="合计金额" prop="due_date" show-overflow-tooltip />
<el-table-column label="合计金额大写" prop="insurance_no" show-overflow-tooltip /> <el-table-column label="申请日期" prop="apply_date" show-overflow-tooltip />
<el-table-column label="账户编码）" prop="insurance" show-overflow-tooltip /> <el-table-column label="合计金额" prop="total_amount" show-overflow-tooltip />
<el-table-column label="合计金额大写" prop="total_amount_uppercase" show-overflow-tooltip />
<el-table-column label="账户编码" prop="insurance" show-overflow-tooltip />
<el-table-column label="投保金额（万元）" prop="insured_amount" show-overflow-tooltip /> <el-table-column label="投保金额（万元）" prop="insured_amount" show-overflow-tooltip />
<el-table-column label="开户银行" prop="insurance_company" show-overflow-tooltip /> <el-table-column label="开户银行" prop="insurance_company" show-overflow-tooltip />
<el-table-column label="账号" prop="insurance_detail" show-overflow-tooltip /> <el-table-column label="账号" prop="insurance_detail" show-overflow-tooltip />
@ -97,7 +98,7 @@
<script lang="ts" setup name="projectLists"> <script lang="ts" setup name="projectLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { insurancemanagementLists, insurancemanagementDelete, insurancemanagementDetail } from '@/api/project_salary' import { projectsalarypaymentLists, projectsalarypaymentDelete, projectsalarypaymentDetail } from '@/api/project_salary_payment'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import { getAllProjectTypes } from '@/api/projecttype' import { getAllProjectTypes } from '@/api/projecttype'
const protype = reactive([]) const protype = reactive([])
@ -112,11 +113,10 @@ const showDtail = ref(false)
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
type: '', payment_code: '',
insurance_no: '', apply_date: '',
insurance_company: '', payment_type: '',
invoice_no: '',
handler: '',
}) })
@ -131,10 +131,10 @@ const handleSelectionChange = (val: any[]) => {
} }
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name,pay_type') const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name,payment_type')
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: insurancemanagementLists, fetchFun: projectsalarypaymentLists,
params: queryParams params: queryParams
}) })
@ -149,7 +149,7 @@ const handleAdd = async () => {
// 编辑 // 编辑
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
console.log(data.id) console.log(data.id)
let res = await insurancemanagementDetail({ id: data.id }) let res = await projectsalarypaymentDetail({ id: data.id })
showEdit.value = true showEdit.value = true
await nextTick() await nextTick()
editRef.value?.open('edit') editRef.value?.open('edit')
@ -159,11 +159,11 @@ const handleEdit = async (data: any) => {
// 删除 // 删除
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？') await feedback.confirm('确定要删除？')
await insurancemanagementDelete({ id }) await projectsalarypaymentDelete({ id })
getLists() getLists()
} }
const handledetail = async (data: any) => { const handledetail = async (data: any) => {
let res = await insurancemanagementDetail({ id: data.id }) let res = await projectsalarypaymentDetail({ id: data.id })
showDtail.value = true showDtail.value = true
await nextTick() await nextTick()
detailRef.value?.open() detailRef.value?.open()