diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 50a717a..ce130e4 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -92,19 +92,20 @@ export function getCkeckProjectList(query) {
});
}
-//合格不合格
-export function changeCheckDetailStatus(recordId, status,defectCode) {
+//合格不合格
+export function changeCheckDetailStatus(recordId, status,defectCode,remark) {
const data = {
recordId,
status,
- defectCode
+ defectCode,
+ remark
}
return request({
url: '/quality/qcIncome/changeCheckDetailStatus',
method: 'put',
data: data
})
-}
+}
//测量值提交
export function commitActualValue(recordId, actualValues) {
@@ -117,7 +118,7 @@ export function commitActualValue(recordId, actualValues) {
method: 'put',
data: data
})
-}
+}
//审核结果提交
export function commitCheckResult(recordId,typeCode,checkType,orderNo) {
@@ -132,7 +133,7 @@ export function commitCheckResult(recordId,typeCode,checkType,orderNo) {
method: 'put',
data: data
})
-}
+}
export function getDefectList(defectType) {
const data = {
@@ -169,4 +170,4 @@ export function getProductWorkOrder(query) {
method: 'get',
params: query
});
- }
\ No newline at end of file
+ }
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index d19dd88..8974b43 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -428,6 +428,7 @@ export default {
dicts: ["unit","check_status","check_result"],
data() {
return {
+ showFlag:false,
// 遮罩层
loading: true,
// 选中数组
@@ -698,7 +699,7 @@ export default {
},
//工单选择确认
onSelectWorkOrder(obj) {
- this.form.orderNo = obj.orderNo;
+ this.form.orderNo = obj.workorderCode;
this.form.materialName = obj.materialName;
this.form.materialCode = obj.materialCode;
this.form.quality = obj.quality;
diff --git a/src/views/quality/qcProduce/selectWorkOrder.vue b/src/views/quality/qcProduce/selectWorkOrder.vue
index 7d7fee1..162388a 100644
--- a/src/views/quality/qcProduce/selectWorkOrder.vue
+++ b/src/views/quality/qcProduce/selectWorkOrder.vue
@@ -31,8 +31,8 @@
-
-
+
+
{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}
diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue
index 1fb1a67..7f8312c 100644
--- a/src/views/quality/qcTableXJ/index.vue
+++ b/src/views/quality/qcTableXJ/index.vue
@@ -88,13 +88,13 @@
-
-
+
+
-
+
-
+
@@ -221,7 +221,7 @@ export default {
var m = dd.getMonth() + 1;//获取当前月份的日期
var d = dd.getDate();
return y + "-" + m +"-"+d;
- },
+ },
indexMethod(index){
return index+1 ;
@@ -328,7 +328,7 @@ export default {
handleDetail(row) {
this.reset();
let sr = row;
-
+
this.queryParams.orderNo = sr.orderNo;
getXJCheckTableDetail(this.queryParams).then(response => {
this.pOrderTableList = response;
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index b6bcc7c..fa9c0e6 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -89,12 +89,23 @@
处理
+ >提交OA
+
+
+ OA审批查看
-
-
- 处理
-
-
-
-
+
+
-
-
+
+
@@ -285,6 +285,7 @@