From 9fd925c1e44d4148ddb3ca864661b56b71302a23 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:04:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

---
 src/components/view/b2-standard-template.vue |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index f69a83b..d42a770 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -167,8 +167,11 @@
 				this.addPower = add
 			},
 			templateWrite(row) {
-				this.isShow = true
-				this.row = row
+				this.$axios.get(this.$api.StandardTemplate.getEditTemplatePreparation + '?id=' + row.id).then(res => {
+					this.row = row
+					this.row.thing = res.data
+					this.isShow = true
+				})
 			},
 			closed() {
 				this.loading = true
@@ -196,7 +199,7 @@
 					}
 				}
         data.data[0].celldata.forEach(a=>{
-          if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��'){
+          if(a.v.ps!=undefined&&(a.v.ps.value==='妫�楠屽��' || a.v.ps.value==='璁惧鍚嶇О' || a.v.ps.value==='璁惧缂栫爜' || a.v.ps.value==='缁撹')){
             if(a.v.v === undefined){
               a.v.v = ""
             }

--
Gitblit v1.9.3