|
|
|
@ -143,21 +143,12 @@ |
|
|
|
<!-- 新增巡检记录 --> |
|
|
|
<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-item prop="orderNo" :rules="rules.orderNoType"> |
|
|
|
<span slot="label" @click="getBaseList(1052)"><a herf="#">工单号</a></span> |
|
|
|
<el-input v-model="modalData.orderNo" style="width: 221px"></el-input> |
|
|
|
<el-form-item prop="orderNo" :rules="rules.seqNoType"> |
|
|
|
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span> |
|
|
|
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item prop="orderNo" :rules="rules.orderNoType">--> |
|
|
|
<!-- <span slot="label" @click="getOrderNoList"><a herf="#">工单号</a></span>--> |
|
|
|
<!-- <el-input v-model="modalData.orderNo" @change="orderNoChange()" style="width: 221px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<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-select> |
|
|
|
<el-form-item label="工单号" prop="orderNo" :rules="rules.orderNoType"> |
|
|
|
<el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
@ -184,7 +175,7 @@ |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="物料" prop="partNo" :rules="rules.partNoType"> |
|
|
|
<el-select v-model="modalData.partNo" placeholder="请选择" style="width: 321px"> |
|
|
|
<el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in partList" |
|
|
|
:key = "i.partNo" |
|
|
|
@ -193,8 +184,23 @@ |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType"> |
|
|
|
<el-input v-model="modalData.rollQty" type="number" style="width: 120px"></el-input> |
|
|
|
</el-form> |
|
|
|
<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-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType"> |
|
|
|
<el-input v-model="modalData.rollQty" type="number" 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 label="老卷号"> |
|
|
|
<el-input v-model="modalData.batchRollNo" style="width: 456px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
@ -575,6 +581,8 @@ |
|
|
|
resourceId: '', |
|
|
|
resourceDesc: '', |
|
|
|
rollQty: '', |
|
|
|
seqNo: '', |
|
|
|
batchRollNo: '' |
|
|
|
}, |
|
|
|
// 展示列集 |
|
|
|
columnList: [ |
|
|
|
@ -662,6 +670,18 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'seqNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '派工单号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'operationDesc', |
|
|
|
headerAlign: "center", |
|
|
|
@ -1043,35 +1063,42 @@ |
|
|
|
partList: [], |
|
|
|
IPQCSelections: [], |
|
|
|
rules:{ |
|
|
|
orderNoType:[ |
|
|
|
seqNoType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
orderNoType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
operationDescType:[ |
|
|
|
operationDescType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
resourceIdType:[ |
|
|
|
resourceIdType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
partNoType:[ |
|
|
|
partNoType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
], |
|
|
|
rollQtyType:[ |
|
|
|
rollQtyType: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
@ -1084,7 +1111,7 @@ |
|
|
|
message: ' ', |
|
|
|
trigger: 'change' |
|
|
|
} |
|
|
|
] |
|
|
|
], |
|
|
|
}, |
|
|
|
// orderNoData:{ |
|
|
|
// limit: 10, |
|
|
|
@ -1223,7 +1250,7 @@ |
|
|
|
this.$nextTick(() => { |
|
|
|
let strVal = '' |
|
|
|
if (val === 1052) { |
|
|
|
strVal = this.modalData.orderNo |
|
|
|
strVal = this.modalData.seqNo |
|
|
|
this.$refs.baseList.init(val, strVal) |
|
|
|
} |
|
|
|
}) |
|
|
|
@ -1232,7 +1259,10 @@ |
|
|
|
/* 列表方法的回调 */ |
|
|
|
getBaseData (val) { |
|
|
|
if (this.tagNo === 1052) { |
|
|
|
this.modalData.seqNo = val.seqno |
|
|
|
this.modalData.orderNo = val.orderno |
|
|
|
this.modalData.operationDesc = '' |
|
|
|
this.modalData.resourceId = '' |
|
|
|
this.getOperationList() |
|
|
|
this.getPartList() |
|
|
|
} |
|
|
|
@ -1358,6 +1388,8 @@ |
|
|
|
resourceId: '', |
|
|
|
resourceDesc: '', |
|
|
|
rollQty: '', |
|
|
|
seqNo: '', |
|
|
|
batchRollNo: '' |
|
|
|
}; |
|
|
|
this.operationList = []; |
|
|
|
this.resourceList = []; |
|
|
|
@ -1368,6 +1400,10 @@ |
|
|
|
|
|
|
|
// 新增IPQC巡检记录 |
|
|
|
saveData(){ |
|
|
|
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { |
|
|
|
this.$message.warning('请选择派工单！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { |
|
|
|
this.$message.warning('请选择工单！') |
|
|
|
return |
|
|
|
@ -1463,7 +1499,7 @@ |
|
|
|
|
|
|
|
// 删除检验记录 |
|
|
|
deleteModal () { |
|
|
|
if(this.IPQCSelections.length == 0){ |
|
|
|
if(this.IPQCSelections.length === 0){ |
|
|
|
this.$alert('请勾选要删除的检验单！', '提示', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
@ -1500,35 +1536,25 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
Transfer(){ |
|
|
|
if (this.detailData.inspectionResult == '' || this.detailData.inspectionResult == null) { |
|
|
|
if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { |
|
|
|
this.$alert('请选择检验结论！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
if (this.detailData.inspectorNo == '' || this.detailData.inspectorNo == null) { |
|
|
|
if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { |
|
|
|
this.$alert('请选择检验员！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
// if (this.detailData.inspectionResult == 'Y' && (this.detailData.disposalMeasures == '特采' || this.detailData.disposalMeasures == '拒收')) { |
|
|
|
// this.$alert('合格不予处置措施，请查看！', '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// return false |
|
|
|
// } |
|
|
|
for (let i = 0; i < this.detailList.length; i++) { |
|
|
|
if(this.detailList[i].itemResult == '' || this.detailList[i].itemResult == null){ |
|
|
|
// this.$alert(this.detailList[i].itemDesc+'是否合格未确认！', '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// return false |
|
|
|
if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){ |
|
|
|
this.detailList[i].itemResult = 'Y' |
|
|
|
} |
|
|
|
if(this.detailList[i].valueTypeDb == 'N') { |
|
|
|
if(this.detailList[i].valueTypeDb === 'N') { |
|
|
|
checkIPQCSubDetailValue(this.detailList[i]).then(({data}) => { |
|
|
|
if (data.flag == 2 && this.detailList[i].itemResult == 'Y') { |
|
|
|
if (data.flag === 2 && this.detailList[i].itemResult ==='Y') { |
|
|
|
this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
@ -1557,7 +1583,7 @@ |
|
|
|
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark |
|
|
|
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) |
|
|
|
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
|
if (data && data.code == '0') { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.detailInformationFlag = false |
|
|
|
} else { |
|
|
|
@ -1685,7 +1711,6 @@ |
|
|
|
obj.subDetailValue = ""; |
|
|
|
obj.samplingLocation = ""; |
|
|
|
this.tableData.push(obj); |
|
|
|
console.log(this.tableData) |
|
|
|
} else { |
|
|
|
this.$alert("记录已提交！", '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
@ -1780,13 +1805,10 @@ |
|
|
|
console.log(this.$route.meta.menuId) |
|
|
|
userFavoriteList(userFavorite).then(({data}) => { |
|
|
|
for (let i = 0; i < data.list.length; i++) { |
|
|
|
// let flag=false; |
|
|
|
if(this.$route.meta.menuId==data.list[i].menuId){ |
|
|
|
this.favorite = true |
|
|
|
// flag=true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -1797,17 +1819,10 @@ |
|
|
|
functionId: this.$route.meta.menuId, |
|
|
|
} |
|
|
|
if (this.favorite) { |
|
|
|
// 取消收藏 |
|
|
|
// this.$confirm(`确定取消收藏`, '提示', { |
|
|
|
// confirmButtonText: '确定', |
|
|
|
// cancelButtonText: '取消', |
|
|
|
// type: 'warning' |
|
|
|
// }).then(() => { |
|
|
|
removeUserFavorite(userFavorite).then(({data}) => { |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.favorite = false |
|
|
|
}) |
|
|
|
// }) |
|
|
|
removeUserFavorite(userFavorite).then(({data}) => { |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.favorite = false |
|
|
|
}) |
|
|
|
} else { |
|
|
|
// 收藏 |
|
|
|
saveUserFavorite(userFavorite).then(({data}) => { |
|
|
|
@ -1824,7 +1839,6 @@ |
|
|
|
await qcIPQCInspectionSearch(this.searchData).then(({data}) => { |
|
|
|
this.exportList= data.page.list; |
|
|
|
}) |
|
|
|
|
|
|
|
return this.exportList; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -1847,7 +1861,6 @@ |
|
|
|
}) |
|
|
|
json += "}" |
|
|
|
let s = eval("(" + json + ")") |
|
|
|
|
|
|
|
return s |
|
|
|
}, |
|
|
|
} |
|
|
|
|
杨奉源
2 years ago