.

src/main/java/com/izouma/zhumj/service/report/ReportService.java

@@ -28,7 +28,6 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestParam;
-import sun.awt.image.PixelConverter;
 
 import javax.persistence.criteria.Predicate;
 import java.math.BigDecimal;

src/main/java/com/izouma/zhumj/service/sale/CustomerService.java

@@ -17,7 +17,6 @@ import com.izouma.zhumj.repo.sale.CustomerRecordRepo;
 import com.izouma.zhumj.repo.sale.CustomerRepo;
 import com.izouma.zhumj.utils.ObjUtils;
 import com.izouma.zhumj.utils.SecurityUtils;
-import com.sun.scenario.effect.impl.prism.PrDrawable;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;

src/main/vue/src/components/RichText.vue

@@ -74,7 +74,6 @@ export default {
                                 })
                                 .catch(e => {
                                     loadingInstance.close();
-                                    failure(e);
                                 });
                         };
                         //触发点击
@@ -99,7 +98,6 @@ export default {
                                 })
                                 .catch(e => {
                                     loadingInstance.close();
-                                    failure(e);
                                 });
                         };
                         //触发点击

src/main/vue/src/components/roomStatus/CheckinDialog.vue

@@ -520,27 +520,24 @@ export default {
             }
         },
         confirmBlackList() {
-          if (this.checkInForm.idNo) {
-              this.$http
-                  .get(
-                      '/user/checkBlackList',
-                      { idNo : this.checkInForm.idNo }
-                  )
-                  .then(res => {
-                      if (res) {
-                          this.$notify({
-                              title: '提示',
-                              message: '该用户在黑名单中',
-                              duration: 0
-                          });
-                      }
-                  })
-                  .catch(e => {
-                      console.log(e);
-                      this.saving = false;
-                      this.$message.error(e.error);
-                  });
-          }
+            if (this.checkInForm.idNo) {
+                this.$http
+                    .get('/user/checkBlackList', { idNo: this.checkInForm.idNo })
+                    .then(res => {
+                        if (res) {
+                            this.$notify({
+                                title: '提示',
+                                message: '该用户在黑名单中',
+                                duration: 0
+                            });
+                        }
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            }
         },
         confirmCheckin() {
             this.$refs.checkInForm.validate(valid => {

src/main/vue/src/views/CustomerPaymentList.vue

@@ -73,7 +73,12 @@
                     <el-button @click="editRow(row)" v-if="row.used === false" type="primary" size="mini" plain
                         >入账</el-button
                     >
-                    <el-button @click="denyRow(row)" v-if="row.rejected === true || row.used === false" type="primary" size="mini" plain
+                    <el-button
+                        @click="denyRow(row)"
+                        v-if="row.rejected === true || row.used === false"
+                        type="primary"
+                        size="mini"
+                        plain
                         >删除</el-button
                     >
                     <el-button @click="changeInfo(row)" type="primary" size="mini" plain>编辑</el-button>

src/main/vue/src/views/FeeTypeDetail.vue

@@ -82,7 +82,18 @@ export default {
     methods: {
         exportExcel() {
             let workbook = XLSX.utils.book_new();
-            const head = ['feeName', 'roomName', 'bedName', 'name', 'amount', 'time', 'remark', 'idNo', 'payMethod','cycle'];
+            const head = [
+                'feeName',
+                'roomName',
+                'bedName',
+                'name',
+                'amount',
+                'time',
+                'remark',
+                'idNo',
+                'payMethod',
+                'cycle'
+            ];
             const headerDisplay = {
                 feeName: '类型',
                 roomName: '房间',
@@ -93,7 +104,7 @@ export default {
                 remark: '备注',
                 idNo: '身份证',
                 payMethod: '付款方式',
-                cycle:'周期'
+                cycle: '周期'
             };
             this.loading = true;
             let data = this.composeParams();