From 720e979d7ed9e2fbb2e9444a39bde22bda0557f4 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 3 Dec 2024 17:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=89=A9=E8=B5=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ma/base.js | 9 +++
.../lease/apply/component/addToolsApply.vue | 2 +-
src/views/material/ma/type/index.vue | 74 ++++++++++++++-----
.../material/ma/typeConfigKeeper/index.vue | 1 +
4 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/src/api/ma/base.js b/src/api/ma/base.js
index b27a734f..2ef024e7 100644
--- a/src/api/ma/base.js
+++ b/src/api/ma/base.js
@@ -105,3 +105,12 @@ export function getProjectList(query) {
})
}
+
+//库管员维修员
+export function getUserTypeList(query) {
+ return request({
+ url: '/system/user/list',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index 900f9946..6ffec32e 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -141,7 +141,7 @@
-
+
@@ -411,7 +411,7 @@
v-model="form.name2"
placeholder="请输入"
maxlength="20"
- type="number"
+ type="number" :min="0"
style="width: 170px"
/>
@@ -426,7 +426,7 @@
v-model="form.name1"
placeholder="请输入"
maxlength="20"
- type="number"
+ type="number" :min="0"
style="width: 160px"
/>
@@ -440,7 +440,7 @@
@@ -480,7 +480,7 @@
确 定
@@ -632,9 +632,7 @@
- 确 定
+ 确 定
取 消
@@ -657,7 +655,10 @@ import {
delMaType,
addMaType,
updateMaType,
+ getUserTypeList
} from "@/api/ma/base";
+import { getKeeperIds} from "@/api/ma/typeConfigKeeper";
+import { getRepairIds } from "@/api/ma/typeConfigRepair";
import { imgUpLoad } from "@/api/system/upload";
export default {
@@ -680,6 +681,8 @@ export default {
// 库管员用户数据
keeperList: null,
keeperDataRange: [],
+ KeeperOptions: [],
+ repairerOptions: [],
//维修员用户数据
repairUserList: null,
//资产类型数据
@@ -793,9 +796,40 @@ export default {
},
created() {
this.getTreeData();
+ this.getKeeperData();
+ this.getRepairerData();
// this.getList()
},
methods: {
+ async getKeeperData() {
+ const itemName = "ku_guan_role_ids";
+ let roleIdsTemp = []
+ await getKeeperIds(itemName).then((response) => {
+ const roleIds = response.rows[response.rows.length - 1].itemValue
+ .split(",")
+ .map((item) => Number(item));
+ roleIdsTemp = roleIds;
+ });
+ await getUserTypeList({ roleIds: roleIdsTemp }).then((response) => {
+ this.KeeperOptions = response.rows;
+ });
+ },
+ async getRepairerData() {
+ const itemName = "wei_xiu_role_ids";
+ let roleIdsTemp = []
+ await getRepairIds(itemName).then((response) => {
+ const roleIds = response.rows[response.rows.length - 1].itemValue
+ .split(",")
+ .map((item) => Number(item));
+ roleIdsTemp = roleIds;
+ });
+ await getUserTypeList({ roleIds: roleIdsTemp }).then((response) => {
+ this.repairerOptions = response.rows;
+ });
+ },
+
+
+
/** 查询物资类型 */
async getKeeperDataList(data) {
let keepdataRes = await queryKeeperDataApi({
@@ -1270,7 +1304,7 @@ export default {
// 单位文字样式
span {
font-size: 14px;
- color: #606266;
+ // color: #606266;
margin-left: 8px;
}
diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue
index 670afa72..ff1d7043 100644
--- a/src/views/material/ma/typeConfigKeeper/index.vue
+++ b/src/views/material/ma/typeConfigKeeper/index.vue
@@ -440,6 +440,7 @@ export default {
async getTreeData() {
const itemName = "ku_guan_role_ids";
await getKeeperIds(itemName).then((response) => {
+ console.log(response)
const roleIds = response.rows[response.rows.length - 1].itemValue
.split(",")
.map((item) => Number(item));