From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期三, 30 三月 2022 16:21:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master --- src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 99 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 74 insertions(+), 25 deletions(-) diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue index d8f78df..ede80cb 100644 --- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue +++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue @@ -4,17 +4,17 @@ <el-row> <el-col :span="5"> <el-form-item label="设备名称"> - <el-input v-model="listQuery.filter.name"></el-input> + <el-input v-model="listQuery.filter.name" placeholder="请输入设备名称" clearable></el-input> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="设备状态"> - <el-select v-model="listQuery.filter.status" placeholder="请选择设备状态"> + <el-select v-model="listQuery.filter.status" placeholder="请选择设备状态" clearable> <el-option v-for="item in unitIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> </el-select> </el-form-item> </el-col> - <el-col :span="4" style="text-align: center"> + <el-col :span="6" style="text-align: center"> <el-button type="primary" icon="el-icon-search" @click="find()" class="btns" >搜索</el-button > @@ -24,6 +24,9 @@ class="btns" @click="handleClick('', '新增')" >新增</el-button + > + <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns" + >重置</el-button > </el-col> </el-row> @@ -41,7 +44,7 @@ </el-table-column> <el-table-column prop="volume" label="容积" align="center"> </el-table-column> - <el-table-column prop="userId" label="负责人" align="center"> + <el-table-column prop="userName" label="负责人" align="center"> </el-table-column> <el-table-column align="center" label="操作"> <template slot-scope="scope"> @@ -83,12 +86,12 @@ <el-row> <el-col :span="12"> <el-form-item label="设备编号" prop="serialNumber"> - <el-input v-model.number="form.serialNumber" maxlength="50"></el-input> + <el-input v-model="form.serialNumber" maxlength="50" placeholder="请输入设备编号"></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="设备名称" prop="name"> - <el-input v-model="form.name" maxlength="50"></el-input> + <el-input v-model="form.name" maxlength="50" placeholder="请输入设备名称"></el-input> </el-form-item> </el-col> </el-row> @@ -112,14 +115,28 @@ </el-col> <el-col :span="12"> <el-form-item label="容积" prop="volume"> - <el-input v-model.number="form.volume" maxlength="50"></el-input> + <el-input v-model="form.volume" maxlength="50" + placeholder="请输入容积" + ></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="12"> <el-form-item label="负责人" prop="userId"> - <el-input v-model="form.userId" maxlength="50"></el-input> + <el-select + v-model="form.userId" + placeholder="请选择负责人" + style="width: 100%" + > + <el-option + v-for="item in personInCharge" + :key="item.id" + :label="item.realname" + :value="item.id" + > + </el-option> + </el-select> </el-form-item> </el-col> </el-row> @@ -139,6 +156,7 @@ majorEquipmentAdd, majorEquipmentMod, majorEquipmentDel, + majorEquipmentLis } from "@/api/majorEquipment.js"; export default { data() { @@ -150,6 +168,7 @@ status: "", volume: "", serialNumber:"", + userId:"", }, pageSize: 10, recordTotal: 0, @@ -158,28 +177,44 @@ listQuery: { filter: { name: "", + // status:"", }, pageIndex: 1, pageSize: 10, }, type:'', rules: { - serialNumber:{ required: true, message: '容积必须为数字值'}, - volume:{ type: 'number', message: '负责人必须为数字值'}, - name: [ - { required: true, message: "预案名称不能为空", trigger: "change" }, + serialNumber:[ + { required: true, message: "设备编号不能为空", trigger: "change"}, + // { type:'number', message: '设备编号必须为数字值'} ], + volume:[ + { required: true, message: "容积不能为空", trigger: "change"}, + // { type:'number', message: "容积必须为数字值", trigger: "change"}, + { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' } + ], + name:{ required: true, message: "设备名称不能为空", trigger: "change" }, + status:{ required: true, message: "状态不能为空", trigger: "change" }, + userId:{ required: true, message: "负责人不能为空", trigger: "change" }, }, - unitIdOptions:[{label:"在用",value:0},{label:"停用",value:1}] + unitIdOptions:[{label:"在用",value:0},{label:"停用",value:1}], + personInCharge:[], }; }, created() { this.elementManagementL(); + this.productionMajorEquipmentErt(); }, methods: { + productionMajorEquipmentErt(){ + majorEquipmentLis().then(res=>{ + if (res.data.code ==200){ + this.personInCharge=res.data.result + } + }) + }, async elementManagementL() { var res = await majorEquipmentList(this.listQuery); - console.log(res); if (res.data.code == 200) { this.list = res.data.result.records; this.recordTotal = res.data.result.total @@ -192,6 +227,7 @@ this.$nextTick(() => { this.$refs["form"].clearValidate(); }); + if (type == "新增") { this.title = "新增"; this.form = { @@ -250,21 +286,34 @@ }); }, deleteById(val) { - majorEquipmentDel({id:val}).then((res) => { - if (res.data.code == 200) { - this.elementManagementL(); - this.$notify({ - title: "成功", - message: "删除成功", - type: "success", - duration: 2000, - }); - } - }); + this.$confirm('确认删除吗','提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(()=>{ + majorEquipmentDel({id:val}).then((res) => { + if (res.data.code == 200) { + this.elementManagementL(); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + } + }); + }) + .catch(error =>{ + }); }, find(){ this.elementManagementL(); }, + reset(){ + this.listQuery.filter={} + this.elementManagementL(); + }, handleSizeChange(val){ this.listQuery.pageSize = val this.elementManagementL(); -- Gitblit v1.9.2