From ca545089ae7ad89184cdb78c0f5e176e3301a290 Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Fri, 15 Mar 2024 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=92=8C=E8=AD=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=80=E8=B5=B7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/duty/edit.vue  | 9 ++++++++-
 src/views/duty/index.vue | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/duty/edit.vue b/src/views/duty/edit.vue
index 9c8e483..9804ba1 100644
--- a/src/views/duty/edit.vue
+++ b/src/views/duty/edit.vue
@@ -61,7 +61,7 @@
                         <el-option
                             v-for="(item, index) in optionsData.policeList"
                             :key="index"
-                            :label="item.name"
+                            :label=showpoliceList(item.name,item.empNo)
                             :value="item.empNo"
                         />
                     </el-select>
@@ -229,6 +229,13 @@ const open = (type = 'add') => {
     popupRef.value?.open()
 }
 
+const showpoliceList = (name:string,empNo:string) => {
+    return name + empNo
+}
+
+
+
+
 const setFormData = async (data: Record<string, any>) => {
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
diff --git a/src/views/duty/index.vue b/src/views/duty/index.vue
index 4d16340..043c9f7 100644
--- a/src/views/duty/index.vue
+++ b/src/views/duty/index.vue
@@ -2,7 +2,7 @@
     <div class="index-lists">
         <el-card class="!border-none" shadow="never">
             <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
-                <el-form-item label="警号" prop="holidayName">
+                <el-form-item label="警号" prop="holidayName" style="width: 180px;">
                     <el-input class="w-[280px]" v-model="queryParams.empNo" />
                 </el-form-item>
                 <el-form-item label="机构名称" prop="holidayName">