Browse Source

2026-01-15

优化
master
fengyuan_yang 4 days ago
parent
commit
68dc501e2b
  1. 31
      src/views/modules/qc/FQCResultEntry.vue
  2. 27
      src/views/modules/qc/IPQCResultEntry.vue
  3. 7
      src/views/modules/qc/IQCResultEntry.vue
  4. 7
      src/views/modules/qc/OQCResultEntry.vue
  5. 7
      src/views/modules/yieldReport/com_process_inspection.vue

31
src/views/modules/qc/FQCResultEntry.vue

@ -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)

27
src/views/modules/qc/IPQCResultEntry.vue

@ -88,7 +88,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-col :span="5"> <el-col :span="5">
@ -1496,7 +1498,7 @@
import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.js" import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.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"
@ -1570,6 +1572,7 @@
sopFileList: [], sopFileList: [],
sopFileLoading: false, sopFileLoading: false,
currentFileRow: null, currentFileRow: null,
operationDescList: [], //
// //
favorite: false, favorite: false,
// start // start
@ -3061,9 +3064,22 @@
this.queryResourceList() this.queryResourceList()
// //
this.loadWorkCenterList() this.loadWorkCenterList()
//
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;
@ -4148,7 +4164,12 @@
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIPQCDetailedRecord(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)

7
src/views/modules/qc/IQCResultEntry.vue

@ -2952,7 +2952,12 @@
saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIQCDetailedRecord(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)

7
src/views/modules/qc/OQCResultEntry.vue

@ -2803,7 +2803,12 @@
if (data && data.code === 0) { if (data && data.code === 0) {
this.searchData.inspectionNo = '' this.searchData.inspectionNo = ''
this.getDataList() this.getDataList()
this.detailInformationFlag = false
// (type=1)
if (type === '1') {
this.getInspectionFormData()
} else {
this.detailInformationFlag = false
}
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',

7
src/views/modules/yieldReport/com_process_inspection.vue

@ -2409,7 +2409,12 @@ export default {
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIPQCDetailedRecord(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)

Loading…
Cancel
Save