diff --git a/src/api/quality/defectType.js b/src/api/quality/defectType.js
index 934f147..79146fe 100644
--- a/src/api/quality/defectType.js
+++ b/src/api/quality/defectType.js
@@ -42,3 +42,9 @@ export function delDefectType(faultId) {
method: 'delete'
});
}
+export function getDefectTypeListByDefectType(defectType) {
+ return request({
+ url: '/quality/defectType/getDefectTypeListByDefectType/' + defectType,
+ method: 'get',
+ });
+}
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 87873d3..4e5364d 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -313,7 +313,12 @@ export default {
console.log(this.form.groupId);
if(this.form.materialCode != null) {
addMaterialGroupDetail(this.form).then((response) => {
- this.$modal.msgSuccess("新增成功");
+ let message = response.code
+ if(message == 200) {
+ this.$modal.msgSuccess("新增成功");
+ }else {
+ this.$modal.msgError("新增失败");
+ }
this.open = false;
this.getMaterialTree();
});
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index a16f56f..5a275f7 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -196,7 +196,7 @@
-
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -332,19 +332,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -424,6 +414,7 @@ import ItemSelectWorkOrder from "./selectWorkOrder.vue";
import ItemSelectWorkCenter from "./selectWorkCenter.vue";
import ItemSelectUser from "../qcIncome/selectUser.vue";
import ItemSelectProject from "../qcIncome/checkProjectType.vue";
+import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
export default {
name: "QcProduce",
components: { ItemSelectWorkCenter,ItemSelectUser,ItemSelectProject,ItemSelectWorkOrder},
@@ -445,6 +436,7 @@ export default {
// 生产过程检验任务表格数据
qcProduceList: [],
checkTypeList:[],
+ defectTypeList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -522,6 +514,7 @@ export default {
this.getDate();
this.getList();
this.getCheckTypes();
+ this.handleDefectType();
},
methods: {
/****/
@@ -602,7 +595,8 @@ export default {
updateBy: null,
updateTime: null,
factoryCode: null,
- delFlag: null
+ delFlag: null,
+ defects: []
};
this.resetForm("form");
},
@@ -625,8 +619,10 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
+ this.form.defects = this.defectTypeList;
this.open = true;
this.title = "添加生产过程检验任务";
+
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -735,6 +731,12 @@ export default {
//提交检测结果
saveCheck(){
this.getList();
+ },
+ handleDefectType() {
+ const defectType = "produce"
+ getDefectTypeListByDefectType(defectType).then(response => {
+ this.defectTypeList = response.rows;
+ });
}
}
};
diff --git a/src/views/quality/qcSampleRule/index.vue b/src/views/quality/qcSampleRule/index.vue
index f6c71fe..3a9b95c 100644
--- a/src/views/quality/qcSampleRule/index.vue
+++ b/src/views/quality/qcSampleRule/index.vue
@@ -133,13 +133,13 @@
-
+
-
+
-
+