用户导入

src/views/system/dept/extend.vue

@@ -1896,7 +1896,7 @@ export default {
       let dat = {
         orgType: this.orgType,
         weatherAreaCode: this.weatherAreaCode,
-        askariCertificate: this.imgs[this.imgs.length - 1].toString(","),
+        askariCertificate: this.imgs.length>0?this.imgs[this.imgs.length - 1].toString(","):null,
         premisesArea: this.premisesArea,
         ownership: this.ownership,
         outsideArea: this.outsideArea,

src/views/system/user/index.vue

@@ -127,16 +127,17 @@
             <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
               v-hasPermi="['system:user:remove']">删除</el-button>
           </el-col> -->
-            <!--          <el-col :span="1.5">-->
-            <!--            <el-button-->
-            <!--              type="info"-->
-            <!--              plain-->
-            <!--              icon="el-icon-upload2"-->
-            <!--              size="mini"-->
-            <!--              @click="handleImport"-->
-            <!--              v-hasPermi="['system:user:import']"-->
-            <!--            >导入</el-button>-->
-            <!--          </el-col>-->
+                      <el-col :span="1.5">
+                        <el-button
+                          type="info"
+                          plain
+                          icon="el-icon-upload2"
+                          size="mini"
+                          @click="handleImport"
+                          v-hasPermi="['system:user:import']"
+                        >导入</el-button>
+                      </el-col>
+            
                      <el-col :span="1.5">
                        <el-button
                           type="warning"
@@ -485,7 +486,7 @@
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
+        <!-- <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
             <el-checkbox v-model="upload.updateSupport" />
             是否更新已经存在的用户数据
@@ -498,7 +499,7 @@
             @click="importTemplate"
             >下载模板</el-link
           >
-        </div>
+        </div> -->
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>