bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
bonus 2024-12-03 17:49:04 +08:00
parent f5da08f165 720e979d7e
commit e56dedc5ba
4 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/ma/base.js
View File

@ -106,4 +106,11 @@ export function getProjectList(query) {
}
//库管员维修员
export function getUserTypeList(query) {
return request({
url: '/system/user/list',
method: 'get',
params: query
})
}

2
src/views/material/lease/apply/component/addToolsApply.vue
View File

@ -141,7 +141,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="出库数量" prop="alNum" />
<!-- <el-table-column align="center" label="出库数量" prop="alNum" /> -->
<el-table-column
label="备注"
prop="remark"

74
src/views/material/ma/type/index.vue
View File

@ -322,7 +322,7 @@
<el-form-item label="总保有量" prop="name9">
<el-input
v-model="form.name9"
type="number"
type="number" :min="0"
placeholder="请输入总保有量"
maxlength="20"
:disabled="true"
@ -333,7 +333,7 @@
<el-form-item label="在库数量" prop="name8">
<el-input
v-model="form.name8"
type="number"
type="number" :min="0"
placeholder="请输入在库数量"
maxlength="20"
:disabled="true"
@ -344,7 +344,7 @@
<el-form-item label="在用数量" prop="name7">
<el-input
v-model="form.name7"
type="number"
type="number" :min="0"
placeholder="请输入在用数量"
maxlength="20"
:disabled="true"
@ -358,7 +358,7 @@
<el-form-item label="在修数量" prop="name6">
<el-input
v-model="form.name6"
type="number"
type="number" :min="0"
placeholder="请输入在修数量"
maxlength="20"
:disabled="true"
@ -369,7 +369,7 @@
<el-form-item label="待报废数量" prop="name5">
<el-input
v-model="form.name5"
type="number"
type="number" :min="0"
placeholder="请输入待报废数量"
maxlength="20"
:disabled="true"
@ -380,7 +380,7 @@
<el-form-item label="丢失数量" prop="name4">
<el-input
v-model="form.name4"
type="number"
type="number" :min="0"
placeholder="请输入丢失数量"
maxlength="20"
:disabled="true"
@ -400,7 +400,7 @@
v-model="form.name3"
placeholder="请输入"
maxlength="20"
type="number"
type="number" :min="0"
style="width: 170px"
/>
</el-form-item>
@ -411,7 +411,7 @@
v-model="form.name2"
placeholder="请输入"
maxlength="20"
type="number"
type="number" :min="0"
style="width: 170px"
/>
</el-form-item>
@ -426,7 +426,7 @@
v-model="form.name1"
placeholder="请输入"
maxlength="20"
type="number"
type="number" :min="0"
style="width: 160px"
/>
</el-form-item>
@ -440,7 +440,7 @@
<el-input
v-model="form.name10"
placeholder="请输入"
type="number"
type="number" :min="0"
maxlength="20"
style="width: 160px"
/>
@ -480,7 +480,7 @@
<el-form-item label="检验周期(月)" prop="testCycle">
<el-input
v-model="form.testCycle"
type="number"
type="number" :min="0"
placeholder="请输入"
maxlength="20"
style="width: 100%"
@ -491,7 +491,7 @@
<el-form-item label="抽检比例(%)" prop="name11">
<el-input
v-model="form.name11"
type="number"
type="number" :min="0"
placeholder="请输入"
maxlength="20"
style="width: 170px"
@ -533,7 +533,7 @@
<el-form-item label="持荷时间(分)" prop="holdingTime">
<el-input
v-model="form.holdingTime"
type="number"
type="number" :min="0"
placeholder="请输入"
maxlength="20"
style="width: 170px"
@ -551,7 +551,7 @@
style="width: 100%"
>
<el-option
v-for="keeper in keeperList"
v-for="keeper in KeeperOptions"
:key="keeper.userId"
:label="keeper.userName"
:value="keeper.userId"
@ -568,7 +568,7 @@
style="width: 100%"
>
<el-option
v-for="keeper in keeperList"
v-for="keeper in repairerOptions"
:key="keeper.userId"
:label="keeper.userName"
:value="keeper.userId"
@ -582,7 +582,7 @@
<template>
<el-button
v-if="this.title == '新增' || this.title == '修改'"
type="primary"
type="primary"
@click="submitForm"
>确 定</el-button
>
@ -632,9 +632,7 @@
<el-row style="text-align: right">
<el-form-item>
<el-button size="small" type="primary" @click="onSubmit"
>确 定</el-button
>
<el-button size="small" type="primary" style="color: #fff;" @click="onSubmit">确 定</el-button>
<el-button size="small" @click="onCancel">取 消</el-button>
</el-form-item>
</el-row>
@ -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;
}

1
src/views/material/ma/typeConfigKeeper/index.vue
View File

@ -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));