From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b2-standard-template.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index f4e7e35..53eff22 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -40,7 +40,7 @@
<div class="standard-template">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鍘熷璁板綍妯℃澘</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">鍘熷璁板綍妯℃澘</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</el-col>
@@ -62,8 +62,8 @@
:upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate"
:componentData="componentData" :key="upIndex" />
</div>
- <el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="80%" :before-close="isClose">
- <div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow">
+ <el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="85%" :before-close="isClose">
+ <div style="width: 100%;height: 82vh;overflow: auto;" v-if="isShow">
<Excel :data="row.thing" :execlTitle="row.name" v-loading="loading"></Excel>
</div>
</el-dialog>
@@ -162,13 +162,20 @@
this.componentData.do.splice(1, 1)
}
if (!up) {
+ this.componentData.do.splice(2, 1)
this.componentData.do.splice(0, 1)
}
this.addPower = add
},
templateWrite(row) {
- this.isShow = true
- this.row = row
+ this.$axios.get(this.$api.StandardTemplate.getEditTemplatePreparation + '?id=' + row.id).then(res => {
+ if(res.code != 200){
+ return
+ }
+ this.row = row
+ this.row.thing = res.data
+ this.isShow = true
+ })
},
closed() {
this.loading = true
@@ -196,7 +203,7 @@
}
}
data.data[0].celldata.forEach(a=>{
- if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��' || a.v.ps!=undefined&&a.v.ps.value==='璁惧鍚嶇О' || 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 = ""
}
@@ -215,7 +222,6 @@
this.loading = false
this.$message.success('宸蹭繚瀛�')
this.isShow = false
- this.refreshTable()
})
},
isClose(done) {
--
Gitblit v1.9.3