|
|
|
@ -118,7 +118,8 @@ |
|
|
|
</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>--> |
|
|
|
<span slot="label" @click="queryMethodList"><a>方法编码</a></span> |
|
|
|
<el-input v-model="modalData.methodNo" style="width: 143px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="方法名称" prop="methodName" :rules="rules.methodNameType"> |
|
|
|
@ -170,6 +171,59 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 检验方法 --> |
|
|
|
<el-dialog title="检验方法清单" :close-on-click-modal="false" v-drag :visible.sync="methodModelFlag" width="520px"> |
|
|
|
<div class="rq"> |
|
|
|
<el-form :inline="true" label-position="top" :model="methodData"> |
|
|
|
<el-form-item :label="'方法编码'"> |
|
|
|
<el-input v-model="methodData.methodNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'方法名称'"> |
|
|
|
<el-input v-model="methodData.methodName" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'检验类型'"> |
|
|
|
<el-select v-model="methodData.inspectionTypeNo" style="width: 100px"> |
|
|
|
<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="queryMethodList">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="300" |
|
|
|
:data="methodList" |
|
|
|
@row-dblclick="getRowData" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in methodDetailList" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
: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.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="methodModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
<!-- 导入 --> |
|
|
|
<qcUpload ref="qcUpload" @refreshPageTables="getDataList()" v-drag></qcUpload> |
|
|
|
@ -182,7 +236,8 @@ |
|
|
|
qcItemSave, // 新增项目 |
|
|
|
qcItemUpdate, // 修改项目 |
|
|
|
qcItemDelete, // 删除项目 |
|
|
|
inspectionTypeSearch |
|
|
|
inspectionTypeSearch, // 查询检验类型 |
|
|
|
queryMethodList // 查询检验方法 |
|
|
|
} from "@/api/qc/qc.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
|
@ -502,6 +557,53 @@ |
|
|
|
] |
|
|
|
}, |
|
|
|
options: [], |
|
|
|
methodData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
methodNo: '', |
|
|
|
methodName: '', |
|
|
|
inspectionTypeNo: '', |
|
|
|
inspectionTypeName: '' |
|
|
|
}, |
|
|
|
methodList: [], |
|
|
|
methodModelFlag: false, |
|
|
|
methodDetailList: [ |
|
|
|
{ |
|
|
|
columnProp: 'methodNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '方法编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'methodName', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '方法名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'inspectionTypeName', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '检验类型', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
], |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
@ -759,6 +861,27 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取检验方法列表 |
|
|
|
queryMethodList () { |
|
|
|
queryMethodList(this.methodData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.methodList = data.rows |
|
|
|
this.methodModelFlag = true |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 选中检验方法 |
|
|
|
getRowData (row) { |
|
|
|
this.modalData.methodNo = row.methodNo |
|
|
|
this.modalData.methodName = row.methodName |
|
|
|
this.methodModelFlag = false |
|
|
|
}, |
|
|
|
|
|
|
|
// 校验用户是否收藏 |
|
|
|
favoriteIsOk() { |
|
|
|
let userFavorite = { |
|
|
|
|