|
|
@@ -1,28 +1,10 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="防护用品中文名称" prop="conservatoryMeasureName">
|
|
|
+ <el-form-item label="防护用品" prop="conservatoryMeasureName">
|
|
|
<el-input
|
|
|
v-model="queryParams.conservatoryMeasureName"
|
|
|
- placeholder="请输入防护用品中文名称"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="防护用品对应显示" prop="conservatoryMeasureCode">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.conservatoryMeasureCode"
|
|
|
- placeholder="请输入防护用品对应显示"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="防护用品对应分项" prop="conservatoryMeasureNo">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.conservatoryMeasureNo"
|
|
|
- placeholder="请输入防护用品对应分项"
|
|
|
+ placeholder="请输入防护用品"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -30,7 +12,12 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="防护用品类型" prop="protectType">
|
|
|
<el-select v-model="queryParams.protectType" placeholder="请选择防护用品类型" clearable size="small">
|
|
|
- <el-option label="请选择字典生成" value=""/>
|
|
|
+ <el-option
|
|
|
+ v-for="dict in protectTypeOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -46,7 +33,7 @@
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
- v-hasPermi="['ehs:protect:add']"
|
|
|
+ v-hasPermi="['configuration:protect:add']"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -57,7 +44,7 @@
|
|
|
size="mini"
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
- v-hasPermi="['ehs:protect:edit']"
|
|
|
+ v-hasPermi="['configuration:protect:edit']"
|
|
|
>修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -68,42 +55,39 @@
|
|
|
size="mini"
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
- v-hasPermi="['ehs:protect:remove']"
|
|
|
+ v-hasPermi="['configuration:protect:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="info"
|
|
|
- icon="el-icon-upload2"
|
|
|
- size="mini"
|
|
|
- @click="handleImport"
|
|
|
- v-hasPermi="['ehs:protect:edit']"
|
|
|
- >导入
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="warning"
|
|
|
- icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
- @click="handleExport"
|
|
|
- v-hasPermi="['ehs:protect:export']"
|
|
|
- >导出
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
+ <!-- <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="info"
|
|
|
+ icon="el-icon-upload2"
|
|
|
+ size="mini"
|
|
|
+ @click="handleImport"
|
|
|
+ v-hasPermi="['configuration:protect:edit']"
|
|
|
+ >导入
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExport"
|
|
|
+ v-hasPermi="['configuration:protect:export']"
|
|
|
+ >导出
|
|
|
+ </el-button>
|
|
|
+ </el-col>-->
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
<el-table v-loading="loading" :data="protectList" @selection-change="handleSelectionChange" :height="clientHeight"
|
|
|
border>
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
- <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="防护用品中文名称" align="center" prop="conservatoryMeasureName" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="防护用品对应显示" align="center" prop="conservatoryMeasureCode" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="防护用品对应分项" align="center" prop="conservatoryMeasureNo" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="防护用品显示字段" align="center" prop="conservatoryMeasureContent" :show-overflow-tooltip="true"/>
|
|
|
- <el-table-column label="防护用品类型" align="center" prop="protectType" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="ID" align="center" prop="id" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="防护用品" align="center" prop="conservatoryMeasureName" :show-overflow-tooltip="true"/>
|
|
|
+ <el-table-column label="防护用品类型" align="center" prop="protectType" :formatter="protectTypeFormat"/>
|
|
|
<el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -111,7 +95,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['ehs:protect:edit']"
|
|
|
+ v-hasPermi="['configuration:protect:edit']"
|
|
|
>修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
@@ -119,7 +103,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['ehs:protect:remove']"
|
|
|
+ v-hasPermi="['configuration:protect:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
@@ -137,10 +121,10 @@
|
|
|
<!-- 添加或修改危害物质-防护用品对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
- <el-form-item label="防护用品中文名称" prop="conservatoryMeasureName">
|
|
|
- <el-input v-model="form.conservatoryMeasureName" placeholder="请输入防护用品中文名称"/>
|
|
|
+ <el-form-item label="防护用品" prop="conservatoryMeasureName">
|
|
|
+ <el-input v-model="form.conservatoryMeasureName" placeholder="请输入防护用品"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="防护用品对应显示" prop="conservatoryMeasureCode">
|
|
|
+<!-- <el-form-item label="防护用品对应显示" prop="conservatoryMeasureCode">
|
|
|
<el-input v-model="form.conservatoryMeasureCode" placeholder="请输入防护用品对应显示"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="防护用品对应分项" prop="conservatoryMeasureNo">
|
|
|
@@ -148,15 +132,20 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="防护用品显示字段">
|
|
|
<editor v-model="form.conservatoryMeasureContent" :min-height="192"/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>-->
|
|
|
<el-form-item label="防护用品类型" prop="protectType">
|
|
|
<el-select v-model="form.protectType" placeholder="请选择防护用品类型">
|
|
|
- <el-option label="请选择字典生成" value=""/>
|
|
|
+ <el-option
|
|
|
+ v-for="dict in protectTypeOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="归属部门" prop="deptId">
|
|
|
+<!-- <el-form-item label="归属部门" prop="deptId">
|
|
|
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>-->
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
@@ -211,6 +200,7 @@ import {treeselect} from "@/api/system/dept";
|
|
|
import {getToken} from "@/utils/auth";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
+import Editor from '@/components/Editor';
|
|
|
|
|
|
export default {
|
|
|
name: "Protect",
|
|
|
@@ -239,6 +229,8 @@ export default {
|
|
|
clientHeight: 300,
|
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
|
+ // 防护用品类型字典
|
|
|
+ protectTypeOptions: [],
|
|
|
// 用户导入参数
|
|
|
upload: {
|
|
|
// 是否显示弹出层（用户导入）
|
|
|
@@ -252,16 +244,13 @@ export default {
|
|
|
// 设置上传的请求头部
|
|
|
headers: {Authorization: "Bearer " + getToken()},
|
|
|
// 上传的地址
|
|
|
- url: process.env.VUE_APP_BASE_API + "/ehs/protect/importData"
|
|
|
+ url: process.env.VUE_APP_BASE_API + "/configuration/protect/importData"
|
|
|
},
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 20,
|
|
|
conservatoryMeasureName: null,
|
|
|
- conservatoryMeasureCode: null,
|
|
|
- conservatoryMeasureNo: null,
|
|
|
- conservatoryMeasureContent: null,
|
|
|
protectType: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
@@ -269,7 +258,7 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
conservatoryMeasureName: [
|
|
|
- {required: true, message: "防护用品中文名称不能为空", trigger: "blur"}
|
|
|
+ {required: true, message: "防护用品不能为空", trigger: "blur"}
|
|
|
],
|
|
|
}
|
|
|
};
|
|
|
@@ -287,6 +276,9 @@ export default {
|
|
|
})
|
|
|
this.getList();
|
|
|
this.getTreeselect();
|
|
|
+ this.getDicts("matter_protect_type").then(response => {
|
|
|
+ this.protectTypeOptions = response.data;
|
|
|
+ });
|
|
|
},
|
|
|
methods: {
|
|
|
/** 查询危害物质-防护用品列表 */
|
|
|
@@ -304,6 +296,10 @@ export default {
|
|
|
this.deptOptions = response.data;
|
|
|
});
|
|
|
},
|
|
|
+ // 防护用品类型字典翻译
|
|
|
+ protectTypeFormat(row, column) {
|
|
|
+ return this.selectDictLabel(this.protectTypeOptions, row.protectType);
|
|
|
+ },
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false;
|
|
|
@@ -314,9 +310,6 @@ export default {
|
|
|
this.form = {
|
|
|
id: null,
|
|
|
conservatoryMeasureName: null,
|
|
|
- conservatoryMeasureCode: null,
|
|
|
- conservatoryMeasureNo: null,
|
|
|
- conservatoryMeasureContent: null,
|
|
|
protectType: null
|
|
|
};
|
|
|
this.resetForm("form");
|
徐明浩