add

src/api/contract_ledger.ts

@@ -7,3 +7,19 @@ export function apiContractLedgerLists(params: any) {
     params,
   });
 }
+
+// 财务管理--合同台账列表
+export function apiMarketingContract(params: any) {
+  return request.get({
+    url: "/marketing.MarketingContract/info",
+    params,
+  });
+}
+
+// 财务管理--合同台账列表
+export function apiMarketingContractdownload(params: any) {
+  return request.get({
+    url: "/marketing.marketing_contract/download?export=2",
+    params,
+  });
+}

src/views/build_plan/edit.vue

@@ -73,7 +73,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="施工人员" prop="work_user">
-                            <el-input v-model="formData.work_user" clearable placeholder="请输入施工人员" />
+                            <el-input v-model="formData.work_user_name" @click="userclick('work_user')" clearable
+                                placeholder="请输入施工人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -112,6 +113,7 @@
                         <customDialog @customEvent="customEvent" :project_id="formData.project_id"></customDialog>
                     </el-dialog>
                 </div>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
                 <el-dialog v-model="showDialog1" title="选择施工工序" width="70%">
                     <builddivisionDialog @customEvent="customEvent1" division_id=""></builddivisionDialog>
@@ -205,6 +207,7 @@ const formData = reactive({
     plan_start_date: '',
     plan_end_date: '',
     work_user: "",
+    work_user_name: "",
     work_content: "",
     unit: "",
     price: "",
@@ -213,6 +216,22 @@ const formData = reactive({
     file: ""
 
 })
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 
 
 // 表单验证

src/views/consult_demand/edit.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="项目名称" prop="project_name">
                     <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" @click="showDialog = true"

src/views/contract_ledger/detail.js

@@ -0,0 +1,127 @@
+const detailConfig = {
+    title: "造价项目台账",
+    config: [
+        {
+            label: "项目编号",
+            value: "project_num"
+        },
+        {
+            label: "项目名称",
+            value: "project_name"
+        },
+        {
+            label: "关联合同",
+            value: "contract_name"
+        },
+        {
+            label: "咨询类型",
+            value: "types_text"
+        },
+        {
+            label: "行业",
+            value: "industry_text"
+        },
+        {
+            label: "所在省份",
+            value: "province_name"
+        },
+        {
+            label: "所在市区",
+            value: "city_name"
+        },
+        {
+            label: "具体地址",
+            value: "address",
+        },
+        {
+            label: "计划开始日期",
+            value: "starting",
+        },
+        {
+            label: "计划结束日期",
+            value: "endtime",
+        },
+        {
+            label: "计划工期",
+            value: "jhgq",
+        },
+
+        {
+            label: "部门",
+            value: "dept_name",
+        },
+        {
+            label: "项目负责人",
+            value: "principal_name",
+        },
+        {
+            label: "项目相关人员",
+            value: "person_text",
+        },
+        {
+            label: "项目总投资",
+            value: "invest",
+        },
+        {
+            label: "预算造价",
+            value: "budget",
+        },
+
+        {
+            label: "送审造价",
+            value: "cost",
+        },
+
+        {
+            label: "审定造价",
+            value: "approval",
+        },
+
+        {
+            label: "委托单位",
+            value: "aunit_name",
+        },
+
+        {
+            label: "委托方联系人",
+            value: "Acontact",
+        },
+
+        {
+            label: "联系电话",
+            value: "acontactnum",
+        },
+
+        {
+            label: "登记日期",
+            value: "date",
+        },
+
+        {
+            label: "项目规模及概括",
+            value: "generalize",
+        },
+
+        {
+            label: "建设单位",
+            value: "js_unit",
+        },
+        {
+            label: "注意事项",
+            value: "note",
+        },
+        {
+            label: "备注",
+            value: "remark",
+            column: 1
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+    ]
+
+}
+export default detailConfig;

src/views/contract_ledger/index.vue

@@ -27,34 +27,59 @@
                     <el-table-column :render-header="pager.calcWidth" label="合同编号" prop="contract_code" />
                     <el-table-column :render-header="pager.calcWidth" label="合同类型" prop="contract_type_text"
                         show-overflow-tooltip />
-                    <el-table-column label="业务性质" prop="business_nature_text" show-overflow-tooltip />
+                    <el-table-column label="业务性质" :render-header="pager.calcWidth" prop="business_nature_text"
-                    <el-table-column :render-header="pager.calcWidth" label="甲方签约单位" prop="part_a_name"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="签约单位" prop="part_a_name"
+                        show-overflow-tooltip />
+                    <el-table-column label="签订部门" :render-header="pager.calcWidth" prop="signed_dept_name"
                         show-overflow-tooltip />
-                    <el-table-column label="签订部门" prop="signed_dept_name" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="合同签订金额" prop="signed_amount"
                         show-overflow-tooltip />
+                    <!-- <el-table-column :render-header="pager.calcWidth" label="开票日期" prop="" show-overflow-tooltip /> -->
                     <el-table-column :render-header="pager.calcWidth" label="已开票金额" prop="total_invoice_amount"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="已到账金额" prop="total_refund_amount"
-                        show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="已结算金额" prop="total_settlement_amount"
-                        show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="未开票金额" prop="not_total_invoice_amount"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="未到账金额" prop="not_total_refund_amount"
+                    <el-table-column :render-header="pager.calcWidth" label="开票已回款金额" prop="total_refund_amount"
                         show-overflow-tooltip />
-                    <el-table-column :render-header="pager.calcWidth" label="开票未回款金额" prop="invoice_not_refund_amount"
+                    <!-- <el-table-column :render-header="pager.calcWidth" label="回款日期" prop="" show-overflow-tooltip /> -->
+                    <el-table-column label="开票未回款金额" prop="invoice_not_refund_amount" show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="合同未回款金额" prop="" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ (+row.signed_amount) - (+row.total_refund_amount) }}
+
+                        </template>
+                    </el-table-column>
+                    <!-- <el-table-column label="备注" prop="reamrk" show-overflow-tooltip /> -->
+                    <!-- <el-table-column :render-header="pager.calcWidth" label="已到账金额" prop="total_refund_amount"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="已结算金额" prop="total_settlement_amount"
+                        show-overflow-tooltip />
+                    <el-table-column :render-header="pager.calcWidth" label="未到账金额" prop="not_total_refund_amount"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="回款未开票金额" prop="refund_not_invoice_amount"
                         show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="合同结算日期" prop="settlement_date"
-                        show-overflow-tooltip />
+                        show-overflow-tooltip /> -->
+                    <el-table-column label="操作" width="150" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['contract.contract_negotiation/delete']" type="primary" link
+                                @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
+                            <el-button v-perms="['contract.contract_negotiation/detail']" link @click="handleDown(row.id)">
+                                下载
+                            </el-button>
+                        </template>
+                    </el-table-column>
                 </el-table>
             </div>
             <div class="flex mt-4 justify-end">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" />
+
         <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
     </div>
 </template>
@@ -62,14 +87,15 @@
 <script lang="ts" setup name="financialRefundLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiContractLedgerLists } from '@/api/contract_ledger'
+import { apiContractLedgerLists, apiMarketingContract, apiMarketingContractdownload } from '@/api/contract_ledger'
-import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
+import detailConfig from './detail'
+
 // import EditPopup from './edit.vue'
 
-// const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = shallowRef<InstanceType<typeof EditPopup>>()
 // // 是否显示编辑框
-// const showEdit = ref(false)
+const showDetail = ref(false)
 
 
 // 查询条件
@@ -93,27 +119,23 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-// // 添加
-// const handleAdd = async () => {
-//     showEdit.value = true
-//     await nextTick()
-//     editRef.value?.open('add')
-// }
 
-// // 编辑
+// 详情
-// const handleEdit = async (data: any) => {
+const handleDetail = async (id: any) => {
-//     showEdit.value = true
+    let res = await apiMarketingContract({ id })
-//     await nextTick()
+    showDetail.value = true
-//     editRef.value?.open('edit')
+    await nextTick()
-//     editRef.value?.setFormData(data)
+    detailRef.value?.open()
-// }
+    detailRef.value?.setFormData(res)
+}
 
-// // 删除
+// 下载
-// const handleDelete = async (id: number | any[]) => {
+const handleDown = async (id: number | any[]) => {
-//     await feedback.confirm('确定要删除？')
+    let res = await apiMarketingContractdownload({ id })
-//     await apiFinancialRefundDelete({ id })
+    const a = document.createElement('a')
-//     getLists()
+    a.href = res.url
-// }
+    a.click()
+}
 
 getLists()
 </script>

src/views/custom_service/edit.vue

@@ -69,12 +69,12 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="接待人" prop="receiver"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="userclick('receiver')">
-                            <el-input v-model="formData.receiver" clearable placeholder="请输入接待人" />
+                            <el-input v-model="formData.receiver_name" clearable placeholder="请输入接待人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="指定处理人" prop="processed_user" @click="userclick"
+                        <el-form-item label="指定处理人" prop="processed_user" @click="userclick('processed_user')"
                             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                             <el-input v-model="formData.processed_user_name" clearable readonly placeholder="请输入指定处理人" />
                         </el-form-item>
@@ -137,7 +137,6 @@ import peojectDialog from '@/components/project/index.vue'
 const showDialog = ref(false)
 const showDialog1 = ref(false)
 const showDialog2 = ref(false)
-const personnel = ref<any>()
 
 const customEvent = (e: any) => {
     formData.project_id = e.id
@@ -173,15 +172,17 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
 //打开弹窗
-
+const personnel = ref<any>()
-const userclick = () => {
+let val = ''
+const userclick = (vals) => {
+    val = vals
     personnel.value.open()
 
 }
 //确认
 const submituser = (e: any) => {
-    formData.processed_user = e.id;
+    formData[val] = e.id;
-    formData.processed_user_name = e.name
+    formData[val + '_name'] = e.name
 }
 
 
@@ -215,7 +216,8 @@ const formData = reactive({
     contract_code: "",
     contract_id: "",
     custom_name: "",
-    custom_id: ""
+    custom_id: "",
+    receiver_name: ""
 })
 
 

src/views/data_reception/index.vue

@@ -41,7 +41,7 @@
                     <el-table-column label="项目名称" prop="projectInfo.project_name" show-overflow-tooltip />
                     <el-table-column label="项目编号" prop="projectInfo.project_num" show-overflow-tooltip />
                     <el-table-column label="登记日期" prop="apptime" show-overflow-tooltip />
-                    <el-table-column label="登记人" prop="person" show-overflow-tooltip />
+                    <el-table-column label="登记人" prop="person_name" show-overflow-tooltip />
                     <el-table-column label="资料份数" prop="number" show-overflow-tooltip />
                     <el-table-column label="存放位置" prop="position" show-overflow-tooltip />
                     <el-table-column label="说明" prop="tips" show-overflow-tooltip />

src/views/finance_payment_apply/edit.vue

@@ -86,8 +86,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="申请人" prop="apply_user">
-                            <el-input v-model="formData.apply_user" clearable placeholder="请输入申请人" />
+                            <el-input v-model="formData.apply_user_name" readonly @click="userclick('apply_user')" clearable
-
+                                placeholder="请输入申请人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -215,6 +215,8 @@
                     <dialogTable :config="bank_account" @customEvent="customEvent4" />
                 </el-dialog>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
         </popup>
 
     </div>
@@ -333,6 +335,7 @@ const formData = reactive({
     "pay_type": '',
     period: "",
     "apply_user": "",
+    "apply_user_name": "",
     "invoice_status": '',
     "amount": '',
     "desc": "",
@@ -349,6 +352,19 @@ const formData = reactive({
         "account": ""
     },
 })
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 
 // 表单验证

src/views/finance_receipt_record/edit.vue

@@ -91,7 +91,7 @@
                     <el-col :span="8">
                         <el-form-item label="发票税率" prop="invoice_tax_rate">
                             <el-select v-model="formData.invoice_tax_rate" placeholder="请选择" @change="amountinput"
-                                class="w-[400px]">
+                                class=" flex-1">
                                 <el-option :label="item.name" :value="item.value"
                                     v-for="item in dictData.tax_rate"></el-option>
                             </el-select>

src/views/financial_invoice/detail.js

@@ -91,7 +91,11 @@ const detailConfig = {
             label: "创建时间",
             value: "create_time",
         },
-
+        {
+            label: "发票",
+            value: "annex",
+            column: 1
+        },
     ]
 
 }

src/views/financial_invoice/edit.vue

@@ -117,6 +117,11 @@
                         </el-form-item>
                     </el-col>
                     <createUserLable flag :formData="formData" />
+                    <el-col :span="8">
+                        <el-form-item label="发票上传">
+                            <UploadAnnex :formData="formData"></UploadAnnex>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
             <el-dialog v-model="showDialog" title="选择合同" width="70%">
@@ -181,7 +186,8 @@ const formData = reactive({
     "sign_money": "",
     "sign_time": "",
     "total_invoice_amount": 0,
-    "total_refund_amount": 0
+    "total_refund_amount": 0,
+    annex: []
 })
 
 const customEvent = (e) => {

src/views/financial_invoice/index.vue

@@ -40,7 +40,6 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="合同名称" prop="contract_name" :render-header="pager.calcWidth" />
                     <el-table-column label="开票编号" prop="invoice_code" :render-header="pager.calcWidth" />
-
                     <el-table-column label="开票申请金额" prop="apply_amount" show-overflow-tooltip width="120" />
                     <el-table-column label="开票单位名称" prop="apply_company" show-overflow-tooltip width="120" />
                     <el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip width="120" />
@@ -50,6 +49,8 @@
                     <el-table-column label="发票类型" prop="invoice_type_text" show-overflow-tooltip />
                     <el-table-column label="到账状态" prop="is_refund" show-overflow-tooltip />
                     <el-table-column label="到账金额" prop="refund_amount" show-overflow-tooltip />
+                    <el-table-column label="开票时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="到账时间" prop="refund_date" show-overflow-tooltip />
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['financial.financial_invoice/edit']" type="primary" link
@@ -60,8 +61,7 @@
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button>
-                            <el-button v-perms="['financial.financial_invoice/detail']" link
+                            <el-button v-perms="['financial.financial_invoice/detail']" link @click="handleDetail(row.id)">
-                                @click="handleDetail(row.id)">
                                 详情
                             </el-button>
                         </template>

src/views/financial_refund/detail.js

@@ -58,6 +58,12 @@ const detailConfig = {
             label: "创建时间",
             value: "create_time",
         },
+        {
+            label: "到账回单",
+            value: "annex",
+            column: 1
+        },
+
 
     ]
 

src/views/financial_refund/edit.vue

@@ -43,6 +43,9 @@
                 <el-form-item label="说明" prop="remark">
                     <el-input v-model="formData.remark" clearable placeholder="请输入说明" type="textarea" />
                 </el-form-item>
+                <el-form-item label="到账回单" prop="annex">
+                    <UploadAnnex :formData="formData"></UploadAnnex>
+                </el-form-item>
                 <createUserLable :formData="formData" />
             </el-form>
             <el-dialog v-model="showDialog" title="选择合同" width="70%">
@@ -108,7 +111,8 @@ const formData = reactive({
     "sign_money": "",
     "apply_amount": "",
     "total_invoice_amount": 0,
-    "total_refund_amount": 0
+    "total_refund_amount": 0,
+    annex: []
 })
 
 const customEvent = (e) => {

src/views/project/edit.vue

@@ -76,7 +76,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="联系人" prop="contacts">
-                            <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                            <el-input v-model="formData.contacts_name" clearable placeholder="请输入联系人" readonly
+                                @click="userclick('contacts')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -91,12 +92,17 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="联系人部门" prop="department">
-                            <el-input v-model="formData.department" clearable placeholder="请输入联系人部门" />
+                            <!-- <el-input v-model="formData.department" clearable placeholder="请输入联系人部门" /> -->
+                            <el-select v-model="formData.department" placeholder="请选择部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="负责人" prop="person">
-                            <el-input v-model="formData.person" clearable placeholder="请输入负责人" />
+                            <el-input v-model="formData.person_name" clearable placeholder="请输入负责人" readonly
+                                @click="userclick('person')" />
                         </el-form-item>
                     </el-col>
 
@@ -221,6 +227,8 @@
         <el-dialog v-model="showDialog" title="选择客户" width="70%">
             <customDialog @customEvent="customEvent"></customDialog>
         </el-dialog>
+        <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
     </div>
 </template>
 
@@ -275,10 +283,12 @@ const formData = reactive({
     bidding_time: '',
     bidding_method: '',
     contacts: '',
+    contacts_name: "",
     position: '',
     telephone: '',
     department: '',
     person: '',
+    person_name: "",
     relationship: '',
     discovery_time: '',
     information_sources: '',
@@ -296,6 +306,8 @@ const formData = reactive({
 })
 
 
+
+
 // 表单验证
 const formRules = reactive<any>({
     telephone: [
@@ -362,7 +374,35 @@ const handleClose = () => {
     emit('close')
 }
 
+import { deptLists } from "@/api/org/department"
 
+// <el-select v-model="formData.department" placeholder="请选择部门" class="flex-1">
+//                                 <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+//                                 </el-option>
+//                             </el-select>
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    let res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
 
 defineExpose({
     open,

src/views/project_cost_adjustment/edit.vue

@@ -15,7 +15,7 @@
                     <el-input v-model="formData.adjust_amount" clearable placeholder="请输入调整金额" />
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                 </el-form-item>
                 <el-form-item label="附件">
                     <uploadAnnex :formData="formData"></uploadAnnex>

src/views/project_estimate/edit.vue

@@ -44,7 +44,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="制单人" prop="create_user">
-                            <el-input v-model="formData.create_user" clearable placeholder="请输入制单人" />
+                            <el-input v-model="formData.create_user_name" clearable placeholder="请输入制单人" readonly
+                                @click="openUserList('create_user')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -76,7 +77,7 @@
                                 <el-option v-for="(item, index) in jlist" :key="index" :label="item.name"
                                     :value="parseInt(item.id)" />
                             </el-select> -->
-                            <el-input v-model="formData.technician_name" @click="openUserList" clearable
+                            <el-input v-model="formData.technician_name" @click="openUserList('technician')" clearable
                                 placeholder="点击选择技术人员" readonly />
                         </el-form-item>
                     </el-col>
@@ -160,6 +161,7 @@ const formData = reactive({
     customer_demand_id: '',
     estimate_source: '',
     create_user: '',
+    create_user_name: '',
     recording_time: "",
     quotation_date: '',
     invoice_type: '',
@@ -209,7 +211,9 @@ const customEvent2 = (e: any) => {
 };
 
 
-const openUserList = async () => {
+let val = ''
+const openUserList = async (vals) => {
+    val = vals
     showDialog3.value = true;
     await nextTick();
     personnel.value.open();
@@ -218,9 +222,8 @@ const openUserList = async () => {
 
 //确认
 const submituser = (e: any) => {
-
+    formData[val + '_name'] = e.name
-    formData.technician_name = e.name
+    formData[val] = e.id
-    formData.technician = e.id
     console.log(e)
     showDialog3.value = false;
 };

src/views/project_expense_reimbursement/edit.vue

@@ -33,7 +33,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="报销人" prop="apply_user">
-                            <el-input v-model="formData.apply_user" clearable placeholder="请输入报销人" />
+                            <el-input v-model="formData.apply_user_name" @click="userclick('apply_user')" clearable
+                                placeholder="请输入报销人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -209,6 +210,7 @@
                     </div>
                 </el-col>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
                 <project @customEvent="customEvent">
@@ -312,6 +314,7 @@ const formData = reactive({
     "loan_apply_code": "", //借款单id，当报销类型包含借款冲抵选项时必填
     "offset_loan_amount": "", //冲抵借款金额，当报销类型包含借款冲抵选项时必填
     "apply_user": "", //必填，报销人
+    "apply_user_name": "", //必填，报销人
     "apply_date": "", //必填，报销日期
     "payee_name": "", //必填，收款人姓名
     "payee_bank": "", //必填，收款银行
@@ -347,7 +350,19 @@ const formData = reactive({
         "account": ""
     },
 })
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
 
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 const invoiceIndex = ref(0)
 // 上传文件

src/views/project_follow_up/edit.vue

@@ -20,10 +20,12 @@
                             <el-input v-model="custom_name" disabled clearable placeholder="系统自动填写" />
                         </el-form-item> </el-col><el-col :span="8">
                         <el-form-item label="执行人" prop="executor">
-                            <el-input v-model="formData.executor" clearable placeholder="请输入执行人" />
+                            <el-input v-model="formData.executor_name" clearable placeholder="请输入执行人" readonly
+                                @click="userclick('executor')" />
                         </el-form-item></el-col><el-col :span="8">
                         <el-form-item label="联系人" prop="contacts">
-                            <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                            <el-input v-model="formData.contacts_name" @click="userclick('contacts')" clearable
+                                placeholder="请输入联系人" />
                         </el-form-item> </el-col><el-col :span="8">
                         <el-form-item label="联系电话" prop="contact_information"
                             :rules="[{ validator: checkPhone, trigger: 'blur' }]">
@@ -102,6 +104,8 @@
         <el-dialog v-model="showDialog" title="选择项目" width="70%">
             <projectTable @customEvent="customEvent"></projectTable>
         </el-dialog>
+        <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
     </div>
 </template>
 
@@ -125,6 +129,21 @@ const project_name = ref('')
 const project_code = ref('')
 const custom_name = ref('')
 
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 // dialog
 const showDialog = ref(false)
 
@@ -138,7 +157,9 @@ const formData = reactive({
     id: '',
     project_id: '',
     executor: '',
+    executor_name: '',
     contacts: '',
+    contacts_name: '',
     contact_information: '',
     project_role: '',
     position: '',

src/views/project_loan_apply/edit.vue

@@ -8,7 +8,8 @@
                         @click="showDialog = true" />
                 </el-form-item>
                 <el-form-item label="借款人" prop="apply_user">
-                    <el-input v-model="formData.apply_user" clearable placeholder="请输入借款人" />
+                    <el-input v-model="formData.apply_user_name" clearable placeholder="请输入借款人"
+                        @click="userclick('apply_user')" />
                 </el-form-item>
                 <el-form-item label="借款申请日期" prop="loan_date">
                     <el-date-picker class="flex-1 !flex" v-model="formData.loan_date" clearable value-format="YYYY-MM-DD "
@@ -29,7 +30,7 @@
                         type='number' />
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                 </el-form-item>
                 <el-col :span="24">
                     <el-form-item label="附件">
@@ -49,6 +50,8 @@
                 <el-form-item label="开户账号">
                     <el-input v-model="formData.bank_account.account" readonly v-type="'account'" />
                 </el-form-item>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
             </el-form>
 
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -99,6 +102,7 @@ const formData = reactive({
     "project_id": '',
     project_name: "",
     "apply_user": "",
+    "apply_user_name": "",
     "loan_date": "",
     "loan_amount": 0,
     "payee_name": "",
@@ -204,6 +208,21 @@ const getDetail = async (row: Record<string, any>) => {
 }
 
 
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
+
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()

src/views/project_logs/edit.vue

@@ -18,7 +18,8 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="联系人" prop="contacts">
-                            <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                            <el-input v-model="formData.contacts_name" clearable placeholder="请输入联系人"
+                                @click="userclick('contacts')" />
                         </el-form-item> </el-col>
 
                     <el-col :span="8">
@@ -41,7 +42,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="执行人" prop="executor">
-                            <el-input v-model="formData.executor" clearable placeholder="请输入执行人" />
+                            <el-input v-model="formData.executor_name" @click="userclick('executor')" clearable
+                                placeholder="请输入执行人" />
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="下次回访日期" prop="next_follow_up_date">
@@ -63,6 +65,8 @@
                 </el-row>
 
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
         </popup>
 
         <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -122,6 +126,22 @@ const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑项目日志管理' : '新增项目日志管理'
 })
 
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 // 表单数据
 const formData = reactive({
     id: '',
@@ -129,9 +149,11 @@ const formData = reactive({
     theme: '',
     wbs_code: '',
     contacts: '',
+    contacts_name: '',
     date: '',
     follow_type: '',
     executor: '',
+    executor_name: '',
     content: '',
     annex: [],
     next_follow_up_date: []

src/views/project_profit_set/edit.vue

@@ -1,10 +1,10 @@
 <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="120px" :rules="formRules" inline>
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-form-item label="项目类型" prop="project_type_id" @click="showDialog = true"
                     :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                    <el-select class="w-[190px]" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
+                    <el-select class="flex-1" v-model="formData.project_type_id" clearable placeholder="请选择项目类型">
                         <el-option v-for="(item, index) in list" :key="index" :label="item.name"
                             :value="parseInt(item.id)" />
                     </el-select>
@@ -14,7 +14,7 @@
                     <el-input v-model="formData.profit_rate" type="number" clearable placeholder="请输入最低利润率(%)" />
                 </el-form-item>
                 <el-form-item label="备注" prop="remark">
-                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                 </el-form-item>
             </el-form>
         </popup>

src/views/project_stakeholder/edit.vue

@@ -25,7 +25,11 @@
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="部门" prop="department">
-                            <el-input v-model="formData.department" clearable placeholder="请输入部门" />
+                            <!-- <el-input v-model="formData.department" clearable placeholder="请输入部门" /> -->
+                            <el-select v-model="formData.department" placeholder="请选择部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
                         </el-form-item> </el-col>
                     <el-col :span="8">
                         <el-form-item label="岗位" prop="station">
@@ -77,6 +81,7 @@
                             <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
                         </el-form-item> </el-col>
                 </el-row>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
             </el-form>
         </popup>
@@ -108,7 +113,6 @@ defineProps({
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const personnel = ref<any>()
 const mode = ref('add')
 
 const list1 = ref([])
@@ -239,6 +243,28 @@ const open = (type = 'add') => {
 const handleClose = () => {
     emit('close')
 }
+import { deptLists } from "@/api/org/department"
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    let res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
 
 getlist1()
 defineExpose({

src/views/project_survey_signature/edit.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="单据编号" prop="num">
                     <el-input v-model="formData.num" clearable placeholder="系统自动生成" disabled />
@@ -34,7 +33,7 @@
                     <el-input v-model="formData.people" clearable placeholder="点击选择" @click="userclick('people')" />
                 </el-form-item>
                 <el-form-item label="登记人" prop="djr">
-                    <el-input v-model="formData.djr" clearable placeholder="请输入登记人" />
+                    <el-input v-model="formData.djr_name" @click="userclick('djr')" clearable placeholder="请输入登记人" />
                 </el-form-item>
                 <el-form-item label="登记日期" prop="apptime">
                     <el-date-picker class="flex-1 !flex" v-model="formData.apptime" clearable type="date"
@@ -118,6 +117,7 @@ const formData = reactive({
     riqi: '',
     people: '',
     djr: '',
+    djr_name: '',
     apptime: '',
     projectInfo: {},
     content: '',
@@ -126,6 +126,10 @@ const formData = reactive({
     annex: [],
 
 })
+
+
+
+
 const customEvent = (e: any) => {
     formData.project_id = e.id
     formData.project_name = e.project_name

src/views/project_travel_reimbursement/index.vue

@@ -30,7 +30,8 @@
             <div class="mt-4">
                 <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="出差申请单编号" prop="trip_reimbursement_code" width="140" />
+                    <el-table-column :render-header="pager.calcWidth" label="出差申请单编号" prop="trip_reimbursement_code"
+                        width="140" />
                     <el-table-column label="项目名称" prop="project_name" :render-header="pager.calcWidth" />
                     <el-table-column :render-header="pager.calcWidth" label="报销类型" prop="reimbursement_type"
                         show-overflow-tooltip />

src/views/quality_accident/edit.vue

@@ -65,7 +65,8 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="本企业人员" prop="not_our_company_user">
-                            <el-input v-model="formData.our_company_user" clearable placeholder="请输入本企业人员" />
+                            <el-input v-model="formData.our_company_user_name" @click="userclick('our_company_user')"
+                                clearable placeholder="请输入本企业人员" />
                         </el-form-item>
                     </el-col>
 
@@ -88,6 +89,7 @@
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
                 </el-dialog>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
             </el-form>
         </popup>
 
@@ -128,6 +130,24 @@ const customEvent = (e: any) => {
     showDialog.value = false;
 };
 
+
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 //获取所有组织
 const getlist = () => {
     getAll().then((res) => {
@@ -168,6 +188,7 @@ const formData = reactive({
     contractor_user: "",
     not_our_company_user: "",
     our_company_user: "",
+    our_company_user_name: "",
     content: "",
 })
 

src/views/quality_check/edit.vue

@@ -57,7 +57,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="检查人" prop="check_user">
-                            <el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
+                            <el-input v-model="formData.check_user_name" @click="userclick('check_user')" clearable
+                                placeholder="请输入检查人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -75,7 +76,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="责任人" prop="resp_user">
-                            <el-input v-model="formData.resp_user" clearable placeholder="请输入责任人" />
+                            <el-input v-model="formData.resp_user_name" @click="userclick('resp_user')" clearable
+                                placeholder="请输入责任人" />
                         </el-form-item>
                     </el-col>
 
@@ -97,12 +99,8 @@
                             <el-input v-model="formData.check_result" clearable placeholder="请输入检查结果" />
                         </el-form-item>
                     </el-col>
-
+                    <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
-
-
                 </el-row>
-
-
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
                 </el-dialog>
@@ -170,6 +168,21 @@ const getlist1 = (id: any) => {
     })
 }
 
+// <personnelselector ref="personnel" @confirm="submituser" type = "1" > </personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -184,11 +197,13 @@ const formData = reactive({
     project_id: '',
     check_date: '',
     check_user: '',
+    check_user_name: '',
     check_unit: '',
     check_item: '',
     check_result: '',
     modify_unit: '',
     resp_user: '',
+    resp_user_name: '',
     modify_term: '',
 
     check_nature: '',

src/views/quality_check_nature/edit.vue

@@ -34,11 +34,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="24">
+
-                        <el-form-item label="创建人" prop="user">
-                            <el-input v-model="formData.user" clearable placeholder="请输入创建人" />
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="说明" prop="illustrate">
                             <el-input v-model="formData.illustrate" type="textarea" clearable placeholder="请输入说明" />
@@ -51,13 +47,14 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-
+                    <el-col :span="24">
-
+                        <el-form-item label="创建人" prop="user">
+                            <el-input v-model="formData.user_name" @click="userclick('user')" clearable
+                                placeholder="请输入创建人" />
+                        </el-form-item>
+                    </el-col>
                 </el-row>
-
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
-
-
-
 
             </el-form>
         </popup>
@@ -100,6 +97,19 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
 
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 //获取所有组织
 const getlist = () => {
     getAll().then((res) => {
@@ -129,10 +139,10 @@ const popupTitle = computed(() => {
 const formData = reactive({
     id: '',
     user: "",
+    user_name: "",
     illustrate: "",
     date: '',
     name: "",
-
     dept_id: '',
     org_id: "",
 

src/views/quality_modify/edit.vue

@@ -57,7 +57,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="检查人" prop="check_user">
-                            <el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
+                            <el-input v-model="formData.check_user_name" @click="userclick('check_user')" clearable
+                                placeholder="请输入检查人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -75,12 +76,14 @@
 
                     <el-col :span="8">
                         <el-form-item label="责任人" prop="resp_user">
-                            <el-input v-model="formData.resp_user" clearable placeholder="请输入责任人" />
+                            <el-input v-model="formData.resp_user_name" @click="userclick('resp_user')" clearable
+                                placeholder="请输入责任人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="抄送人" prop="copy_user">
-                            <el-input v-model="formData.copy_user" clearable placeholder="请输入抄送人" />
+                            <el-input v-model="formData.copy_user_name" @click="userclick('copy_user')" clearable
+                                placeholder="请输入抄送人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -103,6 +106,7 @@
                     </el-col>
 
 
+                    <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
                 </el-row>
 
@@ -174,6 +178,22 @@ const getlist1 = (id: any) => {
     })
 }
 
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -188,13 +208,16 @@ const formData = reactive({
     project_id: '',
     check_date: '',
     check_user: '',
+    check_user_name: '',
     check_unit: '',
     check_item: '',
     check_result: '',
     modify_unit: '',
     resp_user: '',
+    resp_user_name: '',
     modify_term: '',
     copy_user: '',
+    copy_user_name: '',
     check_nature: '',
     quality_hazards: '',
 

src/views/quality_specification/edit.vue

@@ -38,7 +38,11 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="发布部门" prop="release_dept">
-                            <el-input v-model="formData.release_dept" clearable placeholder="请输入发布部门" />
+                            <!-- <el-input v-model="formData.release_dept" clearable placeholder="请输入发布部门" /> -->
+                            <el-select v-model="formData.release_dept" placeholder="请选择部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -79,6 +83,7 @@ const list2 = reactive([])
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
 const userInfo = userStore.userInfo
+import { deptLists } from "@/api/org/department"
 
 defineProps({
     dictData: {
@@ -111,6 +116,12 @@ const getlist1 = (id: any) => {
         list2.splice(0, list2.length, ...res)
     })
 }
+const deptList = ref([])
+const getDeptList = async () => {
+    let res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
 
 // 弹窗标题
 const popupTitle = computed(() => {

src/views/safety_accident/edit.vue

@@ -60,7 +60,8 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="承包商人员" prop="contractor_user">
-                            <el-input v-model="formData.contractor_user" clearable placeholder="请输入承包商人员" />
+                            <el-input v-model="formData.contractor_user_name" @click="userclick('contractor_user')"
+                                clearable placeholder="请输入承包商人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -69,8 +70,9 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="本企业人员" prop="not_our_company_user">
+                        <el-form-item label="本企业人员" prop="our_company_user_name">
-                            <el-input v-model="formData.our_company_user" clearable placeholder="请输入本企业人员" />
+                            <el-input v-model="formData.our_company_user_name" @click="userclick('our_company_user')"
+                                clearable placeholder="请输入本企业人员" />
                         </el-form-item>
                     </el-col>
 
@@ -101,6 +103,7 @@
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
                 </el-dialog>
 
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
             </el-form>
         </popup>
@@ -184,12 +187,25 @@ const formData = reactive({
     org_id: "",
     device_accident: "",
     contractor_user: "",
+    contractor_user_name: "",
     not_our_company_user: "",
     our_company_user: "",
+    our_company_user_name: "",
     content: "",
 })
 
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
 
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 // 表单验证
 const formRules = reactive<any>({
 

src/views/safety_check/edit.vue

@@ -53,7 +53,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="检查人" prop="check_user">
-                            <el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
+                            <el-input v-model="formData.check_user_name" @click="userclick('check_user')" clearable
+                                placeholder="请输入检查人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -61,10 +62,6 @@
                             <el-input v-model="formData.check_company" clearable placeholder="请输入检查单位" />
                         </el-form-item>
                     </el-col>
-
-
-
-
                     <el-col :span="8">
                         <el-form-item label="检查区域" prop="check_area">
                             <el-input v-model="formData.check_area" clearable placeholder="请输入检查区域" />
@@ -98,7 +95,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="责任人" prop="resp_user">
-                            <el-input v-model="formData.resp_user" clearable placeholder="请输入责任人" />
+                            <el-input v-model="formData.resp_user_name" @click="userclick('resp_user')" clearable
+                                placeholder="请输入责任人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -143,8 +141,7 @@
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
                 </el-dialog>
-
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
-
             </el-form>
         </popup>
 
@@ -204,7 +201,18 @@ const getlist1 = (id: any) => {
         list2.splice(0, list2.length, ...res)
     })
 }
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
 
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -220,12 +228,14 @@ const formData = reactive({
     check_name: '',
     check_date: '',
     check_user: '',
+    check_user_name: '',
     check_company: '',
     check_area: '',
     check_item: '',
     check_result: '',
     modify_company: '',
     resp_user: '',
+    resp_user_name: '',
     risk_level: '',
     safety_hazard: '',
     modify_term: '',

src/views/safety_hazard/edit.vue

@@ -38,17 +38,20 @@
 
                     <el-col :span="8">
                         <el-form-item label="施工单位负责人" prop="construction_company_user">
-                            <el-input v-model="formData.construction_company_user" clearable placeholder="请输入施工单位负责人" />
+                            <el-input v-model="formData.construction_company_user_name"
+                                @click="userclick('construction_company_user')" clearable placeholder="请输入施工单位负责人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="监理单位负责人" prop="supervision_company_user">
-                            <el-input v-model="formData.supervision_company_user" clearable placeholder="请输入监理单位负责人" />
+                            <el-input v-model="formData.supervision_company_user_name"
+                                @click="userclick('supervision_company_user')" clearable placeholder="请输入监理单位负责人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="建设单位负责人" prop="build_company_user">
-                            <el-input v-model="formData.build_company_user" clearable placeholder="请输入建设单位负责人" />
+                            <el-input v-model="formData.build_company_user_name" @click="userclick('build_company_user')"
+                                clearable placeholder="请输入建设单位负责人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -77,13 +80,17 @@
 
                     <el-col :span="8">
                         <el-form-item label="主责部门" prop="department">
-                            <el-input v-model="formData.department" clearable placeholder="请输入主责部门" />
+                            <el-select v-model="formData.department" placeholder="请选择部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8">
                         <el-form-item label="主要人员" prop="users">
-                            <el-input v-model="formData.users" clearable placeholder="请输入主要人员" />
+                            <el-input v-model="formData.users_name" @click="userclick('users')" clearable
+                                placeholder="请输入主要人员" />
                         </el-form-item>
                     </el-col>
 
@@ -117,13 +124,10 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
-
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
                 </el-dialog>
-
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
-
             </el-form>
         </popup>
 
@@ -147,6 +151,7 @@ const project_name = ref('')
 const project_code = ref('')
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
+import { deptLists } from "@/api/org/department"
 
 defineProps({
     dictData: {
@@ -196,25 +201,50 @@ const formData = reactive({
     id: '',
     file: [],
     remark: '',
-
     emergency_measure: '',
     manage_measure: '',
     technical_measure: '',
     users: '',
+    users_name: '',
     department: '',
     control_level: '',
     risk_level: '',
     accident: '',
     source: '',
     build_company_user: '',
+    build_company_user_name: '',
     supervision_company_user: '',
+    supervision_company_user_name: '',
     construction_company_user: '',
+    construction_company_user_name: '',
     fill_company: '',
     project_id: '',
     dept_id: '',
     org_id: '',
 
 })
+const deptList = ref([])
+const getDeptList = async () => {
+    let res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 
 
 // 表单验证

src/views/safety_modify/edit.vue

@@ -57,7 +57,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="检查人" prop="check_user">
-                            <el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
+                            <el-input v-model="formData.check_user_name" @click="userclick('check_user')" clearable
+                                placeholder="请输入检查人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -67,7 +68,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="整改人" prop="modify_user">
-                            <el-input v-model="formData.modify_user" clearable placeholder="请输入整改人" />
+                            <el-input v-model="formData.modify_user_name" @click="userclick('modify_user')" clearable
+                                placeholder="请输入整改人" />
                         </el-form-item>
                     </el-col>
 
@@ -80,7 +82,8 @@
 
                     <el-col :span="8">
                         <el-form-item label="责任人" prop="resp_user">
-                            <el-input v-model="formData.resp_user" clearable placeholder="请输入责任人" />
+                            <el-input v-model="formData.resp_user_name" @click="userclick('resp_user')" clearable
+                                placeholder="请输入责任人" />
                         </el-form-item>
                     </el-col>
 
@@ -137,12 +140,10 @@
                         </el-form-item>
                     </el-col> -->
                 </el-row>
-
-
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
                 </el-dialog>
-
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
             </el-form>
         </popup>
@@ -239,6 +240,22 @@ const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑安全整改表' : '新增安全整改表'
 })
 
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 // 表单数据
 const formData = reactive({
 
@@ -249,12 +266,15 @@ const formData = reactive({
     check_name: '',
     check_date: '',
     check_user: '',
+    check_user_name: '',
     check_company: '',
     check_item: '',
     check_result: '',
     modify_company: '',
     resp_user: '',
+    resp_user_name: '',
     modify_user: '',
+    modify_user_name: '',
     safety_hazard: '',
     modify_term: '',
     remark: '',

src/views/safety_product_month/edit.vue

@@ -38,7 +38,8 @@
 
                     <el-col :span="24">
                         <el-form-item label="负责人" prop="resp_user">
-                            <el-input v-model="formData.resp_user" clearable placeholder="请输入负责人" />
+                            <el-input v-model="formData.resp_user_name" @click="userclick('resp_user')" clearable
+                                placeholder="请输入负责人" />
                         </el-form-item>
                     </el-col>
 
@@ -80,6 +81,8 @@
                             <upload-annex :form-data="formData" value="file"></upload-annex>
                         </el-form-item>
                     </el-col>
+                    <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
                 </el-row>
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <porjectDialog @customEvent="customEvent"></porjectDialog>
@@ -153,6 +156,7 @@ const formData = reactive({
     project_id: "",
     month: "",
     resp_user: "",
+    resp_user_name: "",
     classify: "",
     hazard_num: "",
     data_statistics: "",
@@ -171,6 +175,19 @@ const formData = reactive({
 const formRules = reactive<any>({
 
 })
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 
 // 获取详情

src/views/safety_standard/edit.vue

@@ -41,7 +41,11 @@
 
                     <el-col :span="24">
                         <el-form-item label="发布部门" prop="publish_dep">
-                            <el-input v-model="formData.publish_dep" clearable placeholder="请输入发布部门" />
+                            <!-- <el-input v-model="formData.publish_dep" clearable placeholder="请输入发布部门" /> -->
+                            <el-select v-model="formData.publish_dep" placeholder="请选择部门" class="flex-1">
+                                <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -73,6 +77,7 @@ const list1 = reactive([])
 const list2 = reactive([])
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
+import { deptLists } from "@/api/org/department"
 
 defineProps({
     dictData: {
@@ -99,6 +104,13 @@ const deptrmt = (e: any) => {
     getlist1(e)
 
 }
+
+const deptList = ref([])
+const getDeptList = async () => {
+    let res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
 //获取所有部门
 const getlist1 = (id: any) => {
     deptAll({ 'org_id': id }).then((res) => {

src/views/supervision_device_entry/edit.vue

@@ -33,7 +33,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="共同参与人" prop="co_participant">
-                            <el-input v-model="formData.co_participant" clearable placeholder="请输入共同参与人" />
+                            <el-input v-model="formData.co_participant_name" @click="userclick('co_participant')" clearable
+                                placeholder="请输入共同参与人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -151,6 +152,7 @@
                 </el-dialog>
 
 
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
             </el-form>
 
@@ -200,6 +202,7 @@ const formData = reactive({
     company_name: "",
     enter_result: '',
     co_participant: '',
+    co_participant_name: '',
     remark: '',
     create_user: "",
     create_time: "",
@@ -207,6 +210,23 @@ const formData = reactive({
     entry_problem: []
 })
 
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 const tableConfig = reactive(
     {
         title: "问题",

src/views/supervision_inspection/edit.vue

@@ -61,7 +61,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="巡视人员" prop="inspection_user">
-                            <el-input v-model="formData.inspection_user" clearable placeholder="请输入巡视人员" />
+                            <el-input v-model="formData.inspection_user_name" @click="userclick('inspection_user')"
+                                clearable placeholder="请输入巡视人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -85,7 +86,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="关注人" prop="follow_user">
-                            <el-input v-model="formData.follow_user" clearable placeholder="请输入关注人" />
+                            <el-input v-model="formData.follow_user_name" @click="userclick('follow_user')" clearable
+                                placeholder="请输入关注人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -119,6 +121,7 @@
                     </el-dialog>
                 </div>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
             <formTable :formData="formData.inspection_result" :config="tableConfig"></formTable>
             <formTable :formData="formData.inspection_problem" :config="tableConfig1" :dictData="dictData"></formTable>
         </popup>
@@ -244,11 +247,13 @@ const formData = reactive({
     start_time: timeFormat('', 'yyyy-mm-dd hh:MM:ss'),
     end_time: '',
     inspection_user: '',
+    inspection_user_name: '',
     company_id: 0,
     company_name: '',
     inspection_content: '',
     create_time: "",
     follow_user: '',
+    follow_user_name: '',
     check_item_detail_ids: [],
     check_item_detail_name: '',
     annex: [],
@@ -256,6 +261,23 @@ const formData = reactive({
     inspection_result: [],
     inspection_problem: []
 })
+
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 const customEvent = (e) => {
     formData.project_id = e.id
     formData.project_name = e.project_name

src/views/supervision_material_entry/edit.vue

@@ -29,7 +29,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="共同参与人" prop="co_participant">
-                            <el-input v-model="formData.co_participant" clearable placeholder="请输入共同参与人" />
+                            <el-input v-model="formData.co_participant_name" @click="userclick('co_participant')" clearable
+                                placeholder="请输入共同参与人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -75,6 +76,7 @@
                     </dialogTable>
                 </el-dialog>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
             <formTable :formData="formData.entry_detail" :config="tableConfig"></formTable>
         </popup>
     </div>
@@ -119,6 +121,7 @@ const formData = reactive({
     code: '',
     enter_time: '',
     co_participant: '',
+    co_participant_name: '',
     enter_result: '',
     parallel_test: '',
     remark: '',
@@ -127,6 +130,23 @@ const formData = reactive({
     entry_detail: []
 })
 
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
+
 const tableConfig = reactive(
     {
         title: "材料信息",

src/views/supervision_material_parallel_testing/edit.vue

@@ -25,7 +25,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="送检人">
-                            <el-input v-model="formData.inspector" clearable placeholder="请输入见证人" />
+                            <el-input v-model="formData.inspector_name" @click="userclick('inspector')" clearable
+                                placeholder="请输入见证人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -41,6 +42,8 @@
                     </el-col>
                 </el-row>
                 <formTable :formData="formData.detail" :config="tableConfig"></formTable>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
                 <el-dialog v-model="showDialog2" title="选择来源单据" width="70%">
                     <dialogTable :config="supervision_material_entry" @customEvent="customEvent1"
                         :query="{ parallel_test: 1 }"></dialogTable>
@@ -84,6 +87,7 @@ const formData = reactive({
     "material_entry_id": 1,
     material_entry_name: "",
     "inspector": "",
+    "inspector_name": "",
     "inspection_date": "",
     "remark": "",
     "annex": [],
@@ -92,6 +96,22 @@ const formData = reactive({
     "detail": []
 })
 
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 const checkNum = (rule: any, value: any, callback: any, source) => {
     const regex = /\[(\d+)\]/; // 匹配方括号内的数字,也就是table的下标
     let index = 0

src/views/supervision_material_parallel_testing/index.vue

@@ -40,7 +40,7 @@
                     <el-table-column label="来源单据" prop="material_entry_code" show-overflow-tooltip />
                     <el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
                     <el-table-column label="检验编号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="送检人" prop="inspector" show-overflow-tooltip />
+                    <el-table-column label="送检人" prop="inspector_name" show-overflow-tooltip />
                     <el-table-column label="送检日期" prop="inspection_date" show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" align="center" fixed="right" width="200">

src/views/supervision_meeting_minutes/edit.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="项目名称" prop="project_name">
                     <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@@ -19,10 +18,11 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="主持人">
-                    <el-input v-model="formData.emcee" clearable placeholder="请输入主持人" />
+                    <el-input v-model="formData.emcee_name" @click="userclick('emcee')" clearable placeholder="请输入主持人" />
                 </el-form-item>
                 <el-form-item label="记录人">
-                    <el-input v-model="formData.recorder" clearable placeholder="请输入记录人" />
+                    <el-input v-model="formData.recorder_name" @click="userclick('recorder')" clearable
+                        placeholder="请输入记录人" />
                 </el-form-item>
                 <el-form-item label="会议地点">
                     <el-input v-model="formData.location" clearable placeholder="请输入会议地点" />
@@ -34,12 +34,13 @@
                     <el-input v-model="formData.content" clearable placeholder="请输入会议内容" />
                 </el-form-item>
                 <createUserLable :formData="formData"></createUserLable>
-
                 <el-form-item label="附件" prop="annex">
                     <uploadAnnex :formData="formData"></uploadAnnex>
 
                 </el-form-item>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
                 <dialogTable @customEvent="customEvent" :config="supervision_project" />
 
@@ -81,7 +82,9 @@ const formData = reactive({
     type: '',
     time: '',
     emcee: '',
+    emcee_name: '',
     recorder: '',
+    recorder_name: '',
     location: '',
     attendees: '',
     content: '',
@@ -89,6 +92,20 @@ const formData = reactive({
     create_user: "",
     create_time: "",
 })
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 const handleAvatarSuccess_four = (response: any) => {
     Array.isArray(formData.annex) ? '' : formData.annex = []
     // @ts-ignore

src/views/supervision_meeting_minutes/index.vue

@@ -42,8 +42,8 @@
                     <el-table-column :render-header="pager.calcWidth" label="会议主题" prop="theme" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="会议类型" prop="type" show-overflow-tooltip />
                     <el-table-column label="会议时间" prop="time" show-overflow-tooltip />
-                    <el-table-column label="主持人" prop="emcee" show-overflow-tooltip />
+                    <el-table-column label="主持人" prop="emcee_name" show-overflow-tooltip />
-                    <el-table-column label="记录人" prop="recorder" show-overflow-tooltip />
+                    <el-table-column label="记录人" prop="recorder_name" show-overflow-tooltip />
                     <el-table-column label="会议地点" prop="location" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="与会人员" prop="attendees" show-overflow-tooltip />
                     <el-table-column label="会议内容" prop="content" show-overflow-tooltip />

src/views/supervision_notice/edit.vue

@@ -29,7 +29,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="通知人员" prop="notify_user">
-                            <el-input v-model="formData.notify_user" clearable placeholder="请输入通知人员" />
+                            <el-input v-model="formData.notify_user_name" @click="userclick('notify_user')" clearable
+                                placeholder="请输入通知人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -60,6 +61,8 @@
                 </div>
             </el-form>
             <formTable :formData="formData.problem" :config="tableConfig"></formTable>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
         </popup>
     </div>
 </template>
@@ -98,6 +101,7 @@ const formData = reactive({
     company_id: '',
     company_name: '',
     notify_user: '',
+    notify_user_name: '',
     issue_date: '',
     create_user: "",
     create_time: "",
@@ -108,6 +112,21 @@ const formData = reactive({
         "demand_description": ""
     }]
 })
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 const tableConfig = reactive(
     {

src/views/supervision_notice/index.vue

@@ -35,7 +35,7 @@
                     <el-table-column label="项目通知编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="要求回复日期" prop="reply_date" show-overflow-tooltip />
                     <el-table-column label="施工单位" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="通知人员" prop="notify_user" show-overflow-tooltip />
+                    <el-table-column label="通知人员" prop="notify_user_name" show-overflow-tooltip />
                     <el-table-column label="下达日期" prop="issue_date" show-overflow-tooltip />
                     <el-table-column label="操作" width="200px" fixed="right" align="center">
 

src/views/supervision_planning/edit.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
                 <el-form-item label="项目名称" prop="project_id">
                     <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@@ -14,7 +13,8 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="评审人员">
-                    <el-input v-model="formData.approval_user" clearable placeholder="请输入评审人员" />
+                    <el-input v-model="formData.approval_user_name" @click="userclick('approval_user')" clearable
+                        placeholder="请输入评审人员" />
                 </el-form-item>
                 <el-form-item label="方案名称" prop="scheme_name">
                     <el-input v-model="formData.scheme_name" clearable placeholder="请输入方案名称" />
@@ -35,6 +35,8 @@
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable @customEvent="customEvent" :config="supervision_project" />
                 </el-dialog>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
             </el-form>
         </popup>
     </div>
@@ -70,6 +72,7 @@ const formData = reactive({
     project_name: "",
     approval_type: '',
     approval_user: '',
+    approval_user_name: '',
     scheme_name: '',
     approval_content: '',
     remark: '',
@@ -125,6 +128,22 @@ const formRules = reactive<any>({
 })
 
 
+
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {

src/views/supervision_side_station/edit.vue

@@ -86,7 +86,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="旁站人员" prop="side_station_user">
-                            <el-input v-model="formData.side_station_user" clearable placeholder="请输入旁站人员" />
+                            <el-input v-model="formData.side_station_user_name" @click="userclick('side_station_user')"
+                                clearable placeholder="请输入旁站人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -125,6 +126,8 @@
                     </el-dialog>
                 </div>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
             <formTable :formData="formData.side_result" :config="tableConfig"></formTable>
             <formTable :formData="formData.side_problem" :config="tableConfig1" :dictData="dictData"></formTable>
         </popup>
@@ -179,6 +182,7 @@ const formData = reactive({
     situation: '',
     side_station_result: '',
     side_station_user: '',
+    side_station_user_name: '',
     check_item_detail_ids: [],
     annex: [],
     create_user: "",
@@ -198,6 +202,21 @@ const formData = reactive({
     side_problem: []
 })
 
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 
 const tableConfig = reactive(
     {

src/views/supervision_test_blocks_specimens/edit.vue

@@ -21,7 +21,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="见证人" prop="witness">
-                            <el-input v-model="formData.witness" clearable placeholder="请输入见证人" />
+                            <el-input v-model="formData.witness_name" @click="userclick('witness')" clearable
+                                placeholder="请输入见证人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -82,6 +83,8 @@
                 </el-dialog>
             </div>
             <formTable :formData="formData.problem" :config="tableConfig" :dictData="dictData"></formTable>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
         </popup>
     </div>
 </template>
@@ -121,6 +124,7 @@ const formData = reactive({
     test_type: '',
     code: '',
     witness: '',
+    witness_name: '',
     test_site: '',
     company_id: '',
     company_name: "",
@@ -134,6 +138,22 @@ const formData = reactive({
     problem: []
 })
 
+
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 const tableConfig = reactive(
     {
         title: "问题",

src/views/supervision_test_blocks_specimens/index.vue

@@ -64,7 +64,7 @@
                         show-overflow-tooltip />
                     <el-table-column label="试验类型" prop="test_type" show-overflow-tooltip />
                     <el-table-column :render-header="pager.calcWidth" label="编号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="见证人" prop="witness" show-overflow-tooltip />
+                    <el-table-column label="见证人" prop="witness_name" show-overflow-tooltip />
                     <el-table-column label="试验部位" prop="test_site" show-overflow-tooltip />
                     <el-table-column label="单位名称" prop="company_name" show-overflow-tooltip />
                     <el-table-column label="开始日期" prop="start_date" show-overflow-tooltip />

src/views/supervision_witness_sampling/edit.vue

@@ -29,12 +29,14 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="见证人" prop="witness">
-                            <el-input v-model="formData.witness" clearable placeholder="请输入见证人" />
+                            <el-input v-model="formData.witness_name" @click="userclick('witness')" clearable
+                                placeholder="请输入见证人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="取样人" prop="sampler">
-                            <el-input v-model="formData.sampler" clearable placeholder="请输入取样人" />
+                            <el-input v-model="formData.sampler_name" @click="userclick('sampler')" clearable
+                                placeholder="请输入取样人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -56,6 +58,7 @@
 
                 </el-dialog>
             </el-form>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
 
         </popup>
     </div>
@@ -102,13 +105,32 @@ const formData = reactive({
     code: '',
     sampling_date: '',
     witness: '',
+    witness_name: '',
     sampler: '',
+    sampler_name: '',
     annex: '',
     create_user: "",
     create_time: "",
     sampling_detail: []
 })
 
+
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
+
 const checkNum = (rule: any, value: any, callback: any, source) => {
     const regex = /\[(\d+)\]/; // 匹配方括号内的数字,也就是table的下标
     let index = 0

src/views/supervision_work_contact/edit.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
-            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
@@ -17,7 +16,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="发起人" prop="initiator">
-                            <el-input v-model="formData.initiator" clearable placeholder="请输入发起人" />
+                            <el-input v-model="formData.initiator_name" @click="userclick('initiator')" clearable
+                                placeholder="请输入发起人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="抄送人员" prop="copy_user">
-                            <el-input v-model="formData.copy_user" clearable placeholder="请输入抄送人员" />
+                            <el-input v-model="formData.copy_user_name" @click="userclick('copy_user')" clearable
+                                placeholder="请输入抄送人员" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -49,6 +50,8 @@
                 </el-dialog>
             </el-form>
             <formTable :formData="formData.problem" :config="tableConfig"></formTable>
+            <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
         </popup>
     </div>
 </template>
@@ -84,9 +87,11 @@ const formData = reactive({
     project_name: '',
     code: '',
     initiator: '',
+    initiator_name: '',
     initiation_date: '',
     theme: '',
     copy_user: '',
+    copy_user_name: "",
     annex: '',
     problem: [{
         "problem_name": "",
@@ -94,6 +99,20 @@ const formData = reactive({
     }]
 })
 
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 const tableConfig = reactive(
     {
         title: "通知问题",

src/views/supervision_work_contact/index.vue

@@ -39,10 +39,10 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
                     <el-table-column label="联系编号" prop="code" show-overflow-tooltip />
-                    <el-table-column label="发起人" prop="initiator" show-overflow-tooltip />
+                    <el-table-column label="发起人" prop="initiator_name" show-overflow-tooltip />
                     <el-table-column label="发起日期" prop="initiation_date" show-overflow-tooltip />
                     <el-table-column label="主题" prop="theme" show-overflow-tooltip />
-                    <el-table-column label="抄送人员" prop="copy_user" show-overflow-tooltip />
+                    <el-table-column label="抄送人员" prop="copy_user_name" show-overflow-tooltip />
                     <el-table-column label="操作" align='center' fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['supervision_work.supervision_work_contact/edit']" type="primary" link

src/views/zjzx_invoice/edit.vue

@@ -108,7 +108,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="开票联系人">
-                            <el-input v-model="formData.apply_contact" clearable placeholder="请输入开票联系人" />
+                            <el-input v-model="formData.apply_contact_name" @click="userclick('apply_contact')" clearable
+                                placeholder="请输入开票联系人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -123,6 +124,7 @@
                     </el-col>
                     <createUserLable :formData="formData" flag></createUserLable>
                 </el-row>
+                <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
             </el-form>
             <el-dialog v-model="showDialog" title="选择项目" width="70%">
                 <dialogTable :config="cost_project" @customEvent="customEvent">
@@ -171,6 +173,7 @@ const formData = reactive({
     apply_company_bank: '',
     apply_company_account: '',
     apply_contact: '',
+    apply_contact_name: '',
     pay_type: '',
     invoice_content: '',
     create_user: '',
@@ -241,6 +244,21 @@ const setFormData = async (data: Record<any, any>) => {
 }
 
 
+// <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
+
+//打开弹窗
+const personnel = ref<any>()
+let val = ''
+const userclick = (vals) => {
+    val = vals
+    personnel.value.open()
+
+}
+//确认
+const submituser = (e: any) => {
+    formData[val] = e.id;
+    formData[val + '_name'] = e.name
+}
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()

test.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <div style="width: 100vw; height: 100vh; background-color: pink">
+      wotule1
+    </div>
+  </body>
+</html>