From a1917eca0b4f0fabf9f13648a840c2be8e2bf7f9 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 15:41:26 +0800
Subject: [PATCH] modified: src/components/view/standard-table/target.vue modified: src/components/view/standard.vue
---
src/components/view/rawInsDetail.vue | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 13741d8..c2b201f 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -365,7 +365,9 @@
}
this.getOptions();
},
- mounted() {},
+ mounted() {
+
+ },
computed: {
conclusionTable() {
const conclusion = {};
@@ -375,7 +377,7 @@
...new Set(this.projectTable.map(item => item.uName))
];
if (
- this.projectTable.filter(item => item.testState === null).length ===
+ this.projectTable.filter(item => item.testState === undefined).length ===
this.projectTable.length
) {
conclusion.testState = null;
@@ -427,21 +429,21 @@
},
methods: {
assertTest(row){
- let fuArr=['>', '<', '=']
- if(!fuArr.includes(row.required[0])){
- this.$message({
- message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
- if(!fuArr.includes(row.internal[0])){
- this.$message({
- message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
- type: 'warning'
- });
- return
- }
+ // let fuArr=['>', '<', '=']
+ // if(!fuArr.includes(row.required[0])){
+ // this.$message({
+ // message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
+ // if(!fuArr.includes(row.internal[0])){
+ // this.$message({
+ // message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
},
// 璁惧鏍戣繃婊ゆ悳绱�
filterNode(value, data) {
@@ -456,6 +458,7 @@
params: { id: this.detailId }
})
.then(res => {
+ console.log(res);
this.detailInfo = res.data;
this.projectTable = res.data.children;
this.projectTable.forEach(i => {
@@ -479,11 +482,12 @@
console.log(this.projectTable);
if(this.projectTable.length>0){
let filterTable= this.projectTable.filter(item=>{
- return item.required===''||item.internal===''||item.required===null||item.internal===null
+ return item.required===''||item.internal===''||
+ item.required===null||item.internal===null||item.name===''
})
if(filterTable.length>0) {
this.$message({
- message: "鏍囧噯鍊煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
+ message: "椤圭洰鍚嶇О锛屾爣鍑嗗�煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
type: 'warning'
});
return
@@ -494,15 +498,25 @@
i.testValue = i.testValueList.join(",");
});
this.detailInfo.rawInsProducts = this.projectTable;
- const res = await this.$axios.post(
+ this.$axios.post(
this.$api.url.addRawInspects,
{ ...this.detailInfo },
{ headers: { "Content-Type": "application/json" } }
- );
- this.detailId = res.data;
- this.getDetailInfo();
- this.$message.success(res.message);
- this.goBack();
+ ).then(res=>{
+ console.log(res);
+ if(res.code=="201"){
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ return
+ }else{
+ // this.detailId = res.data;
+ // this.getDetailInfo();
+ // // this.$message.success(res.message);
+ // this.goBack();
+ }
+ });
},
// 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
--
Gitblit v1.9.3