Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/views/base/checkinInfo-list.vue

@@ -201,7 +201,7 @@
       <el-form label-width="150px">
         <el-form-item label="模板下载">
           <el-link
-            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart/personInfo/2020/10/小鹏管家人员导入模板.xls"
+            href="http://rccs.oss-cn-hangzhou.aliyuncs.com/smart_school/personInfo/2020/10/%E5%B0%8F%E9%B9%8F%E7%AE%A1%E5%AE%B6%E7%A7%9F%E6%88%B7%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls"
             type="primary"
             target="_blank"
             >点击下载模板</el-link
@@ -277,7 +277,7 @@ export default {
       modalTitle: "",
       businessKey: "",
       batchImportVisible: false,
-      uploadUrlXls: Constant.serverUrl + "/base/personInfo/importXls",
+      uploadUrlXls: Constant.serverUrl + "/base/checkinInfo/importXls",
       batchImportFileList: [],
       xlsLoading: false,
       headers: {

src/views/business/billPush-detail-list.vue

@@ -360,20 +360,28 @@ export default {
         },
         handlePush(){
             var self = this;
+
+            self.$confirm("是否确认推送账单?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+            })
+            .then(() => {
             
-            var formData = new FormData();
-            formData.append("id", self.businessKey);
+                var formData = new FormData();
+                formData.append("id", self.businessKey);
 
-            billPushApi.pushBill(formData).then((response)=>{
-                var jsonData = response.data;
+                billPushApi.pushBill(formData).then((response)=>{
+                    var jsonData = response.data;
 
-                if (jsonData.result) {
-                    this.changePage(this.pageIndex);
-                    this.$message.success("账单消息推送成功！");
-                } else {
-                    this.$message.error(jsonData.message + "");
-                }
+                    if (jsonData.result) {
+                        this.changePage(this.pageIndex);
+                        this.$message.success("账单消息推送成功！");
+                    } else {
+                        this.$message.error(jsonData.message + "");
+                    }
 
+                });
             });
         },
     },