设备添加、产品添加

This commit is contained in:
shijing 2023-06-30 17:25:14 +08:00
parent 8bc055bf06
commit d9181d1905
7 changed files with 105 additions and 645 deletions

View File

@ -206,26 +206,6 @@ const routes = [
},
"component": "em/equipment"
},
{
"name": "monitoring",
"path": "/em/monitoring",
"meta": {
"title": "计量设备",
"icon": "el-icon-grid",
"perms": ["equipment"]
},
"component": "em/monitoring"
},
{
"name": "em",
"path": "/em/mpoint",
"meta": {
"title": "测点管理",
"icon": "el-icon-grid",
"perms": ["mpoint"]
},
"component": "em/mpoint"
},
]
},
{
@ -821,6 +801,16 @@ const routes = [
"perms": ["bi"]
},
"children": [
{
"path": "/ungrouped/team",
"name": "team",
"meta": {
"title": "班组管理",
"icon": "el-icon-postcard",
"type": "menu",
},
"component": "sys/team"
},
{
"name": "mgruop",
"path": "/ungrouped/mgruop",
@ -895,17 +885,6 @@ const routes = [
},
"component": "sys/dept"
},
{
"path": "/sys/team",
"name": "team",
"meta": {
"title": "班组管理",
"icon": "el-icon-postcard",
"type": "menu",
// "perms": ["team"]
},
"component": "sys/team"
},
{
"path": "/sys/post",
"name": "post",

View File

@ -41,8 +41,6 @@
</el-table-column>
<el-table-column label="购置日期" prop="buy_date">
</el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column label="状态">
<template #default="scope">
<el-tag v-if="scope.row.state===10" type="success">
@ -63,36 +61,26 @@
<template #default="scope">{{ scope.row.parameter }}</template>
</el-table-column>
<el-table-column label="保管人">
<template #default="scope">{{ scope.row.keeper_.username }}</template>
<template #default="scope">{{ scope.row.keeper_name }}</template>
</el-table-column>
<el-table-column label="存放位置" show-overflow-tooltip>
<template #default="scope">{{ scope.row.place }}</template>
</el-table-column>
<el-table-column label="绑定工序" show-overflow-tooltip>
<template #default="scope">
<el-tag v-for="item in scope.row.step_"
:key="item.number"
:label="item.name"
:value="item.number">{{item.name}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" show-overflow-tooltip>
<template #default="scope">{{ scope.row.description }}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<template #default="scope">
<el-link
v-if="checkPermission(['equipment_update'])"
type="primary"
@click="handleEdit(scope.row)"
@click="table_edit(scope.row)"
>
编辑
</el-link>
<el-link
v-if="checkPermission(['equipment_delete'])"
type="danger"
@click="handleDelete(scope.row)"
@click="table_del(scope.row)"
>
删除
</el-link>
@ -160,12 +148,10 @@ export default {
},
//
async table_del(row) {
this.$API.rpm.rparty.delete
this.$API.em.equipment.delete
.req(row.id)
.then((res) => {
this.$message.success("删除成功");
return res;
})
.catch((err) => {

View File

@ -56,7 +56,7 @@
v-model="form.production_date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
value-format="YYYY-MM-DD"
style="width:100%"
>
</el-date-picker>
@ -68,25 +68,24 @@
v-model="form.buy_date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
value-format="YYYY-MM-DD"
style="width:100%"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="数量">
<el-input v-model="form.count" placeholder="数量"/>
<el-form-item label="用电功率">
<el-input-number v-model="form.power_kw" placeholder="用电功率"/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="技术指标">
<el-form-item label="技术参数">
<el-input
type="textarea"
:rows="4"
v-model="form.parameter"
placeholder="技术指标"
placeholder="技术参数"
/>
</el-form-item>
<el-form-item label="存放位置">
@ -94,37 +93,26 @@
</el-form-item>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="所属部门" prop="belong_dept">
<el-cascader :options="depOptions" :props="{ checkStrictly: true,emitPath:false }" ref="demoCascader"
style="width:100%" v-model="form.belong_dept"></el-cascader>
<el-form-item label="所属部门">
<el-cascader
v-model="form.belong_dept"
:options="group"
:props="groupsProps"
:show-all-levels="false"
clearable
style="width: 100%"
></el-cascader>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="责任人" prop="keeper_name">
<el-select
v-model="form.keeper_name"
filterable
style="width: 100%"
allow-create
default-first-option
placeholder="请选择">
<el-option
v-for="item in keeperOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-form-item label="班组班长" prop="leader_name">
<span style="display:flex">
<el-input readonly v-model="form.keeper_name"></el-input>
<ehsUserSelect :multiple="false" @submit="getReceptionist"/>
</span>
</el-form-item>
</el-col>
<!-- <el-col :md="12" :sm="24">
<el-form-item label="校/检周期" prop="cycle">
<el-input
v-model="form.cycle"
placeholder="校准或检定周期"
/>
</el-form-item>
</el-col> -->
</el-row>
<el-form-item label="描述">
<el-input
@ -206,18 +194,29 @@ export default {
depOptions: [],
selectionFilters: [],
setFiltersVisible: false,
belong_dept_options: []
belong_dept_options: [],
groupsProps: {
multiple: false,
emitPath: false,
checkStrictly: true,
},
group: [],
};
},
mounted() {
this.getDeptOptions()
this.getGroup();
},
methods: {
getDeptOptions() {
this.$API.system.dept.list.req({page:0, type__in:'dept'}).then(res=>{
this.belong_dept_options = genTree(res);
})
//
async getGroup() {
let res = await this.$API.system.dept.list.req({ page: 0 });
this.group = genTree(res);
},
getReceptionist(data) {
this.form.keeper=data.id;
this.form.keeper_name=data.name
},
//
open(mode = "add") {
this.mode = mode;
@ -232,9 +231,9 @@ export default {
try {
var res;
if (this.mode == "add") {
res = await this.$API.rpm.rparty.create.req(this.form);
res = await this.$API.em.equipment.create.req(this.form);
} else if (this.mode == "edit") {
res = await this.$API.rpm.rparty.update.req(
res = await this.$API.em.equipment.update.req(
this.form.id,
this.form
);

View File

@ -1,209 +0,0 @@
<template>
<el-container>
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input
v-model="query.search"
placeholder="名称"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="设备编号">
<template #default="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="管理类别">
<template #default="scope">
{{mgmtype_[scope.row.mgmtype]}}
</template>
</el-table-column>
<el-table-column label="校/检方式">
<template #default="scope">{{ waytype_[scope.row.way] }}</template>
</el-table-column>
<el-table-column label="标准/依据" width="100">
<template #default="scope">{{ scope.row.standard }}</template>
</el-table-column>
<el-table-column label="校/检周期" width="100">
<template #default="scope">{{ scope.row.cycle }}</template>
</el-table-column>
<el-table-column label="最近一次校准日期" width="140">
<template #default="scope">{{ scope.row.check_date }}</template>
</el-table-column>
<el-table-column label="下次校准日期">
<template #default="scope">
<el-tag v-if="scope.row.next_check_date" :type="setClass(scope.row.next_check_date)">
{{scope.row.next_check_date}}
</el-tag>
<div v-else></div>
</template>
</el-table-column>
<el-table-column label="设备名称">
<template #default="scope">{{ scope.row.name }}</template>
</el-table-column>
<el-table-column label="型号规格">
<template #default="scope">{{ scope.row.model }}</template>
</el-table-column>
<el-table-column label="生产厂家">
<template #default="scope">{{ scope.row.factory }}</template>
</el-table-column>
<el-table-column label="使用类别">
<template #default="scope">{{ usetype_[scope.row.way] }}</template>
</el-table-column>
<el-table-column label="校/检状态">
<template #default="scope">
<el-tag v-if="scope.row.state===10" type="success">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else type="danger">
{{ state_[scope.row.state] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="保管人">
<template #default="scope">
{{scope.row.keeper_.username}}
</template>
</el-table-column>
<el-table-column label="存放位置">
<template #default="scope">{{ scope.row.place }}</template>
</el-table-column>
<el-table-column label="绑定工序">
<template #default="scope">
<el-tag
v-for="item in scope.row.step_"
:key="item.number"
:label="item.name"
:value="item.number"
>
{{ item.name }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注">
<template #default="scope">{{ scope.row.description }}</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<template #default="scope">
<el-link
v-if="checkPermission(['equipment.update'])"
type="primary"
@click="handleEdit(scope)"
>
编辑
</el-link>
<el-link
v-if="checkPermission(['equipment.delete'])"
type="danger"
@click="handleDelete(scope)"
>
删除
</el-link>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
<save-dialog
v-if="dialog.save"
ref="saveDialog"
@success="handleSaveSuccess"
@closed="dialog.save = false"
></save-dialog>
</template>
<script>
import saveDialog from "./monitoring_form.vue";
export default {
name: "rparty",
components: {
saveDialog,
},
data() {
return {
dialog: {
save: false,
permission: false,
},
apiObj: this.$API.em.equipment.list,
query: {
page:1,
page_size:20,
type:20
},
selection: [],
};
},
methods: {
//
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
//
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
//
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show").setData(row);
});
},
//
async table_del(row) {
this.$API.rpm.rparty.delete
.req(row.id)
.then((res) => {
this.$message.success("删除成功");
return res;
})
.catch((err) => {
return err;
});
},
//
handleSaveSuccess(data, mode) {
if (mode == "add") {
this.$refs.table.refresh();
} else if (mode == "edit") {
this.$refs.table.refresh();
}
},
handleQuery() {
this.$refs.table.queryData(this.query)
},
resetQuery() {
this.query = {};
},
},
};
</script>

View File

@ -1,319 +0,0 @@
<template>
<el-drawer
:title="titleMap[mode]"
v-model="visible"
:size="1000"
destroy-on-close
@closed="$emit('closed')"
>
<el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px">
<el-form
ref="Form"
:model="form"
label-width="100px"
label-position="right"
:rules="rule1"
>
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="name">
<el-input v-model="form.name" placeholder="设备名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备编号" prop="number">
<el-input v-model="form.number" placeholder="设备编号"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="型号规格" prop="model">
<el-input v-model="form.model" placeholder="规格型号规格"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准/依据" prop="standard">
<el-input
v-model="form.standard"
placeholder="溯源标准或依据"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="校/检状态" prop="state">
<el-select
style="width: 100%"
v-model="form.state"
placeholder="请选择"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="管理类别" prop="mgmtype">
<el-select
style="width: 100%"
v-model="form.mgmtype"
placeholder="请选择"
>
<el-option
v-for="item in mgmoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="存放位置" prop="place">
<el-input v-model="form.place" placeholder="存放位置"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="责任人" prop="keeper">
<el-select
v-model="form.keeper"
filterable
style="width: 100%"
allow-create
default-first-option
placeholder="请选择"
>
<el-option
v-for="item in keeperOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="校/检方式" prop="way">
<el-select
style="width: 100%"
v-model="form.way"
placeholder="请选择"
>
<el-option
v-for="item in wayoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="存放位置" prop="place">
<el-input v-model="form.place" placeholder="存放位置"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="使用类别" prop="usetype">
<el-select
style="width: 100%"
v-model="form.usetype"
placeholder="请选择"
>
<el-option
v-for="item in useoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="校/检周期" prop="cycle">
<el-input
v-model="form.cycle"
placeholder="校准或检定周期"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="生产厂家" prop="factory">
<el-input v-model="form.factory" placeholder="生产厂商及国别"/>
</el-form-item>
<el-form-item label="备注" prop="description">
<el-input
type="textarea"
:rows="4"
v-model="form.description"
placeholder="备注"
/>
</el-form-item>
</el-form>
</el-main>
<el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit"
>保存</el-button
>
<el-button @click="visible = false">取消</el-button>
</el-footer>
</el-container>
</el-drawer>
</template>
<script>
import {genTree} from "@/utils/verificate";
export default {
emits: ["success", "closed"],
data() {
return {
loading: false,
mode: "add",
titleMap: {
add: "新增计量设备",
edit: "编辑计量设备",
show: "查看计量设备",
},
form: {
type:10,
},
rules: {
name: [{required: true, message: "请输入", trigger: "blur"}],
number: [{required: true, message: "请输入", trigger: "blur"}],
keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
},
options: [
{
value: 10,
label: "合格",
},
{
value: 40,
label: "禁用",
}
,
{
value: 50,
label: "报废",
},
],
useoptions: [
{
value: 1,
label: "专用",
},
{
value: 2,
label: "公用",
},
],
wayoptions: [
{
value: 1,
label: "外检",
},
{
value: 2,
label: "自检",
},
],
mgmoptions: [
{
value: 1,
label: "A",
},
{
value: 2,
label: "B",
},
{
value: 3,
label: "C",
},
],
visible: false,
isSaveing: false,
keeperOptions: [],
depOptions: [],
selectionFilters: [],
setFiltersVisible: false,
belong_dept_options: []
};
},
mounted() {
this.getDeptOptions()
},
methods: {
getDeptOptions() {
this.$API.system.dept.list.req({page:0, type__in:'dept'}).then(res=>{
this.belong_dept_options = genTree(res);
})
},
//
open(mode = "add") {
this.mode = mode;
this.visible = true;
return this;
},
//
submit() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
try {
var res;
if (this.mode == "add") {
res = await this.$API.rpm.rparty.create.req(this.form);
} else if (this.mode == "edit") {
res = await this.$API.rpm.rparty.update.req(
this.form.id,
this.form
);
}
this.isSaveing = false;
this.$emit("success", this.form, this.mode);
this.visible = false;
this.$message.success("操作成功");
return res;
} catch (err) {
//
this.isSaveing = false;
return err;
}
}
});
},
//
setData(data) {
Object.assign(this.form, data);
},
//
setFilters(filters) {
this.selectionFilters = filters;
this.setFiltersVisible = true;
},
},
};
</script>
<style>
</style>

View File

@ -57,7 +57,18 @@
</el-select>
</el-form-item>
<el-form-item label="主要产品">
<el-input v-model="form.product" clearable></el-input>
<el-select
v-model="form.material"
placeholder="分类"
clearable
>
<el-option
v-for="item in materials"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属部门" prop="belong_dept">
<el-select
@ -114,7 +125,6 @@
name: [{required: true, message: '请输入测点集名称'}],
cate: [{required: true, message: '请选择分类'}],
belong_dept: [{required: true, message: '请选择所属部门'}],
},
groupsProps: {
multiple: false,
@ -130,19 +140,21 @@
'other':'其他',
},
group: [],
materials:[],
productList:[],
}
},
mounted() {
// this.getList();
this.getGroup();//
// this.getProduct();//
this.getMaterials();//
},
methods: {
handleChange(value) {
console.log(value);
console.log(this.form.belong_dept);
},
getMaterials(){},
//
async getGroup() {
let res = await this.$API.system.dept.list.req({ page_size: 3 , type:'dept'});
@ -150,8 +162,8 @@
},
//
getProduct(){
var res = this.$API.mtm.product.list.req({page:0});
this.productList = res.data;
var res = this.$API.mtm.material.list.req({page:0});
this.materials = res.data;
},
//
roleAdd(){

View File

@ -15,7 +15,7 @@
<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="名称" prop="name" min-width="100"></el-table-column>
<el-table-column label="计量物料" prop="product" min-width="150"></el-table-column>
<el-table-column label="计量物料" prop="material_name" min-width="150"></el-table-column>
<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
<el-table-column label="所属工段" prop="mgroup_name" min-width="150"></el-table-column>
<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
@ -78,9 +78,9 @@
>
<el-option
v-for="item in epOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
@ -95,24 +95,28 @@
>
<el-option
v-for="item in mgroupOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="所属部门">
<el-cascader
v-model="form.belong_dept"
:options="group"
:props="groupsProps"
:show-all-levels="false"
<el-form-item label="计量物料">
<el-select
v-model="form.material"
placeholder="计量物料"
clearable
style="width: 100%"
@change="handleChange"
></el-cascader>
style="width: 100%;"
>
<el-option
v-for="item in materials"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -179,13 +183,14 @@
group: [],
mgroupOptions:[],
epOptions:[],
materials:[],
monitoredOptions:[],
}
},
mounted() {
// this.getList();
this.getMaterial();
this.getGroup();//
this.getEquipment();//
this.getMonitored();//
@ -204,21 +209,28 @@
//
getEquipment(){
this.$API.em.equipment.list.req({page:0,type:10}).then(res=>{
this.epOptions = res.data;
this.epOptions = res;
})
},
//
getMonitored(){
this.$API.em.equipment.list.req({page:0,type:20}).then(res=>{
this.monitoredOptions = res.data;
this.monitoredOptions = res;
})
},
//
getMgroup(){
this.$API.mtm.material.list.req({page:0}).then(res=>{
this.mgroupOptions = res.data;
this.$API.mtm.mgroup.list.req({page:0}).then(res=>{
this.mgroupOptions = res;
})
},
//
getMaterial(){
this.$API.mtm.material.list.req({page:0}).then(res=>{
this.materials = res;
})
},
//
roleAdd(){
this.limitedVisible = true;