suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备管理-工装管理-挂具设置-新增排序/权限

Browse Source 
设备管理-工装管理-飞靶设置-新增排序/权限
dev-scheduling
ysn 1 month ago
parent 24bc6d144b
commit 56b1770339
2 changed files with 213 additions and 132 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/views/equiptManagement/workwearManagement/columnData.js
  2. 315
      src/views/equiptManagement/workwearManagement/index.vue

16
src/views/equiptManagement/workwearManagement/columnData.js
Unescape View File

@ -5,6 +5,7 @@ export default {
prop: 'fsCode',
span: 24,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -18,6 +19,7 @@ export default {
prop: 'fsType',
span: 24,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -33,6 +35,7 @@ export default {
search: true,
type: 'select',
display: false,
sortable: 'custom',
dicUrl: '/api/blade-system/dict/dictionary?code=workwear_status',
},
@ -42,6 +45,7 @@ export default {
label: '挂具编号',
prop: 'rsCode',
search: true,
sortable: 'custom',
span: 24,
rules: [
{
@ -56,6 +60,7 @@ export default {
prop: 'rsType',
span: 24,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -69,6 +74,7 @@ export default {
label: '挂具状态',
prop: 'rsStatus',
search: true,
sortable: 'custom',
type: 'select',
display: false,
dicUrl: '/api/blade-system/dict/dictionary?code=workwear_status',
@ -111,7 +117,7 @@ export const feiBaOption = {
labelWidth: 80,
searchLabelWidth: 80,
menuWidth: 80,
menuAlign:"center",
menuAlign: "center",
dialogWidth: 600,
dialogClickModal: false,
searchEnter: true,
@ -138,6 +144,7 @@ export const feiBaOption = {
prop: 'fsCode',
span: 24,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -151,6 +158,7 @@ export const feiBaOption = {
prop: 'fsType',
span: 24,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -164,6 +172,7 @@ export const feiBaOption = {
label: '飞靶状态',
prop: 'status',
search: true,
sortable: 'custom',
type: 'select',
display: false,
dicUrl: '/api/blade-system/dict/dictionary?code=workwear_status',
@ -194,7 +203,7 @@ export const rackOption = {
labelWidth: 80,
searchLabelWidth: 80,
menuWidth: 80,
menuAlign:"center",
menuAlign: "center",
dialogWidth: 600,
dialogClickModal: false,
searchEnter: true,
@ -220,6 +229,7 @@ export const rackOption = {
label: '挂具编号',
prop: 'rsCode',
search: true,
sortable: 'custom',
span: 24,
rules: [
{
@ -234,6 +244,7 @@ export const rackOption = {
prop: 'rsType',
span: 24,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -247,6 +258,7 @@ export const rackOption = {
label: '挂具状态',
prop: 'status',
search: true,
sortable: 'custom',
type: 'select',
display: false,
dicUrl: '/api/blade-system/dict/dictionary?code=workwear_status',

315
src/views/equiptManagement/workwearManagement/index.vue
Unescape View File

@ -22,9 +22,13 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@sort-change="sortChange"
:permission="permissionList"
>
<template #menu-left>
<el-button type="danger" plain @click="removeFn">删除</el-button>
<el-button type="danger" plain v-if="currentDeletePermission" @click="removeFn"
>删除</el-button
>
</template>
</avue-crud>
@ -45,42 +49,56 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@sort-change="sortChange"
:permission="permissionList"
>
<template #menu-left>
<el-button type="danger" plain @click="removeFn">删除</el-button>
<el-button type="danger" plain v-if="currentDeletePermission" @click="removeFn"
>删除</el-button
>
</template>
</avue-crud>
</basic-container>
</template>
<script>
import columnData from "./columnData.js";
import {getFeiBaSetList,addFeiBaSet,editFeiBaSet,deleteFeiba,getRackSetList,addRackSet,editRackSet,deleteRackSet} from '@/api/equiptManagement/workwearManagement'
import columnData from './columnData.js';
import {
getFeiBaSetList,
addFeiBaSet,
editFeiBaSet,
deleteFeiba,
getRackSetList,
addRackSet,
editRackSet,
deleteRackSet,
} from '@/api/equiptManagement/workwearManagement';
import { add } from '@/api/system/menu.js';
import {feiBaOption,rackOption} from './columnData.js'
import { feiBaOption, rackOption } from './columnData.js';
import { mapGetters } from 'vuex';
export default {
data() {
return {
loading: false,
tabPosition: "rackSet",
feibaLoading:false,
gjLoading:false,
feiBaOption:feiBaOption,
rackOption:rackOption,
tabPosition: 'rackSet',
feibaLoading: false,
gjLoading: false,
feiBaOption: feiBaOption,
rackOption: rackOption,
selectionList: [],
formInline: {
type: "", //统计类型
user: "", //调度员
type: '', //统计类型
user: '', //调度员
},
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
query: {},
option: {
columnSort: true,
tip: false,
height: "auto",
height: 'auto',
calcHeight: 32,
simplePage: false,
searchShow: true,
@ -103,24 +121,55 @@ export default {
gridBtn: false,
index: false,
searchShowBtn: false,
searchLabelPosition: "left",
searchLabelPosition: "left",
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: "left",
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: "right",
addBtnIcon: " ",
viewBtnIcon: " ",
delBtnIcon: " ",
editBtnIcon: " ",
align: "center",
searchMenuPosition: 'right',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
align: 'center',
column: [],
},
data: [],
};
},
computed: {
...mapGetters(['permission']),
permissionList() {
// 根据当前tab页签返回对应的权限
if (this.tabPosition === 'rackSet') {
// 挂具设置权限
return {
addBtn: this.validData(this.permission.workwearManagement1_add, false),
// viewBtn: this.validData(this.permission.workwearManagement1_view, false),
delBtn: this.validData(this.permission.workwearManagement1_del, false),
editBtn: this.validData(this.permission.workwearManagement1_edit, false),
};
} else {
// 飞靶设置权限
return {
addBtn: this.validData(this.permission.workwearManagement2_add, false),
// viewBtn: this.validData(this.permission.workwearManagement2_view, false),
delBtn: this.validData(this.permission.workwearManagement2_del, false),
editBtn: this.validData(this.permission.workwearManagement2_edit, false),
};
}
},
currentDeletePermission() {
// 当前tab页签对应的删除权限
if (this.tabPosition === 'rackSet') {
return this.validData(this.permission.workwearManagement1_del, false);
} else {
return this.validData(this.permission.workwearManagement2_del, false);
}
},
},
methods: {
// 选中表格数据
selectionChange(list) {
@ -128,171 +177,191 @@ export default {
},
removeFn() {
if (this.selectionList.length === 0) {
return this.$message.warning("请先选择数据再进行删除！");
}
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
if(this.tabPosition == "feiBaSet"){
deleteFeiba({ids:this.selectionList.map(item => item.id).join(',')}).then(res =>{
if(res.data.code == 200){
this.$message.success('删除成功')
this.getFeiBa()
return this.$message.warning('请先选择数据再进行删除！');
}
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
}else{
deleteRackSet({ids:this.selectionList.map(item => item.id).join(',')}).then(res =>{
if(res.data.code == 200){
this.$message.success('删除成功')
this.getRackSet()
.then(() => {
if (this.tabPosition == 'feiBaSet') {
deleteFeiba({ ids: this.selectionList.map(item => item.id).join(',') }).then(res => {
if (res.data.code == 200) {
this.$message.success('删除成功');
this.getFeiBa();
}
})
});
} else {
deleteRackSet({ ids: this.selectionList.map(item => item.id).join(',') }).then(res => {
if (res.data.code == 200) {
this.$message.success('删除成功');
this.getRackSet();
}
}).catch(() => {
this.$message.info("取消删除");
});
}
})
.catch(() => {
this.$message.info('取消删除');
});
},
// 刷新
refreshChange() {
if (this.tabPosition == 'feiBaSet') {
this.getFeiBa();
} else {
this.getRackSet();
}
},
// 排序
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// 重新加载数据
this.refreshChange();
},
// 搜索
searchChange(params, done) {
if (this.tabPosition == "feiBaSet") {
if (this.tabPosition == 'feiBaSet') {
this.query = params;
this.page.currentPage = 1;
this.getFeiBa();
done();
}else{
} else {
this.query = params;
this.page.currentPage = 1;
this.getRackSet();
done();
}
},
currentChange(currentPage){
currentChange(currentPage) {
this.page.currentPage = currentPage;
if(this.tabPosition == "feiBaSet"){
if (this.tabPosition == 'feiBaSet') {
this.getFeiBa();
}else{
} else {
this.getRackSet();
}
},
sizeChange(pageSize){
sizeChange(pageSize) {
this.page.pageSize = pageSize;
if(this.tabPosition == "feiBaSet"){
if (this.tabPosition == 'feiBaSet') {
this.getFeiBa();
}else{
} else {
this.getRackSet();
}
},
// 重置
searchReset() {
if (this.tabPosition == "feiBaSet") {
if (this.tabPosition == 'feiBaSet') {
this.query = {};
this.getFeiBa();
done();
}else{
} else {
this.query = {};
this.getRackSet();
done();
}
},
rowSave(row, done, loading){
if (this.tabPosition == "feiBaSet") {
rowSave(row, done, loading) {
if (this.tabPosition == 'feiBaSet') {
let params = {
fsCode:row.fsCode,
fsType:row.fsType
}
addFeiBaSet(params).then(res =>{
if(res.data.code == 200){
this.$message.success('新增成功')
done()
this.getFeiBa()
fsCode: row.fsCode,
fsType: row.fsType,
};
addFeiBaSet(params).then(res => {
if (res.data.code == 200) {
this.$message.success('新增成功');
done();
this.getFeiBa();
}
})
}else{
});
} else {
let params = {
rsCode:row.rsCode,
rsType:row.rsType
}
addRackSet(params).then(res =>{
if(res.data.code == 200){
this.$message.success('新增成功')
done()
this.getRackSet()
rsCode: row.rsCode,
rsType: row.rsType,
};
addRackSet(params).then(res => {
if (res.data.code == 200) {
this.$message.success('新增成功');
done();
this.getRackSet();
}
})
});
}
},
rowUpdate(row, index, done, loading){
if (this.tabPosition == "feiBaSet") {
rowUpdate(row, index, done, loading) {
if (this.tabPosition == 'feiBaSet') {
let params = {
id:row.id,
fsCode:row.fsCode,
fsType:row.fsType
}
editFeiBaSet(params).then(res =>{
if(res.data.code == 200){
this.$message.success('修改成功')
done()
this.getFeiBa()
}else{
this.$message.error(res.data.message)
done()
id: row.id,
fsCode: row.fsCode,
fsType: row.fsType,
};
editFeiBaSet(params).then(res => {
if (res.data.code == 200) {
this.$message.success('修改成功');
done();
this.getFeiBa();
} else {
this.$message.error(res.data.message);
done();
}
})
}else{
});
} else {
let params = {
id:row.id,
rsCode:row.rsCode,
rsType:row.rsType
}
editRackSet(params).then(res =>{
if(res.data.code == 200){
this.$message.success('修改成功')
done()
this.getRackSet()
}else{
this.$message.error(res.data.message)
done()
id: row.id,
rsCode: row.rsCode,
rsType: row.rsType,
};
editRackSet(params).then(res => {
if (res.data.code == 200) {
this.$message.success('修改成功');
done();
this.getRackSet();
} else {
this.$message.error(res.data.message);
done();
}
})
});
}
},
getFeiBa(){
getFeiBa() {
// this.feibaLoading = true
getFeiBaSetList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
current: this.page.currentPage,
size: this.page.pageSize,
...this.query,
}).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
// setTimeout(() => {
// this.feibaLoading = false
// }, 50);
})
});
},
getRackSet(){
getRackSet() {
// this.gjLoading = true
getRackSetList({
current:this.page.currentPage,
size:this.page.pageSize,
...this.query
}).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
current: this.page.currentPage,
size: this.page.pageSize,
...this.query,
}).then(res => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
// setTimeout(() => {
// this.gjLoading = false
// }, 50);
})
});
},
tabPositionChange(value, event) {
this.option.column = columnData[this.tabPosition];
if (this.tabPosition == "feiBaSet") {
this.getFeiBa()
if (this.tabPosition == 'feiBaSet') {
this.getFeiBa();
} else {
this.getRackSet()
this.getRackSet();
}
},
onLoad() {},

Write Preview
Loading…
Cancel
Save