|
|
@ -83,7 +83,9 @@ |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="5"> |
|
|
<el-col :span="5"> |
|
|
<el-form-item label="工序"> |
|
|
<el-form-item label="工序"> |
|
|
<el-input v-model="searchData.operationDesc" placeholder="请输入工序" clearable></el-input> |
|
|
|
|
|
|
|
|
<el-select v-model="searchData.operationDesc" clearable filterable placeholder="请选择工序"> |
|
|
|
|
|
<el-option v-for="item in operationDescList" :key="item" :label="item" :value="item"></el-option> |
|
|
|
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
@ -126,9 +128,7 @@ |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="5"> |
|
|
<el-col :span="5"> |
|
|
<el-form-item label="质检员"> |
|
|
<el-form-item label="质检员"> |
|
|
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable> |
|
|
|
|
|
<i slot="prefix" class="el-input__icon el-icon-user"></i> |
|
|
|
|
|
</el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
@ -1287,7 +1287,7 @@ |
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
import {getInspectionFile} from '@/api/eam/eam_object_list.js' |
|
|
import {getInspectionFile} from '@/api/eam/eam_object_list.js' |
|
|
import { searchQcSopFileList, downloadSopFile } from '@/api/qc/qc.js' |
|
|
|
|
|
|
|
|
import { searchQcSopFileList, downloadSopFile, getAllOperationDescList } from '@/api/qc/qc.js' |
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' |
|
|
import {qcPrint} from '@/api/qc/qcPrint.js' |
|
|
import {qcPrint} from '@/api/qc/qcPrint.js' |
|
|
import excel from "@/utils/excel-util.js" |
|
|
import excel from "@/utils/excel-util.js" |
|
|
@ -1359,6 +1359,7 @@ |
|
|
sopFileList: [], |
|
|
sopFileList: [], |
|
|
sopFileLoading: false, |
|
|
sopFileLoading: false, |
|
|
currentFileRow: null, |
|
|
currentFileRow: null, |
|
|
|
|
|
operationDescList: [], // 工序下拉列表 |
|
|
// 是否收藏 |
|
|
// 是否收藏 |
|
|
favorite: false, |
|
|
favorite: false, |
|
|
// 导出 start |
|
|
// 导出 start |
|
|
@ -2809,9 +2810,22 @@ |
|
|
} |
|
|
} |
|
|
// 获取用户角色 |
|
|
// 获取用户角色 |
|
|
this.getUserRoleList() |
|
|
this.getUserRoleList() |
|
|
|
|
|
// 加载工序下拉列表 |
|
|
|
|
|
this.loadOperationDescList() |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
// 加载工序下拉列表 |
|
|
|
|
|
loadOperationDescList() { |
|
|
|
|
|
const params = { |
|
|
|
|
|
userName: this.$store.state.user.name |
|
|
|
|
|
} |
|
|
|
|
|
getAllOperationDescList(params).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.operationDescList = data.rows || [] |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
// 切换搜索框展开/收起 |
|
|
// 切换搜索框展开/收起 |
|
|
toggleSearchExpand() { |
|
|
toggleSearchExpand() { |
|
|
this.searchExpanded = !this.searchExpanded; |
|
|
this.searchExpanded = !this.searchExpanded; |
|
|
@ -3815,7 +3829,12 @@ |
|
|
saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
if (data && data.code === 0) { |
|
|
if (data && data.code === 0) { |
|
|
this.getDataList() |
|
|
this.getDataList() |
|
|
this.detailInformationFlag = false |
|
|
|
|
|
|
|
|
// 应用时(type=1)不关闭对话框,只刷新数据 |
|
|
|
|
|
if (type === '1') { |
|
|
|
|
|
this.getInspectionFormData() |
|
|
|
|
|
} else { |
|
|
|
|
|
this.detailInformationFlag = false |
|
|
|
|
|
} |
|
|
this.$message.success('操作成功') |
|
|
this.$message.success('操作成功') |
|
|
} else { |
|
|
} else { |
|
|
this.$message.error(data.msg) |
|
|
this.$message.error(data.msg) |
|
|
|