From 5d75fcaea0a3774052b7484a4ffe755258502363 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 20:49:11 +0800
Subject: [PATCH] fix:开始执行人员就绪按钮
---
ruoyi-ui/src/views/system/user/index.vue | 157 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 1dbc2d1..ed3749d 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -9,7 +9,8 @@
<el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
</div>
<div class="head-container">
- <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+ <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id"
+ default-expand-all="false" highlight-current @node-click="handleNodeClick" />
</div>
</el-col>
</pane>
@@ -58,22 +59,23 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
- <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
- <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
+
+ <!-- OA鐢ㄦ埛ID鍒楀凡闅愯棌锛屽彧鍦ㄧ紪杈戣〃鍗曚腑鏄剧ず -->
+ <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[2].visible" width="150" />
+ <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[5].visible" width="120" />
+ <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[6].visible">
<template slot-scope="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" v-if="columns[7].visible" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>
@@ -82,6 +84,8 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">鍒嗛厤瑙掕壊</el-dropdown-item>
+ <!-- 鏂板锛氱鐞嗗垎鍏徃閰嶇疆鍏ュ彛 -->
+ <el-dropdown-item command="handleManageBranch" icon="el-icon-office-building" v-hasPermi="['system:user:edit']">绠＄悊鍒嗗叕鍙�</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -106,6 +110,23 @@
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
<treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="OA鐢ㄦ埛ID" prop="oaUserId">
+ <el-input v-model="form.oaUserId" placeholder="OA绯荤粺鐨勭敤鎴稩D" type="number" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鍙鐞嗗垎鍏徃">
+ <div>
+ <el-tag v-for="bc in userBranchCompanies" :key="bc.deptId" type="info" size="small" style="margin-right:6px;margin-bottom:6px">{{ bc.deptName }}</el-tag>
+ <span v-if="userBranchCompanies.length === 0" style="color:#999">鏆傛棤鍒嗗叕鍙�</span>
+ </div>
</el-form-item>
</el-col>
</el-row>
@@ -145,6 +166,16 @@
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鏌ョ湅鎵�鏈夊挩璇㈠崟">
+ <el-radio-group v-model="form.canViewAllConsult">
+ <el-radio label="0">鍚�</el-radio>
+ <el-radio label="1">鏄�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -197,6 +228,21 @@
<el-button @click="upload.open = false">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 鏂板锛氱敤鎴风鐞嗗垎鍏徃閰嶇疆瀵硅瘽妗� -->
+ <el-dialog title="閰嶇疆绠＄悊鍒嗗叕鍙�" :visible.sync="branchDialog.open" width="500px" append-to-body>
+ <el-form label-width="100px">
+ <el-form-item label="鍙鐞嗗垎鍏徃">
+ <div>
+ <el-tag v-for="bc in branchDialog.companies" :key="bc.deptId" type="info" size="small" style="margin-right:6px;margin-bottom:6px">{{ bc.deptName }}</el-tag>
+ <span v-if="branchDialog.companies.length === 0" style="color:#999">鏆傛棤鍒嗗叕鍙�</span>
+ </div>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="branchDialog.open = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -207,6 +253,8 @@
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { Splitpanes, Pane } from "splitpanes";
import "splitpanes/dist/splitpanes.css";
+import request from "@/utils/request";
+import { listDept, listBranchByUser } from "@/api/system/dept";
export default {
name: "User",
@@ -276,15 +324,16 @@
status: undefined,
deptId: undefined
},
- // 鍒椾俊鎭�
+ // 鍒椾俊鎭紙OA鐢ㄦ埛ID鍒楅粯璁ら殣钘忥級
columns: [
{ key: 0, label: `鐢ㄦ埛缂栧彿`, visible: true },
- { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
- { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
- { key: 3, label: `閮ㄩ棬`, visible: true },
- { key: 4, label: `鎵嬫満鍙风爜`, visible: true },
- { key: 5, label: `鐘舵�乣, visible: true },
- { key: 6, label: `鍒涘缓鏃堕棿`, visible: true }
+ { key: 1, label: `OA鐢ㄦ埛ID`, visible: false },
+ { key: 2, label: `鐢ㄦ埛鍚嶇О`, visible: true },
+ { key: 3, label: `鐢ㄦ埛鏄电О`, visible: true },
+ { key: 4, label: `閮ㄩ棬`, visible: true },
+ { key: 5, label: `鎵嬫満鍙风爜`, visible: true },
+ { key: 6, label: `鐘舵�乣, visible: true },
+ { key: 7, label: `鍒涘缓鏃堕棿`, visible: true }
],
// 琛ㄥ崟鏍￠獙
rules: {
@@ -298,7 +347,7 @@
password: [
{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
{ min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' },
- { pattern: /^[^<>"'|\\]+$/, message: "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\ |", trigger: "blur" }
+ { pattern: /^[^<>"'|\\]+$/, message: "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\\ |", trigger: "blur" }
],
email: [
{
@@ -314,7 +363,17 @@
trigger: "blur"
}
]
- }
+ },
+ // 鏂板锛氬垎鍏徃閰嶇疆瀵硅瘽妗嗘暟鎹�
+ branchDialog: {
+ open: false,
+ userId: null,
+ deptOptions: [],
+ selectedDeptIds: [],
+ companies: []
+ },
+ // 鍩轰簬 oa_order_class 璁＄畻鐨勫垎鍏徃鍒楄〃锛堝彧璇诲睍绀猴級
+ userBranchCompanies: []
};
},
watch: {
@@ -393,6 +452,8 @@
deptId: undefined,
userName: undefined,
nickName: undefined,
+ oaUserId: undefined,
+ oaOrderClass: undefined,
password: undefined,
phonenumber: undefined,
email: undefined,
@@ -400,7 +461,8 @@
status: "0",
remark: undefined,
postIds: [],
- roleIds: []
+ roleIds: [],
+ canViewAllConsult: "0"
};
this.resetForm("form");
},
@@ -432,6 +494,9 @@
case "handleAuthRole":
this.handleAuthRole(row);
break;
+ case "handleManageBranch":
+ this.handleManageBranch(row);
+ break;
default:
break;
}
@@ -460,8 +525,38 @@
this.open = true;
this.title = "淇敼鐢ㄦ埛";
this.form.password = "";
+ this.loadUserBranchCompanies();
});
},
+ // 鏍规嵁 form.oaOrderClass 璁＄畻鍒嗗叕鍙稿垪琛紙service/dispatch 缂栫爜鍖归厤锛�
+ loadUserBranchCompanies() {
+ this.userBranchCompanies = [];
+ const codesStr = this.form.oaOrderClass || '';
+ const codes = codesStr.split(',').map(s => s.trim()).filter(s => s);
+ if (codes.length === 0) {
+ return;
+ }
+ listDept({ parentId: 100 }).then(res => {
+ const all = res.data || [];
+ const codeSet = new Set(codes);
+ const list = [];
+ const seen = new Set();
+ all.forEach(d => {
+ const s = d.serviceOrderClass || '';
+ const dis = d.dispatchOrderClass || '';
+ if ((s && codeSet.has(s)) || (dis && codeSet.has(dis))) {
+ if (!seen.has(d.deptId)) {
+ seen.add(d.deptId);
+ list.push({ deptId: d.deptId, deptName: d.deptName });
+ }
+ }
+ });
+ this.userBranchCompanies = list;
+ }).catch(() => {
+ this.userBranchCompanies = [];
+ });
+ },
+
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
@@ -472,7 +567,7 @@
inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
inputValidator: (value) => {
if (/<|>|"|'|\||\\/.test(value)) {
- return "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\ |"
+ return "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\\ |"
}
},
}).then(({ value }) => {
@@ -486,6 +581,26 @@
const userId = row.userId;
this.$router.push("/system/user-auth/role/" + userId);
},
+ /** 绠＄悊鍒嗗叕鍙搁厤缃叆鍙� */
+ handleManageBranch(row) {
+ const userId = row.userId;
+ this.branchDialog.userId = userId;
+ // 鍔犺浇鍒嗗叕鍙稿垪琛紙OA鑷姩鎺у埗锛屽彧璇诲睍绀猴級
+ listBranchByUser(userId).then(res => {
+ const list = res.data || [];
+ this.branchDialog.companies = (list || []).map(d => ({ deptId: d.deptId, deptName: d.deptName }));
+ this.branchDialog.open = true;
+ }).catch(() => {
+ this.$modal.msgError('鍔犺浇鍒嗗叕鍙搁厤缃け璐�');
+ });
+ },
+ /** 淇濆瓨鍒嗗叕鍙搁厤缃� */
+ // 宸插彇娑堜繚瀛橈紝OA鑷姩鎺у埗锛堜粎鍙灞曠ず锛�
+ // submitBranchCompanies() {
+ // const userId = this.branchDialog.userId;
+ // const deptIds = this.branchDialog.selectedDeptIds || [];
+ // // 淇濈暀鍗犱綅锛岄伩鍏嶈璋冪敤
+ // },
/** 鎻愪氦鎸夐挳 */
submitForm: function() {
this.$refs["form"].validate(valid => {
@@ -550,4 +665,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.1