Browse Source

bug#1886数据导入窗口缺少文本

feture-12345
mk 1 year ago
parent
commit
fc23467e89
  1. 6
      src/views/modules/base/smartExcel/cpts/excel-upload-data.vue
  2. 7
      src/views/modules/base/smartExcel/cpts/excel-view.vue

6
src/views/modules/base/smartExcel/cpts/excel-upload-data.vue

@ -64,7 +64,7 @@
<HoseSearch ref="house_form"/>
</div>
</div>
<p>温馨提示智能填表将使用平台内已有的基础数据如果您所在的组织下尚无基础数据请先通过<el-button type="text" @click="$router.push({path:'/main/base-smartImport'})">文字按钮</el-button>导入基础数据后再进行填表操作</p>
<p>温馨提示智能填表将使用平台内已有的基础数据如果您所在的组织下尚无基础数据请先通过<el-button type="text" @click="toSmartImport">[智能导入]</el-button>导入基础数据后再进行填表操作</p>
<div>
<span slot="footer" style="margin-top: 30px; display: flex; justify-content: flex-end;">
<el-button v-if="progress != 1" @click="progress = progress - 1">上一步</el-button>
@ -161,6 +161,10 @@ export default {
},
methods: {
toSmartImport(){
this.$router.push({path:'/main/base-smartImport'})
this.$emit('handleUploadDataHide',null)
},
onClickTab(value) {
this.formData1 = {}
this.dataSourceList.filter(item => item.status === 1).forEach(item => {

7
src/views/modules/base/smartExcel/cpts/excel-view.vue

@ -1,6 +1,6 @@
<template>
<div class='flex' :style="{ height: tableHeight }">
<div class="left_menu flex flex-y" v-if="!sheetTotal">
<div class="left_menu flex flex-y" v-if="!sheetTotal && pageType !== 'filling'">
<!-- <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button> -->
<section>
<h3>{{ menuList[0].taskTitle }}</h3>
@ -17,9 +17,7 @@
<div :class="['flex', 'flex-y', 'flex1', sheetTotal ? 'luckysheet-wrap' : 'luckysheet-wrap-all']">
<div class="top_btn flex flex-end">
<div>
<el-button type="text" round @click="handelClickBack" icon="el-icon-back" v-if="!sheetTotal">返回</el-button>
<el-button type="text" round @click="handelClickBack" v-if="pageType !== 'add' || sheetTotal"
icon="el-icon-back">返回</el-button>
<el-button type="text" round @click="handelClickBack" icon="el-icon-back" v-if="!sheetTotal || pageType == 'filling'">返回</el-button>
<el-button type="warning" v-if="pageType === 'add'" @click="handleClickInspect"> 自动检查</el-button>
<el-button type="success" @click="onClickUplond()" v-if="pageType !== 'add'"> 智能填表</el-button>
</div>
@ -175,6 +173,7 @@ export default {
},
async handleUploadDataHide(val) {
this.showUploadData = false;
if(!val) return
luckysheet.insertRow(this.currentTable[0].data.length, 1)
const findLastNonNullIndex = (arr) => {
for (let i = arr.length - 1; i >= 0; i--) {

Loading…
Cancel
Save