|
|
|
@ -9,7 +9,7 @@
|
|
|
|
|
<el-row :gutter="20">
|
|
|
|
|
|
|
|
|
|
<el-col :span="24" :xs="24">
|
|
|
|
|
<el-table v-loading="loading" :data="itemList" ref="myTable" >
|
|
|
|
|
<el-table v-loading="loading" :data="itemList" ref="myTable">
|
|
|
|
|
<el-table-column width="50" align="center" type="selection">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- 序号 -->
|
|
|
|
@ -18,12 +18,12 @@
|
|
|
|
|
<el-table-column label="检验规则名称" align="left" prop="ruleName" width="300"/>
|
|
|
|
|
<el-table-column label="检验规则属性" align="left" prop="propertyCode" width="120" >
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<dict-tag
|
|
|
|
|
:options="dict.type.qc_rule_prop"
|
|
|
|
|
:value="scope.row.propertyCode"
|
|
|
|
|
/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<dict-tag
|
|
|
|
|
:options="dict.type.qc_rule_prop"
|
|
|
|
|
:value="scope.row.propertyCode"
|
|
|
|
|
/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="检验方式" align="left" prop="checkMode" width="150" :show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="检验工具" align="left" prop="checkTool" />
|
|
|
|
|
<el-table-column label="检验标准" align="left" prop="checkStandard" width="150" :show-overflow-tooltip="true"/>
|
|
|
|
@ -37,6 +37,23 @@
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-input v-model="scope.row.remark" placeholder="请输入不良描述" />
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="不良类型" align="left" prop="defectCode" width="120">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-select v-model="scope.row.defectCode" placeholder="检验结果" clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="(item,index) in defectList"
|
|
|
|
|
:key="index"
|
|
|
|
|
:label="item.defectSubclass"
|
|
|
|
|
:value="item.defectCode"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="不良数量" align="left" prop="defectQuality" width="120">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-input type="number" v-model="scope.row.defectQuality" placeholder="请输入不良数量"/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="检测值" align="center" class-name="small-padding fixed-width" v-if="this.viewStatus != '1' ">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
@ -55,7 +72,6 @@
|
|
|
|
|
v-model="scope.row.status"
|
|
|
|
|
active-value="Y"
|
|
|
|
|
inactive-value="N"
|
|
|
|
|
@change="handleStatusChange(scope.row)"
|
|
|
|
|
></el-switch>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -121,7 +137,7 @@ export default {
|
|
|
|
|
total: 0,
|
|
|
|
|
// BOM产品表格数据
|
|
|
|
|
itemList: null,
|
|
|
|
|
|
|
|
|
|
qcCheckTaskDetails: [],
|
|
|
|
|
//树名称
|
|
|
|
|
bomCode: undefined,
|
|
|
|
|
defaultProps: {
|
|
|
|
@ -156,7 +172,7 @@ export default {
|
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
|
|
getDefect(){
|
|
|
|
|
getDefectList('defect_in').then(response => {
|
|
|
|
|
getDefectList('material').then(response => {
|
|
|
|
|
this.defectList = response;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
@ -207,10 +223,25 @@ export default {
|
|
|
|
|
this.resetForm("queryForm");
|
|
|
|
|
this.handleQuery();
|
|
|
|
|
},
|
|
|
|
|
getAllRowData() {
|
|
|
|
|
this.rowData = this.$refs.myTable.data;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//提交整体检测结果
|
|
|
|
|
submitBomForm() {
|
|
|
|
|
commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => {
|
|
|
|
|
//获取待检验信息列表--点处理后获取检测项--提交
|
|
|
|
|
this.getAllRowData();
|
|
|
|
|
const data = {
|
|
|
|
|
recordId: this.data.recordId,
|
|
|
|
|
typeCode: this.typeCode,
|
|
|
|
|
checkType: this.checkType,
|
|
|
|
|
orderCode: this.orderNo,
|
|
|
|
|
workorderCodeSap: this.orderNo,
|
|
|
|
|
sampleQuality: this.data.sampleQuality,
|
|
|
|
|
incomeBatchNo: this.data.incomeBatchNo,
|
|
|
|
|
qcCheckTaskDetails: this.rowData,
|
|
|
|
|
}
|
|
|
|
|
commitCheckResult(data).then(response => {
|
|
|
|
|
this.$modal.msgSuccess("检测完成");
|
|
|
|
|
this.$emit('saveCheck');
|
|
|
|
|
this.showFlag = false;
|
|
|
|
@ -223,16 +254,16 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// 数据状态修改/Y合格N不合格
|
|
|
|
|
handleStatusChange(row) {
|
|
|
|
|
/* handleStatusChange(row) {
|
|
|
|
|
let text = row.status === "N" ? "不合格" : "合格";
|
|
|
|
|
this.$modal.confirm('确认' + '"' + row.projectNo + '"'+text+'吗?').then(function() {
|
|
|
|
|
return changeCheckDetailStatus(row.recordId, row.status, row.defectCode,row.remark);
|
|
|
|
|
return changeCheckDetailStatus(row.recordId, row.status, row.remark, row.defectCode, row.defectQuality);
|
|
|
|
|
}).then(() => {
|
|
|
|
|
this.$modal.msgSuccess(text + "操作成功");
|
|
|
|
|
}).catch(function() {
|
|
|
|
|
row.status = row.status === "N" ? "Y" : "N";
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
}, */
|
|
|
|
|
|
|
|
|
|
//动态测量值
|
|
|
|
|
/** 检测结果钮操作 */
|
|
|
|
|