From e03f39a06c9f17ee0bf9a2b1fa24b7de0ea2e3d4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 11:47:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/rawInsDetail.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 7dea5b5..19898d7 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -12,7 +12,7 @@
>鎻� 浜�</el-button
>
<el-button
- icon="el-icon-download"
+ icon="el-icon-back"
@click="
() => {
goBack();
@@ -350,6 +350,7 @@
</template>
<script>
+import { triggerRef } from "vue";
import RawIns from "./raw-ins.vue";
export default {
components: { RawIns },
@@ -383,6 +384,7 @@
} else {
conclusion.testState = 1;
}
+ console.log([conclusion]);
return [conclusion];
}
},
@@ -467,10 +469,24 @@
this.detailId = res.data;
this.getDetailInfo();
this.$message.success(res.message);
+ this.goBack();
},
// 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
async changeState(row, index) {
+ let val=row.testValueList.filter(item=>{
+ return item!=''&&item!=null
+ })
+ let eq=val.filter(item=>{
+ return /^[^><=]/.test(item)
+ })
+ if(eq.length>0){
+ this.$message({
+ message: "杈撳叆鍊糩"+eq+"]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ type: 'warning'
+ });
+ return
+ }
if (this.detailId !== null) {
const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
DevId: row.deviceId,
@@ -485,9 +501,9 @@
const res = await this.$axios.post(
this.$api.url.updateRawInspectsById + `${this.detailId}`
).then(res=>{
-聽 聽 聽 聽 this.$parent.removeAllTab()
this.$message.success("鎻愪氦鎴愬姛");
this.getDetailInfo();
+ this.goBack()
聽 聽 聽 });
},
// 鑾峰彇璁惧鏍戝唴瀹�
@@ -505,6 +521,7 @@
name: "",
required: "",
textValue: "",
+ testState:null,
testValueList: [],
unit: ""
};
--
Gitblit v1.9.3