diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue
index 54fdbc59..dce5ee54 100644
--- a/src/views/mes/dailyReportNew/index.vue
+++ b/src/views/mes/dailyReportNew/index.vue
@@ -85,13 +85,13 @@
>
-
+
-
+
-
+
@@ -251,6 +251,11 @@ export default {
return cellValue.slice(7,18); //返回值
}
},
+ teamLeaderFormate(row, column, cellValue){
+ if(cellValue != null){
+ return cellValue.split("-")[0]; //返回值
+ }
+ },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 011427c1..2ce8a720 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -656,7 +656,13 @@
-
+
+ √合格
+ ×不合格
+
+
+ 备注:判定合格打“√”，不合格打“×”
+
@@ -739,6 +745,7 @@ export default {
validateRules: [],
checkList: [],
standardNo: null,
+ checkResult: 'Y',
printData: {
printable: 'printForm',
ignore: ['no-print'],
@@ -960,6 +967,7 @@ export default {
this.form.ignore = ['no-print'];//打印时需要
this.firstReportOpen = true;
this.title = "首检检验报告";
+ this.checkResult = response.data.checkResult;
})
this.queryParams.recordId = recordId;
this.getCheckedProjectList();
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index d0976b49..4e449930 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -544,7 +544,7 @@ export default {
this.checkProjectList0 = itemType0s;
this.total = response.total;
this.loading = false;
- this.form.standardNo = this.checkProjectList[0].standardNo;
+ //this.form.standardNo = this.checkProjectList[0].standardNo;
this.rowspan()
});
diff --git a/src/views/quality/qcInventory/selectPutInOrder.vue b/src/views/quality/qcInventory/selectPutInOrder.vue
index 8f50c9b0..e237ca79 100644
--- a/src/views/quality/qcInventory/selectPutInOrder.vue
+++ b/src/views/quality/qcInventory/selectPutInOrder.vue
@@ -9,10 +9,19 @@
-
+
+
+
+
-
-
+
+