diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 3487d87..f46cd73 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -1,13 +1,15 @@
-
-
+
+
+
+
-
+
-
检查人:
品质主管:
-
+
-
+
@@ -203,7 +205,7 @@
-
-
+
-
+
-
+
@@ -278,7 +280,7 @@
-
+
@@ -312,7 +314,7 @@
-
+
@@ -427,8 +429,9 @@ export default {
return index + 1;
},
/****/
+ //获取检验节点
getCheckTypes() {
- getCheckTypes('material').then(response => {
+ getCheckTypes('produce').then(response => {
this.checkTypes = response;
});
},
@@ -499,7 +502,7 @@ export default {
updateTime: null,
factoryCode: null,
delFlag: null,
-
+
};
this.resetForm("form");
},
@@ -529,7 +532,7 @@ export default {
handleLook(row) {
this.reset();
const recordId = row.recordId || this.ids
-
+
if(row.checkType =='checkTypeSC') {
getProduce(recordId).then(response => {
this.form = response.data;
@@ -555,7 +558,7 @@ export default {
this.newWorkerLoading = false // 设置加载状态为false,表示加载完成
})
}
-
+
},
/** 提交按钮 */
submitForm() {
@@ -630,11 +633,11 @@ export default {
margin-bottom: 15px;
margin-left: 10px;
}
-.center-text {
+.center-text {
text-align: center;
}
.my-print-nav {
margin-top: 15px;
margin-bottom: 15px;
}
-
\ No newline at end of file
+
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 5a275f7..8bedf17 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -122,7 +122,7 @@
v-hasPermi="['quality:qcProduce:add']"
>新增
-
+
-
+
@@ -622,7 +622,7 @@ export default {
this.form.defects = this.defectTypeList;
this.open = true;
this.title = "添加生产过程检验任务";
-
+
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -632,6 +632,10 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改生产过程检验任务";
+
+ getBatchList(response.data.orderNo).then(response => {
+ this.batchList = response;
+ });
});
},
/** 提交按钮 */
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index f2a6792..b6bcc7c 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -128,8 +128,8 @@
/>
-
-
+
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}