|
|
|
@ -101,7 +101,7 @@ |
|
|
|
<el-date-picker style="width: 130px" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd' placeholder="结束日期"></el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button> |
|
|
|
<el-button v-if="!authSearch" :loading="searchLoading" type="primary" @click="getDataList">查询</el-button> |
|
|
|
<el-button v-if="!authSave" type="primary" @click="addModal">新增</el-button> |
|
|
|
<el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button> |
|
|
|
<el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button> |
|
|
|
@ -258,7 +258,7 @@ |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(505)"><a herf="#">机台</a></span> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(505, 1)"><a herf="#">机台</a></span> |
|
|
|
<el-input v-model="modalData.resourceDesc" readonly style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item v-else label="机台" prop="resourceId" :rules="rules.resourceIdType">--> |
|
|
|
@ -334,7 +334,7 @@ |
|
|
|
|
|
|
|
<!-- 检验单详情页 --> |
|
|
|
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag top="5vh" :visible.sync="detailInformationFlag" width="1200px"> |
|
|
|
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList"> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item :label="'物料编码'"> |
|
|
|
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -368,7 +368,7 @@ |
|
|
|
<el-input class="inlineNumber numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 70px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList"> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item :label="'检验结论'"> |
|
|
|
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择"> |
|
|
|
<el-option label="合格" value="合格"></el-option> |
|
|
|
@ -383,8 +383,8 @@ |
|
|
|
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 303px"></el-input> |
|
|
|
<el-input v-else v-model="detailData.inspectionRemark" style="width: 303px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="检验员"> |
|
|
|
<!-- <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled style="width: 100px">--> |
|
|
|
<!-- <el-form-item label="检验员">--> |
|
|
|
<!-- <el-select v-model="detailData.inspectorNo" disabled style="width: 100px">--> |
|
|
|
<!-- <el-option--> |
|
|
|
<!-- v-for = "i in options"--> |
|
|
|
<!-- :key = "i.inspectorNo"--> |
|
|
|
@ -392,14 +392,10 @@ |
|
|
|
<!-- :value = "i.inspectorNo">--> |
|
|
|
<!-- </el-option>--> |
|
|
|
<!-- </el-select>--> |
|
|
|
<el-select v-model="detailData.inspectorNo" disabled style="width: 100px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in options" |
|
|
|
:key = "i.inspectorNo" |
|
|
|
:label = "i.inspectorName" |
|
|
|
:value = "i.inspectorNo"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<el-form-item> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(505, 2)"><a herf="#">实际机台</a></span> |
|
|
|
<el-input v-model="detailData.actualResourceDesc" readonly style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<span v-if="detailData.submitFlag === 'Y'" slot="label">协同人员</span> |
|
|
|
@ -1030,7 +1026,8 @@ |
|
|
|
inspectionResult: '', |
|
|
|
submitList: [], |
|
|
|
}, |
|
|
|
tagNo:'', |
|
|
|
tagNo: '', |
|
|
|
type: '', |
|
|
|
searchData: { |
|
|
|
site: '', |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
@ -1069,16 +1066,16 @@ |
|
|
|
dataList: [], |
|
|
|
dataListSelections: [], |
|
|
|
modalData: { |
|
|
|
flag:'', |
|
|
|
flag: '', |
|
|
|
site: '', |
|
|
|
bu: '', |
|
|
|
inspectionNo:'', |
|
|
|
inspectionNo: '', |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
inspectionTypeNo:'', |
|
|
|
inspectionTypeName:'', |
|
|
|
inspectorNo:'', |
|
|
|
inspectorName:'', |
|
|
|
inspectionTypeNo: '', |
|
|
|
inspectionTypeName: '', |
|
|
|
inspectorNo: '', |
|
|
|
inspectorName: '', |
|
|
|
orderNo: '', |
|
|
|
operationDesc: '', |
|
|
|
operationNo: '', |
|
|
|
@ -1100,7 +1097,8 @@ |
|
|
|
sjzs: '', |
|
|
|
boxNo: '', |
|
|
|
createBy: '', |
|
|
|
importantFlag: '' |
|
|
|
importantFlag: '', |
|
|
|
actualResourceId: '' |
|
|
|
}, |
|
|
|
// 展示列集 |
|
|
|
columnList1: [ |
|
|
|
@ -1672,7 +1670,9 @@ |
|
|
|
responsiblePersonName: '', |
|
|
|
passQty: '', |
|
|
|
notPassQty: '', |
|
|
|
shiftDesc: '' |
|
|
|
shiftDesc: '', |
|
|
|
actualResourceId: '', |
|
|
|
actualResourceDesc: '' |
|
|
|
}, |
|
|
|
detailInformationFlag: false, |
|
|
|
detailList: [], |
|
|
|
@ -1696,7 +1696,8 @@ |
|
|
|
responsiblePersonName: '', |
|
|
|
subDetailList: [], |
|
|
|
passQty: '', |
|
|
|
notPassQty: '' |
|
|
|
notPassQty: '', |
|
|
|
actualResourceId: '' |
|
|
|
}, |
|
|
|
detailColumnList: [ |
|
|
|
{ |
|
|
|
@ -2419,6 +2420,7 @@ |
|
|
|
currentRow: {}, |
|
|
|
currentDetailRow: {}, |
|
|
|
saveLoading: false, |
|
|
|
searchLoading: false |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -3096,18 +3098,23 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取基础数据列表S |
|
|
|
getBaseList (val,type) { |
|
|
|
getBaseList (val, type) { |
|
|
|
this.tagNo = val |
|
|
|
this.type = type |
|
|
|
this.$nextTick(() => { |
|
|
|
let strVal = '' |
|
|
|
if (val === 1052) { |
|
|
|
this.searchSeqInfo() |
|
|
|
this.seqDetailFlag = true |
|
|
|
} |
|
|
|
if (val === 505) { |
|
|
|
if (val === 505 && type === 1) { |
|
|
|
strVal = this.modalData.resourceDesc |
|
|
|
this.$refs.baseList.init(val, strVal) |
|
|
|
} |
|
|
|
if (val === 505 && type === 2) { |
|
|
|
strVal = this.detailData.actualResourceDesc |
|
|
|
this.$refs.baseList.init(val, strVal) |
|
|
|
} |
|
|
|
if (val === 509) { |
|
|
|
strVal = this.detailData.responsiblePerson |
|
|
|
this.$refs.baseList.init(val, strVal) |
|
|
|
@ -3129,10 +3136,14 @@ |
|
|
|
this.getOperationList() |
|
|
|
//this.getPartList() |
|
|
|
} |
|
|
|
if (this.tagNo === 505) { |
|
|
|
if (this.tagNo === 505 && this.type === 1) { |
|
|
|
this.modalData.resourceId = val.ResourceID |
|
|
|
this.modalData.resourceDesc = val.ResourceDesc |
|
|
|
} |
|
|
|
if (this.tagNo === 505 && this.type === 2) { |
|
|
|
this.detailData.actualResourceId = val.ResourceID |
|
|
|
this.detailData.actualResourceDesc = val.ResourceDesc |
|
|
|
} |
|
|
|
if (this.tagNo === 509) { |
|
|
|
this.detailData.responsiblePerson = val.SupplierID |
|
|
|
} |
|
|
|
@ -3264,7 +3275,8 @@ |
|
|
|
sjzs: '', |
|
|
|
boxNo: '', |
|
|
|
createBy: this.$store.state.user.name, |
|
|
|
importantFlag: '' |
|
|
|
importantFlag: '', |
|
|
|
actualResourceId: '' |
|
|
|
} |
|
|
|
this.operationList = [] |
|
|
|
this.resourceList = [] |
|
|
|
@ -3452,8 +3464,9 @@ |
|
|
|
this.$message.warning('请选择检验模板！') |
|
|
|
return |
|
|
|
} |
|
|
|
this.modalData.actualResourceId = this.modalData.resourceId // 2025 04 14 新增实际机台 默认=机台 |
|
|
|
this.saveLoading = true |
|
|
|
if(this.modalData.flag === '1'){ |
|
|
|
if(this.modalData.flag === '1') { |
|
|
|
saveOsInspection(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
@ -3481,6 +3494,7 @@ |
|
|
|
|
|
|
|
// 获取主信息数据列表 |
|
|
|
getDataList () { |
|
|
|
this.searchLoading = true |
|
|
|
this.searchData.limit = this.pageSize |
|
|
|
this.searchData.page = this.pageIndex |
|
|
|
qcIPQCInspectionSearch(this.searchData).then(({data}) => { |
|
|
|
@ -3489,7 +3503,12 @@ |
|
|
|
this.pageIndex = data.page.currPage |
|
|
|
this.pageSize = data.page.pageSize |
|
|
|
this.totalPage = data.page.totalCount |
|
|
|
this.searchLoading = false |
|
|
|
} else { |
|
|
|
this.searchLoading = false |
|
|
|
} |
|
|
|
}).catch(() => { |
|
|
|
this.searchLoading = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -3654,6 +3673,7 @@ |
|
|
|
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) |
|
|
|
this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty |
|
|
|
this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty |
|
|
|
this.saveInformationData.actualResourceId = this.detailData.actualResourceId |
|
|
|
// this.saveInformationData.subDetailList = this.acquisitionList |
|
|
|
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
@ -3731,6 +3751,8 @@ |
|
|
|
this.detailData.responsiblePerson = row.responsiblePerson |
|
|
|
this.detailData.responsiblePersonName = row.responsiblePersonName |
|
|
|
this.detailData.shiftDesc = row.shiftDesc |
|
|
|
this.detailData.actualResourceId = row.actualResourceId |
|
|
|
this.detailData.actualResourceDesc = row.actualResourceDesc |
|
|
|
if (row.state === '待检验') { |
|
|
|
this.detailData.passQty = row.samplingQty |
|
|
|
} else { |
|
|
|
@ -3823,7 +3845,6 @@ |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
fengyuan_yang
9 months ago