diff --git a/src/api/supervision_monitoring_equipment.ts b/src/api/supervision_monitoring_equipment.ts
index 7c016ab..eca43f5 100644
--- a/src/api/supervision_monitoring_equipment.ts
+++ b/src/api/supervision_monitoring_equipment.ts
@@ -23,4 +23,8 @@ export function apiSupervisionMonitoringEquipmentDelete(params: any) {
// 工程监理--监控设备信息详情
export function apiSupervisionMonitoringEquipmentDetail(params: any) {
return request.get({ url: '/supervision_project.supervision_monitoring_equipment/detail', params })
-}
\ No newline at end of file
+}
+
+// export function apiSupervisionMonitoringEquipmentDetail(params: any) {
+// return request.get({ url: '/supervision_project.supervision_monitoring_equipment/detail', params })
+// }
\ No newline at end of file
diff --git a/src/views/apply_with_seal/index.vue b/src/views/apply_with_seal/index.vue
index deac7a6..4a74e3b 100644
--- a/src/views/apply_with_seal/index.vue
+++ b/src/views/apply_with_seal/index.vue
@@ -47,12 +47,16 @@
<el-table-column label="印章名称" prop="name" show-overflow-tooltip />
<el-table-column label="盖章次数" prop="frequency" show-overflow-tooltip />
<el-table-column label="限制次数" prop="limit" show-overflow-tooltip />
- <el-table-column label="用印部门" prop="depar" show-overflow-tooltip />
+ <!-- <el-table-column label="用印部门" prop="depar" show-overflow-tooltip /> -->
<el-table-column label="盖章人" prop="stampman" show-overflow-tooltip />
<el-table-column label="关联项目" prop="projectInfo.project_name" show-overflow-tooltip />
<el-table-column label="项目负责人" prop="projectInfo.principal" show-overflow-tooltip />
<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>
+ <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="applicant" show-overflow-tooltip /> -->
@@ -67,8 +71,8 @@
@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>
</template>
@@ -87,7 +91,6 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiApplyWithSealLists, apiApplyWithSealDelete, apiApplyWithSealDetail } from '@/api/apply_with_seal'
-import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@@ -143,4 +146,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>
-
diff --git a/src/views/project_progress_payment_detail/edit.vue b/src/views/project_progress_payment_detail/edit.vue
index f8c0613..4a9941d 100644
--- a/src/views/project_progress_payment_detail/edit.vue
+++ b/src/views/project_progress_payment_detail/edit.vue
@@ -1,6 +1,7 @@
<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="140px" :rules="formRules">
<el-row>
<el-col :span="8">
@@ -65,12 +66,14 @@
<el-row>
<el-col :span="8">
<el-form-item label="审核造价(土建)" prop="audit_cost_tj">
- <el-input v-model="formData.audit_cost_tj" clearable placeholder="请输入审核造价(土建)" type="number" />
+ <el-input v-model="formData.audit_cost_tj" clearable placeholder="请输入审核造价(土建)"
+ type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核造价(安装)" prop="audit_cost_az">
- <el-input v-model="formData.audit_cost_az" clearable placeholder="请输入审核造价(安装)" type="number" />
+ <el-input v-model="formData.audit_cost_az" clearable placeholder="请输入审核造价(安装)"
+ type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -84,7 +87,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="进度审核造价小计" prop="jdshzj_xiaoji">
- <el-input v-model="formData.jdshzj_xiaoji" clearable placeholder="请输入进度审核造价小计" type="number" />
+ <el-input v-model="formData.jdshzj_xiaoji" clearable placeholder="请输入进度审核造价小计"
+ type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -110,7 +114,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="累计完成工程款" prop="ljwc_funds">
- <el-input v-model="formData.ljwc_funds" clearable placeholder="系统自动计算" disabled type="number" />
+ <el-input v-model="formData.ljwc_funds" clearable placeholder="系统自动计算" disabled
+ type="number" />
</el-form-item>
</el-col>
diff --git a/src/views/project_progress_payment_detail/index.vue b/src/views/project_progress_payment_detail/index.vue
index 1f97127..5f74971 100644
--- a/src/views/project_progress_payment_detail/index.vue
+++ b/src/views/project_progress_payment_detail/index.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-card class="!border-none mb-4" shadow="never">
+ <!-- <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item>
@@ -10,15 +10,15 @@
:page-size="pager.size" />
</el-form-item>
</el-form>
- </el-card>
+ </el-card> -->
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
- <el-button v-perms="['project_process_management.project_progress_payment_detail/add']" type="primary"
+ <!-- <el-button v-perms="['project_process_management.project_progress_payment_detail/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
- 新增
- </el-button>
+新增
+</el-button> -->
<el-button v-perms="['project_process_management.project_progress_payment_detail/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
@@ -128,4 +128,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>
-
diff --git a/src/views/supervision_commencement_report/edit.vue b/src/views/supervision_commencement_report/edit.vue
index b7adc1f..513f301 100644
--- a/src/views/supervision_commencement_report/edit.vue
+++ b/src/views/supervision_commencement_report/edit.vue
@@ -1,136 +1,3 @@
-<!-- <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="project_id">
- <el-input v-model="formData.project_id" clearable placeholder="请选择项目" />
- </el-form-item>
- <el-form-item label="文档名称" prop="doc_name">
- <el-input v-model="formData.doc_name" clearable placeholder="请输入文档名称" />
- </el-form-item>
- <el-form-item label="文档简介" prop="doc_desc">
- <el-input v-model="formData.doc_desc" 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="supervisionCommencementReportEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-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: '',
- project_id: '',
- doc_name: '',
- doc_desc: '',
- annex: '',
- create_user: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
- project_id: [{
- required: true,
- message: '请选择项目',
- trigger: ['blur']
- }],
- doc_name: [{
- required: true,
- message: '请输入文档名称',
- trigger: ['blur']
- }],
- doc_desc: [{
- 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 apiSupervisionCommencementReportDetail({
- id: row.id
- })
- setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
- await formRef.value?.validate()
- const data = { ...formData, }
- mode.value == 'edit'
- ? await apiSupervisionCommencementReportEdit(data)
- : await apiSupervisionCommencementReportAdd(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> -->
-
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@@ -140,18 +7,18 @@ defineExpose({
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
- <el-form-item label="文档名称" prop="doc_name">
+ <el-form-item label="文档名称">
<el-input v-model="formData.doc_name" clearable placeholder="请输入文档名称" />
</el-form-item>
- <el-form-item label="文档简介" prop="doc_desc">
+ <el-form-item label="文档简介">
<el-input v-model="formData.doc_desc" clearable placeholder="请输入文档简介" type="textarea" />
</el-form-item>
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
- <el-form-item label="操作人" prop="create_user">
- <el-input v-model="formData.create_user" clearable placeholder="请输入操作人" />
+ <el-form-item label="操作人">
+ <el-input v-model="formData.create_user_name" clearable placeholder="请输入操作人" />
</el-form-item>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -164,9 +31,12 @@ defineExpose({
<script lang="ts" setup name="supervisionFirstMeetingEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
-import { apiSupervisionCommencementReportAdd, apiSupervisionCommencementReportEdit, apiSupervisionCommencementReportDetail } from '@/api/supervision_commencement_report'
+import { apiSupervisionCommencementReportAdd, apiSupervisionCommencementReportEdit } from '@/api/supervision_commencement_report'
import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@@ -193,7 +63,8 @@ const formData = reactive({
doc_name: '',
doc_desc: '',
annex: [],
- create_user: '',
+ create_user_name: userStore.account,
+
})
const customEvent = (e) => {
formData.project_id = e.id
diff --git a/src/views/supervision_construction_management_personnel/edit.vue b/src/views/supervision_construction_management_personnel/edit.vue
index 8d70b49..d0381ae 100644
--- a/src/views/supervision_construction_management_personnel/edit.vue
+++ b/src/views/supervision_construction_management_personnel/edit.vue
@@ -7,7 +7,7 @@
<el-col :span="8">
<el-form-item label="所属单位" prop="unit_qualification_id">
<el-input v-model="formData.company_name" clearable placeholder="请输入所属单位"
- @click="showDialog1 = true" />
+ @click="showDialog1 = true" readonly />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -16,14 +16,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="身份证" prop="id_card">
+ <el-form-item label="身份证">
<el-input v-model="formData.id_card" clearable placeholder="请输入身份证" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="创建人" prop="create_user">
+ <el-form-item label="创建人">
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
</el-col>
@@ -34,45 +34,45 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="岗位" prop="job">
+ <el-form-item label="岗位">
<el-input v-model="formData.job" clearable placeholder="请输入岗位" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="资质名称1" prop="qualification_name_one">
+ <el-form-item label="资质名称1">
<el-input v-model="formData.qualification_name_one" clearable placeholder="请输入资质名称1" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="认证机构1" prop="certification_body_one">
+ <el-form-item label="认证机构1">
<el-input v-model="formData.certification_body_one" clearable placeholder="请输入认证机构1" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="资质编号1" prop="qualification_number_one">
+ <el-form-item label="资质编号1">
<el-input v-model="formData.qualification_number_one" clearable placeholder="请输入资质编号1" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="发证日期1" prop="get_date_one">
+ <el-form-item label="发证日期1">
<el-date-picker class="flex-1 !flex" v-model="formData.get_date_one" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="有效日期1" prop="effective_date_one">
+ <el-form-item label="有效日期1">
<el-date-picker class="flex-1 !flex" v-model="formData.effective_date_one" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="资质1状态" prop="qualification_one_status">
+ <el-form-item label="资质1状态">
<el-select class="flex-1" v-model="formData.qualification_one_status" clearable
placeholder="请选择">
<el-option label="有效" :value="0" />
@@ -83,38 +83,38 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="资质名称2" prop="qualification_name_two">
+ <el-form-item label="资质名称2">
<el-input v-model="formData.qualification_name_two" clearable placeholder="请输入资质名称2" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="认证机构2" prop="certification_body_two">
+ <el-form-item label="认证机构2">
<el-input v-model="formData.certification_body_two" clearable placeholder="请输入认证机构2" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="资质编号2" prop="qualification_number_two">
+ <el-form-item label="资质编号2">
<el-input v-model="formData.qualification_number_two" clearable placeholder="请输入资质编号2" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="发证日期2" prop="get_date_two">
+ <el-form-item label="发证日期2">
<el-date-picker class="flex-1 !flex" v-model="formData.get_date_two" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="有效日期2" prop="effective_date_two">
+ <el-form-item label="有效日期2">
<el-date-picker class="flex-1 !flex" v-model="formData.effective_date_two" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="资质2状态" prop="qualification_two_status">
+ <el-form-item label="资质2状态">
<el-select class="flex-1" v-model="formData.qualification_two_status" clearable
placeholder="请选择">
<el-option label="有效" :value="0" />
@@ -137,13 +137,10 @@
</el-form-item>
</el-col>
</el-row>
- <el-dialog v-model="showDialog" title="选择项目" width="70%">
- <dialogTable @customEvent="customEvent" :config="supervision_project" />
-
- </el-dialog>
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位" width="70%">
- <dialogTable :config="supervision_participating_units" @customEvent="customEvent1">
+ <dialogTable :config="supervision_participating_units_qualifications"
+ @customEvent="customEvent1">
</dialogTable>
</el-dialog>
</div>
@@ -156,9 +153,8 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionConstructionManagementPersonnelAdd, apiSupervisionConstructionManagementPersonnelEdit, } from '@/api/supervision_construction_management_personnel'
-import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
-import { supervision_participating_units } from "@/components/dialogTable/dialogTableConfig"
+import { supervision_participating_units_qualifications } from "@/components/dialogTable/dialogTableConfig"
defineProps({
@@ -214,17 +210,13 @@ const formData = reactive({
effective_date_two: '',
qualification_two_status: '',
remark: '',
- annex: '',
+ annex: [],
create_user: '',
})
-const customEvent = (e) => {
- formData.project_id = e.id
- formData.project_name = e.project_name
- showDialog.value = false
-}
+
const customEvent1 = (e) => {
formData.unit_qualification_id = e.id
- formData.company_name = e.unit_name
+ formData.company_name = e.company_name
showDialog1.value = false
}
diff --git a/src/views/supervision_construction_planning/edit.vue b/src/views/supervision_construction_planning/edit.vue
index 4ef4773..cfac70e 100644
--- a/src/views/supervision_construction_planning/edit.vue
+++ b/src/views/supervision_construction_planning/edit.vue
@@ -45,6 +45,7 @@ const mode = ref('add')
const showDialog = ref(false)
const handleAvatarSuccess_four = (response: any) => {
+ Array.isArray(formData.annex) ? "" : formData.annex = []
// @ts-ignore
response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
diff --git a/src/views/supervision_design_disclosure/edit.vue b/src/views/supervision_design_disclosure/edit.vue
index fab9423..aa89204 100644
--- a/src/views/supervision_design_disclosure/edit.vue
+++ b/src/views/supervision_design_disclosure/edit.vue
@@ -7,18 +7,18 @@
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
- <el-form-item label="文档名称" prop="doc_name">
+ <el-form-item label="文档名称">
<el-input v-model="formData.doc_name" clearable placeholder="请输入文档名称" />
</el-form-item>
- <el-form-item label="文档简介" prop="doc_desc">
+ <el-form-item label="文档简介">
<el-input v-model="formData.doc_desc" clearable placeholder="请输入文档简介" type="textarea" />
</el-form-item>
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
- <el-form-item label="操作人" prop="create_user">
- <el-input v-model="formData.create_user" clearable placeholder="请输入操作人" />
+ <el-form-item label="操作人">
+ <el-input v-model="formData.create_user_name" clearable placeholder="请输入操作人" />
</el-form-item>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -35,6 +35,9 @@ import Popup from '@/components/popup/index.vue'
import { apiSupervisionDesignDisclosureEdit, apiSupervisionDesignDisclosureAdd } from '@/api/supervision_design_disclosure'
import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@@ -61,7 +64,8 @@ const formData = reactive({
doc_name: '',
doc_desc: '',
annex: [],
- create_user: '',
+ create_user_name: userStore.account,
+
})
const customEvent = (e) => {
formData.project_id = e.id
@@ -118,12 +122,7 @@ const setFormData = async (data: Record<any, any>) => {
}
-const getDetail = async (row: Record<string, any>) => {
- const data = await apiSupervisionFirstMeetingDetail({
- id: row.id
- })
- setFormData(data)
-}
+
// 提交按钮
@@ -153,6 +152,5 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
- getDetail
})
</script>
diff --git a/src/views/supervision_first_meeting/edit.vue b/src/views/supervision_first_meeting/edit.vue
index 2f2547c..54590ae 100644
--- a/src/views/supervision_first_meeting/edit.vue
+++ b/src/views/supervision_first_meeting/edit.vue
@@ -7,18 +7,18 @@
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
- <el-form-item label="文档名称" prop="doc_name">
+ <el-form-item label="文档名称">
<el-input v-model="formData.doc_name" clearable placeholder="请输入文档名称" />
</el-form-item>
- <el-form-item label="文档简介" prop="doc_desc">
+ <el-form-item label="文档简介">
<el-input v-model="formData.doc_desc" clearable placeholder="请输入文档简介" type="textarea" />
</el-form-item>
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
- <el-form-item label="操作人" prop="create_user">
- <el-input v-model="formData.create_user" clearable placeholder="请输入操作人" />
+ <el-form-item label="操作人">
+ <el-input v-model="formData.create_user_name" clearable placeholder="请输入操作人" />
</el-form-item>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -34,6 +34,9 @@ import Popup from '@/components/popup/index.vue'
import { apiSupervisionFirstMeetingAdd, apiSupervisionFirstMeetingEdit, apiSupervisionFirstMeetingDetail } from '@/api/supervision_first_meeting'
import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@@ -60,7 +63,7 @@ const formData = reactive({
doc_name: '',
doc_desc: '',
annex: [],
- create_user: '',
+ create_user_name: userStore.account,
})
const customEvent = (e) => {
formData.project_id = e.id
diff --git a/src/views/supervision_first_meeting/index.vue b/src/views/supervision_first_meeting/index.vue
index 178d810..13e8010 100644
--- a/src/views/supervision_first_meeting/index.vue
+++ b/src/views/supervision_first_meeting/index.vue
@@ -44,8 +44,8 @@
<el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
<el-table-column label="操作" width="120" 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']"
@@ -67,7 +67,7 @@
<script lang="ts" setup name="supervisionFirstMeetingLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
-import { apiSupervisionFirstMeetingLists, apiSupervisionFirstMeetingDelete } from '@/api/supervision_first_meeting'
+import { apiSupervisionFirstMeetingLists, apiSupervisionFirstMeetingDelete, apiSupervisionFirstMeetingDetail } from '@/api/supervision_first_meeting'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@@ -109,10 +109,11 @@ const handleAdd = async () => {
// 编辑
const handleEdit = async (data: any) => {
+ let res = await apiSupervisionFirstMeetingDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
- editRef.value?.setFormData(data)
+ editRef.value?.setFormData(res)
}
// 删除
@@ -124,4 +125,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>
-
diff --git a/src/views/supervision_monitoring_equipment/edit.vue b/src/views/supervision_monitoring_equipment/edit.vue
index 3935213..9e74683 100644
--- a/src/views/supervision_monitoring_equipment/edit.vue
+++ b/src/views/supervision_monitoring_equipment/edit.vue
@@ -2,7 +2,7 @@
<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 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="点击选择项目" readonly
@click="showDialog = true" />
@@ -16,7 +16,7 @@
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
- <el-form-item label="设备序列号" prop="device_sn" label-width="100px">
+ <el-form-item label="设备序列号" prop="device_sn">
<el-input v-model="formData.device_sn" clearable placeholder="请输入设备序列号" />
</el-form-item>
<el-form-item label="编号" prop="number">
@@ -28,19 +28,22 @@
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
</el-dialog>
- <div style="margin-bottom: 30px;">设备列表</div>
+ <div>
+ 设备列表
+ <el-button @click="handleAdd()" v-if="!formData.devices.length">+</el-button>
+ </div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.devices">
- <el-table-column label="序号" v-if="mode == 'add'">
+ <el-table-column label="序号">
<template #default="{ row }">
- <el-button @click="handleAdd(row)">+</el-button>
+ <el-button @click="handleAdd()">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
</template>
</el-table-column>
- <el-table-column label="姓名" prop="name">
+ <el-table-column label="设备名称" prop="name">
<template #default="{ row }">
- <el-input v-model="row.name" :readonly="mode == 'edit'" />
+ <el-input v-model="row.name" />
</template>
</el-table-column>
<el-table-column label="是否显示" prop="duties">
@@ -63,7 +66,7 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionMonitoringEquipmentAdd, apiSupervisionMonitoringEquipmentEdit, apiSupervisionMonitoringEquipmentDetail } from '@/api/supervision_monitoring_equipment'
-import { apiSupervisionMonitoringEquipmentDetailLists } from '@/api/supervision_monitoring_equipment_detail'
+import { apiSupervisionMonitoringEquipmentDetailLists, apiSupervisionMonitoringEquipmentDetailDelete } from '@/api/supervision_monitoring_equipment_detail'
import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
defineProps({
@@ -113,6 +116,10 @@ const handleAdd = () => {
}
const handleDelete = (row: any) => {
+ if (row.id) {
+ apiSupervisionMonitoringEquipmentDetailDelete({ id: row.id })
+ }
+
const index = formData.devices.indexOf(row);
formData.devices.splice(index, 1);
}
diff --git a/src/views/supervision_participating_units_qualifications/edit.vue b/src/views/supervision_participating_units_qualifications/edit.vue
index e36d022..8f309f9 100644
--- a/src/views/supervision_participating_units_qualifications/edit.vue
+++ b/src/views/supervision_participating_units_qualifications/edit.vue
@@ -3,40 +3,40 @@
<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-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_id">
+ <el-form-item label="所属单位" prop="company_name">
<el-input v-model="formData.company_name" clearable placeholder="请输入所属单位"
- @click="showDialog1 = true" />
+ @click="showDialog1 = true" readonly />
</el-form-item>
- <el-form-item label="资质名称" prop="qualification_name">
+ <el-form-item label="资质名称">
<el-input v-model="formData.qualification_name" clearable placeholder="请输入资质名称" />
</el-form-item>
- <el-form-item label="资质编号" prop="qualification_number">
- <el-input v-model="formData.qualification_number" clearable placeholder="请输入资质编号" />
+ <el-form-item label="资质编号">
+ <el-input v-model="formData.qualification_number" clearable placeholder="请输入资质编号" type="number" />
</el-form-item>
- <el-form-item label="发证日期" prop="get_date">
+ <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>
</el-form-item>
- <el-form-item label="有效日期" prop="effective_date">
+ <el-form-item label="有效日期">
<el-date-picker class="flex-1 !flex" v-model="formData.effective_date" clearable
value-format="YYYY-MM-DD " placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
- <el-form-item label="资质状态 " prop="qualification_status">
+ <el-form-item label="资质状态 ">
<el-select class="flex-1" v-model="formData.qualification_status" clearable placeholder="请选择部门">
<el-option label="有效" :value="0" />
<el-option label="无效" :value="1" />
</el-select>
</el-form-item>
- <el-form-item label="备注" prop="remark">
+ <el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item>
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
diff --git a/src/views/supervision_participating_units_qualifications/index.vue b/src/views/supervision_participating_units_qualifications/index.vue
index 6f4e02e..310f6e4 100644
--- a/src/views/supervision_participating_units_qualifications/index.vue
+++ b/src/views/supervision_participating_units_qualifications/index.vue
@@ -3,7 +3,8 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="资质名称" prop="qualification_name">
- <el-input class="w-[280px]" v-model="queryParams.qualification_name" clearable placeholder="请输入资质名称" />
+ <el-input class="w-[280px]" v-model="queryParams.qualification_name" clearable
+ placeholder="请输入资质名称" />
</el-form-item>
<el-form-item label="资质编号" prop="qualification_number">
<el-input class="w-[280px]" v-model="queryParams.qualification_number" clearable
@@ -23,7 +24,8 @@
</template>
新增
</el-button>
- <el-button v-perms="['supervision_qualification_review.supervision_participating_units_qualifications/delete']"
+ <el-button
+ v-perms="['supervision_qualification_review.supervision_participating_units_qualifications/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
@@ -31,7 +33,7 @@
<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_id" show-overflow-tooltip />
+ <el-table-column label="所属单位" prop="company_name" show-overflow-tooltip />
<el-table-column label="资质名称" prop="qualification_name" show-overflow-tooltip />
<el-table-column label="资质编号" prop="qualification_number" show-overflow-tooltip />
<el-table-column label="发证日期" prop="get_date" show-overflow-tooltip />
@@ -125,4 +127,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>
-
diff --git a/src/views/supervision_planning/edit.vue b/src/views/supervision_planning/edit.vue
index 400279e..55eef5c 100644
--- a/src/views/supervision_planning/edit.vue
+++ b/src/views/supervision_planning/edit.vue
@@ -13,17 +13,17 @@
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
- <el-form-item label="评审人员" prop="approval_user">
+ <el-form-item label="评审人员">
<el-input v-model="formData.approval_user" clearable placeholder="请输入评审人员" />
</el-form-item>
<el-form-item label="方案名称" prop="scheme_name">
<el-input v-model="formData.scheme_name" clearable placeholder="请输入方案名称" />
</el-form-item>
<el-form-item label="评审内容" prop="approval_content">
- <el-input v-model="formData.approval_content" clearable placeholder="请输入评审内容" />
+ <el-input v-model="formData.approval_content" clearable placeholder="请输入评审内容" type="textarea" />
</el-form-item>
- <el-form-item label="备注" prop="remark">
- <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+ <el-form-item label="备注">
+ <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
<el-form-item label="附件" prop="annex">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
diff --git a/src/views/supervision_project/edit.vue b/src/views/supervision_project/edit.vue
index bd01b50..8a2668f 100644
--- a/src/views/supervision_project/edit.vue
+++ b/src/views/supervision_project/edit.vue
@@ -2,7 +2,7 @@
<div class="edit-popup">
<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-form ref="formRef" :model="formData" label-width="90px" :rules="formRules" :disabled="mode == 'detail'">
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="project_name">
@@ -10,7 +10,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="行业" prop="industry">
+ <el-form-item label="行业">
<el-select class="flex-1" v-model="formData.industry" clearable placeholder="请选择行业">
<el-option v-for="(item, index) in dictData.supervision_project_industry" :key="index"
:label="item.name" :value="parseInt(item.value)" />
@@ -18,7 +18,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="性质" prop="nature">
+ <el-form-item label="性质">
<el-select class="flex-1" v-model="formData.nature" clearable placeholder="请选择性质">
<el-option v-for="(item, index) in dictData.supervision_project_nature" :key="index"
:label="item.name" :value="parseInt(item.value)" />
@@ -28,12 +28,12 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="建设单位" prop="build_unit">
+ <el-form-item label="建设单位">
<el-input v-model="formData.build_unit" clearable placeholder="请输入建设单位" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="建设区域" prop="build_area">
+ <el-form-item label="建设区域">
<el-select class="flex-1" v-model="formData.build_area" clearable placeholder="请选择建设区域">
<el-option v-for="(item, index) in dictData.supervision_project_build_area" :key="index"
:label="item.name" :value="parseInt(item.value)" />
@@ -41,7 +41,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="项目地址" prop="address">
+ <el-form-item label="项目地址">
<el-input v-model="formData.address" clearable placeholder="请输入项目地址" />
</el-form-item>
</el-col>
@@ -49,7 +49,7 @@
<el-row>
<el-col :span="8">
- <el-form-item label="项目等级" prop="project_level">
+ <el-form-item label="项目等级">
<el-select class="flex-1" v-model="formData.project_level" clearable placeholder="请选择盖章名称">
<el-option v-for="(item, index) in dictData.supervision_project_level" :key="index"
:label="item.name" :value="parseInt(item.value)" />
@@ -57,13 +57,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="总投资(万元)" prop="total_investment" label-width="120px">
+ <el-form-item label="总投资(万元)" label-width="120px">
<el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(万元)"
type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="立项日期" prop="initiation_date">
+ <el-form-item label="立项日期">
<!-- <el-input v-model="formData.initiation_date" clearable placeholder="请输入立项日期" /> -->
<el-date-picker class="flex-1 !flex" v-model="formData.initiation_date" clearable
type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
@@ -73,18 +73,18 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="关联合同" prop="contract">
+ <el-form-item label="关联合同">
<el-input v-model="formData.contract" clearable placeholder="请输入关联合同" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="合同金额" prop="contract_amount">
+ <el-form-item label="合同金额">
<el-input v-model="formData.contract_amount" clearable placeholder="请输入合同金额"
type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="实际开工日期" prop="actual_start_date" label-width="120px">
+ <el-form-item label="实际开工日期" label-width="120px">
<el-date-picker class="flex-1 !flex" v-model="formData.actual_start_date" clearable
type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
</el-date-picker>
@@ -93,7 +93,7 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="实际竣工日期" prop="actual_end_date" label-width="120px">
+ <el-form-item label="实际竣工日期" label-width="120px">
<!-- <el-input v-model="formData.actual_end_date" clearable placeholder="请输入实际竣工日期" /> -->
<el-date-picker class="flex-1 !flex" v-model="formData.actual_end_date" clearable
type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
@@ -101,7 +101,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="计划开工日期" prop="planned_start_date" label-width="120px">
+ <el-form-item label="计划开工日期" label-width="120px">
<!-- <el-input v-model="formData.planned_start_date" clearable placeholder="请输入计划开工日期" /> -->
<el-date-picker class="flex-1 !flex" v-model="formData.planned_start_date" clearable
type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
@@ -109,7 +109,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="计划竣工日期" prop="planned_end_date" label-width="120px">
+ <el-form-item label="计划竣工日期" label-width="120px">
<!-- <el-input v-model="formData.planned_end_date" clearable placeholder="请输入计划竣工日期" /> -->
<el-date-picker class="flex-1 !flex" v-model="formData.planned_end_date" clearable
type="date" value-format="YYYY-MM-DD" placeholder="请选择日期">
@@ -119,46 +119,49 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="合同服务内容" prop="contract_content" label-width="120px">
- <el-input v-model="formData.contract_content" clearable placeholder="请输入合同服务内容" />
+ <el-form-item label="合同服务内容" label-width="120px">
+ <el-input v-model="formData.contract_content" clearable placeholder="请输入合同服务内容"
+ type="textarea" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="项目概况" prop="project_overview">
- <el-input v-model="formData.project_overview" clearable placeholder="请输入项目概况" />
+ <el-form-item label="项目概况">
+ <el-input v-model="formData.project_overview" clearable placeholder="请输入项目概况"
+ type="textarea" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="项目要求" prop="project_requirements">
- <el-input v-model="formData.project_requirements" clearable placeholder="请输入项目要求" />
+ <el-form-item label="项目要求">
+ <el-input v-model="formData.project_requirements" clearable placeholder="请输入项目要求"
+ type="textarea" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="备注" prop="remark">
- <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+ <el-form-item label="备注">
+ <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="监管部门" prop="supervision_department">
+ <el-form-item label="监管部门">
<el-input v-model="formData.supervision_department" clearable placeholder="请输入监管部门" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="实施部门" prop="implementation_department">
+ <el-form-item label="实施部门">
<el-input v-model="formData.implementation_department" clearable placeholder="请输入实施部门" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="项目部" prop="project_department">
+ <el-form-item label="项目部">
<el-input v-model="formData.project_department" clearable placeholder="请输入项目部" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="工程状态" prop="engineering_status">
+ <el-form-item label="工程状态">
<el-select class="flex-1" v-model="formData.engineering_status" clearable
placeholder="请选择盖章名称">
<el-option v-for="(item, index) in dictData.supervision_project_status" :key="index"
@@ -167,14 +170,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="项目负责人员" prop="project_manager" label-width="120px">
+ <el-form-item label="项目负责人员" label-width="120px">
<el-input v-model="formData.project_manager" clearable placeholder="请输入项目负责人员" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="甲方单位" prop="part_a_unit">
+ <el-form-item label="甲方单位">
<el-input v-model="formData.part_a_unit" clearable placeholder="请输入甲方单位" />
</el-form-item>
</el-col>
@@ -415,6 +418,10 @@ const getDetail = async (row: Record<string, any>) => {
// 提交按钮
const handleSubmit = async () => {
+ if (mode.value == 'detail') {
+ popupRef.value?.close()
+ return
+ }
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
diff --git a/src/views/supervision_project/index.vue b/src/views/supervision_project/index.vue
index f620ed5..f5f9995 100644
--- a/src/views/supervision_project/index.vue
+++ b/src/views/supervision_project/index.vue
@@ -55,7 +55,11 @@
<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="project_name" show-overflow-tooltip>
+ <template #default="{ row }">
+ <el-link type="primary" @click="handleDetail(row)"> {{ row.project_name }}</el-link>
+ </template>
+ </el-table-column>
<el-table-column label="项目编号" prop="project_code" show-overflow-tooltip />
<el-table-column label="行业" prop="industry_text" show-overflow-tooltip />
<el-table-column label="性质" prop="nature_text" show-overflow-tooltip />
@@ -93,6 +97,7 @@
@click="handleDelete(row.id)">
删除
</el-button>
+
</template>
</el-table-column>
</el-table>
@@ -162,6 +167,16 @@ const handleEdit = async (data: any) => {
editRef.value?.setFormData(res)
}
+// 详情
+const handleDetail = async (data: any) => {
+ let res = await apiSupervisionProjectDetail({ id: data.id })
+ showEdit.value = true
+ await nextTick()
+ editRef.value?.open('detail')
+ editRef.value?.setFormData(res)
+}
+
+
// 删除
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？')
@@ -171,4 +186,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>
-
diff --git a/src/views/supervision_rules/edit.vue b/src/views/supervision_rules/edit.vue
index a4580eb..0f93c1e 100644
--- a/src/views/supervision_rules/edit.vue
+++ b/src/views/supervision_rules/edit.vue
@@ -7,18 +7,18 @@
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
- <el-form-item label="文档名称" prop="doc_name">
+ <el-form-item label="文档名称">
<el-input v-model="formData.doc_name" clearable placeholder="请输入文档名称" />
</el-form-item>
- <el-form-item label="文档简介" prop="doc_desc">
+ <el-form-item label="文档简介">
<el-input v-model="formData.doc_desc" clearable placeholder="请输入文档简介" type="textarea" />
</el-form-item>
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
- <el-form-item label="操作人" prop="create_user">
- <el-input v-model="formData.create_user" clearable placeholder="请输入操作人" />
+ <el-form-item label="操作人">
+ <el-input v-model="formData.create_user_name" clearable placeholder="请输入操作人" />
</el-form-item>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -32,9 +32,12 @@
<script lang="ts" setup name="supervisionFirstMeetingEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
-import { apiSupervisionRulesAdd, apiSupervisionRulesEdit, apiSupervisionRulesDetail } from '@/api/supervision_rules'
+import { apiSupervisionRulesAdd, apiSupervisionRulesEdit } from '@/api/supervision_rules'
import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@@ -61,7 +64,7 @@ const formData = reactive({
doc_name: '',
doc_desc: '',
annex: [],
- create_user: '',
+ create_user_name: userStore.account,
})
const customEvent = (e) => {
formData.project_id = e.id
diff --git a/src/views/supervision_rules_disclosure/edit.vue b/src/views/supervision_rules_disclosure/edit.vue
index 3bd2466..19dcc18 100644
--- a/src/views/supervision_rules_disclosure/edit.vue
+++ b/src/views/supervision_rules_disclosure/edit.vue
@@ -3,22 +3,22 @@
<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-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="doc_name">
+ <el-form-item label="文档名称">
<el-input v-model="formData.doc_name" clearable placeholder="请输入文档名称" />
</el-form-item>
- <el-form-item label="文档简介" prop="doc_desc">
+ <el-form-item label="文档简介">
<el-input v-model="formData.doc_desc" clearable placeholder="请输入文档简介" type="textarea" />
</el-form-item>
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
- <el-form-item label="操作人" prop="create_user">
- <el-input v-model="formData.create_user" clearable placeholder="请输入操作人" />
+ <el-form-item label="操作人">
+ <el-input v-model="formData.create_user_name" clearable placeholder="请输入操作人" />
</el-form-item>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -34,6 +34,9 @@ import Popup from '@/components/popup/index.vue'
import { apiSupervisionRulesDisclosureAdd, apiSupervisionRulesDisclosureEdit, } from '@/api/supervision_rules_disclosure'
import { supervision_project } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@@ -60,7 +63,7 @@ const formData = reactive({
doc_name: '',
doc_desc: '',
annex: [],
- create_user: '',
+ create_user_name: userStore.account,
})
const customEvent = (e) => {
formData.project_id = e.id
diff --git a/src/views/supervision_safety_management_personnel/edit.vue b/src/views/supervision_safety_management_personnel/edit.vue
index b40c0ab..568de28 100644
--- a/src/views/supervision_safety_management_personnel/edit.vue
+++ b/src/views/supervision_safety_management_personnel/edit.vue
@@ -23,18 +23,18 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="创建人" prop="create_user">
- <el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
+ <el-form-item label="创建人">
+ <el-input v-model="formData.create_user_name" clearable placeholder="请输入创建人" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="技术职称" prop="technical_title">
+ <el-form-item label="技术职称">
<el-input v-model="formData.technical_title" clearable placeholder="请输入技术职称" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="岗位" prop="job">
+ <el-form-item label="岗位">
<el-input v-model="formData.job" clearable placeholder="请输入岗位" />
</el-form-item>
</el-col>
@@ -58,7 +58,7 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="发证日期1" prop="get_date_one">
+ <el-form-item label="发证日期1">
<el-date-picker class="flex-1 !flex" v-model="formData.get_date_one" clearable
value-format="YYYY-MM-DD " placeholder="选择日期">
</el-date-picker>
@@ -114,7 +114,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="资质2状态" prop="qualification_two_status">
+ <el-form-item label="资质2状态">
<el-select class="flex-1" v-model="formData.qualification_two_status" clearable
placeholder="请选择">
<el-option label="有效" :value="0" />
@@ -126,23 +126,22 @@
<el-row>
<el-col :span="8">
- <el-form-item label="备注" prop="remark">
+ <el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="附件" prop="annex">
+ <el-form-item label="附件">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
</el-col>
</el-row>
- <el-dialog v-model="showDialog" title="选择项目" width="70%">
- <dialogTable @customEvent="customEvent" :config="supervision_project" />
- </el-dialog>
+
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位" width="70%">
- <dialogTable :config="supervision_participating_units" @customEvent="customEvent1">
+ <dialogTable :config="supervision_participating_units_qualifications"
+ @customEvent="customEvent1">
</dialogTable>
</el-dialog>
</div>
@@ -155,8 +154,12 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionSafetyManagementPersonnelAdd, apiSupervisionSafetyManagementPersonnelEdit, } from '@/api/supervision_safety_management_personnel'
-import { supervision_project, supervision_participating_units } from "@/components/dialogTable/dialogTableConfig"
+import { supervision_participating_units_qualifications } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
+
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@@ -167,7 +170,6 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
-const showDialog = ref(false)
const showDialog1 = ref(false)
@@ -211,16 +213,13 @@ const formData = reactive({
qualification_two_status: '',
remark: '',
annex: [],
- create_user: '',
+ create_user_name: userStore.account,
+
})
-const customEvent = (e) => {
- formData.project_id = e.id
- formData.project_name = e.project_name
- showDialog.value = false
-}
+
const customEvent1 = (e) => {
formData.unit_qualification_id = e.id
- formData.company_name = e.unit_name
+ formData.company_name = e.company_name
showDialog1.value = false
}
diff --git a/src/views/supervision_special_operation_personnel/edit.vue b/src/views/supervision_special_operation_personnel/edit.vue
index 38056eb..f63dc3a 100644
--- a/src/views/supervision_special_operation_personnel/edit.vue
+++ b/src/views/supervision_special_operation_personnel/edit.vue
@@ -28,9 +28,6 @@
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择时间" />
</el-form-item>
<el-form-item label="离场时间" prop="leave_time">
- <!-- <el-date-picker class="flex-1 !flex" v-model="formData.leave_time" clearable type="date"
- value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
- </el-date-picker> -->
<el-date-picker class="flex-1 !flex" v-model="formData.leave_time" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择时间" />
</el-form-item>
@@ -51,7 +48,7 @@
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
<el-dialog v-model="showDialog1" title="选择单位" width="70%">
- <dialogTable :config="supervision_participating_units" @customEvent="customEvent1">
+ <dialogTable :config="supervision_participating_units_qualifications" @customEvent="customEvent1">
</dialogTable>
</el-dialog>
</el-form>
@@ -63,7 +60,7 @@
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionSpecialOperationPersonnelAdd, apiSupervisionSpecialOperationPersonnelEdit, } from '@/api/supervision_special_operation_personnel'
-import { supervision_participating_units } from "@/components/dialogTable/dialogTableConfig"
+import { supervision_participating_units_qualifications } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
defineProps({
dictData: {