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

安环管理-废水处理-槽液排放记录-删除-新增功能

Browse Source 
安环管理-废水处理-槽液排放记录-新增-日期可以选择时间
dev-scheduling
ysn 15 hours ago
parent 9e8b4b3a63
commit bcc5be14a9
3 changed files with 171 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. 20
      src/api/safetyManagement/dischargeRec.js
  2. 4
      src/views/safetyManagement/wastewater/components/addEditDialogDischargeRec.vue
  3. 275
      src/views/safetyManagement/wastewater/components/dischargeRec.vue

20
src/api/safetyManagement/dischargeRec.js
Unescape View File

@ -22,16 +22,16 @@ export const add = row => {
});
};
// // 删除
// export const remove = ids => {
// return request({
// url: '/blade-desk/bsSafeInspectionPoint/remove',
// method: 'post',
// params: {
// ids,
// },
// });
// };
// 删除
export const remove = ids => {
return request({
url: '/blade-desk/bsDischargeRec/remove',
method: 'post',
params: {
ids,
},
});
};
// 修改
export const update = row => {

4
src/views/safetyManagement/wastewater/components/addEditDialogDischargeRec.vue
Unescape View File

@ -51,7 +51,7 @@
<!-- 排放量 -->
<el-table-column align="center" label="排放量(单位:L)" width="170">
<template #header>
<span><i style="color: red">*</i>排放量</span>
<span><i style="color: red">*</i>排放量(单位:L)</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].amount`" :rules="formRules.amount">
@ -74,7 +74,7 @@
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].dirDate`" :rules="formRules.dirDate">
<el-date-picker v-model="scope.row.dirDate" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" type="date" placeholder="选择日期" style="width: 100%" />
value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="选择日期" style="width: 100%" />
</el-form-item>
</template>
</el-table-column>

275
src/views/safetyManagement/wastewater/components/dischargeRec.vue
Unescape View File

