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 1cc2aab419
commit 429c23ea23
1 changed files with 113 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 179
      src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue

179
src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
Unescape View File

@ -18,15 +18,21 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
:permission="permissionList"
> >
<template #menu-left> <template #menu-left>
<el-button type="danger" @click="handleDelete">删 除 </el-button> <el-button type="danger" v-if="permission.workTankManagement_del" @click="handleDelete">
删 除
</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport">导入 </el-button> <el-button type="primary" v-if="permission.workTankManagement_import" @click="handleImport">
导入
</el-button>
</template> </template>
<template #status-desc="{type}"> <template #status-desc="{ type }">
<p v-if="type == 'edit'" style="color:red">注：作业槽停用将停止下发槽液任务</p> <p v-if="type == 'edit'" style="color: red">注：作业槽停用将停止下发槽液任务</p>
</template> </template>
<template #status="{ row }"> <template #status="{ row }">
<div style="display: flex; align-items: center; justify-content: center"> <div style="display: flex; align-items: center; justify-content: center">
@ -58,8 +64,14 @@
</template> </template>
<script> <script>
import {getList,addWorkTank,updateWorkTank,deleteWorkTank} from "@/api/basicData/workTankManagement" import {
getList,
addWorkTank,
updateWorkTank,
deleteWorkTank,
} from '@/api/basicData/workTankManagement';
import basicImport from '@/components/basic-import/main.vue'; import basicImport from '@/components/basic-import/main.vue';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
basicImport, basicImport,
@ -108,11 +120,11 @@ export default {
showOverflowTooltip: true, showOverflowTooltip: true,
align: 'center', align: 'center',
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelWidth:'auto', searchLabelWidth: 'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',
menuWidth:120, menuWidth: 120,
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
column: [ column: [
@ -120,7 +132,7 @@ export default {
label: '作业中心', label: '作业中心',
prop: 'workstationId', prop: 'workstationId',
type: 'select', type: 'select',
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
@ -132,19 +144,19 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect", dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect',
props:{ props: {
label:"wcName", label: 'wcName',
value:"id" value: 'id',
} },
}, },
{ {
label: '槽号', label: '槽号',
prop: 'workTankCode', prop: 'workTankCode',
search: true, search: true,
sortable: true, sortable: 'custom',
filter: true, filter: true,
searchOrder:1, searchOrder: 1,
// addDisplay: false, // addDisplay: false,
// editDisplay: false, // editDisplay: false,
// viewDisplay: false, // viewDisplay: false,
@ -161,7 +173,7 @@ export default {
label: '作业槽描述', label: '作业槽描述',
prop: 'name', prop: 'name',
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
rules: [ rules: [
@ -177,7 +189,7 @@ export default {
prop: 'status', prop: 'status',
type: 'switch', type: 'switch',
search: true, search: true,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
value: 1, value: 1,
@ -185,12 +197,13 @@ export default {
{ label: '暂停使用', value: 0 }, { label: '暂停使用', value: 0 },
{ label: '使用', value: 1 }, { label: '使用', value: 1 },
], ],
width: 110,
}, },
{ {
label: '操作人', label: '操作人',
prop: 'opUserRealName', prop: 'opUserRealName',
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
editDisplay: false, editDisplay: false,
addDisplay: false, addDisplay: false,
@ -202,12 +215,13 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
width: 100,
}, },
{ {
label: '更新时间', label: '更新时间',
prop: 'updateTime', prop: 'updateTime',
search: false, search: false,
sortable: true, sortable: 'custom',
editDisplay: false, editDisplay: false,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
@ -219,6 +233,7 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
width: 180,
}, },
], ],
}, },
@ -250,31 +265,40 @@ export default {
selectionList: [], selectionList: [],
}; };
}, },
mounted() {}, computed: {
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.workTankManagement_add, false),
editBtn: this.validData(this.permission.workTankManagement_edit, false),
delBtn: this.validData(this.permission.workTankManagement_del, false),
};
},
},
methods: { methods: {
beforeOpen(done, type) { beforeOpen(done, type) {
if(type === 'edit') { if (type === 'edit') {
// 将 workstationId 转换为字符串以匹配下拉框的 value 类型 // 将 workstationId 转换为字符串以匹配下拉框的 value 类型
if(this.form.workstationId) { if (this.form.workstationId) {
this.form.workstationId = this.form.workstationId + '' this.form.workstationId = this.form.workstationId + '';
} }
} }
done() done();
}, },
// 点击导入按钮 // 点击导入按钮
handleImport() { handleImport() {
this.isShowImport = true this.isShowImport = true;
}, },
closeDialog(val){ closeDialog(val) {
this.isShowImport = false this.isShowImport = false;
if(val){ if (val) {
this.onLoad() this.onLoad();
} }
}, },
handleDelete(){ handleDelete() {
if(this.selectionList.length == 0){ if (this.selectionList.length == 0) {
this.$message.error('请至少选择一条数据') this.$message.error('请至少选择一条数据');
return return;
} }
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -282,15 +306,14 @@ export default {
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
deleteWorkTank({ deleteWorkTank({
ids:this.selectionList.map(item => item.id).join(',') ids: this.selectionList.map(item => item.id).join(','),
}).then(res =>{ }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('删除成功') this.$message.success('删除成功');
this.onLoad() this.onLoad();
} }
})
}); });
});
}, },
// 多选 // 多选
selectionChange(list) { selectionChange(list) {
@ -305,32 +328,35 @@ export default {
// if(row.workstationId) { // if(row.workstationId) {
// row.workstationId = parseInt(row.workstationId) // row.workstationId = parseInt(row.workstationId)
// } // }
updateWorkTank(row).then(res =>{ updateWorkTank(row)
if(res.data.code == 200){ .then(res => {
this.$message.success('修改成功') if (res.data.code == 200) {
this.onLoad() this.$message.success('修改成功');
done() this.onLoad();
done();
} }
}).catch(err =>{
loading()
}) })
.catch(err => {
loading();
});
}, },
rowSave(row, done, loading) { rowSave(row, done, loading) {
console.log('row-------------------',row) row.status = row.status == '' ? 0 : row.status;
row.status = row.status == "" ? 0 : row.status
// 将 workstationId 转为数字类型 // 将 workstationId 转为数字类型
// if(row.workstationId) { // if(row.workstationId) {
// row.workstationId = parseInt(row.workstationId) // row.workstationId = parseInt(row.workstationId)
// } // }
addWorkTank(row).then(res =>{ addWorkTank(row)
if(res.data.code == 200){ .then(res => {
this.$message.success('新增成功') if (res.data.code == 200) {
this.onLoad() this.$message.success('新增成功');
done() this.onLoad();
done();
} }
}).catch(err =>{
loading(false)
}) })
.catch(err => {
loading(false);
});
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {};
@ -349,14 +375,14 @@ export default {
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
deleteWorkTank({ deleteWorkTank({
ids:row.id ids: row.id,
}).then(res =>{ }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success('删除成功') this.$message.success('删除成功');
this.onLoad() this.onLoad();
done() done();
} }
}) });
}); });
}, },
currentChange(currentPage) { currentChange(currentPage) {
@ -367,18 +393,29 @@ export default {
}, },
refreshChange() { refreshChange() {
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
},
// 排序
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.onLoad(this.page, this.query);
}, },
onLoad() { onLoad() {
this.loading = true; this.loading = true;
getList({ getList({
current:this.page.currentPage, current: this.page.currentPage,
size:this.page.pageSize, size: this.page.pageSize,
...this.query ...this.query,
}).then(res =>{ }).then(res => {
this.data = res.data.data.records this.data = res.data.data.records;
this.page.total = res.data.data.total this.page.total = res.data.data.total;
this.loading = false this.loading = false;
}) });
}, },
}, },
}; };

Write Preview
Loading…
Cancel
Save