|
|
|
@ -196,17 +196,17 @@ |
|
|
|
<!-- </el-select>--> |
|
|
|
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="resourceId" :rules="rules.resourceIdType"> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'"> |
|
|
|
<span slot="label" @click="getBaseList(205)"><a herf="#">机台</a></span> |
|
|
|
<el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="物料编码"> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" label="物料编码" prop="partNo" :rules="rules.partNoType"> |
|
|
|
<el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" :model="modalData"> |
|
|
|
<span slot="label" @click="getBaseList(206)"><a herf="#">物料编码</a></span> |
|
|
|
<span slot="label" @click="queryPartList()"><a herf="#">物料编码</a></span> |
|
|
|
<el-input v-model="modalData.partNo" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="物料名称"> |
|
|
|
@ -224,10 +224,10 @@ |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType"> |
|
|
|
<el-select v-model="modalData.inspectionTypeNo" style="width: 221px"> |
|
|
|
<el-option label="首件检" value="101"></el-option> |
|
|
|
<el-option label="自检" value="102"></el-option> |
|
|
|
<el-option label="巡检" value="103"></el-option> |
|
|
|
<el-option label="末件检" value="104"></el-option> |
|
|
|
<el-option label="首件检" value="首件检"></el-option> |
|
|
|
<el-option label="自检" value="自检"></el-option> |
|
|
|
<el-option label="巡检" value="巡检"></el-option> |
|
|
|
<el-option label="末件检" value="末件检"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType"> |
|
|
|
@ -331,7 +331,7 @@ |
|
|
|
:value = "i.inspectorNo"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
<el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectorNo" placeholder="请选择" style="width: 100px"> |
|
|
|
<el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in options" |
|
|
|
:key = "i.inspectorNo" |
|
|
|
@ -527,7 +527,6 @@ |
|
|
|
<el-table |
|
|
|
:height="300" |
|
|
|
:data="templateList" |
|
|
|
ref="departmentTable" |
|
|
|
@row-dblclick="getRowData" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
@ -549,6 +548,55 @@ |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="templateModelFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 物料 --> |
|
|
|
<el-dialog title="物料清单" :close-on-click-modal="false" v-drag :visible.sync="partModelFlag" width="520px"> |
|
|
|
<div class="rq"> |
|
|
|
<el-form :inline="true" label-position="top" :model="partData"> |
|
|
|
<el-form-item :label="'物料编码'"> |
|
|
|
<el-input v-model="partData.partNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料名称'"> |
|
|
|
<el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'SKU'"> |
|
|
|
<el-input v-model="partData.sku" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="queryPartList()">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="300" |
|
|
|
:data="partList" |
|
|
|
@row-dblclick="getRowData2" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in partDetailList" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="partModelFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 文件清单 --> |
|
|
|
@ -607,7 +655,6 @@ |
|
|
|
saveIPQCSubDetailed, // 新增子明细信息 |
|
|
|
selectIPQCSubDetailedRecord, // 子明细记录信息查询 |
|
|
|
checkIPQCIsSubmit, // 检查是否已提交 |
|
|
|
checkIPQCSubDetailValue, // 检查子明细中的实测值是否在规定范围 |
|
|
|
getOperationList, // 查询工序列表 |
|
|
|
getResourceList, // 查询机台列表 |
|
|
|
getPartList, // 查询物料列表 |
|
|
|
@ -619,7 +666,8 @@ |
|
|
|
InspectionTypeSearch, // 搜索所有检验类型 |
|
|
|
disposalMeasuresSearch, // 获取处置措施列表 |
|
|
|
getRollNo, // 模糊查询标签号 |
|
|
|
rollNoEnter // 标签号回车事件 |
|
|
|
rollNoEnter, // 标签号回车事件 |
|
|
|
queryPartList // 查询物料集合 |
|
|
|
} from "@/api/qc/qc.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
|
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' |
|
|
|
@ -686,8 +734,8 @@ |
|
|
|
inspectionNo:'', |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
inspectionTypeNo:'101', |
|
|
|
inspectionTypeName:'IPQC', |
|
|
|
inspectionTypeNo:'', |
|
|
|
inspectionTypeName:'', |
|
|
|
inspectorNo:'', |
|
|
|
inspectorName:'', |
|
|
|
submit_flag:'', |
|
|
|
@ -776,7 +824,7 @@ |
|
|
|
columnWidth: 100, |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'inspectionTypeName', |
|
|
|
columnProp: 'inspectionTypeNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '检验类型', |
|
|
|
@ -997,7 +1045,7 @@ |
|
|
|
columnWidth: 120, |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'inspectorNo', |
|
|
|
columnProp: 'inspectorName', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '质检员', |
|
|
|
@ -1037,6 +1085,7 @@ |
|
|
|
disposalRemark: '', |
|
|
|
inspectionResult: '', |
|
|
|
inspectorNo: '', |
|
|
|
inspectorName: '', |
|
|
|
inspectionRemark: '', |
|
|
|
submitFlag: '', |
|
|
|
cinvSourceCode: '', |
|
|
|
@ -1303,6 +1352,13 @@ |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
partNoType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
] |
|
|
|
}, |
|
|
|
batchHandleAddModalFlag: false, |
|
|
|
@ -1319,6 +1375,12 @@ |
|
|
|
inspectionTypeNo: '', |
|
|
|
inspectionTypeName: '' |
|
|
|
}, |
|
|
|
partData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
sku: '' |
|
|
|
}, |
|
|
|
templateList: [], |
|
|
|
templateModelFlag: false, |
|
|
|
templateDetailList: [ |
|
|
|
@ -1359,10 +1421,49 @@ |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
], |
|
|
|
partDetailList: [ |
|
|
|
{ |
|
|
|
columnProp: 'partNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '物料编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'partDesc', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '物料名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'sku', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: 'SKU', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
], |
|
|
|
checked: false, |
|
|
|
typeOptions: [], |
|
|
|
disposalMeasuresOptions: [], |
|
|
|
timeout: null |
|
|
|
timeout: null, |
|
|
|
partModelFlag: false |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
@ -1610,10 +1711,10 @@ |
|
|
|
strVal = this.modalData.resourceDesc |
|
|
|
this.$refs.baseList.init(val, strVal) |
|
|
|
} |
|
|
|
if (val === 206) { |
|
|
|
strVal = this.modalData.partNo |
|
|
|
this.$refs.baseList.init(val, strVal) |
|
|
|
} |
|
|
|
// if (val === 206) { |
|
|
|
// strVal = this.modalData.partNo |
|
|
|
// this.$refs.baseList.init(val, strVal) |
|
|
|
// } |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -1631,27 +1732,27 @@ |
|
|
|
this.modalData.resourceId = val.resource_id |
|
|
|
this.modalData.resourceDesc = val.resource_desc |
|
|
|
} |
|
|
|
if (this.tagNo === 206) { |
|
|
|
this.modalData.partNo = val.part_no |
|
|
|
this.modalData.partDesc = val.part_desc |
|
|
|
// 获取物料的其他信息 |
|
|
|
this.getPartInformation() |
|
|
|
} |
|
|
|
// if (this.tagNo === 206) { |
|
|
|
// this.modalData.partNo = val.part_no |
|
|
|
// this.modalData.partDesc = val.part_desc |
|
|
|
// // 获取物料的其他信息 |
|
|
|
// this.getPartInformation() |
|
|
|
// } |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取物料其它信息 |
|
|
|
getPartInformation () { |
|
|
|
getPartInformation(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.modalData.spec = data.rows[0].spec |
|
|
|
this.modalData.sku = data.rows[0].sku |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
// // 获取物料其它信息 |
|
|
|
// getPartInformation () { |
|
|
|
// getPartInformation(this.modalData).then(({data}) => { |
|
|
|
// if (data && data.code === 0) { |
|
|
|
// this.modalData.spec = data.rows[0].spec |
|
|
|
// this.modalData.sku = data.rows[0].sku |
|
|
|
// } else { |
|
|
|
// this.$alert(data.msg, '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// }, |
|
|
|
|
|
|
|
// 获取工序列表 |
|
|
|
getOperationList () { |
|
|
|
@ -1783,6 +1884,21 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取物料列表 |
|
|
|
queryPartList () { |
|
|
|
// 查询所有物料 |
|
|
|
queryPartList(this.partData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.partList = data.rows |
|
|
|
this.partModelFlag = true |
|
|
|
}else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 选中检验模板 |
|
|
|
getRowData (row) { |
|
|
|
this.modalData.templateId = row.templateId |
|
|
|
@ -1790,6 +1906,15 @@ |
|
|
|
this.templateModelFlag = false |
|
|
|
}, |
|
|
|
|
|
|
|
// 选中物料 |
|
|
|
getRowData2 (row) { |
|
|
|
this.modalData.partNo = row.partNo |
|
|
|
this.modalData.partDesc = row.partDesc |
|
|
|
this.modalData.sku = row.sku |
|
|
|
this.modalData.spec = row.spec |
|
|
|
this.partModelFlag = false |
|
|
|
}, |
|
|
|
|
|
|
|
// 是否新增特殊任务 |
|
|
|
changeSpecialTask () { |
|
|
|
// 先重置数据 |
|
|
|
@ -1861,7 +1986,7 @@ |
|
|
|
this.$message.warning('请选择检验类型！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.partNo === '' || this.modalData.partNo == null) { |
|
|
|
if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.partNo === '' || this.modalData.partNo == null)) { |
|
|
|
this.$message.warning('请选择物料！') |
|
|
|
return |
|
|
|
} |
|
|
|
@ -1869,7 +1994,7 @@ |
|
|
|
this.$message.warning('请选择工序！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { |
|
|
|
if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.resourceId === '' || this.modalData.resourceId == null)) { |
|
|
|
this.$message.warning('请选择机台！') |
|
|
|
return |
|
|
|
} |
|
|
|
@ -1980,10 +2105,10 @@ |
|
|
|
this.$message.warning('请选择检验结论！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { |
|
|
|
this.$message.warning('请选择检验员！') |
|
|
|
return |
|
|
|
} |
|
|
|
// if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { |
|
|
|
// this.$message.warning('请选择检验员！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
for (let i = 0; i < this.detailList.length; i++) { |
|
|
|
if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){ |
|
|
|
this.detailList[i].itemResult = 'Y' |
|
|
|
@ -2013,7 +2138,7 @@ |
|
|
|
this.saveInformationData.inspectionNo = this.detailData.inspectionNo |
|
|
|
this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures |
|
|
|
this.saveInformationData.disposalRemark = this.detailData.disposalRemark |
|
|
|
this.saveInformationData.inspectorNo = this.detailData.inspectorNo |
|
|
|
this.saveInformationData.inspectorNo = this.$store.state.user.name |
|
|
|
this.saveInformationData.inspectionResult = this.detailData.inspectionResult |
|
|
|
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark |
|
|
|
this.saveInformationData.rollQty = this.detailData.rollQty |
|
|
|
@ -2046,6 +2171,7 @@ |
|
|
|
this.detailData.disposalRemark = row.disposalRemark |
|
|
|
this.detailData.inspectionResult = row.inspectionResult |
|
|
|
this.detailData.inspectorNo = row.inspectorNo |
|
|
|
this.detailData.inspectorName = row.inspectorName |
|
|
|
this.detailData.inspectionRemark = row.inspectionRemark |
|
|
|
this.detailData.cinvSourceCode = row.cinvSourceCode |
|
|
|
this.detailData.sku = row.sku |
|
|
|
|
杨奉源
2 years ago