This commit is contained in:
zmj 2024-03-26 16:49:27 +08:00
parent b34c29c6db
commit 9324c668d7
45 changed files with 738 additions and 321 deletions
src
api
components
formTable
uploadAnnex
views
apply_with_seal
data_report_commission
financial_budget_doc
project_expense_reimbursement
project_expense_reimbursement_invoice_detail
project_travel_reimbursement
project_travel_reimbursement_invoice_detail
supervision_check_item
supervision_commencement_report
supervision_company_check
supervision_construction_management_personnel
supervision_design_disclosure
supervision_device_entry
supervision_entity_parallel_testing
supervision_first_meeting
supervision_large_equipment
supervision_large_mechanical_equipment
supervision_material_entry
supervision_material_equipment_info
supervision_participating_units_qualifications
supervision_rules
supervision_rules_disclosure
supervision_safety_warning_sign
supervision_side_station
supervision_test_blocks_specimens
zjzx_refund

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 财务管理--项目预算书列表
export function apiFinancialBudgetDocLists(params: any) {
return request.get({ url: '/financial.financial_budget_doc/lists', params })
}
// 添加财务管理--项目预算书
export function apiFinancialBudgetDocAdd(params: any) {
return request.post({ url: '/financial.financial_budget_doc/add', params })
}
// 编辑财务管理--项目预算书
export function apiFinancialBudgetDocEdit(params: any) {
return request.post({ url: '/financial.financial_budget_doc/edit', params })
}
// 删除财务管理--项目预算书
export function apiFinancialBudgetDocDelete(params: any) {
return request.post({ url: '/financial.financial_budget_doc/delete', params })
}
// 财务管理--项目预算书详情
export function apiFinancialBudgetDocDetail(params: any) {
return request.get({ url: '/financial.financial_budget_doc/detail', params })
}

@ -21,7 +21,8 @@
<el-date-picker class="flex-1 !flex" v-model="row[item.value]" clearable value-format="YYYY-MM-DD"
placeholder="请选择日期" v-else-if="item.date">
</el-date-picker>
<el-input v-model="row[item.value]" v-else-if="item.label.includes('单位')"
@input="row[item.value] = row[item.value].replace(/\d+/g, '')" />
<el-input v-model="row[item.value]" v-else />
</template>
</el-table-column>

