Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -59,12 +59,12 @@
             </div>
          </div>
       </el-dialog>
-   <zsylDialog ref="zsylDialog" v-model="zsylFlag" :value='zsylFlag'/>
+      <zsylDialog ref="zsylDialog" v-model="zsylFlag" :value='zsylFlag' />
    </div>
 </template>
 <script>
 import zsylDialog from "./zsyl";
-import { getBdcqzList,invalidCertificate } from "@/api/fqsq.js";
+import { getBdcqzList, invalidCertificate } from "@/api/fqsq.js";
 
 export default {
   components: { zsylDialog },
@@ -93,7 +93,7 @@ export default {
          getBdcqzList({bsmSldy:bsmSldy}).then(res => {
             if (res.code === 200) {
                this.tableData = res.result
-               if(res.result){
+               if (res.result) {
                   this.bdcqz = res.result[0]
                }
             }
@@ -111,24 +111,24 @@ export default {
          }
       },
       //再次打印
-     openInvalidDiglog(item){
+      openInvalidDiglog (item) {
          this.bsmSz = item.bsmSz;
          this.invalidDiglog = true
       },
-     closeInvalidDiglog(){
+      closeInvalidDiglog () {
          this.invalidDiglog = false
          this.bsmSz = '';
          this.zfyy = '';
       },
       //作废缮证信息
-     confirmInvalid(){
-      invalidCertificate({"bsmSz":this.bsmSz,"zfyy": this.zfyy}).then(res => {
+      confirmInvalid () {
+         invalidCertificate({ "bsmSz": this.bsmSz, "zfyy": this.zfyy }).then(res => {
             if (res.code === 200) {
                this.list();
                this.$message.success('作废成功');
                this.invalidDiglog = false;
                this.openZsylDialog(this.bdcqz);
-          }else{
+            } else {
                this.$message.error(res.message);
             }
          })
@@ -138,18 +138,21 @@ export default {
 </script>
 <style scoped lang='scss'>
 @import "~@/styles/public.scss";
+
 .szxx {
    box-sizing: border-box;
    padding-right: 15px;
    width: 100%;
    height: 600px;
    overflow-y: scroll;
+
    .box-card {
       float: left;
       width: 330px;
       margin-top: 20px;
       margin-right: 20px;
       height: 440px;
+
       .szxx_body {
          height: 240px;
       }
@@ -157,78 +160,94 @@ export default {
 }
 
 .szxx_header {
-   color:white;
-   font-weight:bolder;
+   color: white;
+   font-weight: bolder;
    font-size: 18px;
-   .header_type{
+
+   .header_type {
       display: flex;
       justify-content: center;
       align-content: center;
    }
-   .header_text{
+
+   .header_text {
       text-align: center;
-      margin-top:10px;
+      margin-top: 10px;
       height: 50px;
       line-height: 30px;
    }
 }
+
 .top_line {
-   border-top: 2px solid rgb(222,222,222);
+   border-top: 2px solid rgb(222, 222, 222);
 }
+
 .text {
    margin-bottom: 10px;
    text-align: center;
 }
+
 .color_iray {
-   color: rgb(153,153,153);
+   color: rgb(153, 153, 153);
 }
+
 .color_red {
-   color: rgb(255,89,24);
+   color: rgb(255, 89, 24);
 }
+
 .middle_margin {
    margin-bottom: 10px;
 }
+
 .operation_button {
    border: 1px solid rgb(0, 121, 254);
    padding: 15px 10px;
    text-align: center;
    width: 100px;
 }
+
 .card_padding {
-   padding-top:20px
+   padding-top: 20px
 }
+
 .invalid-diglog {
    padding-bottom: 20px;
    font-size: 16px;
    font-weight: bold;
    color: rgb(99, 99, 99);
+
    .invalid-title {
       display: flex;
       align-content: center;
-      .invalid-icon{
-         color:rgb(254,148,0);
+
+      .invalid-icon {
+         color: rgb(254, 148, 0);
          font-size: 34px;
          margin-right: 10px;
       }
-      .invalid-body{
+
+      .invalid-body {
          line-height: 40px;
          margin-bottom: 10px;
       }
    }
+
    .invalid-reson {
       margin-bottom: 10px;
    }
-   .dialog-footer{
+
+   .dialog-footer {
       margin-top: 10px;
       display: flex;
-      justify-content: end;
+      justify-content: flex-end;
    }
 }
 
-/deep/.el-card__header{
-   background-color: rgb(198,67,83);
+/deep/.el-card__header {
+   background-color: rgb(198, 67, 83);
 }
-/deep/.el-card__body{
+
+/deep/.el-card__body {
    padding: 0px
 }
 </style>
\ No newline at end of file

@@ -344,8 +344,6 @@ export default {
       li:hover {
         border: 1px solid #ffffff;
         border-radius: 5px;
-        //color: $light-blue ;
-
         .svg-icon {
           //color: $light-blue ;
         }