|
|
|
@ -2,14 +2,28 @@ |
|
|
|
<div class="mod-config"> |
|
|
|
<!-- 收藏 --> |
|
|
|
<div> |
|
|
|
<span @click="favoriteFunction()"> |
|
|
|
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg> |
|
|
|
</span> |
|
|
|
<span @click="favoriteFunction()"> |
|
|
|
<icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg> |
|
|
|
</span> |
|
|
|
</div> |
|
|
|
<!-- 条件查询 --> |
|
|
|
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()"> |
|
|
|
<el-form-item :label="'项目名称'"> |
|
|
|
<el-input v-model="searchData.itemDesc" style="width: 120px"></el-input> |
|
|
|
<el-form-item :label="'项目编码:'"> |
|
|
|
<el-input v-model="searchData.itemNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'项目名称:'"> |
|
|
|
<el-input v-model="searchData.itemDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="检验类型:"> |
|
|
|
<el-select v-model="searchData.inspectionTypeNo" placeholder="请选择"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option |
|
|
|
v-for = "i in options" |
|
|
|
:key = "i.inspectionTypeNo" |
|
|
|
:label = "i.inspectionTypeName" |
|
|
|
:value = "i.inspectionTypeNo"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="getDataList()">查询</el-button> |
|
|
|
@ -76,11 +90,11 @@ |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:fixed="item.fixed === '' ? false : item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -97,13 +111,26 @@ |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
|
|
|
|
<el-pagination |
|
|
|
@size-change="sizeChangeHandle" |
|
|
|
@current-change="currentChangeHandle" |
|
|
|
:current-page="pageIndex" |
|
|
|
:page-sizes="[20, 50, 100, 200, 500]" |
|
|
|
:page-size="pageSize" |
|
|
|
:total="totalPage" |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
|
|
|
|
<!-- 新增和修改 --> |
|
|
|
<el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="检验项目名称:" prop="itemDesc" :rules="rules.itemDescType"> |
|
|
|
<el-form-item label="项目编码:" prop="itemNo" :rules="rules.itemNoType"> |
|
|
|
<el-input v-model="modalData.itemNo" :disabled="modalDisableFlag" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="项目名称:" prop="itemDesc" :rules="rules.itemDescType"> |
|
|
|
<el-input v-model="modalData.itemDesc" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'检验值类型'" prop="valueTypeDb" :rules="rules.valueTypeDbType"> |
|
|
|
<el-form-item label="检验值类型:" prop="valueTypeDb" :rules="rules.valueTypeDbType"> |
|
|
|
<el-select filterable v-model="modalData.valueTypeDb" style="width: 120px"> |
|
|
|
<el-option label="文本" value="T"></el-option> |
|
|
|
<el-option label="数字" value="N"></el-option> |
|
|
|
@ -112,25 +139,35 @@ |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item prop="methodNo" :rules="rules.methodNoType"> |
|
|
|
<span slot="label" style="" @click="getBaseList(1036)"><a herf="#">检验方法编码</a></span> |
|
|
|
<span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span> |
|
|
|
<el-input v-model="modalData.methodNo" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="检验方法名称:" prop="methodName" :rules="rules.methodNameType"> |
|
|
|
<el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType"> |
|
|
|
<el-input v-model="modalData.methodName" disabled style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> |
|
|
|
<el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in options" |
|
|
|
:key = "i.inspectionTypeNo" |
|
|
|
:label = "i.inspectionTypeName" |
|
|
|
:value = "i.inspectionTypeNo"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="参照值:"> |
|
|
|
<el-input v-if="modalData.valueTypeDb == 'T'" v-model="modalData.defaultValue" style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb == 'N'" v-model="modalData.defaultValue" type="number" style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.defaultValue" style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.defaultValue" type="number" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="最大值:"> |
|
|
|
<el-input v-if="modalData.valueTypeDb == 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb == 'N'" v-model="modalData.maxValue" type="number" style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.maxValue" type="number" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="最小值:"> |
|
|
|
<el-input v-if="modalData.valueTypeDb == 'T'" v-model="modalData.minValue" type="number" disabled style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb == 'N'" v-model="modalData.minValue" type="number" style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.minValue" type="number" disabled style="width: 120px"></el-input> |
|
|
|
<el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
@ -151,6 +188,7 @@ |
|
|
|
qcItemSave, // 新增项目 |
|
|
|
qcItemUpdate, // 修改项目 |
|
|
|
qcItemDelete, // 删除项目 |
|
|
|
InspectionTypeSearch |
|
|
|
} from "@/api/qc/qc.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
|
@ -186,16 +224,24 @@ |
|
|
|
exportList:[], |
|
|
|
// 导出 end |
|
|
|
searchData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
itemNo: '', |
|
|
|
itemDesc: '', |
|
|
|
itemType: 'D' |
|
|
|
itemType: 'D', |
|
|
|
inspectionTypeNo: '', |
|
|
|
page: 1, |
|
|
|
limit: 10, |
|
|
|
}, |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 50, |
|
|
|
totalPage: 0, |
|
|
|
height: 200, |
|
|
|
dataList: [], |
|
|
|
dataListLoading: false, |
|
|
|
modalFlag: false, |
|
|
|
modalDisableFlag: false, |
|
|
|
modalData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
flag: '', |
|
|
|
itemNo: '', |
|
|
|
itemDesc: '', |
|
|
|
@ -209,6 +255,7 @@ |
|
|
|
methodNo: '', |
|
|
|
methodName: '', |
|
|
|
updateBy: '', |
|
|
|
inspectionTypeNo: '' |
|
|
|
}, |
|
|
|
// 检验项目展示标头 |
|
|
|
columnList: [ |
|
|
|
@ -272,6 +319,18 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'inspectionTypeNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
columnLabel: '检验类型', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'defaultValue', |
|
|
|
headerAlign: 'center', |
|
|
|
@ -386,7 +445,22 @@ |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
} |
|
|
|
inspectionTypeNoType:[ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
itemNoType:[ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
] |
|
|
|
}, |
|
|
|
options: [], |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
@ -397,6 +471,7 @@ |
|
|
|
created () { |
|
|
|
this.getDataList() |
|
|
|
this.favoriteIsOk() |
|
|
|
this.InspectionTypeSearch() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
/** |
|
|
|
@ -445,6 +520,25 @@ |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 每页数 |
|
|
|
sizeChangeHandle (val) { |
|
|
|
this.pageSize = val |
|
|
|
this.pageIndex = 1 |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
// 当前页 |
|
|
|
currentChangeHandle (val) { |
|
|
|
this.pageIndex = val |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
// 查询检验类型 |
|
|
|
InspectionTypeSearch(){ |
|
|
|
InspectionTypeSearch().then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.options = data.rows |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
/* 列表方法的回调 */ |
|
|
|
getBaseData (val) { |
|
|
|
if (this.tagNo === 1036) { |
|
|
|
@ -454,13 +548,19 @@ |
|
|
|
}, |
|
|
|
// 获取数据列表 |
|
|
|
getDataList () { |
|
|
|
this.searchData.limit = this.pageSize |
|
|
|
this.searchData.page = this.pageIndex |
|
|
|
qcItemSearch(this.searchData).then(({data}) => { |
|
|
|
this.dataList = data.rows |
|
|
|
this.dataList = data.page.list |
|
|
|
this.pageIndex = data.page.currPage |
|
|
|
this.pageSize = data.page.pageSize |
|
|
|
this.totalPage = data.page.totalCount |
|
|
|
}) |
|
|
|
}, |
|
|
|
addModal () { |
|
|
|
this.modalData = { |
|
|
|
flag: '1', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
createdBy: this.$store.state.user.name, |
|
|
|
itemNo: '', |
|
|
|
itemDesc: '', |
|
|
|
@ -473,6 +573,7 @@ |
|
|
|
methodNo: '', |
|
|
|
methodName: '', |
|
|
|
updateBy: '', |
|
|
|
inspectionTypeNo: '' |
|
|
|
} |
|
|
|
this.modalDisableFlag = false |
|
|
|
this.modalFlag = true |
|
|
|
@ -480,6 +581,7 @@ |
|
|
|
updateModal (row) { |
|
|
|
this.modalData = { |
|
|
|
flag: '2', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
itemNo: row.itemNo, |
|
|
|
itemDesc: row.itemDesc, |
|
|
|
valueTypeDb: row.valueTypeDb, |
|
|
|
@ -492,6 +594,7 @@ |
|
|
|
methodNo: row.methodNo, |
|
|
|
methodName: row.methodName, |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
inspectionTypeNo: row.inspectionTypeNo |
|
|
|
} |
|
|
|
this.modalDisableFlag = true |
|
|
|
this.modalFlag = true |
|
|
|
@ -504,7 +607,7 @@ |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
qcItemDelete(row).then(({data}) => { |
|
|
|
if (data && data.code == 0) { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
@ -523,27 +626,29 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
saveData () { |
|
|
|
if (this.modalData.itemDesc == '' || this.modalData.itemDesc == null) { |
|
|
|
this.$alert('请输入检验项目名称！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
if (this.modalData.itemNo === '' || this.modalData.itemNo == null) { |
|
|
|
this.$message.warning('请输入检验项目编码！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.valueTypeDb == '' || this.modalData.valueTypeDb == null) { |
|
|
|
this.$alert('请输入检验值类型！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) { |
|
|
|
this.$message.warning('请输入检验项目名称！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.methodNo == '' || this.modalData.methodNo == null) { |
|
|
|
this.$alert('请选择检验方法！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
if (this.modalData.valueTypeDb === '' || this.modalData.valueTypeDb == null) { |
|
|
|
this.$message.warning('请选择检验值类型！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) { |
|
|
|
this.$message.warning('请选择检验类型！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.methodNo === '' || this.modalData.methodNo == null) { |
|
|
|
this.$message.warning('请选择检验方法！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.flag == '1') { |
|
|
|
if (this.modalData.flag === '1') { |
|
|
|
qcItemSave(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code == 0) { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.modalFlag = false |
|
|
|
this.$message({ |
|
|
|
@ -561,7 +666,7 @@ |
|
|
|
}) |
|
|
|
} else { |
|
|
|
qcItemUpdate(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code == 0) { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.modalFlag = false |
|
|
|
this.$message({ |
|
|
|
@ -588,7 +693,7 @@ |
|
|
|
} |
|
|
|
userFavoriteList(userFavorite).then(({data}) => { |
|
|
|
for (let i = 0; i < data.list.length; i++) { |
|
|
|
if(this.$route.meta.menuId==data.list[i].menuId){ |
|
|
|
if(this.$route.meta.menuId == data.list[i].menuId){ |
|
|
|
this.favorite = true |
|
|
|
} |
|
|
|
} |
|
|
|
|
杨奉源
3 years ago