@ -6,6 +6,7 @@
<el-button type="primary">
上传
</el-button>
<!-- <span class="ml-5 text-xs ">可上传</span> -->
</el-upload>
<div v-for="(item, index) in formData[value]" class="ml-5 flex ">
@ -31,6 +32,8 @@ const props = defineProps({
})
const handleAvatarSuccess = (response: any) => {
console.log(props.formData[props.value], 'sdadsa')
props.formData[props.value] ||= []
// @ts-ignore
response.code != 0 ? props.formData[props.value].push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -43,7 +42,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="盖章次数" prop="frequency">
<el-input v-model="formData.frequency" clearable placeholder="请输入盖章次数" />
<el-input v-model="formData.frequency" clearable placeholder="请输入盖章次数" type="number" />
</el-form-item>
</el-col>
</el-row>
@ -63,8 +62,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用印部门" prop="depar"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" label-width="100px">
<el-form-item label="用印部门" prop="depar">
<el-select class="flex-1" v-model="formData.depar" clearable placeholder="用印部门">
<el-option v-for="(item, index) in list2" :key="index" :label="item.name"
:value="item.id" />
@ -81,7 +79,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="项目负责人" prop="project_director">
<el-input v-model="formData.project_director" clearable placeholder="请输入项目负责人" readonly />
<el-input v-model="formData.project_director" clearable placeholder="系统自动获取" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
@ -248,9 +246,10 @@ const formData = reactive({
})
const customEvent = (e: any) => {
console.log(e, 'e')
formData.project_id = e.id
formData.project_name = e.project_name
formData.principal = e.contract.project_director
formData.project_director = e.contract.project_director
showDialog.value = false
}

@ -37,9 +37,9 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="申请编号" prop="num" show-overflow-tooltip />
<el-table-column label="关联项目" prop="projectInfo.project_name" show-overflow-tooltip />
<el-table-column label="盖章申请类型" prop="types">
<el-table-column label="申请编号" prop="num" :render-header="pager.calcWidth" />
<el-table-column label="关联项目" prop="projectInfo.project_name" :render-header="pager.calcWidth" />
<el-table-column label="盖章申请类型" prop="types" width="120">
<template #default="{ row }">
<dict-value :options="dictData.apply_with_seal_type" :value="row.types" />
</template>
@ -58,27 +58,27 @@
<el-table-column label="盖章次数" prop="frequency" show-overflow-tooltip />
<el-table-column label="限制次数" prop="limit" show-overflow-tooltip />
<el-table-column label="盖章人" prop="stampman" show-overflow-tooltip />
<el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip />
<el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip width="100" />
<el-table-column label="盖章内容" prop="content" show-overflow-tooltip />
<el-table-column label="印章是否外借" prop="loan" show-overflow-tooltip>
<el-table-column label="印章是否外借" prop="loan" show-overflow-tooltip width="120">
<template #default="{ row }">
{{ row.loan == 1 ? '是' : "否" }}
</template>
</el-table-column>
<el-table-column label="印章借用日期" prop="borrow" show-overflow-tooltip />
<el-table-column label="结束借用日期" prop="returndate" show-overflow-tooltip />
<el-table-column label="实际借章日期" prop="sjborrow" show-overflow-tooltip />
<el-table-column label="实际借章人" prop="sjborrower" show-overflow-tooltip />
<el-table-column label="实际归还日期" prop="sjreturn" show-overflow-tooltip />
<el-table-column label="实际归还人" prop="returnee" show-overflow-tooltip />
<el-table-column label="印章借用日期" prop="borrow" show-overflow-tooltip width="120" />
<el-table-column label="结束借用日期" prop="returndate" show-overflow-tooltip width="120" />
<el-table-column label="实际借章日期" prop="sjborrow" show-overflow-tooltip width="120" />
<el-table-column label="实际借章人" prop="sjborrower" show-overflow-tooltip width="100" />
<el-table-column label="实际归还日期" prop="sjreturn" show-overflow-tooltip width="120" />
<el-table-column label="实际归还人" prop="returnee" show-overflow-tooltip width="100" />
<el-table-column label="操作" width="150" fixed="right" align="center">
<template #default="{ row }">
<el-button v-perms="['project_process_management.apply_with_seal/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['project_process_management.apply_with_seal/delete']" type="danger"
link @click="handleDelete(row.id)">
<el-button v-perms="['project_process_management.apply_with_seal/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button>
<el-button v-perms="['project_process_management.apply_with_seal/detail']" link

@ -22,23 +22,77 @@
<el-table-column label="项目编号" prop="project_num" show-overflow-tooltip width="120" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip width="120" />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip width="120" />
<el-table-column prop="contract_name" show-overflow-tooltip align="center">
<el-table-column label="专业" width="200">
<template #default="{ row }">
<el-table :data="row.children">
<el-table-column label="专业" prop="professional_type" show-overflow-tooltip />
<el-table-column label="任务名称" prop="task_name" show-overflow-tooltip />
<el-table-column label="任务类型" prop="task_type" show-overflow-tooltip />
<el-table-column label="工程师" prop="engineer" show-overflow-tooltip />
<el-table-column label="造价金额" prop="zj_amount" show-overflow-tooltip />
<el-table-column label="收款金额" prop="sk_amount" show-overflow-tooltip />
<el-table-column label="提成比例" prop="tc_rate" show-overflow-tooltip />
<el-table-column label="其他加减项" prop="other_fee" show-overflow-tooltip />
<el-table-column label="应提成金额" prop="tc_amount" show-overflow-tooltip />
<el-table-column label="累计支付金额" prop="pay_amount" show-overflow-tooltip />
<el-table :data="row.children" :show-header="false">
<el-table-column prop="professional_type" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="任务名称" prop="task_name" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="task_name" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="任务类型" prop="task_type" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="task_type" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="工程师" prop="engineer" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="engineer" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="造价金额" prop="zj_amount" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="zj_amount" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="收款金额" prop="sk_amount" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="sk_amount" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="提成比例" prop="tc_rate" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="tc_rate" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="其他加减项" prop="other_fee" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="other_fee" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="应提成金额" prop="tc_amount" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="tc_amount" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
<el-table-column label="累计支付金额" prop="pay_amount" show-overflow-tooltip width="120">
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="pay_amount" show-overflow-tooltip />
</el-table>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex justify-end mt-4">

@ -0,0 +1,158 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="合同id" prop="contract_id">
<el-input v-model="formData.contract_id" clearable placeholder="请输入合同id" />
</el-form-item>
<el-form-item label="预算书编号" prop="code">
<el-input v-model="formData.code" clearable placeholder="请输入预算书编号" />
</el-form-item>
<el-form-item label="预算书名称" prop="name">
<el-input v-model="formData.name" clearable placeholder="请输入预算书名称" />
</el-form-item>
<el-form-item label="下达日期" prop="issue_date">
<el-input v-model="formData.issue_date" clearable placeholder="请输入下达日期" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item>
<el-form-item label="附件" prop="annex">
<el-input v-model="formData.annex" clearable placeholder="请输入附件" />
</el-form-item>
<el-form-item label="创建人" prop="create_user">
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="financialBudgetDocEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiFinancialBudgetDocAdd, apiFinancialBudgetDocEdit, apiFinancialBudgetDocDetail } from '@/api/financial_budget_doc'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑财务管理--项目预算书' : '新增财务管理--项目预算书'
})
//
const formData = reactive({
id: '',
contract_id: '',
code: '',
name: '',
issue_date: '',
remark: '',
annex: '',
create_user: '',
})
//
const formRules = reactive<any>({
contract_id: [{
required: true,
message: '请输入合同id',
trigger: ['blur']
}],
code: [{
required: true,
message: '请输入预算书编号',
trigger: ['blur']
}],
name: [{
required: true,
message: '请输入预算书名称',
trigger: ['blur']
}],
issue_date: [{
required: true,
message: '请输入下达日期',
trigger: ['blur']
}],
remark: [{
required: true,
message: '请输入备注',
trigger: ['blur']
}],
create_user: [{
required: true,
message: '请输入创建人',
trigger: ['blur']
}]
})
//
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiFinancialBudgetDocDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiFinancialBudgetDocEdit(data)
: await apiFinancialBudgetDocAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

@ -0,0 +1,136 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="合同id" prop="contract_id">
<el-input class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请输入合同id" />
</el-form-item>
<el-form-item label="预算书编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入预算书编号" />
</el-form-item>
<el-form-item label="预算书名称" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入预算书名称" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['financial.financial_budget_doc/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['financial.financial_budget_doc/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="合同id" prop="contract_id" show-overflow-tooltip />
<el-table-column label="预算书编号" prop="code" show-overflow-tooltip />
<el-table-column label="预算书名称" prop="name" show-overflow-tooltip />
<el-table-column label="下达日期" prop="issue_date" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['financial.financial_budget_doc/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['financial.financial_budget_doc/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="financialBudgetDocLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiFinancialBudgetDocLists, apiFinancialBudgetDocDelete } from '@/api/financial_budget_doc'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
contract_id: '',
code: '',
name: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiFinancialBudgetDocLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiFinancialBudgetDocDelete({ id })
getLists()
}
getLists()
</script>

