From d46f3b348ab5f913cd15be977ce16137ee4343d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/rawInsDetail.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 9f5a5d6..e9a9490 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();
@@ -118,7 +118,7 @@
<el-col :span="7">
<el-form-item label="渚涘簲鍟嗗悕绉�:">
<el-input
- :placeholder="detailId !== null ? '' : '璇疯緭鍏ユ楠屾暟閲�'"
+ :placeholder="detailId !== null ? '' : '璇疯緭鍏ヤ緵搴斿晢鍚嶇О'"
:disabled="detailId !== null"
v-model="detailInfo.supplier"
></el-input>
@@ -274,7 +274,7 @@
<el-table :data="conclusionTable" style="100%">
<el-table-column prop="code" label="鐗╂枡缂栧彿"> </el-table-column>
<el-table-column prop="name" label="鐗╂枡鍚嶇О"> </el-table-column>
- <el-table-column prop="uName" label="妫�楠屽憳">
+ <el-table-column v-if="detailId != null" prop="uName" label="妫�楠屽憳">
<template slot-scope="scope">
<span
v-for="item in scope.row.uName"
@@ -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];
}
},
@@ -439,7 +441,11 @@
this.projectTable = res.data.children;
this.projectTable.forEach(i => {
// 瑙ｅ喅閲嶆柊璧嬪�兼棤娉曠紪杈戞搷浣�
- this.$set(i, "testValueList", i.testValue.split(","));
+ if (i.testValue == null) {
+ this.$set(i, "testValueList", []);
+ } else {
+ this.$set(i, "testValueList", i.testValue.split(","));
+ }
// 鍙栨渶闀跨殑鍒楄〃鏁�
if (i.testValueList.length > this.empiricalValueAdd) {
this.empiricalValueAdd = i.testValueList.length;
@@ -463,6 +469,7 @@
this.detailId = res.data;
this.getDetailInfo();
this.$message.success(res.message);
+ this.goBack();
},
// 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
@@ -480,9 +487,11 @@
async submitSave() {
const res = await this.$axios.post(
this.$api.url.updateRawInspectsById + `${this.detailId}`
- );
- this.$message.success("鎻愪氦鎴愬姛");
- this.getDetailInfo();
+ ).then(res=>{
+ this.$message.success("鎻愪氦鎴愬姛");
+ this.getDetailInfo();
+ this.goBack()
+聽 聽 聽 });
},
// 鑾峰彇璁惧鏍戝唴瀹�
getOptions() {
@@ -499,6 +508,7 @@
name: "",
required: "",
textValue: "",
+ testState:null,
testValueList: [],
unit: ""
};
--
Gitblit v1.9.3