@ -1,41 +1,67 @@
<template>
<div>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-update="rowUpdate"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-update="rowUpdate"
@row-del="handleDelete"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
</el-button> -->
<el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
<el-button type="primary" icon="el-icon-plus" @click="moldAddFn(null, true)"
>新增</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleBatchDelete">删 除 </el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport">导入
</el-button>
<el-button type="primary" @click="handleImport">导入 </el-button>
</template>
</avue-crud>
<!-- 新增 -->
<addEditDialogDischargeRec
v-if="addOpen"
:showDialog="addOpen"
@closeDialog="closeDialog"
:moldAddMore="moldAddMore"
:handleManList="handleManList"
:teamList="teamList"
@submitData="handleSubmitData">
v-if="addOpen"
:showDialog="addOpen"
@closeDialog="closeDialog"
:moldAddMore="moldAddMore"
:handleManList="handleManList"
:teamList="teamList"
@submitData="handleSubmitData"
>
</addEditDialogDischargeRec>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate" templateName="槽液排放记录导入模板.xls"
importUrl="/blade-desk/bsDischargeRec/importExcel" @closeDialog="closeDialog"></basic-import>
<basic-import
v-if="isShowImport"
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate"
templateName="槽液排放记录导入模板.xls"
importUrl="/blade-desk/bsDischargeRec/importExcel"
@closeDialog="closeDialog"
></basic-import>
</div>
</template>
<script>
import { getList, update, getType, getUserList } from '@/api/safetyManagement/dischargeRec.js';
import {
getList,
update,
getType,
getUserList,
remove,
} from '@/api/safetyManagement/dischargeRec.js';
import basicImport from '@/components/basic-import/main.vue';
import addEditDialogDischargeRec from './addEditDialogDischargeRec.vue';
import { getTeam } from '@/api/tankSolutionSystem/info'
import { getTeam } from '@/api/tankSolutionSystem/info';
export default {
components: {
@ -44,7 +70,7 @@ export default {
},
data() {
return {
TankSol:[],
TankSol: [],
addOpen: false, //新增弹窗
teamList: [],
moldAddMore: true,
@ -54,7 +80,7 @@ export default {
handleManList: [], // 水处理工选项
option: {
addBtn: false,
height: "auto",
height: 'auto',
calcHeight: 32,
tip: false,
simplePage: true,
@ -67,15 +93,15 @@ export default {
index: true,
selection: true,
viewBtn: false,
delBtn: false,
editBtnText: "修改",
addBtnIcon: " ",
viewBtnIcon: " ",
delBtnIcon: " ",
editBtnIcon: " ",
viewBtnText: "详情",
delBtn: true,
editBtnText: '修改',
addBtnIcon: 'el-icon-plus',
viewBtnIcon: 'el-icon-view',
delBtnIcon: 'el-icon-delete',
editBtnIcon: 'el-icon-edit',
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 80,
menuWidth: 200,
dialogWidth: 1040,
dialogClickModal: false,
searchEnter: true,
@ -87,18 +113,18 @@ export default {
columnSort: true,
index: false,
showOverflowTooltip: true,
searchLabelPosition: "left",
searchLabelPosition: "left",
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: "center",
menuAlign: 'center',
gridBtn: false,
searchMenuPosition: "right",
align: "center",
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: "报废槽液类型",
prop: "wasteType",
label: '报废槽液类型',
prop: 'wasteType',
// bind: "wasteType.wtName",
sortable: true,
filter: true,
@ -110,19 +136,19 @@ export default {
dicUrl: '/api/blade-system/dict/dictionary?code=ScrapTankSolType',
props: {
label: 'dictValue',
value: 'dictKey'
value: 'dictKey',
},
rules: [
{
required: true,
message: "请选择报废槽液类型",
trigger: "blur",
message: '请选择报废槽液类型',
trigger: 'blur',
},
],
},
{
label: "排放班组",
prop: "bsTeamSet",
label: '排放班组',
prop: 'bsTeamSet',
// bind: "bsTeamSet.tsName",
search: true,
sortable: true,
@ -132,19 +158,19 @@ export default {
dicUrl: '/api/blade-desk/BA/TeamSet/listForSelect',
props: {
label: 'tsName',
value: 'tsCode'
value: 'tsCode',
},
rules: [
{
required: true,
message: "请输入名称",
trigger: "blur",
message: '请输入名称',
trigger: 'blur',
},
],
},
{
label: "排放量(单位:L)",
prop: "amount",
label: '排放量(单位:L)',
prop: 'amount',
search: true,
sortable: true,
filter: true,
@ -153,62 +179,62 @@ export default {
rules: [
{
required: true,
message: "请输入药品名称",
trigger: "blur",
message: '请输入药品名称',
trigger: 'blur',
},
],
},
{
label: "日期",
prop: "queryDirDate",
label: '日期',
prop: 'queryDirDate',
search: true,
searchLabelWidth: 50,
sortable: true,
filter: true,
hide: true,
editDisplay:false,
editDisplay: false,
span: 12,
type: "datetime",
type: 'datetime',
searchRange: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
startPlaceholder: "开始时间",
endPlaceholder: "结束时间",
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
rules: [
{
required: true,
message: "请输入选择日期",
trigger: "blur",
message: '请输入选择日期',
trigger: 'blur',
},
],
},
{
label: "日期",
prop: "dirDate",
label: '日期',
prop: 'dirDate',
// search: true,
sortable: true,
filter: true,
span: 12,
type: "datetime",
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
rules: [
{
required: true,
message: "请输入选择日期",
trigger: "blur",
message: '请输入选择日期',
trigger: 'blur',
},
],
},
{
label: "水处理工",
prop: "handleMan",
label: '水处理工',
prop: 'handleMan',
filterable: true,
search: true,
sortable: true,
filter: true,
span: 12,
type: "select",
type: 'select',
dicData: [],
props: {
label: 'name',
@ -217,14 +243,14 @@ export default {
rules: [
{
required: true,
message: "请选择水处理工",
trigger: "blur",
message: '请选择水处理工',
trigger: 'blur',
},
],
},
{
label: "备注",
prop: "memo",
label: '备注',
prop: 'memo',
search: false,
sortable: true,
filter: true,
@ -242,21 +268,21 @@ export default {
},
mounted() {
this.getTeamList();
this.getTypeList()
this.getUserList()
this.getTypeList();
this.getUserList();
},
methods: {
// 排放班组
getTeamList() {
getTeam().then(res => {
this.teamList = res.data.data
})
this.teamList = res.data.data;
});
},
// 报废槽液类型
getTypeList() {
getType().then(res => {
this.TankSol = res.data.data
})
this.TankSol = res.data.data;
});
},
// 用户
getUserList() {
@ -264,50 +290,68 @@ export default {
current: 1,
size: 10000000,
// deptId
roleId:'2008432609730281474'
roleId: '2008432609730281474',
}).then(res => {
const result = res.data.data.records
this.handleManList = result
const result = res.data.data.records;
this.handleManList = result;
this.option.column.forEach(col => {
if (col.prop === 'handleMan') {
col.dicData = this.handleManList;
}
});
})
});
},
// 新增
moldAddFn(row, flag) {
this.addOpen = true;
this.moldAddMore = flag;
},
//关闭弹窗
closeDialog(val) {
this.addOpen = false;
this.isShowImport = false;
if (val) {
this.onLoad(this.page);
}
},
// 处理子组件提交的数据
handleSubmitData(data) {
// 这里添加处理提交数据的逻辑
// this.$message.success("数据提交成功！");
this.addOpen = false;
},
// 新增
moldAddFn(row, flag) {
this.addOpen = true
this.moldAddMore = flag
},
//关闭弹窗
closeDialog(val) {
this.addOpen = false;
this.isShowImport = false
if(val){
this.onLoad(this.page);
}
},
// 处理子组件提交的数据
handleSubmitData(data) {
// 这里添加处理提交数据的逻辑
// this.$message.success("数据提交成功！");
this.addOpen = false;
},
// 点击导入按钮
handleImport() {
this.isShowImport = true
this.isShowImport = true;
},
handleDelete() {
// 批量删除
handleBatchDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
this.$message.error('请至少选择一条数据');
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => { });
this.$confirm('确定删除数据吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
remove(this.selectionList.map(item => item.id).join(',')).then(res => {
this.$message.success('删除成功');
this.refreshChange();
});
});
},
handleDelete(row) {
this.$confirm('确定删除数据吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
remove(row.id).then(res => {
this.$message.success('删除成功');
this.refreshChange();
});
});
},
// 多选
selectionChange(list) {
@ -319,8 +363,8 @@ export default {
},
// 搜索重置
searchReset() {
this.query = {}
this.onLoad(this.page)
this.query = {};
this.onLoad(this.page);
},
// 加载页面数据
onLoad(page, params = {}) {
@ -328,7 +372,6 @@ export default {
const requestParams = Object.assign({}, params, this.query);
// 后端要字符串类型
if (requestParams.queryDirDate && Array.isArray(requestParams.queryDirDate)) {
requestParams.queryDirDate = requestParams.queryDirDate.join(',');
}
getList(page.currentPage, page.pageSize, requestParams)
@ -346,13 +389,12 @@ export default {
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params)
done()
this.onLoad(this.page, params);
done();
},
//更新
rowUpdate(row, index, done, loading) {
console.log("aaaaaaaaaaaaaa")
rowUpdate(row, index, done, loading) {
console.log('aaaaaaaaaaaaaa');
update(row).then(
() => {
this.onLoad(this.page);
@ -368,10 +410,7 @@ export default {
}
);
},
},
};
</script>
<style lang="scss" scoped></style>

Write Preview
Loading…
Cancel
Save