add

src/components/createUserLable/index.vue

@@ -0,0 +1,43 @@
+<template>
+
+    <el-col :span="8" v-if="flag">
+        <el-form-item label="创建人" prop="create_user">
+            <el-input v-model="formData.create_user" clearable placeholder="请输入填表人" />
+        </el-form-item>
+    </el-col>
+    <el-col :span="8" v-if="flag">
+        <el-form-item label="创建人时间" prop="create_time">
+            <el-date-picker class="flex-1 !flex" v-model="formData.create_time" clearable type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择创建时间">
+            </el-date-picker>
+        </el-form-item>
+    </el-col>
+
+    <el-form-item label="创建人" prop="create_user" v-if="!flag">
+        <el-input v-model="formData.create_user" clearable placeholder="请输入填表人" />
+    </el-form-item>
+
+    <el-form-item label="创建时间" prop="create_time" v-if="!flag">
+        <el-date-picker class="flex-1 !flex" v-model="formData.create_time" clearable type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择创建时间">
+        </el-date-picker>
+    </el-form-item>
+</template>
+
+
+
+<script lang="ts" setup name="createUserLable">
+import { defineProps } from "vue"
+import { timeFormat } from '@/utils/util'
+import useUserStore from "@/stores/modules/user";
+
+let props = defineProps({
+    flag: Boolean,
+    formData: Object
+})
+
+const userStore = useUserStore().userInfo;
+props.formData.create_user = props.formData.create_user || userStore.account
+props.formData.create_time = props.formData.create_time || timeFormat('', 'yyyy-mm-dd hh:MM:ss')
+
+</script>

src/views/consult_new_start_project/edit.vue

@@ -207,11 +207,15 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiConsultNewStartProjectAdd, apiConsultNewStartProjectEdit, apiConsultNewStartProjectDetail, apiconsult_project_evolve, apiconsult_project_evolve_delete, apiconsult_project_preparation, apiconsult_project_preparation_delete } from '@/api/consult_new_start_project'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 import { consult_project } from "@/components/dialogTable/dialogTableConfig"
+
+import { timeFormat } from '@/utils/util'
 import useUserStore from "@/stores/modules/user";
 const userStore = useUserStore().userInfo;
+
+
+
 const showDialog = ref(false)
 
 

src/views/supervision_accept/edit.vue

