Merge branch 'dev'

@@ -13,7 +13,6 @@
           <component :is="editItem" ref='childRef' :key="key" :formData='formData' />
         </div>
         <div class="ls-mask-footer" v-if='btnShow'>
-          <el-button type="primary" @click="onConfirm">{{ confirmText }}</el-button>
           <el-button @click="onCancel">{{ cancelText }}</el-button>
         </div>
       </div>
@@ -30,7 +29,7 @@
         editItem: "",
         isMain: false,
         formData: undefined,//父组件传递的参数 负责传给子组件
-        btnShow: false,
+        btnShow: true,
         cancel: function () { },
         confirm: function () { },
         cancelText: '取消',
@@ -141,25 +140,25 @@
   }
 
   .mask-content {
-    padding: 20px;
+    padding: 5px 20px 50px 20px;
     width: 100%;
-    min-height: 30%;
+    min-height: 20%;
     max-height: 90vh;
     overflow-y: scroll;
   }
 
   .ls-mask-footer {
-    height: 50px;
+    height: 33px;
     display: flex;
     justify-content: center;
     width: 100%;
     position: absolute;
-    border-top: 1px solid $borderColor;
     bottom: 0;
     background: #ffffff;
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
     overflow: hidden;
+    margin-bottom: 10px;
   }
 
   /deep/.closeStyle {

@@ -458,8 +458,8 @@ aside {
 
   .icon {
     position: absolute;
-    top: 9px;
-    right: 5px;
+    top: 12px;
+    right: 0px;
     transform: rotate(45deg);
     color: #fff;
     font-size: 12px;
@@ -474,7 +474,7 @@ aside {
   height: 0;
   border-width: 0px 0px 55px 55px;
   border-style: none solid solid;
-  border-color: transparent transparent red;
+  border-color: transparent transparent rgb(216, 62, 62);
   position: absolute;
   top: 0;
   right: 0;

 /*
  * @Description: 弹框组件的封装
  * @Autor: renchao
- * @LastEditTime: 2023-07-07 09:21:10
+ * @LastEditTime: 2023-07-12 09:58:13
  */
 import ywPopup from '@/components/ywPopup/index'
 import Popup1 from '@/components/Popup1/index'
@@ -23,7 +23,7 @@ export function popupDialog (title, url, params, width = '75%', isMain, height,
   })
 }
 
-export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) {
+export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = true, callback, cancel) {
   // Popup.install
   ywPopup(title, url, {
     height: height,

 <!--
-  功能：初始化功能描述
-  作者：calliope
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-12 09:55:38
 -->
 <template>
   <div class='ywdialog'>
-    <el-link type="danger" :underline="false">{{formData.message}}</el-link>
     <el-table
       v-if="formData.result"
       :data="formData.result"

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-12 09:23:03
+-->
 <template>
   <div class="home">
     <div class="home-left">

@@ -22,20 +22,17 @@
               :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
+              row.qlzt == '4' ? 'linshi' : '',
 
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -24,7 +24,8 @@
               :class="[
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
-                item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+                row.qlzt == '4' ? 'linshi' : '',
+
                 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
@@ -40,9 +41,6 @@
                   icon="el-icon-edit-outline"
                   @click="editDialog(row, 'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -22,21 +22,19 @@
               v-for="(row, index) in tableData"
               :key="index"
               :class="[
-                row.qszt == '2' ? 'lishi' : '',
-                row.qszt == '0' ? 'linshi' : '',
-                item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
-                item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
-                item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
-                item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-                item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              row.qszt == '2' ? 'lishi' : '',
+              row.qszt == '0' ? 'linshi' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
+              item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
               ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -19,7 +19,8 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
@@ -29,9 +30,6 @@
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -24,12 +24,13 @@
               :class="[
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
-                item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+                row.qlzt == '4' ? 'linshi' : '',
+
                 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-                item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
-              ]">
+                item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
+                ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button
                   type="text"
@@ -40,9 +41,6 @@
                   icon="el-icon-edit-outline"
                   @click="editDialog(row, 'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -19,19 +19,17 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -19,19 +19,17 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              row.qlzt == '0' ? 'zhuxiaoIcon' : '',
-              row.qlzt == '3' ? 'linshiIcon' : '',
-              row.qlzt == '2' ? 'linshiIcon' : '',
-              row.qlzt == '1' ? 'xianshiIcon' : '',
-              row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
+              item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="row.qlzt == '1'">
                 有效
               </div>
@@ -62,15 +60,13 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -19,19 +19,17 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -18,19 +18,17 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
               <div class="setbut" v-if="item.prop == 'cz'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -18,19 +18,17 @@
             <td v-for="(row, index) in tableData" :key="index" :class="[
               row.qszt == '2' ? 'lishi' : '',
               row.qszt == '0' ? 'linshi' : '',
-              item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
+              row.qlzt == '4' ? 'linshi' : '',
+
               item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
               item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
-              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '',
+              item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
             ]">
               <div class="setbut" v-if="item.prop == 'cz'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
               </div>
-              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
-                失效
-              </div>
               <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>

@@ -27,15 +27,25 @@
               :class="[
                 row.qszt == '2' ? 'lishi' : '',
                 row.qszt == '0' ? 'linshi' : '',
-                item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
-                item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
+                row.qlzt == '4' ? 'linshi' : '',
+
+                item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
+                item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
+                item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
+                item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
               ]">
-              <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
-                正在办理
-              </div>
-              <div class="icon" v-if="item.prop == 'qszt' &&  row.qszt == '1'">
+              <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
                 有效
               </div>
+              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
+                正在补录
+              </div>
+              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
+                正在申请
+              </div>
+              <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
+                正在注销
+              </div>
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>