白坯检验报告
+白坯检验报告
+包材检验报告
-
+
@@ -889,8 +889,8 @@ export default {
delFlag: null,
};
- this.spanArr = []
- this.position = 0
+ this.spanArr = [];
+ this.position = 0;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -924,6 +924,7 @@ export default {
if(row.checkType =='checkTypeSC') {
getProduce(recordId).then(response => {
this.form = response.data;
+ this.form.materialName = response.data.materialName+'/'+response.data.checkLoc;
//首检报告
this.form.printable = 'firstReportPrint'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 679dcfea..8d21be61 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -157,9 +157,9 @@
-
+
@@ -351,7 +351,9 @@ export default {
'background-color': '#d6dbe1',
'min-width': '100px',
'word-break': 'keep-all'
- }
+ },
+ spanArr: [],
+ position: 0
};
},
created() {
@@ -434,8 +436,9 @@ export default {
updateTime: null,
factoryCode: null,
delFlag: null,
-
};
+ this.spanArr = [];
+ this.position = 0;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -469,7 +472,7 @@ export default {
this.form = response.data;
let checkedValues0 =[];
checkedValues0.push(response.data.checkResult)
- this.form.checkedValues = ['Y'];
+ this.form.checkedValues = checkedValues0;
this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
@@ -526,6 +529,14 @@ export default {
}else if(item.itemType == '0'){
itemType0s.push(item);
}
+
+ if(item.status == 'Y'){
+ item.status = '合格';
+ }else if(item.status == 'N'){
+ item.status = '不合格';
+ }else{
+ item.status = '/';
+ }
})
this.checkProjectList = itemType1s;
@@ -533,6 +544,8 @@ export default {
this.total = response.total;
this.loading = false;
this.form.standardNo = this.checkProjectList[0].standardNo;
+
+ this.rowspan()
});
},
// 打印预览-浏览器打印
@@ -559,7 +572,44 @@ export default {
getCodeValue(defectCode) {
const foundDefect = this.defectList.find(defect => defect.defectCode === defectCode);
return foundDefect.defectSubclass;
- }
+ },
+
+ /**
+ * 1. 若是objectSpanMethod不返回任何东西，表格不会变化
+ * 2. 最外层的判断一般是，先从第几列开始合并
+ * 3. 这次从第0行合并2个，下次就要从第3行开始合并（0行加俩，就到3行了）
+ * 4. 这种方式是有多少条数据，合并多少条数据，比如本案例中有7条数据（从第0条合并到第7条）
+ * 5. return { rowspan: 0, colspan: 0 } // 表示不合并
+ * */
+ rowspan() {
+ this.checkProjectList.forEach((item, index) => {
+ if (index === 0) {
+ this.spanArr.push(1);
+ this.position = 0;
+ } else {
+ if (
+ this.checkProjectList[index].projectRuleName ===
+ this.checkProjectList[index - 1].projectRuleName
+ ) {
+ this.spanArr[this.position] += 1;
+ this.spanArr.push(0);
+ } else {
+ this.spanArr.push(1);
+ this.position = index;
+ }
+ }
+ });
+ },
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+ if (columnIndex === 1) {
+ const _row = this.spanArr[rowIndex];
+ const _col = _row > 0 ? 1 : 0;
+ return {
+ rowspan: _row,
+ colspan: _col,
+ };
+ }
+ },
}
};
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index e1e7fc5a..016f30ce 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -10,7 +10,7 @@
-
+
合格
@@ -18,7 +18,31 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
是
@@ -27,7 +51,7 @@
-
+
-
-
-
-
+
+
-
@@ -188,7 +209,7 @@ import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitChe
import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect";
export default {
name: "itemSelectUser",
- dicts: ["qc_rule_prop","material_type_oa","material_from_oa"],
+ dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
data() {
return {
viewStatus : '0',
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 1841ecb5..e833e2e9 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -711,12 +711,10 @@ export default {
},
//检验项目弹窗
handleCheckProject(row){
-
- if(row.checkStatus != '0'){
- this.$modal.msgSuccess("已经完成检验");
+ if(row.checkStatus != '0'){
+ this.$modal.msgSuccess("已经完成检验");
return
}
-
this.$refs.itemSelectProject.showFlag = true;
this.$refs.itemSelectProject.init(row,'material');
},
@@ -727,7 +725,7 @@ export default {
},
//提交检测结果
saveCheck(){
- this.getList();
+ this.getList();
},
handleDefectType() {
const defectType = "material";
@@ -889,8 +889,8 @@ export default {
delFlag: null,
};
- this.spanArr = []
- this.position = 0
+ this.spanArr = [];
+ this.position = 0;
this.resetForm("form");
},
/** 搜索按钮操作 */
@@ -924,6 +924,7 @@ export default {
if(row.checkType =='checkTypeSC') {
getProduce(recordId).then(response => {
this.form = response.data;
+ this.form.materialName = response.data.materialName+'/'+response.data.checkLoc;
//首检报告
this.form.printable = 'firstReportPrint'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 679dcfea..8d21be61 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -157,9 +157,9 @@