From e5b9da3aee25769bc19a7982a7a8fc5886a56f15 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 19 九月 2023 12:38:16 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/sale.vue modified: src/main.js
---
src/components/view/rawInsDetail.vue | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 4b6009a..4b41eba 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,14 +429,15 @@
},
methods: {
assertTest(row){
- if(!/^[^><=]/.test(row.required)){
+ let fuArr=['>', '<', '=']
+ if(!fuArr.includes(row.required[0])){
this.$message({
message: "鏍囧噯鍊糩"+row.required+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
type: 'warning'
});
return
}
- if(!/^[^><=]/.test(row.internal)){
+ if(!fuArr.includes(row.internal[0])){
this.$message({
message: "鍐呮帶鍊糩"+row.internal+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
type: 'warning'
@@ -455,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 => {
@@ -474,20 +478,45 @@
},
// 鏂板妫�楠屽崟
async addNewRawInspect() {
+ //TODO:
+ 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||item.name===''
+ })
+ if(filterTable.length>0) {
+ this.$message({
+ message: "椤圭洰鍚嶇О锛屾爣鍑嗗�煎拰鍐呮帶鍊间笉鑳戒负绌猴紒",
+ type: 'warning'
+ });
+ return
+ }
+ }
this.projectTable.forEach(i => {
// 灏嗗垪琛ㄨ浆鎹负瀛楃涓�
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