bug

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -89,5 +89,5 @@ public interface TaUserMapper {
      * 查询所有用户列表
      * @return
      */
-    List<TaUser> selectAll(String userName, String loginName, String idCard);
+    List<TaUser> selectAll(@Param("userName") String userName,@Param("loginName") String loginName,@Param("idCard") String idCard);
 }

VUECODE/smart-property-manage/src/views/bill/add/index.vue

@@ -14,8 +14,12 @@
           value-format="timestamp"
           placeholder="选择日期"/>
       </el-form-item>
-      <div>
-        <span>
+      <el-row>
+        <el-col :span="18">
+          <span style="color: #99a9bf; font-size: 13px;">如果还未制作账单，请先下载账单模板，按规则填写费用后再上传</span>
+          <el-button type="primary" size="small" icon="el-icon-download" @click="downloadExcel">下载模板</el-button>
+        </el-col>
+        <el-col :span="6">
           <el-upload
             :on-success="successUpload"
             :limit="1"
@@ -26,12 +30,10 @@
             name="file"
             class="upload-demo"
             multiple>
-            <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
-          </el-upload>
-          如果还未制作账单，请先下载账单模板，按规则填写费用后再上传
-          <el-button type="primary" size="small" icon="el-icon-download" @click="downloadExcel">下载模板</el-button>
-        </span>
-      </div>
+            <el-button slot="trigger" size="small" type="primary">选取账单文件并预览</el-button>
+        </el-upload>
+        </el-col>
+      </el-row>
       <span style="color: #99a9bf; font-size: 13px;">如果想修改下表的内容，请重新下载excel模板填写金额后上传，系统会直接删除下表所有旧数据，以新的excel内容为准</span>
       <el-table
         :data="list"

VUECODE/smart-property-manage/src/views/bill/edi/index.vue

@@ -14,24 +14,26 @@
           value-format="timestamp"
           placeholder="选择日期"/>
       </el-form-item>
-      <div>
-        <span>
+      <el-row>
+        <el-col :span="18">
+          <span style="color: #99a9bf; font-size: 13px;">如果还未制作账单，请先下载账单模板，按规则填写费用后再上传</span>
+          <el-button type="primary" size="small" icon="el-icon-download" @click="downloadExcel">下载模板</el-button>
+        </el-col>
+        <el-col :span="6">
           <el-upload
             :on-success="successUpload"
             :limit="1"
             :on-exceed="handleExceed"
             :before-upload="beforeUpload"
             :data="ruleForm"
+            :action="uploadUrl"
             name="file"
             class="upload-demo"
-            :action="uploadUrl"
             multiple>
-            <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
-          </el-upload>
-          如果还未制作账单，请先下载账单模板，按规则填写费用后再上传
-          <el-button type="primary" size="small" icon="el-icon-download" @click="downloadExcel">下载模板</el-button>
-        </span>
-      </div>
+            <el-button slot="trigger" size="small" type="primary">选取账单文件并预览</el-button>
+        </el-upload>
+        </el-col>
+      </el-row>
       <el-table
         :data="list"
         border