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 | 91 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 11 deletions(-) diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue index abcfd56..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> @@ -59,11 +59,12 @@ </div> <div class="table"> <ValueTable ref="ValueTable" :url="$api.StandardTemplate.selectStandardTemplatePageList" - :upUrl="$api.enums.upEnum" :delUrl="$api.enums.delEnum" :componentData="componentData" :key="upIndex" /> + :upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate" + :componentData="componentData" :key="upIndex" /> </div> - <el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="80%"> - <div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow"> - <Excel></Excel> + <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> </div> @@ -115,7 +116,13 @@ upIndex: 0, addDia: false, addPower: true, - isShow: false + isShow: false, + loading: false, + row: { + id: null, + thing: null, + name: null + } } }, mounted() { @@ -155,17 +162,79 @@ 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.$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(){ - let data = luckysheet.getAllSheets() - console.log(data); + closed() { + this.loading = true + let data = luckysheet.toJson() + delete data.title + delete data.container + delete data.lang + delete data.showsheetbar + delete data.showstatisticBarConfig + delete data.enableAddRow + delete data.enableAddBackTop + delete data.showtoolbarConfig + delete data.cellRightClickConfig + delete data.myFolderUrl + delete data.functionButton + if(data.data[0].config.borderInfo != undefined){ + for (var i = 0; i < data.data[0].config.borderInfo.length; i++) { + let str = data.data[0].config.borderInfo + if (str[i].rangeType === 'range') { + if (str[i].borderType === 'border-none') { + data.data[0].config.borderInfo.splice(i, 1) + i -= 1 + } + } + } + } + data.data[0].celldata.forEach(a=>{ + 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 = "" + } + } + }) + this.$axios.post(this.$api.StandardTemplate.upStandardTemplate, { + id: this.row.id, + thing: JSON.stringify(data), + name: luckysheet.getWorkbookName(['name']) + }, { + headers: { + 'Content-Type': 'application/json' + } + }).then(res => { + if (res.code == 201) return + this.loading = false + this.$message.success('宸蹭繚瀛�') + this.isShow = false + }) + }, + isClose(done) { + this.$confirm('鏄惁闇�瑕佷繚瀛�?', "璀﹀憡", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" + }).then(() => { + this.closed() + }).catch(() => { + done() + }) } } } -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3