站点配置
This commit is contained in:
parent
dec4a044b8
commit
ce21f53e0e
|
|
@ -4,6 +4,13 @@
|
||||||
<div class="section">
|
<div class="section">
|
||||||
<el-header>库管员配置</el-header>
|
<el-header>库管员配置</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
|
<el-button
|
||||||
|
type="success"
|
||||||
|
icon="el-icon-plus"
|
||||||
|
size="small"
|
||||||
|
@click="handleSaveKeeper"
|
||||||
|
>保存库管员配置</el-button
|
||||||
|
>
|
||||||
<el-checkbox-group v-model="selectedValues" class="checkbox-group">
|
<el-checkbox-group v-model="selectedValues" class="checkbox-group">
|
||||||
<el-checkbox
|
<el-checkbox
|
||||||
v-for="item in options"
|
v-for="item in options"
|
||||||
|
|
@ -16,18 +23,18 @@
|
||||||
{{ item.roleKey }}
|
{{ item.roleKey }}
|
||||||
</el-checkbox>
|
</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
<el-button
|
|
||||||
type="success"
|
|
||||||
icon="el-icon-plus"
|
|
||||||
size="mini"
|
|
||||||
@click="handleSaveKeeper"
|
|
||||||
>保存库管员配置</el-button
|
|
||||||
>
|
|
||||||
</el-main>
|
</el-main>
|
||||||
</div>
|
</div>
|
||||||
<div class="section">
|
<div class="section">
|
||||||
<el-header>维修员配置</el-header>
|
<el-header>维修员配置</el-header>
|
||||||
<el-main>
|
<el-main>
|
||||||
|
<el-button
|
||||||
|
type="success"
|
||||||
|
icon="el-icon-plus"
|
||||||
|
size="small"
|
||||||
|
@click="handleSaveRepair"
|
||||||
|
>保存维修员配置</el-button
|
||||||
|
>
|
||||||
<el-checkbox-group
|
<el-checkbox-group
|
||||||
v-model="selectedValuesRepair"
|
v-model="selectedValuesRepair"
|
||||||
class="checkbox-group"
|
class="checkbox-group"
|
||||||
|
|
@ -43,13 +50,6 @@
|
||||||
{{ item.roleKey }}
|
{{ item.roleKey }}
|
||||||
</el-checkbox>
|
</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
<el-button
|
|
||||||
type="success"
|
|
||||||
icon="el-icon-plus"
|
|
||||||
size="mini"
|
|
||||||
@click="handleSaveRepair"
|
|
||||||
>保存维修员配置</el-button
|
|
||||||
>
|
|
||||||
</el-main>
|
</el-main>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="head-container" style>
|
<div class="head-container" style>
|
||||||
<div class="grid-content bg-purple-dark" align="left">组织人员树</div>
|
<div class="grid-content bg-purple-dark" align="left">组织人员树</div>
|
||||||
<el-tree
|
<el-tree
|
||||||
style="height: 700px; overflow: scroll"
|
style="height: 700px; overflow: scroll"
|
||||||
:data="treeOptions"
|
:data="treeOptions"
|
||||||
|
|
@ -47,7 +47,7 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="head-container" style>
|
<div class="head-container" style>
|
||||||
<div class="grid-content bg-purple-dark" align="left">物资类型树</div>
|
<div class="grid-content bg-purple-dark" align="left">物资类型树</div>
|
||||||
<el-tree
|
<el-tree
|
||||||
style="height: 700px; overflow: scroll"
|
style="height: 700px; overflow: scroll"
|
||||||
:data="treeOptionsTwo"
|
:data="treeOptionsTwo"
|
||||||
|
|
@ -142,9 +142,9 @@
|
||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
row-key="typeId"
|
row-key="typeId"
|
||||||
default-expand-all
|
default-expand-all
|
||||||
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
@select="handlerSelect"
|
@select="handlerSelect"
|
||||||
@select-all="handlerSelectAll"
|
@select-all="handlerSelectAll"
|
||||||
>
|
>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
@ -167,30 +167,30 @@
|
||||||
align="center"
|
align="center"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="itemType"
|
prop="itemType"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="物资类型"
|
label="物资类型"
|
||||||
align="center"
|
align="center"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
width="100"
|
width="100"
|
||||||
prop="materialType"
|
prop="materialType"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="物资名称"
|
label="物资名称"
|
||||||
align="center"
|
align="center"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="materialName"
|
prop="materialName"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="规格型号"
|
label="规格型号"
|
||||||
align="center"
|
align="center"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="typeName"
|
prop="typeName"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="库管员"
|
label="库管员"
|
||||||
align="center"
|
align="center"
|
||||||
|
|
@ -222,13 +222,13 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total > 0"
|
||||||
:total="total"
|
:total="total"
|
||||||
:page.sync="queryParams.pageNum"
|
:page.sync="queryParams.pageNum"
|
||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -248,7 +248,7 @@ import {
|
||||||
import {
|
import {
|
||||||
bindKeeper,
|
bindKeeper,
|
||||||
noBindKeeper,
|
noBindKeeper,
|
||||||
getKeeperIds
|
getKeeperIds,
|
||||||
} from "@/api/ma/typeConfigKeeper";
|
} from "@/api/ma/typeConfigKeeper";
|
||||||
import { getUserList } from "@/api/basic/basic";
|
import { getUserList } from "@/api/basic/basic";
|
||||||
import { getInfo } from "@/api/login";
|
import { getInfo } from "@/api/login";
|
||||||
|
|
@ -270,9 +270,9 @@ export default {
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
// 总条数
|
// 总条数
|
||||||
total: 0,
|
total: 0,
|
||||||
totalTemp:0,
|
totalTemp: 0,
|
||||||
countTemp: 1,
|
countTemp: 1,
|
||||||
totalAll:0,
|
totalAll: 0,
|
||||||
// 库管员用户数据
|
// 库管员用户数据
|
||||||
keeperList: null,
|
keeperList: null,
|
||||||
keeperDataRange: [],
|
keeperDataRange: [],
|
||||||
|
|
@ -318,20 +318,20 @@ export default {
|
||||||
children: "children",
|
children: "children",
|
||||||
label: "label",
|
label: "label",
|
||||||
},
|
},
|
||||||
roleIdsTemp:[],
|
roleIdsTemp: [],
|
||||||
userList:[],
|
userList: [],
|
||||||
userNoList:[],
|
userNoList: [],
|
||||||
userIdTemp: -1,
|
userIdTemp: -1,
|
||||||
typeIdTemp: -1,
|
typeIdTemp: -1,
|
||||||
maxLength:100,//已选列表上限,防止数据过多请求报错
|
maxLength: 100, //已选列表上限,防止数据过多请求报错
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
typeName: "",
|
typeName: "",
|
||||||
level: 0,
|
level: 0,
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
displayBindRelationship:true,
|
displayBindRelationship: true,
|
||||||
houseId:"",
|
houseId: "",
|
||||||
// phonenumber: undefined,
|
// phonenumber: undefined,
|
||||||
// status: undefined,
|
// status: undefined,
|
||||||
// typeId: undefined
|
// typeId: undefined
|
||||||
|
|
@ -343,8 +343,8 @@ export default {
|
||||||
afterPrice: "",
|
afterPrice: "",
|
||||||
useDate: "",
|
useDate: "",
|
||||||
},
|
},
|
||||||
isAllSelect:false,
|
isAllSelect: false,
|
||||||
selectionRows:[],
|
selectionRows: [],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
// mounted(){
|
// mounted(){
|
||||||
|
|
@ -362,13 +362,12 @@ export default {
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
// this.getInfo()
|
// this.getInfo()
|
||||||
this.getTreeData();
|
this.getTreeData();
|
||||||
this.getTreeDataTwo();
|
this.getTreeDataTwo();
|
||||||
// this.getKeeperDataList();
|
// this.getKeeperDataList();
|
||||||
// setTimeout(()=>{
|
// setTimeout(()=>{
|
||||||
// this.getList();
|
// this.getList();
|
||||||
// },200)
|
// },200)
|
||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// getInfo() {
|
// getInfo() {
|
||||||
|
|
@ -377,22 +376,22 @@ export default {
|
||||||
// this.companyId = res.user.companyId
|
// this.companyId = res.user.companyId
|
||||||
// })
|
// })
|
||||||
// },
|
// },
|
||||||
selectFirstNode(){
|
selectFirstNode() {
|
||||||
const firstNode = this.$refs.treeTwo.getNode(1);
|
const firstNode = this.$refs.treeTwo.getNode(1);
|
||||||
if(firstNode){
|
if (firstNode) {
|
||||||
this.queryParams.typeId = firstNode.id
|
this.queryParams.typeId = firstNode.id;
|
||||||
this.queryParams.level = 0
|
this.queryParams.level = 0;
|
||||||
this.queryParams.houseId = firstNode.id
|
this.queryParams.houseId = firstNode.id;
|
||||||
this.$refs.treeTwo.setChecked(firstNode,true);
|
this.$refs.treeTwo.setChecked(firstNode, true);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
renderConent(h, { node }) {
|
renderConent(h, { node }) {
|
||||||
let iconClass = '';
|
let iconClass = "";
|
||||||
// 根据 node 的类型判断图标
|
// 根据 node 的类型判断图标
|
||||||
if (node.data.level == 99) {
|
if (node.data.level == 99) {
|
||||||
iconClass = 'el-icon-user-solid';
|
iconClass = "el-icon-user-solid";
|
||||||
}
|
}
|
||||||
// else if (node.type === 'file') {
|
// else if (node.type === 'file') {
|
||||||
// iconClass = 'el-icon-document';
|
// iconClass = 'el-icon-document';
|
||||||
// }
|
// }
|
||||||
|
|
@ -402,10 +401,8 @@ export default {
|
||||||
<i class={iconClass}></i> {node.label}
|
<i class={iconClass}></i> {node.label}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
/** 查询物资类型 */
|
/** 查询物资类型 */
|
||||||
async getKeeperDataList(data) {
|
async getKeeperDataList(data) {
|
||||||
let keepdataRes = await queryKeeperDataApi({
|
let keepdataRes = await queryKeeperDataApi({
|
||||||
|
|
@ -444,40 +441,44 @@ export default {
|
||||||
this.form.keeperDataPro = this.keeperProRange.value;
|
this.form.keeperDataPro = this.keeperProRange.value;
|
||||||
},
|
},
|
||||||
/** 查询新增页面-上级类型下拉树结构 */
|
/** 查询新增页面-上级类型下拉树结构 */
|
||||||
async getTreeData() {;
|
async getTreeData() {
|
||||||
const itemName = 'ku_guan_role_ids'
|
const itemName = "ku_guan_role_ids";
|
||||||
await getKeeperIds(itemName).then((response) =>{
|
await getKeeperIds(itemName).then((response) => {
|
||||||
const roleIds = response.rows[0].itemValue.split(',').map(item => Number(item))
|
const roleIds = response.rows[0].itemValue
|
||||||
this.roleIdsTemp = roleIds
|
.split(",")
|
||||||
})
|
.map((item) => Number(item));
|
||||||
await getUserList({ roleIds: this.roleIdsTemp}).then(response => {
|
this.roleIdsTemp = roleIds;
|
||||||
this.treeOptions = response.data
|
});
|
||||||
|
await getUserList({ roleIds: this.roleIdsTemp }).then((response) => {
|
||||||
|
this.treeOptions = response.data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 查询新增页面-上级类型下拉树结构 */
|
/** 查询新增页面-上级类型下拉树结构 */
|
||||||
async getTreeDataTwo() {
|
async getTreeDataTwo() {
|
||||||
getMaTypeList().then((response) => {
|
getMaTypeList().then((response) => {
|
||||||
this.treeOptionsTwo = response.data
|
this.treeOptionsTwo = response.data;
|
||||||
if(this.treeOptionsTwo.length>0 && this.treeOptionsTwo[0].children.length>0){
|
if (
|
||||||
const firstNode = this.treeOptionsTwo[0].children[0];
|
this.treeOptionsTwo.length > 0 &&
|
||||||
this.queryParams.typeId = firstNode.id
|
this.treeOptionsTwo[0].children.length > 0
|
||||||
this.queryParams.level = 1
|
) {
|
||||||
this.queryParams.houseId = firstNode.houseId
|
const firstNode = this.treeOptionsTwo[0].children[0];
|
||||||
this.getList();
|
this.queryParams.typeId = firstNode.id;
|
||||||
}
|
this.queryParams.level = 1;
|
||||||
})
|
this.queryParams.houseId = firstNode.houseId;
|
||||||
|
this.getList();
|
||||||
|
}
|
||||||
|
});
|
||||||
},
|
},
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
async getList() {
|
async getList() {
|
||||||
this.loading = true
|
this.loading = true;
|
||||||
this.queryParams.displayBindRelationship="true";
|
this.queryParams.displayBindRelationship = "true";
|
||||||
console.log('queryParams1',this.queryParams)
|
console.log("queryParams1", this.queryParams);
|
||||||
await getListByMaType(this.queryParams).then((response) => {
|
await getListByMaType(this.queryParams).then((response) => {
|
||||||
this.typeList = response.data.rows
|
this.typeList = response.data.rows;
|
||||||
this.total = response.data.total
|
this.total = response.data.total;
|
||||||
this.loading = false
|
this.loading = false;
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
// 筛选节点 - 左侧树
|
// 筛选节点 - 左侧树
|
||||||
filterNode(value, data) {
|
filterNode(value, data) {
|
||||||
|
|
@ -493,22 +494,22 @@ export default {
|
||||||
},
|
},
|
||||||
// 筛选节点 - 左侧树
|
// 筛选节点 - 左侧树
|
||||||
filterNodeTwo(value, data) {
|
filterNodeTwo(value, data) {
|
||||||
if (!value) return true
|
if (!value) return true;
|
||||||
return data.label.indexOf(value) !== -1
|
return data.label.indexOf(value) !== -1;
|
||||||
},
|
},
|
||||||
// 节点单击事件 - 左侧树
|
// 节点单击事件 - 左侧树
|
||||||
async handleNodeClickTwo(data,node) {
|
async handleNodeClickTwo(data, node) {
|
||||||
if(data.level==0){
|
if (data.level == 0) {
|
||||||
this.queryParams.typeId = data.id
|
this.queryParams.typeId = data.id;
|
||||||
this.queryParams.level = data.level
|
this.queryParams.level = data.level;
|
||||||
this.queryParams.houseId = data.id
|
this.queryParams.houseId = data.id;
|
||||||
}else{
|
} else {
|
||||||
this.queryParams.typeId = data.id
|
this.queryParams.typeId = data.id;
|
||||||
this.queryParams.level = data.level
|
this.queryParams.level = data.level;
|
||||||
this.queryParams.houseId = data.houseId
|
this.queryParams.houseId = data.houseId;
|
||||||
}
|
}
|
||||||
this.handleQuery()
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
|
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
|
|
@ -545,108 +546,131 @@ export default {
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
// 多选框选中数据
|
// 多选框选中数据
|
||||||
handleSelectionChange(selection) {
|
handleSelectionChange(selection) {
|
||||||
this.userList=[];
|
this.userList = [];
|
||||||
this.userNoList=[];
|
this.userNoList = [];
|
||||||
this.selectionRows = selection,
|
(this.selectionRows = selection),
|
||||||
this.ids = selection.map((item) =>item.typeId);
|
(this.ids = selection.map((item) => item.typeId));
|
||||||
|
|
||||||
selection.forEach(item=>{
|
selection.forEach((item) => {
|
||||||
this.userList.push({'typeId':item.typeId,'userId':this.userIdTemp})
|
this.userList.push({ typeId: item.typeId, userId: this.userIdTemp });
|
||||||
})
|
});
|
||||||
selection.forEach(item=>{
|
selection.forEach((item) => {
|
||||||
if(item.keeperUserId!=null){
|
if (item.keeperUserId != null) {
|
||||||
this.userNoList.push({'typeId':item.typeId,'userId':item.keeperUserId})
|
this.userNoList.push({
|
||||||
|
typeId: item.typeId,
|
||||||
|
userId: item.keeperUserId,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
});
|
||||||
})
|
|
||||||
this.single = selection.length != 1;
|
this.single = selection.length != 1;
|
||||||
this.multiple = !selection.length;
|
this.multiple = !selection.length;
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
//单选操作-跨页
|
//单选操作-跨页
|
||||||
handlerSelect(val, row) {
|
handlerSelect(val, row) {
|
||||||
const index = this.userList.findIndex(item=>item.typeId===row.typeId);
|
const index = this.userList.findIndex(
|
||||||
if(this.ids.indexOf(row.typeId) === -1){
|
(item) => item.typeId === row.typeId
|
||||||
this.userList.push({'typeId':row.typeId,'userId':this.userIdTemp})
|
);
|
||||||
}else if(index!== -1){
|
if (this.ids.indexOf(row.typeId) === -1) {
|
||||||
this.userList.splice(index,1);
|
this.userList.push({ typeId: row.typeId, userId: this.userIdTemp });
|
||||||
}
|
} else if (index !== -1) {
|
||||||
const indexNo = this.userNoList.findIndex(item=>item.typeId===row.typeId);
|
this.userList.splice(index, 1);
|
||||||
if(this.ids.indexOf(row.typeId) === -1){
|
}
|
||||||
this.userNoList.push({'typeId':row.typeId,'userId':row.keeperUserId})
|
const indexNo = this.userNoList.findIndex(
|
||||||
}else if(indexNo!== -1){
|
(item) => item.typeId === row.typeId
|
||||||
this.userNoList.splice(indexNo,1);
|
);
|
||||||
}
|
if (this.ids.indexOf(row.typeId) === -1) {
|
||||||
},
|
this.userNoList.push({ typeId: row.typeId, userId: row.keeperUserId });
|
||||||
|
} else if (indexNo !== -1) {
|
||||||
|
this.userNoList.splice(indexNo, 1);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
//全选操作-跨页
|
//全选操作-跨页
|
||||||
handlerSelectAll(val) {
|
handlerSelectAll(val) {
|
||||||
if (val.length) {
|
if (val.length) {
|
||||||
// 进来此处说明:
|
// 进来此处说明:
|
||||||
// 1 当前页的全选 2 其他页有数据然后当前页的取消全选
|
// 1 当前页的全选 2 其他页有数据然后当前页的取消全选
|
||||||
// 比较全选或者取消全选与当前页的数据,得到差集
|
// 比较全选或者取消全选与当前页的数据,得到差集
|
||||||
// 如果tableData中的数据在val中不存在,则说明是取消全选,需要从currentSelection中移除
|
// 如果tableData中的数据在val中不存在,则说明是取消全选,需要从currentSelection中移除
|
||||||
// 如果tableData中所有的数据都在val中存在,则说明是全选,需要将差集添加到currentSelection中
|
// 如果tableData中所有的数据都在val中存在,则说明是全选,需要将差集添加到currentSelection中
|
||||||
const isAllSelect = this.tableData.every(item =>
|
const isAllSelect = this.tableData.every((item) =>
|
||||||
val.some(valItem => valItem.typeId === item.typeId)
|
val.some((valItem) => valItem.typeId === item.typeId)
|
||||||
)
|
);
|
||||||
if (isAllSelect) {
|
if (isAllSelect) {
|
||||||
// 全选中新增的差集
|
// 全选中新增的差集
|
||||||
const diff = val.filter(
|
const diff = val.filter(
|
||||||
item => !this.userList.some(user => user.typeId === item.typeId)
|
(item) => !this.userList.some((user) => user.typeId === item.typeId)
|
||||||
)
|
);
|
||||||
if (this.userList.length + diff.length > this.maxLength) {
|
if (this.userList.length + diff.length > this.maxLength) {
|
||||||
const spaceLeft = this.maxLength - this.userList.length
|
const spaceLeft = this.maxLength - this.userList.length;
|
||||||
const toAdd = diff.slice(0,spaceLeft)
|
const toAdd = diff.slice(0, spaceLeft);
|
||||||
this.userList = this.userList.concat(toAdd.map(item =>({
|
this.userList = this.userList.concat(
|
||||||
typeId:item.typeId,
|
toAdd.map((item) => ({
|
||||||
userId:this.userIdTemp
|
typeId: item.typeId,
|
||||||
})));
|
userId: this.userIdTemp,
|
||||||
diff.slice(spaceLeft).forEach(item => this.$refs.multipleTable.toggleRowSelection(item, false))
|
}))
|
||||||
} else {
|
);
|
||||||
this.userList = this.userList.concat(diff.map(item=>({
|
diff
|
||||||
typeId:item.typeId,
|
.slice(spaceLeft)
|
||||||
userId:this.userIdTemp
|
.forEach((item) =>
|
||||||
})))
|
this.$refs.multipleTable.toggleRowSelection(item, false)
|
||||||
}
|
);
|
||||||
|
|
||||||
// 全选中新增的差集
|
|
||||||
const diffNo = val.filter(
|
|
||||||
item => !this.userNoList.some(user => user.typeId === item.typeId)
|
|
||||||
)
|
|
||||||
if (this.userNoList.length + diff.length > this.maxLength) {
|
|
||||||
const spaceLeft = this.maxLength - this.userNoList.length
|
|
||||||
const toAdd = diff.slice(0,spaceLeft)
|
|
||||||
this.userNoList = this.userNoList.concat(toAdd.map(item =>({
|
|
||||||
typeId:item.typeId,
|
|
||||||
userId:item.userId
|
|
||||||
})));
|
|
||||||
diff.slice(spaceLeft).forEach(item => this.$refs.multipleTable.toggleRowSelection(item, false))
|
|
||||||
} else {
|
|
||||||
this.userNoList = this.userNoList.concat(diff.map(item=>({
|
|
||||||
typeId:item.typeId,
|
|
||||||
userId:item.userId
|
|
||||||
})))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.userList = this.userList.filter(
|
|
||||||
user => !this.tableData.some(item => item.typeId === user.typeId)
|
|
||||||
)
|
|
||||||
this.userNoList = this.userNoList.filter(
|
|
||||||
user => !this.tableData.some(item => item.typeId === user.typeId)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// 进来此处说明:
|
this.userList = this.userList.concat(
|
||||||
// 其他页并无勾选数据,且当前页取消勾选
|
diff.map((item) => ({
|
||||||
this.userList = []
|
typeId: item.typeId,
|
||||||
this.userNoList = []
|
userId: this.userIdTemp,
|
||||||
|
}))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
},
|
|
||||||
|
// 全选中新增的差集
|
||||||
|
const diffNo = val.filter(
|
||||||
|
(item) =>
|
||||||
|
!this.userNoList.some((user) => user.typeId === item.typeId)
|
||||||
|
);
|
||||||
|
if (this.userNoList.length + diff.length > this.maxLength) {
|
||||||
|
const spaceLeft = this.maxLength - this.userNoList.length;
|
||||||
|
const toAdd = diff.slice(0, spaceLeft);
|
||||||
|
this.userNoList = this.userNoList.concat(
|
||||||
|
toAdd.map((item) => ({
|
||||||
|
typeId: item.typeId,
|
||||||
|
userId: item.userId,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
diff
|
||||||
|
.slice(spaceLeft)
|
||||||
|
.forEach((item) =>
|
||||||
|
this.$refs.multipleTable.toggleRowSelection(item, false)
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
this.userNoList = this.userNoList.concat(
|
||||||
|
diff.map((item) => ({
|
||||||
|
typeId: item.typeId,
|
||||||
|
userId: item.userId,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.userList = this.userList.filter(
|
||||||
|
(user) =>
|
||||||
|
!this.tableData.some((item) => item.typeId === user.typeId)
|
||||||
|
);
|
||||||
|
this.userNoList = this.userNoList.filter(
|
||||||
|
(user) =>
|
||||||
|
!this.tableData.some((item) => item.typeId === user.typeId)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 进来此处说明:
|
||||||
|
// 其他页并无勾选数据,且当前页取消勾选
|
||||||
|
this.userList = [];
|
||||||
|
this.userNoList = [];
|
||||||
|
}
|
||||||
|
},
|
||||||
// handleSelect(selection, row) {
|
// handleSelect(selection, row) {
|
||||||
// this.toggleSelection(selection, row);
|
// this.toggleSelection(selection, row);
|
||||||
// },
|
// },
|
||||||
|
|
@ -654,57 +678,55 @@ export default {
|
||||||
// this.isAllSelect = !this.isAllSelect;
|
// this.isAllSelect = !this.isAllSelect;
|
||||||
// let data = this.typeList;
|
// let data = this.typeList;
|
||||||
// this.toggleSelect(data,this.isAllSelect,'all');
|
// this.toggleSelect(data,this.isAllSelect,'all');
|
||||||
|
|
||||||
// },
|
// },
|
||||||
|
|
||||||
// //选择某行
|
// //选择某行
|
||||||
// selectTr(selection,row){
|
// selectTr(selection,row){
|
||||||
// this.$set(row,'isChecked',!row.isChecked);
|
// this.$set(row,'isChecked',!row.isChecked);
|
||||||
// this.$nextTick(()=>{
|
// this.$nextTick(()=>{
|
||||||
// this.isAllSelect = row.isChecked;
|
// this.isAllSelect = row.isChecked;
|
||||||
// this.toggleSelect(row,row.isChecked,'tr');
|
// this.toggleSelect(row,row.isChecked,'tr');
|
||||||
// });
|
// });
|
||||||
// },
|
// },
|
||||||
|
|
||||||
// //递归子级
|
// //递归子级
|
||||||
// toggleSelect(data,flag,type){
|
// toggleSelect(data,flag,type){
|
||||||
// if(type === 'all'){
|
// if(type === 'all'){
|
||||||
// if(data.length > 0){
|
// if(data.length > 0){
|
||||||
// data.forEach(item=>{
|
// data.forEach(item=>{
|
||||||
// this.toggleSelection(item, flag);
|
// this.toggleSelection(item, flag);
|
||||||
// if(item.children && item.children.length > 0){
|
// if(item.children && item.children.length > 0){
|
||||||
// this.toggleSelect(item.children,flag,type)
|
// this.toggleSelect(item.children,flag,type)
|
||||||
// }
|
// }
|
||||||
// })
|
// })
|
||||||
// }
|
// }
|
||||||
// }else {
|
// }else {
|
||||||
// if(data.children && data.children.length > 0){
|
// if(data.children && data.children.length > 0){
|
||||||
// data.children.forEach(item =>{
|
// data.children.forEach(item =>{
|
||||||
// item.isChecked = !item.isChecked;
|
// item.isChecked = !item.isChecked;
|
||||||
// this.$refs.multipleTable.toggleRowSelection(item, flag);
|
// this.$refs.multipleTable.toggleRowSelection(item, flag);
|
||||||
// this.toggleSelect(item,flag,type);
|
// this.toggleSelect(item,flag,type);
|
||||||
// })
|
// })
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
// },
|
// },
|
||||||
|
|
||||||
|
|
||||||
// //改变选中
|
|
||||||
// toggleSelection(row, flag) {
|
|
||||||
// this.$set(row,'isChecked',flag);
|
|
||||||
// this.$nextTick(()=>{
|
|
||||||
// if (flag) {
|
|
||||||
// this.$refs.multipleTable.toggleRowSelection(row, flag);
|
|
||||||
// } else {
|
|
||||||
// this.$refs.multipleTable.clearSelection();
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// },
|
|
||||||
|
|
||||||
|
// //改变选中
|
||||||
|
// toggleSelection(row, flag) {
|
||||||
|
// this.$set(row,'isChecked',flag);
|
||||||
|
// this.$nextTick(()=>{
|
||||||
|
// if (flag) {
|
||||||
|
// this.$refs.multipleTable.toggleRowSelection(row, flag);
|
||||||
|
// } else {
|
||||||
|
// this.$refs.multipleTable.clearSelection();
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// },
|
||||||
|
|
||||||
/** 绑定按钮操作 */
|
/** 绑定按钮操作 */
|
||||||
handleBind() {
|
handleBind() {
|
||||||
console.log('ids----',this.ids)
|
console.log("ids----", this.ids);
|
||||||
if (this.userIdTemp == -1) {
|
if (this.userIdTemp == -1) {
|
||||||
this.$alert("未勾选绑定人,无法绑定", "提示", {
|
this.$alert("未勾选绑定人,无法绑定", "提示", {
|
||||||
type: "warning",
|
type: "warning",
|
||||||
|
|
@ -712,21 +734,21 @@ export default {
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.ids.length == 0) {
|
if (this.ids.length == 0) {
|
||||||
this.$alert("未进行勾选相关物资,无法绑定", "提示", {
|
this.$alert("未进行勾选相关物资,无法绑定", "提示", {
|
||||||
type: "warning",
|
type: "warning",
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
const ids = this.ids.join(",");
|
const ids = this.ids.join(",");
|
||||||
}
|
}
|
||||||
console.log('userList',this.userList)
|
console.log("userList", this.userList);
|
||||||
bindKeeper(this.userList).then((response) => {
|
bindKeeper(this.userList).then((response) => {
|
||||||
this.$modal.msgSuccess("绑定成功");
|
this.$modal.msgSuccess("绑定成功");
|
||||||
this.ids = null;
|
this.ids = null;
|
||||||
this.userList = null;
|
this.userList = null;
|
||||||
this.userIdTemp = -1
|
this.userIdTemp = -1;
|
||||||
this.getTreeData();
|
this.getTreeData();
|
||||||
this.getList();
|
this.getList();
|
||||||
this.$refs.multipleTable.clearSelection();
|
this.$refs.multipleTable.clearSelection();
|
||||||
|
|
@ -741,16 +763,16 @@ export default {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}else{
|
} else {
|
||||||
noBindKeeper(this.userNoList).then((response) => {
|
noBindKeeper(this.userNoList).then((response) => {
|
||||||
this.$modal.msgSuccess("解绑成功");
|
this.$modal.msgSuccess("解绑成功");
|
||||||
this.ids = null;
|
this.ids = null;
|
||||||
this.userList = null;
|
this.userList = null;
|
||||||
this.userNoList= null;
|
this.userNoList = null;
|
||||||
this.getTreeData();
|
this.getTreeData();
|
||||||
this.getList();
|
this.getList();
|
||||||
this.$refs.multipleTable.clearSelection();
|
this.$refs.multipleTable.clearSelection();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
|
|
@ -773,7 +795,7 @@ export default {
|
||||||
userTwo.push({
|
userTwo.push({
|
||||||
typeId: typeId,
|
typeId: typeId,
|
||||||
userId: userId,
|
userId: userId,
|
||||||
})
|
});
|
||||||
noBindKeeper(userTwo).then((response) => {
|
noBindKeeper(userTwo).then((response) => {
|
||||||
this.$modal.msgSuccess("解绑成功");
|
this.$modal.msgSuccess("解绑成功");
|
||||||
this.getList();
|
this.getList();
|
||||||
|
|
@ -822,8 +844,8 @@ export default {
|
||||||
|
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
let queryTemp = this.queryParams;
|
let queryTemp = this.queryParams;
|
||||||
queryTemp.level = 0;
|
queryTemp.level = 0;
|
||||||
this.download(
|
this.download(
|
||||||
"/material/ma_type/export4Keeper",
|
"/material/ma_type/export4Keeper",
|
||||||
{
|
{
|
||||||
|
|
@ -832,7 +854,6 @@ export default {
|
||||||
`物资类型信息_${new Date().getTime()}.xlsx`
|
`物资类型信息_${new Date().getTime()}.xlsx`
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
@ -854,11 +875,11 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.grid-content {
|
.grid-content {
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
min-height: 24px;
|
min-height: 24px;
|
||||||
}
|
}
|
||||||
.bg-purple-dark {
|
.bg-purple-dark {
|
||||||
background: #e5e9f2;
|
background: #e5e9f2;
|
||||||
}
|
}
|
||||||
|
|
||||||
::v-deep .el-tree .el-tree-node__expand-icon.expanded {
|
::v-deep .el-tree .el-tree-node__expand-icon.expanded {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue