Merge branch 'mhy' into 'master'

优化

See merge request !63

xichongSys/src/views/Myvue/importByExcel.vue

@@ -45,7 +45,7 @@
           multiple
           drag
           accept=".xls,.xlsx"
-          :limit="5"
+          :limit="1"
           :headers="myHeader"
           :before-upload="handleBeforeUpload"
           :file-list="fileList"
@@ -55,7 +55,7 @@
           :auto-upload="false">
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
+          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
         </el-upload>
         <el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button>
       </el-tab-pane>
@@ -103,7 +103,7 @@
           multiple
           drag
           accept=".xls,.xlsx"
-          :limit="5"
+          :limit="1"
           :headers="myHeader"
           :before-upload="handleBeforeUpload"
           :file-list="fileList"
@@ -113,7 +113,7 @@
           :auto-upload="false">
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
+          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
         </el-upload>
         <el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload2">数据导入</el-button>
       </el-tab-pane>
@@ -162,7 +162,7 @@
           multiple
           drag
           accept=".xls,.xlsx"
-          :limit="5"
+          :limit="1"
           :headers="myHeader"
           :before-upload="handleBeforeUpload"
           :file-list="fileList"
@@ -172,7 +172,7 @@
           :auto-upload="false">
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
+          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
         </el-upload>
         <el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload3">数据导入</el-button>
       </el-tab-pane>
@@ -223,7 +223,7 @@
         this.$message.warning("当前限制选择 1 个文件，请删除后继续上传");
       },
       handleBeforeUpload(file) {
-        // this.loading = true;
+        this.loading = true;
         if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
           this.$message.warning(file.name + "不是excel文件");
           this.loading = false;

xichongSys/src/views/Sys/Role.vue

@@ -32,9 +32,9 @@
 			<el-form-item label="备注" prop="remark">
 				<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>
 			</el-form-item>
-      <el-form-item label="签章" prop="seal" align="left">
+      <el-form-item label="签章" prop="seal" align="left" style="height: 80px">
         <el-popover
-          v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr != ''"
+          v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''"
           placement="left"
           title=""
           trigger="hover">
@@ -52,7 +52,7 @@
           :auto-upload="false">
           <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           <el-button
-            v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr != ''"
+            v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''"
             icon="el-icon-delete"
             size="small"
             type="warning"