wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-11-07 设备和质量修改1

java8
杨奉源 2 years ago
parent
1de52d8f90
commit
0dce314d6a
4 changed files with 128 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/qc/qc.js
  2. 51
      src/views/modules/qc/FAIResultEntry.vue
  3. 52
      src/views/modules/qc/FQCResultEntry.vue
  4. 53
      src/views/modules/qc/IPQCResultEntry.vue

1
src/api/qc/qc.js
View File

@ -135,6 +135,7 @@ export const queryTemplateList = data => createAPI(`/pms/qc/queryTemplateList`,'
export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`,'post',data) export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation`,'post',data)
export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data) export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data)
export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data) export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data)
export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data)
// ===================================== IQC检验 ===================================== // ===================================== IQC检验 =====================================
export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data) export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)

51
src/views/modules/qc/FAIResultEntry.vue
View File

@ -136,14 +136,16 @@
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号"> <el-form-item label="标签号">
<el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -600,6 +602,7 @@
InspectionTypeSearch, // 搜索所有检验类型 InspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch, // 获取处置措施列表 disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号 getRollNo, // 模糊查询标签号
rollNoEnter // 标签号回车事件
} from "@/api/qc/qc.js"; } from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam'; import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@ -1329,6 +1332,33 @@
}, },
methods: { methods: {
// 标签号回车事件
rollNoEnter () {
let tempData = {
site: this.$store.state.user.site,
rollNo: this.modalData.rollNo
}
rollNoEnter(tempData).then(({data}) => {
if (data && data.code === 0) {
this.operationList = data.rows
this.modalData.seqNo = data.rows[0].seqNo
this.modalData.orderNo = data.rows[0].orderNo
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
querySearchAsync (queryString, cb) { querySearchAsync (queryString, cb) {
clearTimeout(this.timeout) clearTimeout(this.timeout)
let results = [] let results = []
@ -1385,7 +1415,10 @@
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){ InspectionTypeSearch(){
InspectionTypeSearch().then(({data}) => {
let tempData = {
site: this.$store.state.user.site
}
InspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.typeOptions = data.rows this.typeOptions = data.rows
} }

52
src/views/modules/qc/FQCResultEntry.vue
View File

@ -134,14 +134,16 @@
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号"> <el-form-item label="标签号">
<el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -598,6 +600,7 @@
InspectionTypeSearch, // 搜索所有检验类型 InspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch, // 获取处置措施列表 disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号 getRollNo, // 模糊查询标签号
rollNoEnter // 标签号回车事件
} from "@/api/qc/qc.js"; } from "@/api/qc/qc.js";
import Chooselist from '@/views/modules/common/Chooselist_eam'; import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@ -1326,6 +1329,34 @@
this.disposalMeasuresSearch() this.disposalMeasuresSearch()
}, },
methods: { methods: {
// 标签号回车事件
rollNoEnter () {
let tempData = {
site: this.$store.state.user.site,
rollNo: this.modalData.rollNo
}
rollNoEnter(tempData).then(({data}) => {
if (data && data.code === 0) {
this.operationList = data.rows
this.modalData.seqNo = data.rows[0].seqNo
this.modalData.orderNo = data.rows[0].orderNo
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
querySearchAsync (queryString, cb) { querySearchAsync (queryString, cb) {
clearTimeout(this.timeout) clearTimeout(this.timeout)
let results = [] let results = []
@ -1382,7 +1413,10 @@
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){ InspectionTypeSearch(){
InspectionTypeSearch().then(({data}) => {
let tempData = {
site: this.$store.state.user.site
}
InspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.typeOptions = data.rows this.typeOptions = data.rows
} }

53
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -144,14 +144,16 @@
<el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号"> <el-form-item label="标签号">
<el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable
:fetch-suggestions="querySearchAsync" @select="handleSelect"
placeholder="请输入标签号">
</el-autocomplete>
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag !== 'Y'" style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -617,7 +619,7 @@
InspectionTypeSearch, // 搜索所有检验类型 InspectionTypeSearch, // 搜索所有检验类型
disposalMeasuresSearch, // 获取处置措施列表 disposalMeasuresSearch, // 获取处置措施列表
getRollNo, // 模糊查询标签号 getRollNo, // 模糊查询标签号
getOrderNoList // 查询工单列表
rollNoEnter // 标签号回车事件
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
@ -1376,6 +1378,33 @@
}, },
methods: { methods: {
// 标签号回车事件
rollNoEnter () {
let tempData = {
site: this.$store.state.user.site,
rollNo: this.modalData.rollNo
}
rollNoEnter(tempData).then(({data}) => {
if (data && data.code === 0) {
this.operationList = data.rows
this.modalData.seqNo = data.rows[0].seqNo
this.modalData.orderNo = data.rows[0].orderNo
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// input 模糊搜索 // input 模糊搜索
querySearchAsync (queryString, cb) { querySearchAsync (queryString, cb) {
clearTimeout(this.timeout) clearTimeout(this.timeout)
@ -1433,7 +1462,10 @@
// 查询检验类型 // 查询检验类型
InspectionTypeSearch(){ InspectionTypeSearch(){
InspectionTypeSearch().then(({data}) => {
let tempData = {
site: this.$store.state.user.site
}
InspectionTypeSearch(tempData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.typeOptions = data.rows this.typeOptions = data.rows
} }
@ -1627,7 +1659,6 @@
if (data && data.code === 0) { if (data && data.code === 0) {
this.operationList = data.rows this.operationList = data.rows
this.modalData.operationDesc = data.rows[0].operationDesc this.modalData.operationDesc = data.rows[0].operationDesc
//this.getResourceList()
this.modalData.workCenterNo = data.rows[0].workCenterNo this.modalData.workCenterNo = data.rows[0].workCenterNo
this.modalData.resourceId = data.rows[0].resourceId this.modalData.resourceId = data.rows[0].resourceId
this.modalData.resourceDesc = data.rows[0].resourceDesc this.modalData.resourceDesc = data.rows[0].resourceDesc

Write Preview
Loading…
Cancel
Save