diff --git a/src/views/modules/base/smartExcel/cpts/export-view.vue b/src/views/modules/base/smartExcel/cpts/export-view.vue index c5098482f..64c50fc98 100644 --- a/src/views/modules/base/smartExcel/cpts/export-view.vue +++ b/src/views/modules/base/smartExcel/cpts/export-view.vue @@ -620,9 +620,9 @@ export default { async initForm(type, row) { if (type == "view") { await this.getFormEdit(row.tagId); + this.tagForm.tagName = row.tagName; } else if (type == "edit") { await this.getFormEdit(row.tagId); - this.tagForm.tagName = row.tagName; } this.tagForm.tagId = row.tagId; for (let i in this.tableData) { @@ -1050,11 +1050,13 @@ export default { if((this.$store.state.user.id === this.infoObj.creatorId) || this.importType === 'template'){ this.showConditionDetailsDialog = false; let statisticalValue = luckysheet.getCellValue(row-1,column-1) - if(statisticalValue && (statisticalValue !== 0 && statisticalValue !== null)){ + console.log(statisticalValue); + if(statisticalValue || statisticalValue === 0){ this.activeName = 'history'; this.getConditions4Cell('edit'); } }else{ + this.activeName = 'add'; this.showConditionDetailsDialog = true; this.getConditions4Cell('view') } @@ -1208,6 +1210,7 @@ export default { }, handelClickBack() { this.reportId = ''; + $('#luckysheet-rich-text-editor').css('display', 'none'); this.$emit('close') }, },