From 7b9c91f9feb33f901aa09174fbbf119ee3ebcb24 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期一, 11 七月 2022 17:49:24 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/contingency/component/openEdit.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/contingencyManagement/contingency/component/openEdit.vue b/src/views/contingencyManagement/contingency/component/openEdit.vue
index 2ceb729..80df2a9 100644
--- a/src/views/contingencyManagement/contingency/component/openEdit.vue
+++ b/src/views/contingencyManagement/contingency/component/openEdit.vue
@@ -31,7 +31,7 @@
class="input-with-select"
>
<template #append>
- <el-button :icon="Search"/>
+ <el-button :icon="Search" @click="openUser"/>
</template>
</el-input>
</el-form-item>
@@ -89,10 +89,10 @@
ref="multipleTableRef"
:header-cell-style="{background:'#f6f7fa',color:'#909399'}"
>
- <el-table-column prop="jobNumber" label="人员工号" show-overflow-tooltip></el-table-column>
- <el-table-column prop="personnelName" label="人员名称" show-overflow-tooltip></el-table-column>
- <el-table-column prop="phone" label="手机号码" show-overflow-tooltip></el-table-column>
- <el-table-column prop="position" label="职位" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="jobNumber" label="人员工号" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="personnelName" label="人员名称" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="phone" label="手机号码" show-overflow-tooltip sortable></el-table-column>
+ <el-table-column prop="position" label="职位" show-overflow-tooltip sortable></el-table-column>
<el-table-column label="操作" width="200" align="center">
<template #default="scope">
<el-button size="small" type="primary" text="plain" >查看
@@ -116,9 +116,9 @@
</span>
</template>
</el-dialog>
+ <userSelections ref="userRef"/>
<AddEmergencyPersonnel ref="addRef" />
<EditEmergencyPersonnel ref="editRef" />
-
</div>
</template>
@@ -140,6 +140,7 @@
import {
Search
} from '@element-plus/icons-vue'
+import UserSelections from "/@/components/userSelections/index.vue"
import AddEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue";
import EditEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/editEmergencyPersonnel.vue";
// 定义表格数据类型
@@ -193,6 +194,7 @@
export default defineComponent({
name: 'openEdit',
components: {
+ UserSelections,
AddEmergencyPersonnel,
EditEmergencyPersonnel
},
@@ -392,6 +394,12 @@
],
})
+ // 打开用户选择弹窗
+ const userRef = ref();
+ const openUser = () => {
+ userRef.value.openDialog();
+ };
+
const ruleFormRef = ref<FormInstance>()
// 打开弹窗
const openDialog = (row: RuleFormRow) => {
@@ -435,6 +443,8 @@
ruleFormRef,
tableData,
multipleTableRef,
+ openUser,
+ userRef,
...toRefs(state),
};
},
--
Gitblit v1.9.2