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

add

Browse Source
This commit is contained in:
zmj 2024-04-09 09:48:46 +08:00
parent b626123ee1
commit ca892410f4
13 changed files with 192 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/manage_project/edit.vue
View File

@ -264,8 +264,8 @@ const chekcDate1 = (rule: any, value: any, callback: any) => {
}
const chekcDate2 = (rule: any, value: any, callback: any) => {
if (new Date(formData.initiation_date) < new Date(formData.actual_start_date)) {
callback(new Error('立项日期不能早于实际开工日期'))
if (new Date(formData.actual_start_date) < new Date(formData.initiation_date)) {
callback(new Error('立项日期早于实际开工日期'))
} else {
callback()
}

141
src/views/marketing_contract/edit.vue
View File

@ -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">
@ -11,7 +10,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="合同类型" prop="contract_type">
<el-select v-model="formData.contract_type">
<el-select v-model="formData.contract_type" class="flex-1">
<el-option label="主合同" :value="0"></el-option>
<el-option label="框架协议" :value="1"></el-option>
<el-option label="补充协议" :value="2"></el-option>
@ -25,8 +24,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="合同编号" prop="contract_code">
<el-input v-model="formData.contract_code" clearable placeholder="请输入合同编号"
v-type="'code'" />
<el-input v-model="formData.contract_code" clearable placeholder="请输入合同编号" v-type="'code'" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -35,12 +33,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="part_a_contact">
<el-form-item label="联系人">
<el-input v-model="formData.part_a_contact" clearable placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业主地址" prop="part_a_address">
<el-form-item label="业主地址">
<el-input v-model="formData.part_a_address" clearable placeholder="请输入业主地址" />
</el-form-item>
</el-col>
@ -50,13 +48,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="乙方签约人" prop="part_b_signatory">
<!-- <el-input v-model="formData.part_b_signatory" clearable placeholder="请输入乙方签约人" /> -->
<el-form-item label="乙方签约人">
<el-input v-model="formData.part_b_signatory_name" clearable placeholder="点击选择"
@click="userclick('part_b_signatory')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务性质" prop="business_nature">
<el-select class=' flex-1' v-model="formData.business_nature">
<el-select class='flex-1' v-model="formData.business_nature">
<el-option v-for="(item, index) in dictData.cost_consultation_business_nature "
:key="index" :label="item.name" :value="parseInt(item.value)"></el-option>
</el-select>
@ -73,16 +72,16 @@
<el-col :span="8">
<el-form-item label="资金来源" prop="fund_sources">
<el-select class=' flex-1' v-model="formData.fund_sources">
<el-option v-for="(item, index) in dictData.money_source " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
<el-option v-for="(item, index) in dictData.money_source " :key="index" :label="item.name"
:value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建设区域" prop="const_area">
<el-select class=' flex-1' v-model="formData.const_area">
<el-option v-for="(item, index) in dictData.const_area " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
<el-option v-for="(item, index) in dictData.const_area " :key="index" :label="item.name"
:value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -92,12 +91,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工程总投资" prop="project_money">
<el-form-item label="工程总投资">
<el-input v-model="formData.project_money" clearable placeholder="请输入工程总投资" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工程规模及概况" prop="project_scale">
<el-form-item label="工程规模及概况">
<el-input v-model="formData.project_scale" clearable placeholder="请输入工程规模及概况" />
</el-form-item>
</el-col>
@ -107,55 +106,53 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同签订费率" prop="signed_rate">
<el-form-item label="合同签订费率">
<el-input v-model="formData.signed_rate" clearable placeholder="请输入合同签订费率" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同服务工期" prop="service_duration">
<el-form-item label="合同服务工期">
<el-input v-model="formData.service_duration" clearable placeholder="请输入合同服务工期" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划开始日期" prop="start_date">
<el-form-item label="计划开始日期">
<el-date-picker class="flex-1 !flex" v-model="formData.start_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择发生日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划结束日期" prop="end_date">
<el-form-item label="计划结束日期">
<el-date-picker class="flex-1 !flex" v-model="formData.end_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择发生日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="履约金" prop="performance_money">
<el-input v-model="formData.performance_money" clearable placeholder="请输入履约金"
type="number" />
<el-form-item label="履约金">
<el-input v-model="formData.performance_money" clearable placeholder="请输入履约金" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="履约金到期时间" prop="performance_money_expiration_time">
<el-form-item label="履约金到期时间">
<el-date-picker class="flex-1 !flex" v-model="formData.performance_money_expiration_time"
clearable type="date" value-format="YYYY-MM-DD" placeholder="选择发生日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同付款方式" prop="payment_method">
<el-form-item label="合同付款方式">
<el-input v-model="formData.payment_method" clearable placeholder="请输入合同付款方式" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同主要内容" prop="content">
<el-form-item label="合同主要内容">
<el-input v-model="formData.content" clearable placeholder="请输入合同主要内容" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件" prop="annex">
<!-- <el-input v-model="formData.annex" clearable placeholder="请输入附件" /> -->
<el-form-item label="附件">
<upload-annex :form-data="formData" />
</el-form-item>
</el-col>
@ -168,8 +165,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签订负责人" prop="signed_head">
<!-- <el-input v-model="formData.signed_head" clearable placeholder="请输入签订负责人" /> -->
<el-form-item label="签订负责人" prop="signed_head_name">
<el-input v-model="formData.signed_head_name" clearable placeholder="点击选择"
@click="userclick('signed_head')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -181,21 +179,21 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目总监/经理" prop="project_manager">
<!-- <el-input v-model="formData.project_manager" clearable placeholder="请输入项目总监/经理" /> -->
<el-form-item label="项目总监/经理">
<el-input v-model="formData.project_manager_name" clearable placeholder="点击选择"
@click="userclick('project_manager')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实施方式" prop="implement_method">
<el-form-item label="实施方式">
<el-select class=' flex-1' v-model="formData.implement_method">
<el-option v-for="(item, index) in dictData.cost_consultation_way " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
</el-select>
<el-input v-model="formData.implement_method" clearable placeholder="请输入实施方式" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="盖章名称" prop="seal_name">
<el-form-item label="盖章名称">
<el-select class=' flex-1' v-model="formData.seal_name">
<el-option v-for="(item, index) in dictData.cost_consultation_seal_name " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
@ -203,67 +201,68 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否限制" prop="is_limit">
<el-select v-model="formData.is_limit">
<el-form-item label="是否限制">
<el-select v-model="formData.is_limit" class="flex-1">
<el-option label="否" :value="0"></el-option>
<el-option label="是" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="限制次数" prop="limit_num" v-if="formData,is_limit">
<el-input v-model="formData.limit_num" clearable placeholder="请输入限制次数" type="number"/>
<el-col :span="8" v-if="formData.is_limit">
<el-form-item label="限制次数">
<el-input v-model="formData.limit_num" clearable placeholder="请输入限制次数" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="文件类型" prop="file_type">
<el-form-item label="文件类型">
<el-select class='flex-1' v-model="formData.file_type">
<el-option v-for="(item, index) in dictData.cost_consultation_file_type " :key="index"
<el-option v-for="( item, index ) in dictData.cost_consultation_file_type " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="盖章份数" prop="seal_num">
<el-form-item label="盖章份数">
<el-input v-model="formData.seal_num" clearable placeholder="请输入盖章份数" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="盖章人" prop="seal_user">
<!-- <el-input v-model="formData.seal_user" clearable placeholder="请输入盖章人" /> -->
<el-form-item label="盖章人">
<el-input v-model="formData.seal_user_name" clearable placeholder="点击选择"
@click="userclick('seal_user')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="骑缝盖章" prop="plance_seal">
<el-select class=' flex-1' v-model="formData.plance_seal">
<el-option v-for="(item, index) in dictData.isqfgz " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
<el-form-item label="骑缝盖章">
<el-select class='flex-1' v-model="formData.plance_seal">
<el-option v-for="( item, index ) in dictData.isqfgz " :key="index" :label="item.name"
:value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发出日期" prop="send_date">
<el-form-item label="发出日期">
<el-date-picker class="flex-1 !flex" v-model="formData.send_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择发生日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮寄编号" prop="mailing_number">
<el-input v-model="formData.mailing_number" clearable placeholder="请输入邮寄编号" type="number"/>
<el-form-item label="邮寄编号">
<el-input v-model="formData.mailing_number" clearable placeholder="请输入邮寄编号" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="评审状态" prop="review_status">
<el-select v-model="formData.review_status">
<el-form-item label="评审状态">
<el-select v-model="formData.review_status" class="flex-1">
<el-option label="待移交" :value="0"></el-option>
<el-option label="已移交" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="立项状态" prop="status">
<el-select v-model="formData.review_status">
<el-form-item label="立项状态">
<el-select v-model="formData.review_status" class="flex-1">
<el-option label="待立项" :value="0"></el-option>
<el-option label="已立项" :value="1"></el-option>
</el-select>
@ -272,6 +271,10 @@
<createUserLable :form-data='formData' name='录入' flag></createUserLable>
</el-row>
</el-form>
<div v-if="showDialog">
<personnelselector ref="personnel" @confirm="submituser" type="1">
</personnelselector>
</div>
</popup>
</div>
</template>
@ -298,6 +301,9 @@ const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
const showDialog = ref(false)
const personnel = ref(null)
// 弹窗标题
const popupTitle = computed(() => {
@ -318,6 +324,7 @@ const formData = reactive({
part_a_address: "",
part_b: "",
part_b_signatory: "",
part_b_signatory_name: "",
business_nature: "",
industry_nature: "",
fund_sources: "",
@ -337,8 +344,10 @@ const formData = reactive({
annex: "",
signed_dept: "",
signed_head: "",
signed_head_name: "",
supervise_dept: "",
project_manager: "",
project_manager_name: "",
implement_method: "",
seal_name: "",
is_limit: "",
@ -346,6 +355,7 @@ const formData = reactive({
file_type: "",
seal_num: "",
seal_user: "",
seal_user_name: "",
plance_seal: "",
send_date: "",
mailing_number: "",
@ -354,6 +364,25 @@ const formData = reactive({
create_user: "",
});
let value;
const userclick = async (val) => {
showDialog.value = true
value = val
await nextTick()
personnel.value.open()
}
//确认
const submituser = (e: any) => {
formData[value + '_name'] = e.name
formData.seal_user = e.id
showDialog.value = false
}
// 表单验证
const formRules = reactive<any>({
related_contract_id: [

101
src/views/marketing_contract/index.vue
View File

@ -1,39 +1,74 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="合同类型 0-主合同 1-框架协议 2-补充协议" prop="contract_type">
<el-input class="w-[280px]" v-model="queryParams.contract_type" clearable
placeholder="请输入合同类型 0-主合同 1-框架协议 2-补充协议" />
</el-form-item>
<el-form-item label="合同名称" prop="contract_name">
<el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
</el-form-item>
<el-form-item label="合同编号" prop="contract_code">
<el-input class="w-[280px]" v-model="queryParams.contract_code" clearable placeholder="请输入合同编号" />
</el-form-item>
<el-form-item label="甲方签约单位" prop="part_a">
<el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入甲方签约单位" />
</el-form-item>
<el-form-item label="业务性质" prop="business_nature">
<el-input class="w-[280px]" v-model="queryParams.business_nature" clearable placeholder="请输入业务性质" />
</el-form-item>
<el-form-item label="行业性质" prop="industry_nature">
<el-input class="w-[280px]" v-model="queryParams.industry_nature" clearable placeholder="请输入行业性质" />
</el-form-item>
<el-form-item label="资金来源" prop="fund_sources">
<el-input class="w-[280px]" v-model="queryParams.fund_sources" clearable placeholder="请输入资金来源" />
</el-form-item>
<el-form-item label="建设区域" prop="const_area">
<el-input class="w-[280px]" v-model="queryParams.const_area" clearable placeholder="请输入建设区域" />
</el-form-item>
<el-form-item label="签订金额" prop="signed_amount">
<el-input class="w-[280px]" v-model="queryParams.signed_amount" 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 class="mb-[-16px]" :model="queryParams" label-width="80px">
<el-row>
<el-col :span="6">
<el-form-item label="合同类型" prop="contract_type">
<el-select v-model="queryParams.contract_type" class="flex-1">
<el-option label="主合同" :value="0"></el-option>
<el-option label="框架协议" :value="1"></el-option>
<el-option label="补充协议" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同名称" prop="contract_name">
<el-input class="w-[280px]" v-model="queryParams.contract_name" clearable
placeholder="请输入合同名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同编号" prop="contract_code">
<el-input class="w-[280px]" v-model="queryParams.contract_code" clearable
placeholder="请输入合同编号" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务性质" prop="business_nature">
<el-select class='flex-1' v-model="queryParams.business_nature">
<el-option v-for="(item, index) in dictData.cost_consultation_business_nature "
:key="index" :label="item.name" :value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="行业性质" prop="industry_nature">
<el-select class='flex-1' v-model="queryParams.industry_nature">
<el-option v-for="(item, index) in dictData.cost_consultation_industry_nature "
:key="index" :label="item.name" :value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="资金来源" prop="fund_sources">
<el-select class='flex-1' v-model="queryParams.fund_sources">
<el-option v-for="(item, index) in dictData.money_source " :key="index" :label="item.name"
:value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="建设区域" prop="const_area">
<el-select class='flex-1' v-model="queryParams.const_area">
<el-option v-for="(item, index) in dictData.const_area " :key="index" :label="item.name"
:value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签订金额" prop="signed_amount">
<el-input class="w-[280px]" v-model="queryParams.signed_amount" clearable placeholder="请输入签订金额"
type="number" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">

47
src/views/marketing_framework_agreement/edit.vue
View File

@ -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">
@ -39,7 +38,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="乙方签约人" prop="part_b_signatory">
<el-input v-model="formData.part_b_signatory_name" clearable placeholder="请输入乙方签约人" @click="userclick('part_b_signatory')"/>
<el-input v-model="formData.part_b_signatory_name" clearable placeholder="请输入乙方签约人"
@click="userclick('part_b_signatory')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -52,8 +52,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="暂估签订金额" prop="signed_amount">
<el-input v-model="formData.signed_amount" clearable placeholder="请输入暂估签订金额"
type="number" />
<el-input v-model="formData.signed_amount" clearable placeholder="请输入暂估签订金额" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -79,9 +78,9 @@
<el-col :span="8">
<el-form-item label="附件" prop="">
<upload-annex :form-data="formData"></upload-annex>
</el-form-item>
<upload-annex :form-data="formData"></upload-annex>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签订部门" prop="signed_dept">
@ -93,7 +92,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="签订负责人" prop="signed_head">
<el-input v-model="formData.signed_head_name" readonly clearable placeholder="点击选择签订负责人" @click="userclick('signed_head')"/>
<el-input v-model="formData.signed_head_name" readonly clearable placeholder="点击选择签订负责人"
@click="userclick('signed_head')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -114,7 +114,7 @@
</el-col>
<el-col :span="8" v-if='formData.is_limit'>
<el-form-item label="限制次数" prop="limit_num">
<el-input v-model="formData.limit_num" clearable placeholder="请输入限制次数" type='number'/>
<el-input v-model="formData.limit_num" clearable placeholder="请输入限制次数" type='number' />
</el-form-item>
</el-col>
<el-col :span="8">
@ -127,19 +127,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="盖章份数" prop="seal_num">
<el-input v-model="formData.seal_num" clearable placeholder="请输入盖章份数" type='number'/>
<el-input v-model="formData.seal_num" clearable placeholder="请输入盖章份数" type='number' />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="盖章人" prop="seal_user_name">
<el-input v-model="formData.seal_user_name" clearable placeholder="点击选择盖章人" readonly @click="userclick('seal_user')" />
<el-input v-model="formData.seal_user_name" clearable placeholder="点击选择盖章人" readonly
@click="userclick('seal_user')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="骑缝盖章" prop="plance_seal">
<el-select class=' flex-1' v-model="formData.plance_seal">
<el-option v-for="(item, index) in dictData.isqfgz " :key="index"
:label="item.name" :value="parseInt(item.value)"></el-option>
<el-option v-for="(item, index) in dictData.isqfgz " :key="index" :label="item.name"
:value="parseInt(item.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -155,16 +156,16 @@
<el-input v-model="formData.mailing_number" clearable placeholder="请输入邮寄编号" type='number' />
</el-form-item>
</el-col>
<createUserLable :form-data='formData' name='录入' flag></createUserLable>
<createUserLable :form-data='formData' name='录入' flag></createUserLable>
</el-row>
</el-form>
<div v-if="showDialog">
<personnelselector ref="personnel" @confirm="submituser" type="1">
</personnelselector>
</div>
<personnelselector ref="personnel" @confirm="submituser" type="1">
</personnelselector>
</div>
</popup>
</div>
</template>
@ -185,8 +186,8 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog=ref(false)
const personnel=ref(null)
const showDialog = ref(false)
const personnel = ref(null)
// 弹窗标题
@ -220,7 +221,7 @@ const formData = reactive({
"file_type": '',
"seal_num": '',
"seal_user": '',
seal_user_name:"",
seal_user_name: "",
"plance_seal": '',
"send_date": "",
"mailing_number": "",
@ -232,7 +233,7 @@ const formData = reactive({
let value;
const userclick = async (val) => {
showDialog.value = true
value=val
value = val
await nextTick()
personnel.value.open()
@ -240,7 +241,7 @@ const userclick = async (val) => {
//确认
const submituser = (e: any) => {
formData[value+'_name'] = e.name
formData[value + '_name'] = e.name
formData.seal_user = e.id
showDialog.value = false
}

4
src/views/project_attendance_detail/edit.vue
View File

@ -207,8 +207,8 @@ const getDetail = async (row: Record<string, any>) => {
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
formData.work_start_time = formData.work_start_time ? formData.attendance_date + ` ${formData.work_start_time}` : ""
formData.work_end_time = formData.work_end_time ? formData.attendance_date + ` ${formData.work_end_time}` : ""
// formData.work_start_time = formData.work_start_time ? formData.attendance_date + ` ${formData.work_start_time}` : ""
// formData.work_end_time = formData.work_end_time ? formData.attendance_date + ` ${formData.work_end_time}` : ""
const data = { ...formData }
mode.value == 'edit'
? await attendancedetailEdit(data)

2
src/views/project_settlement/edit.vue
View File

@ -25,7 +25,7 @@
<el-input v-model="formData.settlement_amount_uppercase" readonly disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="结算差异" prop="remaining_amount">
<el-input v-model="formData.remaining_amount" placeholder="请输入结算差异" />
<el-input v-model="formData.remaining_amount" placeholder="保存后自动结算" disabled />
</el-form-item>
<el-form-item label="结算日期" prop="settlement_date">
<el-date-picker class="flex-1 !flex" v-model="formData.settlement_date" clearable type="date"

2
src/views/project_subcontract_settlement/edit.vue
View File

@ -17,7 +17,7 @@
<el-input v-model="formData.settlement_amount_uppercase" readonly disabled placeholder="系统自动填写" />
</el-form-item>
<el-form-item label="结算差异">
<el-input v-model="formData.settlement_difference" placeholder="请输入" />
<el-input v-model="formData.settlement_difference" placeholder="保存后自动结算" disabled />
</el-form-item>
<el-form-item label="结算日期" prop="settlement_date">
<el-date-picker class="flex-1 !flex" v-model="formData.settlement_date" clearable type="date"

2
src/views/supervision_accept/detail.vue
View File

@ -52,7 +52,7 @@
</template>
<el-table :data="formData.accept_check_result">
<el-table-column label="检查类别" prop="check_type" show-overflow-tooltip />
<el-table-column label="检查类容" prop="check_content" show-overflow-tooltip />
<el-table-column label="检查内容" prop="check_content" show-overflow-tooltip />
<el-table-column label="是否必检" prop="must_check_text" show-overflow-tooltip />
<el-table-column label="是否检查结果必检" prop="check_result_text" show-overflow-tooltip />
</el-table>

6
src/views/supervision_accept/edit.vue
View File

@ -171,7 +171,7 @@ const formData = reactive({
const tableConfig = reactive(
{
title: "巡视结果",
title: "验收结果",
tableConfig: [
{
label: "检查类别",
@ -184,7 +184,7 @@ const tableConfig = reactive(
},
{
label: "检查类容",
label: "检查内容",
value: 'check_content'
},
{
@ -223,7 +223,7 @@ const tableConfig = reactive(
const tableConfig1 = reactive(
{
title: "巡视问题",
title: "验收问题",
tableConfig: [
{
label: "问题分类",

2
src/views/supervision_inspection/detail.vue
View File

@ -61,7 +61,7 @@
</template>
<el-table :data="formData.inspection_result">
<el-table-column label="检查类别" prop="check_type" show-overflow-tooltip />
<el-table-column label="检查类容" prop="check_content" show-overflow-tooltip />
<el-table-column label="检查内容" prop="check_content" show-overflow-tooltip />
<el-table-column label="是否必检" prop="must_check_text" show-overflow-tooltip />
<el-table-column label="是否检查结果必检" prop="check_result_text" show-overflow-tooltip />
</el-table>

2
src/views/supervision_inspection/edit.vue
View File

@ -166,7 +166,7 @@ const tableConfig = reactive(
},
{
label: "检查类容",
label: "检查内容",
value: 'check_content'
},
{

2
src/views/supervision_side_station/detail.vue
View File

@ -58,7 +58,7 @@
</template>
<el-table :data="formData.side_result">
<el-table-column label="检查类别" prop="check_type" show-overflow-tooltip />
<el-table-column label="检查类容" prop="check_content" show-overflow-tooltip />
<el-table-column label="检查内容" prop="check_content" show-overflow-tooltip />
<el-table-column label="是否必检" prop="must_check_text" show-overflow-tooltip />
<el-table-column label="是否检查结果必检" prop="check_result_text" show-overflow-tooltip />
</el-table>

4
src/views/supervision_side_station/edit.vue
View File

@ -201,7 +201,7 @@ const formData = reactive({
const tableConfig = reactive(
{
title: "巡视结果",
title: "旁站结果",
tableConfig: [
{
label: "检查类别",
@ -248,7 +248,7 @@ const tableConfig = reactive(
const tableConfig1 = reactive(
{
title: "巡视问题",
title: "旁站问题",
tableConfig: [
{
label: "问题分类",