@ -10,18 +10,40 @@
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card>
<template #header>
报销明细
</template>
<div class="mt-4">
<el-table :data="formData.reimbursement_detail">
<el-table-column label="一级科目" prop="first_level_subject" show-overflow-tooltip />
<el-table-column label="金额" prop="amount" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip width="120" />
</el-table>
</div>
</el-card>
<el-card>
<template #header>
发票明细
</template>
<div class="mt-4">
<el-table :data="formData.invoice_detail">
<el-table-column label="发票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票编号" prop="invoice_sn" show-overflow-tooltip />
<el-table-column label="发票税率" prop="tax_rate_text" show-overflow-tooltip />
<el-table-column label="发票形式" prop="invoice_form_text" show-overflow-tooltip width="100" />
<el-table-column label="发票金额" prop="invoice_amount" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</el-card>
<flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
:submitApi="apiproject_expense_reimbursementApprove" :id="formData?.id" @off="handleClose">
</flowProcess>
<flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" />
<!-- import { apiproject_expense_reimbursementApprove, apiproject_expense_reimbursementFlows } from '@/api/flowSet'
//
const flows = ref([])
const getbidDocumentExaminationFlows = async () => {
if (formData?.approve_id) return
let res = await apiproject_expense_reimbursementFlows()
flows.value = res
} -->
</popup>
</div>
</template>
@ -29,6 +51,10 @@
<script lang="ts" setup name="customdetail">
import { ref, reactive } from "vue"
import { apiproject_expense_reimbursementApprove, apiproject_expense_reimbursementFlows } from '@/api/flowSet'
import { apiProjectExpenseReimbursementDetailLists } from "@/api/project_expense_reimbursement_detail.ts"
import { apiProjectExpenseReimbursementInvoiceDetailLists } from "@/api/project_expense_reimbursement_invoice_detail.ts"
const descriptionList = reactive([
{
lable: "项目名称",
@ -105,6 +131,10 @@ const formData: any = reactive({
const setFormData = async (data: Record<any, any>) => {
Object.assign(formData, data)
getbidDocumentExaminationFlows()
let res = await apiProjectExpenseReimbursementDetailLists({ expense_reimbursement_id: data.id })
formData.reimbursement_detail = res.lists
let res2 = await apiProjectExpenseReimbursementInvoiceDetailLists({ expense_reimbursement_id: data.id })
formData.invoice_detail = res2.lists
}
//

@ -1,90 +1,94 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_name" clearable placeholder="点击选择" readonle
@click="showDialog = true" />
</el-form-item>
<!-- <el-form-item label="报销类型" prop="reimbursement_type">
<el-radio-group v-model="formData.reimbursement_type" class="ml-4">
<el-radio :label="item.value" size="large" v-for="item in dictData.reimbursement_type ">{{ item.name
}}</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item label="报销类型" prop="reimbursement_type">
<el-checkbox-group v-model="formData.reimbursement_type" placeholder="报销类型">
<el-checkbox v-for="(item, index) in dictData.reimbursement_type" :key="index"
:label="item.value">
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="借款单号" prop="loan_apply_id" v-if="formData.reimbursement_type.includes('1')">
<el-input v-model="formData.loan_apply_code" clearable placeholder="点击选择" readonly
@click="showDialog1 = true" />
</el-form-item>
<el-form-item label="冲抵借款金额" prop="offset_loan_amount" v-if="formData.reimbursement_type.includes('1')">
<el-input v-model="formData.offset_loan_amount" clearable placeholder="请输入冲抵借款金额" />
</el-form-item>
<el-form-item label="报销人" prop="apply_user">
<el-input v-model="formData.apply_user" clearable placeholder="请输入报销人" />
</el-form-item>
<el-form-item label="报销日期" prop="apply_date">
<el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="收款人姓名" prop="payee_name">
<el-input v-model="formData.payee_name" clearable placeholder="请输入收款人姓名" />
</el-form-item>
<el-form-item label="收款银行" prop="payee_bank">
<el-input v-model="formData.payee_bank" clearable placeholder="请输入收款银行" />
</el-form-item>
<el-form-item label="收款账号" prop="payee_account">
<el-input v-model="formData.payee_account" clearable placeholder="请输入收款账号" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item>
<el-form-item label="附件">
<el-upload
accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
class="upload-demo" :show-file-list="false" aria-hidden="true"
:headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
:on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
</el-upload>
<div>
<div v-for="(item, index) in formData.annex" 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>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
<!-- <el-form-item label="付款银行账户" prop="bank_account_id">
<el-input v-model="formData.account_name" clearable placeholder="点击选择银行" readonly
@click="showDialog2 = true" />
</el-form-item> -->
<el-form-item label="账户编码" prop="bank_account_id">
<el-input v-model="formData.bank_account.account_sn" clearable placeholder="点击选择银行" readonly
@click="showDialog2 = true" />
</el-form-item>
<el-form-item label="开户银行" prop="bank_account_id">
<el-input v-model="formData.bank_account.deposit_bank" clearable readonly />
</el-form-item>
<el-form-item label="开户名称" prop="bank_account_id">
<el-input v-model="formData.bank_account.account_name" clearable readonly />
</el-form-item>
<el-form-item label="开户账号" prop="bank_account_id">
<el-input v-model="formData.bank_account.account" clearable readonly />
</el-form-item>
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_name" clearable placeholder="点击选择" readonle
@click="showDialog = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报销类型" prop="reimbursement_type">
<el-checkbox-group v-model="formData.reimbursement_type" placeholder="报销类型">
<el-checkbox v-for="(item, index) in dictData.reimbursement_type" :key="index"
:label="item.value">
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formData.reimbursement_type.includes('1')">
<el-form-item label="借款单号">
<el-input v-model="formData.loan_apply_code" clearable placeholder="点击选择" readonly
@click="showDialog1 = true" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="formData.reimbursement_type.includes('1')">
<el-form-item label="冲抵借款金额" prop="offset_loan_amount">
<el-input v-model="formData.offset_loan_amount" clearable placeholder="请输入冲抵借款金额" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报销人" prop="apply_user">
<el-input v-model="formData.apply_user" clearable placeholder="请输入报销人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报销日期" prop="apply_date">
<el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款人姓名" prop="payee_name">
<el-input v-model="formData.payee_name" clearable placeholder="请输入收款人姓名" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款银行" prop="payee_bank">
<el-input v-model="formData.payee_bank" clearable placeholder="请输入收款银行" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款账号" prop="payee_account">
<el-input v-model="formData.payee_account" clearable placeholder="请输入收款账号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件">
<uploadAnnex :formData="formData"></uploadAnnex>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账户编码" prop="bank_account_id">
<el-input v-model="formData.bank_account.account_sn" clearable placeholder="点击选择银行" readonly
@click="showDialog2 = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户银行">
<el-input v-model="formData.bank_account.deposit_bank" clearable readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户名称">
<el-input v-model="formData.bank_account.account_name" clearable readonly />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户账号">
<el-input v-model="formData.bank_account.account" clearable readonly />
</el-form-item>
</el-col>
</el-row>
<el-col :span="24">
<div style="margin-bottom: 30px;">报销明细</div>
@ -99,8 +103,8 @@
<el-table-column label="一级科目">
<template #default="scope">
<el-input v-model="scope.row.first_level_subject" @click="openDialog1(scope)"
readonly placeholder="点击选择" />
<el-input v-model="scope.row.first_level_subject" @click="openDialog1(scope)" readonly
placeholder="点击选择" />
</template>
</el-table-column>
@ -233,9 +237,9 @@ import project from "@/components/project/index.vue"
import projectLoanApply from "@/components/project_loan_apply/index.vue"
import bankaccount from "@/components/bankaccount/index.vue"
import projectcostTemLists from '@/components/projectcostTemLists/index.vue'
import { apiProjectExpenseReimbursementDetailLists } from "@/api/project_expense_reimbursement_detail.ts"
import { apiProjectExpenseReimbursementInvoiceDetailLists } from "@/api/project_expense_reimbursement_invoice_detail.ts"
import { apiProjectExpenseReimbursementDetailLists, apiProjectExpenseReimbursementDetailDelete } from "@/api/project_expense_reimbursement_detail.ts"
import { apiProjectExpenseReimbursementInvoiceDetailLists, apiProjectExpenseReimbursementInvoiceDetailDelete } from "@/api/project_expense_reimbursement_invoice_detail.ts"
import { cloneDeep } from 'lodash'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
@ -339,26 +343,13 @@ const formData = reactive({
"account_name": "",
"account": ""
},
// approve_detail: {
// flow_type: 1,
// flow_path: 1,
// path: "asa/ssa"
// },
})
//
const handleAvatarSuccess_four = (response: any) => {
// @ts-ignore
response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
//
const delFileFn = (index: number) => {
formData.annex.splice(index, 1)
}
const invoiceIndex = ref(0)
//
const handleAvatarSuccess_four1 = (response: any) => {
// @ts-ignore
response.code != 0 ? formData.invoice_detail[invoiceIndex.value].annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
@ -433,9 +424,9 @@ const handleAdd = (row: any) => {
formData.reimbursement_detail.splice(index + 1, 0, {});
};
const handleDelete = (row: any) => {
const handleDelete = async (row: any) => {
if (row.id) await apiProjectExpenseReimbursementDetailDelete({ id: row.id })
// row
if (formData.reimbursement_detail.length <= 1) return
const index = formData.reimbursement_detail.indexOf(row);
formData.reimbursement_detail.splice(index, 1);
};
@ -445,18 +436,19 @@ const handleAdd1 = (row: any) => {
const index = formData.invoice_detail.indexOf(row);
formData.invoice_detail.splice(index + 1, 0,
{
"invoice_type": "1",
"invoice_sn": "FPSN-0001",
"invoice_type": "",
"invoice_sn": "",
"tax_rate": "1",
"invoice_form": "1",
"invoice_amount": "150",
"invoice_amount": "",
"annex": [],
"remark": "test"
}
);
};
const handleDelete1 = (row: any) => {
const handleDelete1 = async (row: any) => {
if (row.id) await apiProjectExpenseReimbursementInvoiceDetailDelete({ id: row.id })
// row
if (formData.invoice_detail.annex <= 1) return
const index = formData.invoice_detail.indexOf(row);
@ -491,8 +483,8 @@ const getDetail = async (row: Record<string, any>) => {
//
const handleSubmit = async () => {
await formRef.value?.validate()
formData.reimbursement_type = formData.reimbursement_type.join(',')
const data = { ...formData, }
const data = cloneDeep({ ...formData, })
data.reimbursement_type = data.reimbursement_type.join(',')
mode.value == 'edit'
? await apiProjectExpenseReimbursementEdit(data)
: await apiProjectExpenseReimbursementAdd(data)

@ -30,18 +30,18 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="费用报销单号" prop="expense_reimbursement_code" show-overflow-tooltip />
<el-table-column label="费用报销单号" prop="expense_reimbursement_code" :render-header="pager.calcWidth" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="报销人" prop="apply_user" show-overflow-tooltip />
<el-table-column label="报销日期" prop="apply_date" show-overflow-tooltip />
<el-table-column label="报销类型" prop="reimbursement_type" show-overflow-tooltip />
<el-table-column label="借款单编号" prop="loan_apply_code" show-overflow-tooltip />
<el-table-column label="借款单编号" prop="loan_apply_code" show-overflow-tooltip width="100" />
<el-table-column label="借款金额" prop="loan_amount" show-overflow-tooltip />
<el-table-column label="报销金额" prop="total_amount" show-overflow-tooltip />
<el-table-column label="付款金额" prop="pay_amount" show-overflow-tooltip />
<el-table-column label="本次冲抵借款金额" prop="offset_loan_amount" show-overflow-tooltip />
<el-table-column label="本次冲抵借款金额" prop="offset_loan_amount" show-overflow-tooltip width="160" />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button v-perms="['project.project_expense_reimbursement/edit']" type="primary" link
@click="handleEdit(row)">

@ -1,59 +1,41 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="费用报销单" prop="expense_reimbursement_id">
<el-form-item label="费用报销单">
<el-input v-model="formData.project_name" clearable placeholder="请输入费用报销单id"
@click="showDialog = true" />
</el-form-item>
<el-form-item label="发票类型" prop="invoice_type">
<el-form-item label="发票类型">
<el-select v-model="formData.invoice_type" placeholder="请选择" class="flex-1">
<el-option :label="item.name" :value="item.value"
v-for="item in dictData.invoice_type"></el-option>
<el-option :label="item.name" :value="item.value" v-for="item in dictData.invoice_type"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票号" prop="invoice_sn">
<el-form-item label="发票号">
<el-input v-model="formData.invoice_sn" clearable placeholder="请输入发票号" />
</el-form-item>
<el-form-item label="发票税率" prop="tax_rate">
<el-form-item label="发票税率">
<el-select v-model="formData.tax_rate" placeholder="请选择" class="flex-1">
<el-option :label="item.name" :value="item.value" v-for="item in dictData.tax_rate"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票形式" prop="invoice_form">
<el-form-item label="发票形式">
<el-select v-model="formData.invoice_form" placeholder="请选择" class="flex-1">
<el-option :label="item.name" :value="item.value"
v-for="item in dictData.invoice_form"></el-option>
<el-option :label="item.name" :value="item.value" v-for="item in dictData.invoice_form"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票金额" prop="invoice_amount">
<el-input v-model="formData.invoice_amount" clearable placeholder="请输入发票金额" />
</el-form-item>
<el-form-item label="发票税额" prop="tax_amount">
<el-form-item label="发票税额">
<el-input v-model="tax_amount" disabled clearable placeholder="请输入发票税额" />
</el-form-item>
<el-form-item label="附件">
<el-upload
accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
class="upload-demo" :show-file-list="false" aria-hidden="true"
:headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
:on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
</el-upload>
<div>
<div v-for="(item, index) in formData.annex" 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>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
<uploadAnnex :formData="formData"></uploadAnnex>
</el-form-item>
<el-form-item label="发票备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入发票备注" />
@ -113,16 +95,7 @@ let tax_amount = computed(() => {
let index = props.dictData.tax_rate.findIndex((item) => item.value == formData.tax_rate)
return (formData.invoice_amount * (props.dictData.tax_rate[index]?.name / 100)).toFixed(2) || 0
})
//
const handleAvatarSuccess_four = (response: any) => {
formData.annex ||= []
// @ts-ignore
response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
//
const delFileFn = (index: number) => {
formData.annex.splice(index, 1)
}
const customEvent = (e: any) => {
formData.expense_reimbursement_id = e.id
formData.project_name = e.project_name

@ -6,7 +6,6 @@
<el-descriptions :column="3" title="成本调整详情" border>
<el-descriptions-item :label="item.lable" label-align="left" align="left" label-class-name="my-label"
v-for="(item, index) in descriptionList" :key="index">
<span v-if="item.lable != '附件'"> {{ item.value.length > 1 ? formData[item.value[0]][item.value[1]] :
formData[item.value[0]]
}}</span>
@ -16,18 +15,44 @@
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card>
<template #header>
报销明细
</template>
<div class="mt-4">
<el-table :data="formData.reimbursement_detail">
<el-table-column label="一级科目" prop="first_level_subject" show-overflow-tooltip />
<el-table-column label="交通" prop="traffic_fee" show-overflow-tooltip />
<el-table-column label="住宿" prop="stay_fee" show-overflow-tooltip />
<el-table-column label="餐饮" prop="restaurant_fee" show-overflow-tooltip width="100" />
<el-table-column label="补助" prop="subsidy_fee" show-overflow-tooltip />
<el-table-column label="其它" prop="other_fee" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip width="120" />
</el-table>
</div>
</el-card>
<el-card>
<template #header>
发票明细
</template>
<div class="mt-4">
<el-table :data="formData.invoice_detail">
<el-table-column label="发票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票编号" prop="invoice_sn" show-overflow-tooltip />
<el-table-column label="发票税率" prop="tax_rate_text" show-overflow-tooltip />
<el-table-column label="发票形式" prop="invoice_form_text" show-overflow-tooltip width="100" />
<el-table-column label="发票金额" prop="invoice_amount" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</el-card>
<flowProcess v-if="!formData?.approve_id || formData.approve_check_status == 4" :flows="flows"
:submitApi="apiproject_travel_reimbursementApprove" :id="formData?.id" @off="handleClose">
</flowProcess>
<flowDetail v-else :approve_id="formData?.approve_id" @off="handleClose" />
<!-- import { apiproject_travel_reimbursementApprove, apiproject_travel_reimbursementFlows } from '@/api/flowSet'
//
const flows = ref([])
const getbidDocumentExaminationFlows = async () => {
if (formData?.approve_id) return
let res = await apiproject_travel_reimbursementFlows()
flows.value = res
} -->
</popup>
</div>
</template>
@ -35,6 +60,9 @@
<script lang="ts" setup name="customdetail">
import { ref, reactive } from "vue"
import { apiproject_travel_reimbursementApprove, apiproject_travel_reimbursementFlows } from '@/api/flowSet'
import { apiProjectTravelReimbursementDetailLists } from "@/api/project_travel_reimbursement_detail.ts"
import { apiProjectTravelReimbursementInvoiceDetailLists } from "@/api/project_travel_reimbursement_invoice_detail.ts"
const descriptionList = reactive([
{
lable: "项目名称",
@ -142,6 +170,11 @@ const formData: any = reactive({
const setFormData = async (data: Record<any, any>) => {
Object.assign(formData, data)
getbidDocumentExaminationFlows()
let res = await apiProjectTravelReimbursementDetailLists({ travel_reimbursement_id: data.id })
formData.reimbursement_detail = res.lists
let res2 = await apiProjectTravelReimbursementInvoiceDetailLists({ travel_reimbursement_id: data.id })
formData.invoice_detail = res2.lists
}
//
@ -162,6 +195,7 @@ const getbidDocumentExaminationFlows = async () => {
}
defineExpose({
open,
setFormData,

@ -135,7 +135,7 @@
<el-input v-model="row.restaurant_fee" />
</template>
</el-table-column>
<el-table-column label="补助" prop="remark">
<el-table-column label="补助">
<template #default="{ row }">
<el-input v-model="row.subsidy_fee" />
@ -179,7 +179,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="发票号">
<el-table-column label="发票号">
<template #default="{ row }"> <el-input v-model="row.invoice_sn" type="number" />
</template></el-table-column>

@ -36,7 +36,7 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="差旅报销单号" prop="trip_reimbursement_code" show-overflow-tooltip />
<el-table-column label="差旅报销单号" prop="trip_reimbursement_code" :render-header="pager.calcWidth" />
<el-table-column label="发票类型" prop="invoice_type_text" show-overflow-tooltip />
<el-table-column label="发票号" prop="invoice_sn" show-overflow-tooltip />
<el-table-column label="发票税率(%)" prop="tax_rate_text" show-overflow-tooltip />

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -27,7 +26,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="节点编号" prop="node_code">
<el-input v-model="formData.node_code" clearable placeholder="请输入节点编号" />
<el-input v-model="formData.node_code" clearable placeholder="请输入节点编号"
@input="formData.node_code = formData.node_code.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -127,7 +127,7 @@ const tableConfig = reactive(
},
{
label: "检查容",
label: "检查容",
value: 'check_content'
},

@ -1,5 +1,5 @@
const detailConfig = {
title: "工程监理--第一次工地会议",
title: "工程监理--开工报告/开工令",
config: [
{
label: "项目名称",

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules" :disabled="mode == 'detail'">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@ -48,7 +47,7 @@ const showDialog = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--第一次工地会议' : '工程监理--第一次工地会议'
return mode.value == 'edit' ? '编辑工程监理--开工报告/开工令' : '工程监理--开工报告/开工令'
})
//

@ -33,7 +33,7 @@
<el-table-column label="文档名称" prop="doc_name" show-overflow-tooltip />
<el-table-column label="文档简介" prop="doc_desc" show-overflow-tooltip />
<el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_const_prepare.supervision_commencement_report/edit']"
type="primary" link @click="handleEdit(row)">
@ -43,8 +43,8 @@
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
<el-button v-perms="['supervision_const_prepare.supervision_commencement_report/detail']"
link @click="handleDetail(row.id)">
<el-button v-perms="['supervision_const_prepare.supervision_commencement_report/detail']" link
@click="handleDetail(row.id)">
详情
</el-button>
</template>
@ -55,9 +55,11 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
width="30vw" :column="1" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" width="30vw"
:column="1" />
</div>
</template>
@ -65,7 +67,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import { apiSupervisionCommencementReportLists, apiSupervisionCommencementReportDelete } from '@/api/supervision_commencement_report'
import { apiSupervisionCommencementReportLists, apiSupervisionCommencementReportDelete, apiSupervisionCommencementReportDetail } from '@/api/supervision_commencement_report'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import detailConfig from './detail'

@ -21,8 +21,7 @@
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_connect.supervision_company_check/add']" type="primary"
@click="handleAdd">
<el-button v-perms="['supervision_connect.supervision_company_check/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
@ -50,12 +49,12 @@
<el-table-column label="操作" width="150" align="center" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_connect.supervision_company_check/edit']" type="primary"
link @click="handleEdit(row)">
<el-button v-perms="['supervision_connect.supervision_company_check/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_connect.supervision_company_check/delete']" type="danger"
link @click="handleDelete(row.id)">
<el-button v-perms="['supervision_connect.supervision_company_check/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button>
<el-button v-perms="['supervision_connect.supervision_company_check/detail']" link
@ -71,8 +70,8 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
width="30vw" :column="1" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" width="30vw"
:column="1" />
</div>
</template>

@ -1,11 +1,10 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="所属单位" prop="unit_qualification_id">
<el-form-item label="所属单位">
<el-input v-model="formData.company_name" clearable placeholder="请输入所属单位"
@click="showDialog1 = true" readonly />
</el-form-item>
@ -44,7 +43,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="资质编号1">
<el-input v-model="formData.qualification_number_one" clearable placeholder="请输入资质编号1" />
<el-input v-model="formData.qualification_number_one" clearable placeholder="请输入资质编号1"
@input="formData.qualification_number_one = formData.qualification_number_one.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
</el-col>
@ -74,7 +74,8 @@
<el-col :span="8">
<el-form-item label="资质名称2">
<el-input v-model="formData.qualification_name_two" clearable placeholder="请输入资质名称2" />
<el-input v-model="formData.qualification_name_two" clearable placeholder="请输入资质名称2"
@input="formData.qualification_name_two = formData.qualification_name_two.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -113,7 +114,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>
@ -122,8 +123,7 @@
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位" width="70%">
<dialogTable :config="supervision_participating_units_qualifications"
@customEvent="customEvent1">
<dialogTable :config="supervision_participating_units_qualifications" @customEvent="customEvent1">
</dialogTable>
</el-dialog>
</div>

@ -1,5 +1,5 @@
const detailConfig = {
title: "工程监理--第一次工地会议",
title: "工程监理--设计交底与图纸会审",
config: [
{
label: "项目名称",

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@ -17,7 +16,7 @@
<uploadAnnex :formData="formData"></uploadAnnex>
</el-form-item>
<createUserLable :formData="formData"></createUserLable>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
@ -51,7 +50,7 @@ const showDialog = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--第一次工地会议' : '新增工程监理--第一次工地会议'
return mode.value == 'edit' ? '编辑工程监理--设计交底与图纸会审' : '新增工程监理--设计交底与图纸会审'
})
//

@ -33,7 +33,7 @@
<el-table-column label="文档名称" prop="doc_name" show-overflow-tooltip />
<el-table-column label="文档简介" prop="doc_desc" show-overflow-tooltip />
<el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_const_prepare.supervision_design_disclosure/edit']"
type="primary" link @click="handleEdit(row)">
@ -56,8 +56,8 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
width="30vw" :column="1" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" width="30vw"
:column="1" />
</div>
</template>

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -38,7 +37,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>
@ -92,7 +91,7 @@
<el-table-column label="计数单位" prop="unit">
<template #default="{ row }">
<el-input v-model="row.unit" />
<el-input v-model="row.unit" @input="row.unit = row.unit.replace(/\d+/g, '')" />
</template>
</el-table-column>
<el-table-column label="是否合同约定品牌" prop="contract_brand">

@ -1,6 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose" :title="popupTitle">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>
@ -103,6 +103,12 @@ const showDialog = ref(false)
const showDialog2 = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--实体平行检验' : '新增工程监理--实体平行检验'
})
//
const formData = reactive({
id: '',

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@ -48,7 +47,14 @@ const showDialog = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--第一次工地会议' : '新增工程监理--第一次工地会议'
})
//

@ -33,10 +33,10 @@
<el-table-column label="文档名称" prop="doc_name" show-overflow-tooltip />
<el-table-column label="文档简介" prop="doc_desc" show-overflow-tooltip />
<el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_const_prepare.supervision_first_meeting/edit']"
type="primary" link @click="handleEdit(row)">
<el-button v-perms="['supervision_const_prepare.supervision_first_meeting/edit']" type="primary"
link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_const_prepare.supervision_first_meeting/delete']"
@ -56,8 +56,8 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
width="30vw" :column="1" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" width="30vw"
:column="1" />
</div>
</template>

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -28,7 +27,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="资质编号1" prop="qualification_number_one">
<el-input v-model="formData.qualification_number_one" clearable placeholder="请输入资质编号1" />
<el-input v-model="formData.qualification_number_one" clearable placeholder="请输入资质编号1"
@input="formData.qualification_number_one = formData.qualification_number_one.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -68,7 +68,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="资质编号2" prop="qualification_number_two">
<el-input v-model="formData.qualification_number_two" clearable placeholder="请输入资质编号2" />
<el-input v-model="formData.qualification_number_two" clearable placeholder="请输入资质编号2"
@input="formData.qualification_number_two = formData.qualification_number_two.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="8">

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -52,14 +51,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="报审表编号">
<el-input v-model="formData.approval_form_code" clearable placeholder="请输入报审表编号" />
<el-input v-model="formData.approval_form_code" clearable placeholder="请输入报审表编号"
@input="formData.approval_form_code = formData.approval_form_code.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报审类型">
<el-select class="flex-1" v-model="formData.approval_type" clearable placeholder="请选择报审类型">
<el-option v-for="(item, index) in dictData.approval_type" :key="index"
:label="item.name" :value="parseInt(item.value)" />
<el-option v-for="(item, index) in dictData.approval_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="70vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="70vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -51,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>

@ -31,21 +31,21 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="项目" prop="project_name" show-overflow-tooltip />
<el-table-column label="采购单位" prop="company_name" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" :render-header="pager.calcWidth" />
<el-table-column label="采购单位" prop="company_name" :render-header="pager.calcWidth" />
<el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
<el-table-column label="编号" prop="code" show-overflow-tooltip />
<el-table-column label="进场时间" prop="enter_time" show-overflow-tooltip />
<el-table-column label="进场结果" prop="enter_result_text" show-overflow-tooltip />
<el-table-column label="是否平行检验" prop="parallel_test_text" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_material_entry/edit']" type="primary"
link @click="handleEdit(row)">
<el-button v-perms="['supervision_work.supervision_material_entry/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_work.supervision_material_entry/delete']" type="danger"
link @click="handleDelete(row.id)">
<el-button v-perms="['supervision_work.supervision_material_entry/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button>
<el-button v-perms="['supervision_work.supervision_material_entry/detail']" link

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@ -17,7 +16,8 @@
<el-input v-model="formData.model" clearable placeholder="请输入型号" />
</el-form-item>
<el-form-item label="计数单位" prop="unit">
<el-input v-model="formData.unit" clearable placeholder="请输入计数单位" />
<el-input v-model="formData.unit" clearable placeholder="请输入计数单位"
@input="formData.unit = formData.unit.replace(/\d+/g, '')" />
</el-form-item>
<el-form-item label="计划数量" prop="number">
<el-input v-model="formData.number" clearable placeholder="请输入计划数量" type="number" />
@ -42,7 +42,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
<el-dialog v-model="showDialog" title="选择项目" width="70%">

@ -1,25 +1,25 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules" :disabled="mode == 'detail'">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
<el-form-item label="所属单位" prop="company_name">
<el-input v-model="formData.company_name" clearable placeholder="请输入所属单位"
@click="showDialog1 = true" readonly />
<el-input v-model="formData.company_name" clearable placeholder="请输入所属单位" @click="showDialog1 = true"
readonly />
</el-form-item>
<el-form-item label="资质名称">
<el-input v-model="formData.qualification_name" clearable placeholder="请输入资质名称" />
</el-form-item>
<el-form-item label="资质编号">
<el-input v-model="formData.qualification_number" clearable placeholder="请输入资质编号" type="number" />
<el-input v-model="formData.qualification_number" clearable placeholder="请输入资质编号"
@input="formData.qualification_number = formData.qualification_number.replace(/[\u4e00-\u9fa5]/g, '')" />
</el-form-item>
<el-form-item label="发证日期">
<el-date-picker class="flex-1 !flex" v-model="formData.get_date" clearable
value-format="YYYY-MM-DD " placeholder="选择签订日期">
<el-date-picker class="flex-1 !flex" v-model="formData.get_date" clearable value-format="YYYY-MM-DD "
placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
<el-form-item label="有效日期">
@ -45,8 +45,8 @@
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位" width="70%">
<dialogTable :config="supervision_participating_units"
:query="{ project_id: formData.project_id }" @customEvent="customEvent1">
<dialogTable :config="supervision_participating_units" :query="{ project_id: formData.project_id }"
@customEvent="customEvent1">
</dialogTable>
</el-dialog>
</div>

@ -1,5 +1,5 @@
const detailConfig = {
title: "工程监理--第一次工地会议",
title: "工程监理--监理细则(文档)",
config: [
{
label: "项目名称",

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules" :disabled="mode == 'detail'">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@ -49,7 +48,7 @@ const showDialog = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--第一次工地会议' : '工程监理--第一次工地会议'
return mode.value == 'edit' ? '编辑工程监理--监理细则(文档)' : '工程监理--监理细则(文档)'
})
//

@ -32,14 +32,14 @@
<el-table-column label="文档名称" prop="doc_name" show-overflow-tooltip />
<el-table-column label="文档简介" prop="doc_desc" show-overflow-tooltip />
<el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_const_prepare.supervision_rules/edit']" type="primary"
link @click="handleEdit(row)">
<el-button v-perms="['supervision_const_prepare.supervision_rules/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_const_prepare.supervision_rules/delete']" type="danger"
link @click="handleDelete(row.id)">
<el-button v-perms="['supervision_const_prepare.supervision_rules/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button>
<el-button v-perms="['supervision_const_prepare.supervision_rules/detail']" link
@ -55,8 +55,8 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
width="30vw" :column="1" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" width="30vw"
:column="1" />
</div>
</template>
@ -64,7 +64,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import { apiSupervisionRulesLists, apiSupervisionRulesDelete } from '@/api/supervision_rules'
import { apiSupervisionRulesLists, apiSupervisionRulesDelete, apiSupervisionRulesDetail } from '@/api/supervision_rules'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import detailConfig from './detail'

@ -1,5 +1,5 @@
const detailConfig = {
title: "工程监理--第一次工地会议",
title: "工程监理--监理规划/细则交底",
config: [
{
label: "项目名称",

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules" :disabled="mode == 'detail'">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@ -49,7 +48,7 @@ const showDialog = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--第一次工地会议' : '工程监理--第一次工地会议'
return mode.value == 'edit' ? '编辑工程监理--监理规划/细则交底' : '工程监理--监理规划/细则交底'
})
//

@ -33,7 +33,7 @@
<el-table-column label="文档名称" prop="doc_name" show-overflow-tooltip />
<el-table-column label="文档简介" prop="doc_desc" show-overflow-tooltip />
<el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_const_prepare.supervision_rules_disclosure/edit']"
type="primary" link @click="handleEdit(row)">
@ -56,8 +56,8 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig"
width="30vw" :column="1" />
<detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" width="30vw"
:column="1" />
</div>
</template>
@ -65,7 +65,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import { apiSupervisionRulesDisclosureLists, apiSupervisionRulesDisclosureDelete } from '@/api/supervision_rules_disclosure'
import { apiSupervisionRulesDisclosureLists, apiSupervisionRulesDisclosureDelete, apiSupervisionRulesDisclosureDetail } from '@/api/supervision_rules_disclosure'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import detailConfig from './detail'

@ -21,6 +21,11 @@ const detailConfig = {
label: "问题描述",
value: "problem_desc"
},
{
label: "附件",
value: "annex",
column: 1
},
{
label: "备注",
value: "remark",

@ -2,7 +2,7 @@
<div class="edit-popup">
<popup ref="popupRef" :async="true" width="80vw" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="100px">
<el-descriptions column="3" title="工程监理--巡视登记详情" border>
<el-descriptions column="3" title="工程监理--旁站登记" border>
<el-descriptions-item label="项目名称" label-align="left" align="left">
{{ formData.project_name }}
</el-descriptions-item>

@ -161,7 +161,7 @@ const flag = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--巡视登记' : '新增工程监理--巡视登记'
return mode.value == 'edit' ? '编辑工程监理--旁站登记' : '新增工程监理--旁站登记'
})

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -31,7 +30,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位名称" prop="company_id">
<el-form-item label="单位名称" prop="company_name">
<el-input v-model="formData.company_name" clearable placeholder="点击选择采购单位" readonly
@click="showDialog2 = true" />
</el-form-item>
@ -59,7 +58,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -66,7 +65,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开票编号" prop="invoice_id">
<el-form-item label="开票编号">
<el-input v-model="formData.invoice_code" clearable placeholder="点击选择开票台账"
@click="showDialog1 = true" />
</el-form-item>
@ -78,8 +77,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="到账日期" prop="date">
<el-date-picker class="flex-1 !flex" v-model="formData.date" clearable
value-format="YYYY-MM-DD" placeholder="选择到账日期">
<el-date-picker class="flex-1 !flex" v-model="formData.date" clearable value-format="YYYY-MM-DD"
placeholder="选择到账日期">
</el-date-picker>
</el-form-item>
</el-col>