|
|
@ -51,7 +51,7 @@
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="14">
|
|
|
|
<el-col :span="14">
|
|
|
|
<el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark">
|
|
|
|
<el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark">
|
|
|
|
<el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
|
|
|
|
<el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
|
|
|
@ -60,7 +60,15 @@
|
|
|
|
-->
|
|
|
|
-->
|
|
|
|
<el-col :span="14">
|
|
|
|
<el-col :span="14">
|
|
|
|
<el-form-item label="不合格描述" prop="remark">
|
|
|
|
<el-form-item label="不合格描述" prop="remark">
|
|
|
|
<el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
|
|
|
|
<!-- <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" /> -->
|
|
|
|
|
|
|
|
<el-select v-model="form.remark" placeholder="请选择不合格描述" clearable>
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="dict in remarkList"
|
|
|
|
|
|
|
|
:key="dict.dictLabel"
|
|
|
|
|
|
|
|
:label="dict.dictLabel"
|
|
|
|
|
|
|
|
:value="dict.dictLabel"
|
|
|
|
|
|
|
|
></el-option>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
@ -162,7 +170,7 @@
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="接受质量限" prop="sampleAql" v-if="this.typeCode == 'material' || this.typeCode == 'product'">
|
|
|
|
<el-form-item label="接受质量限" prop="sampleAql" v-if="this.typeCode == 'material' || this.typeCode == 'product'">
|
|
|
|
<el-select placeholder="请选择接受质量限制" clearable
|
|
|
|
<el-select placeholder="请选择接受质量限制" clearable
|
|
|
|
@change="setSampleAql" v-model="dynamicValidateForm.sampleAql"
|
|
|
|
@change="setSampleAql" v-model="dynamicValidateForm.sampleAql"
|
|
|
@ -225,6 +233,7 @@ import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,
|
|
|
|
commitCheckResult,getDefectList,getWeightValue,getnoOkVals,getAutoJudge
|
|
|
|
commitCheckResult,getDefectList,getWeightValue,getnoOkVals,getAutoJudge
|
|
|
|
} from "@/api/quality/income";
|
|
|
|
} from "@/api/quality/income";
|
|
|
|
import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect";
|
|
|
|
import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect";
|
|
|
|
|
|
|
|
import { getDictData,} from "@/api/system/dict/data";
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
name: "itemSelectUser",
|
|
|
|
name: "itemSelectUser",
|
|
|
|
dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
|
|
|
|
dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
|
|
|
@ -246,6 +255,7 @@ export default {
|
|
|
|
// BOM产品表格数据
|
|
|
|
// BOM产品表格数据
|
|
|
|
itemList: null,
|
|
|
|
itemList: null,
|
|
|
|
qcCheckTaskDetails: [],
|
|
|
|
qcCheckTaskDetails: [],
|
|
|
|
|
|
|
|
remarkList: [],
|
|
|
|
//树名称
|
|
|
|
//树名称
|
|
|
|
bomCode: undefined,
|
|
|
|
bomCode: undefined,
|
|
|
|
defaultProps: {
|
|
|
|
defaultProps: {
|
|
|
@ -306,6 +316,7 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
this.getDefect();
|
|
|
|
this.getDefect();
|
|
|
|
|
|
|
|
this.handleGetDictData();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
getDefect(){
|
|
|
|
getDefect(){
|
|
|
@ -343,7 +354,7 @@ export default {
|
|
|
|
this.queryParams.pageNum = 1;
|
|
|
|
this.queryParams.pageNum = 1;
|
|
|
|
this.queryParams.pageSize = 10;
|
|
|
|
this.queryParams.pageSize = 10;
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
this.getDefect();
|
|
|
|
this.getDefect();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
/** 查询表格列表*/
|
|
|
|
/** 查询表格列表*/
|
|
|
@ -357,6 +368,17 @@ export default {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleGetDictData() {
|
|
|
|
|
|
|
|
const query = {
|
|
|
|
|
|
|
|
dictType: 'unqualified_remark',
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
getDictData(query).then(response => {
|
|
|
|
|
|
|
|
if (response.code === 200) {
|
|
|
|
|
|
|
|
this.remarkList = response.data;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
/** 搜索按钮操作 */
|
|
|
|
/** 搜索按钮操作 */
|
|
|
|
handleQuery() {
|
|
|
|
handleQuery() {
|
|
|
|
this.queryParams.pageNum = 1;
|
|
|
|
this.queryParams.pageNum = 1;
|
|
|
@ -506,7 +528,7 @@ export default {
|
|
|
|
if(this.typeCode=='material' || this.typeCode =='product'){//只有来料和成品有自动判定
|
|
|
|
if(this.typeCode=='material' || this.typeCode =='product'){//只有来料和成品有自动判定
|
|
|
|
debugger
|
|
|
|
debugger
|
|
|
|
//自动判定开始(仅使用范围形)
|
|
|
|
//自动判定开始(仅使用范围形)
|
|
|
|
getAutoJudge(this.quality,
|
|
|
|
getAutoJudge(this.quality,
|
|
|
|
this.dynamicValidateForm.checkLevel,
|
|
|
|
this.dynamicValidateForm.checkLevel,
|
|
|
|
this.dynamicValidateForm.sampleAql,
|
|
|
|
this.dynamicValidateForm.sampleAql,
|
|
|
|
actualValues,
|
|
|
|
actualValues,
|
|
|
@ -522,7 +544,7 @@ export default {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
//结束
|
|
|
|
//结束
|
|
|
|
}else{//不需要自动判定的情况
|
|
|
|
}else{//不需要自动判定的情况
|
|
|
|
this.commitActualValueFun(this.recordId, actualValues,autoStatus,null,null,null,null);
|
|
|
|
this.commitActualValueFun(this.recordId, actualValues,autoStatus,null,null,null,null);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -542,7 +564,7 @@ export default {
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
resetForm(formName) {
|
|
|
|
resetForm(formName) {
|
|
|
|
this.$refs[formName].resetFields();
|
|
|
|
this.$refs[formName].resetFields();
|
|
|
|
},
|
|
|
|
},
|
|
|
|