From 8f059b6cc8daf96433ac699543996c9e1260023c Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 30 十月 2026 09:58:04 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/externalperson/index.vue | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index af8db6b..043b51e 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+ <el-form
+ class="opo-query-form" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="璐﹀彿绫诲埆" prop="usertype">
<el-select v-model="queryParams.usertype" placeholder="璇烽�夋嫨璐﹀彿绫诲埆" clearable size="small">
@@ -55,6 +56,7 @@
</el-table-column>
<el-table-column label="璐﹀彿缂栧彿" align="center" prop="userno" />
<el-table-column label="璐﹀彿鍚嶇О" align="center" prop="username" />
+ <el-table-column label="缁╂晥绉戝" align="center" prop="deptName" width="140" />
<el-table-column label="韬唤璇佸彿" width="200" align="center" prop="idcardno" />
<el-table-column label="鑱岀О" align="center" prop="title">
<template slot-scope="scope">
@@ -116,6 +118,27 @@
dict.label
}}</el-radio>
</el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="hasUserType(form.usertype, 'performance')">
+ <el-col :span="12">
+ <el-form-item label="缁╂晥绉戝" prop="deptId">
+ <el-select
+ v-model="form.deptId"
+ placeholder="璇烽�夋嫨缁╂晥绉戝"
+ clearable
+ filterable
+ style="width: 100%"
+ @change="handleDeptChange"
+ >
+ <el-option
+ v-for="dept in deptList"
+ :key="dept.deptId"
+ :label="dept.deptName"
+ :value="dept.deptId"
+ />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -216,6 +239,7 @@
} from "@/api/project/organization";
import { getUserProfile } from "@/api/system/user";
+import { listDept } from "@/api/system/dept";
export default {
name: "Externalperson",
@@ -241,6 +265,8 @@
//鍖荤枟鏈烘瀯鍒楄〃
unitList: [],
+ // 缁╂晥绉戝鍒楄〃
+ deptList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -292,6 +318,20 @@
],
depositbank: [
{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "blur" }
+ ],
+ deptId: [
+ {
+ validator: (rule, value, callback) => {
+ if (
+ this.hasUserType(this.form.usertype, "performance") &&
+ (value === null || value === undefined || value === "")
+ ) {
+ return callback(new Error("璇烽�夋嫨缁╂晥绉戝"));
+ }
+ return callback();
+ },
+ trigger: "change"
+ }
]
},
};
@@ -305,6 +345,7 @@
created() {
this.getUserProfile();
this.getUnitList();
+ this.getDeptList();
// 榛樿涓嶆墦寮�
// this.getList();
},
@@ -380,7 +421,9 @@
updateBy: null,
updateTime: null,
pym: null,
- wbm: null
+ wbm: null,
+ deptId: null,
+ deptName: null
};
this.resetForm("form");
},
@@ -426,6 +469,9 @@
this.form = response.data;
//璐﹀彿绫诲埆涓哄鍊硷紙閫楀彿鍒嗛殧锛夛紝琛ㄥ崟鐢ㄦ暟缁勫洖鏄�
this.form.usertype = this.splitUserType(response.data.usertype);
+ if (this.form.deptId !== null && this.form.deptId !== undefined && this.form.deptId !== "") {
+ this.form.deptId = Number(this.form.deptId);
+ }
this.open = true;
this.title = "浜哄憳/鍗曚綅璐﹀彿淇℃伅淇敼";
});
@@ -439,6 +485,13 @@
if (res.organizationid == this.form.unitno)
this.form.unitname = res.organizationname;
});
+ //缁╂晥绉戝锛氭彁浜ゅ墠鎸� deptId 鍥炲～ deptName
+ if (this.form.deptId !== null && this.form.deptId !== undefined && this.form.deptId !== "") {
+ const dept = this.deptList.find(
+ item => String(item.deptId) === String(this.form.deptId)
+ );
+ this.form.deptName = dept ? dept.deptName : this.form.deptName;
+ }
//璐﹀彿绫诲埆涓哄鍊硷細鎻愪氦鍓嶈浆鍥為�楀彿鍒嗛殧鐨勫瓧绗︿覆
this.form.usertype = this.joinUserType(this.form.usertype);
console.log(this.form);
@@ -524,6 +577,23 @@
console.log(this.unitList);
}
});
+ },
+ /** 缁╂晥绉戝鍒楄〃 */
+ getDeptList() {
+ listDept({}).then(response => {
+ this.deptList = response.data || [];
+ });
+ },
+ /** 缁╂晥绉戝閫夋嫨鍙樺寲锛氬悓姝ュ悕绉� */
+ handleDeptChange(deptId) {
+ if (deptId === null || deptId === undefined || deptId === "") {
+ this.form.deptName = null;
+ return;
+ }
+ const dept = this.deptList.find(
+ item => String(item.deptId) === String(deptId)
+ );
+ this.form.deptName = dept ? dept.deptName : null;
}
}
};
--
Gitblit v1.9.3