|
|
|
@ -311,6 +311,159 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 检验单详情对话框 --> |
|
|
|
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px" :append-to-body="true"> |
|
|
|
<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> |
|
|
|
<el-form-item :label="'物料类别'"> |
|
|
|
<el-input v-model="detailData.invdefinetype" readonly style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'PN'"> |
|
|
|
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'SKU'"> |
|
|
|
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料名称'"> |
|
|
|
<el-input v-model="detailData.partDesc" readonly style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'单位'"> |
|
|
|
<el-input v-model="detailData.umName" readonly style="width: 60px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="协同人员"> |
|
|
|
<el-input v-model="detailData.operatorName" readonly style="width: 150px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="责任人"> |
|
|
|
<el-input v-model="detailData.responsiblePersonName" readonly style="width: 150px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item :label="'送检数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" v-model="detailData.rollQty" style="width: 85px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'抽样数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" v-model="detailData.samplingQty" style="width: 85px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'合格数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled style="width: 85px"></el-input-number> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-else v-model="detailData.passQty" style="width: 85px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'不合格数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.notPassQty" disabled style="width: 85px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'不合格项目数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled style="width: 85px"></el-input-number> |
|
|
|
<el-input-number :controls="false" :step="0" v-else v-model="detailData.unqualifiedQty" style="width: 85px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'批次合格数'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled style="width: 85px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<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> |
|
|
|
<el-option label="不合格" value="不合格"></el-option> |
|
|
|
</el-select> |
|
|
|
<el-select v-else v-model="detailData.inspectionResult" style="width: 100px" placeholder="请选择"> |
|
|
|
<el-option label="合格" value="合格"></el-option> |
|
|
|
<el-option label="不合格" value="不合格"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'质检备注'"> |
|
|
|
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 293px"></el-input> |
|
|
|
<el-input v-else v-model="detailData.inspectionRemark" style="width: 293px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<!-- 检验明细列表 --> |
|
|
|
<div class="rq"> |
|
|
|
<el-table |
|
|
|
:height="500" |
|
|
|
:data="detailList" |
|
|
|
border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
prop="itemNo" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="项目编号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemName" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="150" |
|
|
|
label="项目名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="standardValue" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="100" |
|
|
|
label="标准值"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="" |
|
|
|
header-align="center" |
|
|
|
align="right" |
|
|
|
min-width="80" |
|
|
|
label="实测值"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" type="number" style="height: 11px; width: 98%"></el-input> |
|
|
|
<el-input v-else v-model="scope.row.textValue" style="height: 11px; width: 98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="" |
|
|
|
header-align="center" |
|
|
|
align="right" |
|
|
|
min-width="80" |
|
|
|
label="抽样数量"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.samplingQty" disabled style="height: 11px; width:98%"></el-input-number> |
|
|
|
<el-input-number :controls="false" :step="0" v-else v-model="scope.row.samplingQty" style="height: 11px; width: 98%"></el-input-number> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="" |
|
|
|
header-align="center" |
|
|
|
align="right" |
|
|
|
min-width="80" |
|
|
|
label="不合格数量"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled style="height: 11px; width:98%"></el-input-number> |
|
|
|
<el-input-number :controls="false" :step="0" v-else v-model="scope.row.unqualifiedQuantity" style="height: 11px; width: 98%"></el-input-number> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="" |
|
|
|
header-align="center" |
|
|
|
align="right" |
|
|
|
min-width="90" |
|
|
|
label="项目检验结论"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px"> |
|
|
|
<el-option label="合格" value="Y" style="color: green"></el-option> |
|
|
|
<el-option label="不合格" value="N" style="color: red"></el-option> |
|
|
|
</el-select> |
|
|
|
<el-select v-else v-model="scope.row.itemResult" style="height: 11px;padding: 0px" placeholder="合格"> |
|
|
|
<el-option label="合格" value="Y" style="color: green"></el-option> |
|
|
|
<el-option label="不合格" value="N" style="color: red"></el-option> |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button> |
|
|
|
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button> |
|
|
|
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
</el-dialog> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
@ -332,7 +485,8 @@ import { |
|
|
|
queryPartList, // 查询物料集合 |
|
|
|
rollNoEnter as rollNoEnterAPI, // 标签号回车事件 |
|
|
|
searchSeqInfo, // 派工单号查询 |
|
|
|
getSiteAndBuByUserName2 // 获取BU列表 |
|
|
|
getSiteAndBuByUserName2, // 获取BU列表 |
|
|
|
saveIPQCDetailedRecord // 保存检验明细记录 |
|
|
|
} from "@/api/qc/qc.js" |
|
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
|
import { getInspectionFile } from '@/api/eam/eam_object_list.js' |
|
|
|
@ -649,6 +803,14 @@ export default { |
|
|
|
batchQualifiedQty: '' |
|
|
|
}, |
|
|
|
detailList: [], |
|
|
|
transferLoadFlag: false, |
|
|
|
saveInformationData: { |
|
|
|
site: '', |
|
|
|
buNo: '', |
|
|
|
inspectionNo:'', |
|
|
|
detailList: [], |
|
|
|
type: '' |
|
|
|
}, |
|
|
|
// 开始检验相关 |
|
|
|
ItemObjectModelFlag: false, |
|
|
|
actionData: { |
|
|
|
@ -1330,6 +1492,28 @@ export default { |
|
|
|
this.fileFlag = true |
|
|
|
}, |
|
|
|
|
|
|
|
// 保存检验明细(应用/保存) |
|
|
|
Transfer(type) { |
|
|
|
this.transferLoadFlag = true |
|
|
|
this.saveInformationData.site = this.detailData.site |
|
|
|
this.saveInformationData.buNo = this.detailData.buNo |
|
|
|
this.saveInformationData.inspectionNo = this.detailData.inspectionNo |
|
|
|
this.saveInformationData.detailList = this.detailList |
|
|
|
this.saveInformationData.type = type |
|
|
|
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.detailInformationFlag = false |
|
|
|
this.$message.success('操作成功') |
|
|
|
} else { |
|
|
|
this.$message.error(data.msg) |
|
|
|
} |
|
|
|
this.transferLoadFlag = false |
|
|
|
}).catch(() => { |
|
|
|
this.transferLoadFlag = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 关闭弹窗 |
|
|
|
handleClose() { |
|
|
|
this.$emit('update:visible', false) |
|
|
|
|