Merge branch 'luckysheet' into test

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

@@ -2,20 +2,20 @@
   <div class="m-detail-main" v-loading="dataListLoading">
     <div class="steps1">
       <el-steps :active="progress">
-        <el-step :class="[this.operatorName == null ? 'showNum' : '']" title="选择数据源"
+        <el-step :class="[this.operatorName == null ? 'showNum' : '']" :title="`${pageType === 'excel'?'选择数据源':'填写表格信息'}`"
           :description="`${this.operatorName}(${this.createdTime})`"></el-step>
-        <el-step title="智能填表设置" :class="[this.progress == 2 || this.progress == 3 ? '' : 'showNum']"></el-step>
+        <el-step  :title="`${pageType === 'excel'?'智能填表设置':'设置表格字段'}`" :class="[this.progress == 2 || this.progress == 3 ? '' : 'showNum']"></el-step>
-        <el-step title="数据填充范围"></el-step>
+        <el-step :title="`${pageType === 'excel'?'数据填充范围':'确定数据范围'}`"></el-step>
       </el-steps>
     </div>
     <div v-show="progress == 1" style="width: 80%; margin-top: 10px; font-size: 16px;">
-      <el-form :model="formData" :rules="rules" ref="ref_form" :label-width="'120px'" v-if="pageType === 'report'">
+      <el-form :model="formData" :rules="rules" ref="ref_form" :label-width="'120px'" v-if="pageType === 'report'" style="margin: 50px 0 ;">
-        <el-form-item label="标题名称" prop="reportName">
+        <el-form-item label="表格名称" prop="reportName">
-          <el-input v-model.trim="formData.reportName" size="small" clearable style=" height: 40px;" placeholder="请输入">
+          <el-input v-model.trim="formData.reportName" size="small" clearable style=" height: 40px;" placeholder="请输入表格名称，5-30字符">
           </el-input>
         </el-form-item>
       </el-form>
-
+      <div  v-if="pageType === 'report'" style="margin-left: 35px;">选择数据源：</div>
       <div class="flex" style="margin: 60px 0;">
         <div @click="onClickTab(item)" class="flex"
           style=" cursor: pointer;  position: relative;display: flex; flex-direction: column; align-items: center; justify-content: center; width: 155px;height: 90px;background: #F1F4FA;border-radius: 4px; margin-left: 60px;"
@@ -139,7 +139,7 @@ export default {
         // },
       ],
       rules: {
-        reportName: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]
+        reportName: [{ required: true, message: '请输入表格名称，5-30字符', trigger: 'blur',min:5,max:30}]
       },
       formData: {
         columnMateJson: '',

src/views/modules/base/smartExcel/cpts/export-process-two.vue

@@ -14,7 +14,7 @@
                 <div class="right-header">
                     <div class="title">已选字段</div>
                 </div>
-                <div class="h80 scroll-h">
+                <div class="h80">
                     <el-collapse v-model.trim="activeCollapse" id="collapsWrs">
                         <el-collapse-item v-for="item in rightList" :key="item.id" :title="item.label" :name="item.id"
                             class="col-h">
@@ -164,7 +164,7 @@ export default {
 .diy-wr {
     display: flex;
     width: 100%;
-    margin-top: 20px;
+    margin-top: 50px;
     .scroll-h{
             height: 450px;
             overflow-y: scroll;
@@ -175,6 +175,7 @@ export default {
 
         .check-boxwr {
             overflow: auto;
+            margin-left: 10px;
         }
     }