@@ -82,6 +82,8 @@
                                 @delFile="delFileFn" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -286,7 +288,8 @@ const formData = reactive({
     accept_result: '',
     check_item_detail_ids: '',
     remark: '',
-    create_user: '',
+    create_user: "",
+    create_time: "",
     check_item_name: "",
     company_name: '',
     check_item_detail_name: '',

src/views/supervision_commencement_report/edit.vue

@@ -17,9 +17,7 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
-                <el-form-item label="操作人">
+                <createUserLable :formData="formData"></createUserLable>
-                    <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" />
                 </el-dialog>
@@ -34,8 +32,6 @@ import Popup from '@/components/popup/index.vue'
 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: {
@@ -63,7 +59,8 @@ const formData = reactive({
     doc_name: '',
     doc_desc: '',
     annex: [],
-    create_user_name: userStore.account,
+    create_user: "",
+    create_time: "",
 
 })
 const customEvent = (e) => {

src/views/supervision_commencement_report/index.vue

@@ -42,7 +42,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_const_prepare.supervision_commencement_report/edit']"

src/views/supervision_construction_management_personnel/index.vue

@@ -27,7 +27,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['supervision_qualification_review.supervision_construction_management_personnel/delete']"
+            <el-button
+                v-perms="['supervision_qualification_review.supervision_construction_management_personnel/delete']"
                 :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
@@ -52,7 +53,7 @@
                     <el-table-column label="有效日期2" prop="effective_date_two" show-overflow-tooltip />
                     <el-table-column label="资质2状态 " prop="qualification_two_status_text" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button
@@ -141,4 +142,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_construction_planning/edit.vue

@@ -17,6 +17,8 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
+                <createUserLable :formData="formData"></createUserLable>
+
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable @customEvent="customEvent" :config="supervision_project" />
 
@@ -65,6 +67,8 @@ const formData = reactive({
     doc_name: '',
     doc_desc: '',
     annex: [],
+    create_user: "",
+    create_time: "",
 })
 
 const customEvent = (e) => {

src/views/supervision_construction_planning/index.vue

@@ -41,7 +41,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_prepare.supervision_construction_planning/edit']"
@@ -125,4 +125,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_contract_disclosure/index.vue

@@ -29,11 +29,11 @@
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <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_name" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['supervision_prepare.supervision_contract_disclosure/edit']" type="primary"
+                            <el-button v-perms="['supervision_prepare.supervision_contract_disclosure/edit']"
-                                link @click="handleEdit(row)">
+                                type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['supervision_prepare.supervision_contract_disclosure/delete']"
@@ -113,4 +113,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_design_disclosure/index.vue

@@ -41,7 +41,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_const_prepare.supervision_design_disclosure/edit']"
@@ -125,4 +125,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_device_entry/edit.vue

@@ -42,6 +42,9 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
+
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
 
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -210,7 +213,8 @@ const formData = reactive({
     enter_result: '',
     co_participant: '',
     remark: '',
-    create_user: '',
+    create_user: "",
+    create_time: "",
     entry_detail: [{
         "name": "",
         "brand": "",

src/views/supervision_entity_parallel_testing/edit.vue

@@ -58,6 +58,8 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                     <el-col :span="8">
                         <el-form-item label="附件" prop="annex">
                             <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@@ -153,7 +155,6 @@ const formData = reactive({
     project_name: '',
     theme: '',
     code: '',
-
     check_item_id: "",
     check_item_name: "",
     position: '',
@@ -162,7 +163,8 @@ const formData = reactive({
     result: '',
     remark: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
     problem: [{
         "problem_cate": '',
         "problem_description": "",

src/views/supervision_excess_risk_security_monitoring/edit.vue

@@ -158,6 +158,8 @@
                             <el-input v-model="formData.control_measures" clearable placeholder="请输入控制措施" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
             </el-form>
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -214,7 +216,8 @@ const formData = reactive({
     exceed_the_control_value: '',
     exceed_the_warning_value: '',
     control_measures: '',
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 
 const customEvent = (e) => {

src/views/supervision_first_meeting/edit.vue

@@ -17,9 +17,7 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
-                <el-form-item label="操作人">
+                <createUserLable :formData="formData"></createUserLable>
-                    <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" />
                 </el-dialog>
@@ -34,8 +32,6 @@ 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: {
@@ -63,7 +59,8 @@ const formData = reactive({
     doc_name: '',
     doc_desc: '',
     annex: [],
-    create_user_name: userStore.account,
+    create_user: "",
+    create_time: "",
 })
 const customEvent = (e) => {
     formData.project_id = e.id

src/views/supervision_first_meeting/index.vue

@@ -41,7 +41,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="操作人" prop="create_user" 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']"

src/views/supervision_high_risk_security_monitoring/edit.vue

@@ -144,6 +144,8 @@
                             <el-input v-model="formData.control_measures" clearable placeholder="请输入控制措施" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
             </el-form>
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -199,7 +201,8 @@ const formData = reactive({
     exceed_the_control_value: '',
     exceed_the_warning_value: '',
     control_measures: '',
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 
 const customEvent = (e) => {

src/views/supervision_inspection/edit.vue

@@ -110,6 +110,9 @@
                                 @delFile="delFileFn" />
                         </el-form-item>
                     </el-col>
+
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -317,7 +320,7 @@ const formData = reactive({
     company_id: 0,
     company_name: '',
     inspection_content: '',
-    is_important: '',
+    create_time: "",
     follow_user: '',
     check_item_detail_ids: [],
     check_item_detail_name: '',

src/views/supervision_large_equipment/index.vue

@@ -50,7 +50,7 @@
                     <el-table-column label="有效日期2" prop="effective_date_two" show-overflow-tooltip />
                     <el-table-column label="资质2状态" prop="qualification_two_status_text" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_qualification_review.supervision_large_equipment/edit']"
@@ -137,4 +137,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_material_entry/edit.vue

@@ -55,6 +55,8 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
 
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -173,7 +175,8 @@ const formData = reactive({
     enter_result: '',
     parallel_test: '',
     remark: '',
-    create_user: '',
+    create_user: "",
+    create_time: "",
     entry_detail: [{
         "name": "",
         "brand": "",

src/views/supervision_material_parallel_testing/edit.vue

@@ -1,165 +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="项目名称" prop="project_id">
-                    <el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
-                </el-form-item>
-                <el-form-item label="来源单据" prop="material_entry_id">
-                    <el-input v-model="formData.material_entry_id" clearable placeholder="请输入来源单据" />
-                </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="inspector">
-                    <el-input v-model="formData.inspector" clearable placeholder="请输入送检人" />
-                </el-form-item>
-                <el-form-item label="送检日期" prop="inspection_date">
-                    <el-input v-model="formData.inspection_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="supervisionMaterialParallelTestingEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiSupervisionMaterialParallelTestingAdd, apiSupervisionMaterialParallelTestingEdit, apiSupervisionMaterialParallelTestingDetail } from '@/api/supervision_material_parallel_testing'
-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: '',
-    material_entry_id: '',
-    code: '',
-    inspector: '',
-    inspection_date: '',
-    remark: '',
-    annex: '',
-    create_user: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-    project_id: [{
-        required: true,
-        message: '请输入项目id',
-        trigger: ['blur']
-    }],
-    material_entry_id: [{
-        required: true,
-        message: '请输入来源单据',
-        trigger: ['blur']
-    }],
-    code: [{
-        required: true,
-        message: '请输入编号',
-        trigger: ['blur']
-    }],
-    inspector: [{
-        required: true,
-        message: '请输入送检人',
-        trigger: ['blur']
-    }],
-    inspection_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 apiSupervisionMaterialParallelTestingDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apiSupervisionMaterialParallelTestingEdit(data)
-        : await apiSupervisionMaterialParallelTestingAdd(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="80vw" @confirm="handleSubmit"
@@ -196,6 +34,9 @@ defineExpose({
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
+
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                     <el-col :span="8">
                         <el-form-item label="附件" prop="annex">
                             <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@@ -316,6 +157,8 @@ const formData = reactive({
     "inspection_date": "",
     "remark": "",
     "annex": [],
+    create_user: "",
+    create_time: "",
     "detail": [
         {
             "name": "",

src/views/supervision_meeting_minutes/edit.vue

@@ -33,6 +33,8 @@
                 <el-form-item label="会议内容">
                     <el-input v-model="formData.content" clearable placeholder="请输入会议内容" />
                 </el-form-item>
+                <createUserLable :formData="formData"></createUserLable>
+
                 <el-form-item label="附件" prop="annex">
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
@@ -84,7 +86,8 @@ const formData = reactive({
     attendees: '',
     content: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 const handleAvatarSuccess_four = (response: any) => {
     Array.isArray(formData.annex) ? '' : formData.annex = []

src/views/supervision_notice/edit.vue

@@ -40,6 +40,8 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                     <el-col :span="8">
                         <el-form-item label="附件" prop="annex">
                             <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@@ -134,6 +136,8 @@ const formData = reactive({
     company_name: '',
     notify_user: '',
     issue_date: '',
+    create_user: "",
+    create_time: "",
     annex: [],
     problem: [{
         "problem_description": "",

src/views/supervision_planning/edit.vue

@@ -29,6 +29,9 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
+
+                <createUserLable :formData="formData"></createUserLable>
+
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable @customEvent="customEvent" :config="supervision_project" />
                 </el-dialog>
@@ -80,7 +83,9 @@ const formData = reactive({
     approval_content: '',
     remark: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
+
 })
 
 const customEvent = (e) => {

src/views/supervision_planning/index.vue

@@ -43,7 +43,7 @@
                     <el-table-column label="方案名称" prop="scheme_name" show-overflow-tooltip />
                     <el-table-column label="评审内容" prop="approval_content" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
 
                         <template #default="{ row }">

src/views/supervision_project/edit.vue

@@ -94,7 +94,6 @@
                 <el-row>
                     <el-col :span="8">
                         <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="请选择日期">
                             </el-date-picker>
@@ -102,7 +101,6 @@
                     </el-col>
                     <el-col :span="8">
                         <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="请选择日期">
                             </el-date-picker>
@@ -110,7 +108,6 @@
                     </el-col>
                     <el-col :span="8">
                         <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="请选择日期">
                             </el-date-picker>
@@ -211,8 +208,13 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiSupervisionProjectAdd, apiSupervisionProjectEdit, apiSupervisionProjectDetail } from '@/api/supervision_project'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+
+import { timeFormat } from '@/utils/util'
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore().userInfo;
+
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -266,9 +268,8 @@ const formData = reactive({
     project_manager: '',
     part_a_unit: '',
     annex: [],
-    "planned_end_dat": "",
+    create_user: userStore.account,
-    create_user: '',
+    create_time: timeFormat('', 'yyyy-mm-dd hh:MM:ss'),
-    create_time: ''
 })
 
 

src/views/supervision_project_acceptance_report/edit.vue

@@ -13,6 +13,8 @@
                 <el-form-item label="文档简介" prop="content">
                     <el-input v-model="formData.content" clearable placeholder="请输入文档简介" />
                 </el-form-item>
+                <createUserLable :formData="formData"></createUserLable>
+
                 <el-form-item label="附件" prop="annex">
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
@@ -57,6 +59,8 @@ const formData = reactive({
     project_name: "",
     title: '',
     content: '',
+    create_user: "",
+    create_time: "",
     annex: [],
 })
 const customEvent = (e) => {

src/views/supervision_project_case_review/edit.vue

@@ -22,6 +22,7 @@
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                 </el-form-item>
+                <createUserLable :formData="formData"></createUserLable>
                 <el-form-item label="附件" prop="annex">
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
@@ -69,7 +70,8 @@ const formData = reactive({
     review_content: '',
     remark: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 const handleAvatarSuccess_four = (response: any) => {
     Array.isArray(formData.annex) ? '' : formData.annex = []

src/views/supervision_project_milestones/edit.vue

@@ -16,6 +16,8 @@
                 <el-form-item label="备注">
                     <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
                 </el-form-item>
+                <createUserLable :formData="formData"></createUserLable>
+
                 <el-form-item label="附件">
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
@@ -62,7 +64,8 @@ const formData = reactive({
     content: '',
     remark: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 const handleAvatarSuccess_four = (response: any) => {
     Array.isArray(formData.annex) ? '' : formData.annex = []

src/views/supervision_project_monthly_report/edit.vue

@@ -112,6 +112,8 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                     <el-col :span="8">
                         <el-form-item label="附件">
                             <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@@ -177,7 +179,8 @@ const formData = reactive({
     safety_situation: '',
     remark: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 
 const handleAvatarSuccess_four = (response: any) => {

src/views/supervision_project_owner_evaluation/edit.vue

@@ -13,6 +13,8 @@
                 <el-form-item label="文档简介" prop="content">
                     <el-input v-model="formData.content" clearable placeholder="请输入文档简介" />
                 </el-form-item>
+                <createUserLable :formData="formData"></createUserLable>
+
                 <el-form-item label="附件" prop="annex">
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
@@ -59,7 +61,8 @@ const formData = reactive({
     title: '',
     content: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
 })
 const handleAvatarSuccess_four = (response: any) => {
     Array.isArray(formData.annex) ? '' : formData.annex = []

src/views/supervision_rules/edit.vue

@@ -17,9 +17,7 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
-                <el-form-item label="操作人">
+                <createUserLable :formData="formData"></createUserLable>
-                    <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,8 +33,6 @@ import Popup from '@/components/popup/index.vue'
 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: {
@@ -64,7 +60,8 @@ const formData = reactive({
     doc_name: '',
     doc_desc: '',
     annex: [],
-    create_user_name: userStore.account,
+    create_user: "",
+    create_time: "",
 })
 const customEvent = (e) => {
     formData.project_id = e.id

src/views/supervision_rules/index.vue

@@ -40,15 +40,15 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['supervision_const_prepare.supervision_rules/edit']" type="primary" link
+                            <el-button v-perms="['supervision_const_prepare.supervision_rules/edit']" type="primary"
-                                @click="handleEdit(row)">
+                                link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['supervision_const_prepare.supervision_rules/delete']" type="danger" link
+                            <el-button v-perms="['supervision_const_prepare.supervision_rules/delete']" type="danger"
-                                @click="handleDelete(row.id)">
+                                link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
@@ -123,4 +123,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_rules_disclosure/edit.vue

@@ -17,9 +17,7 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
-                <el-form-item label="操作人">
+                <createUserLable :formData="formData"></createUserLable>
-                    <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" />
                 </el-dialog>
@@ -34,8 +32,7 @@ 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: {
@@ -63,7 +60,8 @@ const formData = reactive({
     doc_name: '',
     doc_desc: '',
     annex: [],
-    create_user_name: userStore.account,
+    create_user: "",
+    create_time: "",
 })
 const customEvent = (e) => {
     formData.project_id = e.id
@@ -120,12 +118,7 @@ const setFormData = async (data: Record<any, any>) => {
 
 }
 
-const getDetail = async (row: Record<string, any>) => {
+
-    const data = await apiSupervisionFirstMeetingDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
 
 
 // 提交按钮
@@ -155,6 +148,5 @@ const handleClose = () => {
 defineExpose({
     open,
     setFormData,
-    getDetail
 })
 </script>

src/views/supervision_rules_disclosure/index.vue

@@ -42,7 +42,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="操作人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_const_prepare.supervision_rules_disclosure/edit']"
@@ -125,4 +125,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_safety_management_personnel/edit.vue

@@ -22,12 +22,7 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="8">
+                    <createUserLable :formData="formData" flag></createUserLable>
-                        <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="技术职称">
                             <el-input v-model="formData.technical_title" clearable placeholder="请输入技术职称" />
@@ -156,8 +151,6 @@ import Popup from '@/components/popup/index.vue'
 import { apiSupervisionSafetyManagementPersonnelAdd, apiSupervisionSafetyManagementPersonnelEdit, } from '@/api/supervision_safety_management_personnel'
 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({
@@ -213,7 +206,8 @@ const formData = reactive({
     qualification_two_status: '',
     remark: '',
     annex: [],
-    create_user_name: userStore.account,
+    create_user: "",
+    create_time: "",
 
 })
 

src/views/supervision_safety_management_personnel/index.vue

@@ -52,7 +52,7 @@
                     <el-table-column label="有效日期2" prop="effective_date_two" show-overflow-tooltip />
                     <el-table-column label="资质2状态 " prop="qualification_two_status_text" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button

src/views/supervision_side_station/edit.vue

@@ -106,6 +106,8 @@
                                 @delFile="delFileFn" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable @customEvent="customEvent" :config="supervision_project" />
@@ -311,7 +313,8 @@ const formData = reactive({
     side_station_user: '',
     check_item_detail_ids: [],
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
     project_name: '',
     inspection_code: '',
     is_important: "",

src/views/supervision_special_operation_personnel/edit.vue

@@ -44,9 +44,7 @@
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
                 </el-form-item>
-                <el-form-item label="创建人">
+                <createUserLable :formData="formData"></createUserLable>
-                    <el-input v-model="formData.create_user_name" clearable placeholder="请输入创建人" />
-                </el-form-item>
                 <el-dialog v-model="showDialog1" title="选择单位" width="70%">
                     <dialogTable :config="supervision_participating_units_qualifications" @customEvent="customEvent1">
                     </dialogTable>
@@ -95,7 +93,8 @@ const formData = reactive({
     status: '',
     remark: '',
     annex: '',
-    create_user_name: '',
+    create_user: "",
+    create_time: "",
 })
 const handleAvatarSuccess_four = (response: any) => {
     if (!Array.isArray(formData.annex)) formData.annex = []

src/views/supervision_special_operation_personnel/index.vue

@@ -41,7 +41,7 @@
                     <el-table-column label="离场时间" prop="leave_time" show-overflow-tooltip />
                     <el-table-column label="状态" prop="status_text" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="创建人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button
@@ -129,4 +129,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

src/views/supervision_test_blocks_specimens/edit.vue

@@ -63,6 +63,7 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
                     <el-col :span="8">
                         <el-form-item label="附件" prop="annex">
                             <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@@ -169,7 +170,8 @@ const formData = reactive({
     test_result: '',
     remark: '',
     annex: [],
-    create_user: '',
+    create_user: "",
+    create_time: "",
     problem: [{
         "problem_cate": '',
         "problem_description": "",

src/views/supervision_witness_sampling/edit.vue

@@ -44,6 +44,8 @@
                                 @delFile="delFileFn" />
                         </el-form-item>
                     </el-col>
+                    <createUserLable :formData="formData" flag></createUserLable>
+
                 </el-row>
 
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -161,7 +163,9 @@ const formData = reactive({
     witness: '',
     sampler: '',
     annex: '',
-    create_user: '',
+    create_user: "",
+    create_time: "",
+    // 我说
     sampling_detail: [
         {
             "name": "",

src/views/supplier/index.vue

@@ -5,7 +5,7 @@
                 <el-form-item label="联系人" prop="contacts">
                     <el-input class="w-[280px]" v-model="queryParams.contacts" clearable placeholder="请输入联系人" />
                 </el-form-item>
-                <el-form-item label="建档人" prop="create_user_name">
+                <el-form-item label="建档人" prop="create_user">
                     <el-input class="w-[280px]" v-model="queryParams.create_user_name" clearable placeholder="请输入建档人" />
                 </el-form-item>
                 <el-form-item label="供应商编码" prop="supplier_code">
@@ -16,17 +16,20 @@
                 </el-form-item>
                 <el-form-item label="供应商分组" prop="supplier_group">
                     <el-select class="flex-1" v-model="queryParams.supplier_group" clearable placeholder="请选择供应商分组">
-                        <el-option v-for="(item, index) in dictData.supplier_group" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.supplier_group" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="供应商分类" prop="supplier_category">
                     <el-select class="flex-1" v-model="queryParams.supplier_category" clearable placeholder="请选择供应商分类">
-                        <el-option v-for="(item, index) in dictData.supplier_category" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.supplier_category" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="供应商等级" prop="supplier_grade">
                     <el-select class="flex-1" v-model="queryParams.supplier_grade" clearable placeholder="请选择供应商等级">
-                        <el-option v-for="(item, index) in dictData.supplier_grade" :key="index" :label="item.name" :value="parseInt(item.value)" />
+                        <el-option v-for="(item, index) in dictData.supplier_grade" :key="index" :label="item.name"
+                            :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -42,7 +45,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['bid.bid_bidding_decision/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['bid.bid_bidding_decision/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -50,7 +54,7 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
 
-                    <el-table-column label="建档人" prop="create_user_name" show-overflow-tooltip />
+                    <el-table-column label="建档人" prop="create_user" show-overflow-tooltip />
                     <el-table-column label="供应商编码" prop="supplier_code" show-overflow-tooltip />
                     <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
                     <el-table-column label="品牌类别" prop="brand_category" show-overflow-tooltip />
@@ -65,10 +69,12 @@
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['bid.bid_bidding_decision/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['bid.bid_bidding_decision/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['bid.bid_bidding_decision/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['bid.bid_bidding_decision/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['bid.bid_bidding_decision/detail']" link @click="handledetail(row)">
@@ -161,4 +167,3 @@ const handledetail = async (data: any) => {
 }
 getLists()
 </script>
-