From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/place/residencePermitApply.vue |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/views/place/residencePermitApply.vue b/src/views/place/residencePermitApply.vue
index bc67b39..dc5e1cc 100644
--- a/src/views/place/residencePermitApply.vue
+++ b/src/views/place/residencePermitApply.vue
@@ -25,7 +25,7 @@
 
       <template slot-scope="{row, size}" slot="minors">
         <el-tag :size="size">{{
-      row.minors == 2?'是':row.minors==1?'否':''
+      row.minors == 2?'是':'否'
     }}</el-tag>
       </template>
 
@@ -140,7 +140,7 @@
           dialogWidth: 950,
           tip: false,
           border: true,
-          stripe:true,
+          stripe: true,
           index: true,
           viewBtn: true,
           addBtn: false,
@@ -153,7 +153,7 @@
           column: [{
               width: 110,
               span: 12,
-              label: "名称",
+              label: "姓名",
               prop: "name",
               searchSpan: 4,
               searchLabelWidth: 60,
@@ -161,7 +161,7 @@
               align: 'center',
               labelWidth: 110,
             },
-             {
+            {
               width: 120,
               span: 12,
               label: "联系电话",
@@ -177,7 +177,7 @@
               slot: true,
               labelWidth: 110,
             },
-            
+
             {
               width: 160,
               span: 12,
@@ -196,7 +196,7 @@
               prop: "address",
               align: 'center',
               labelWidth: 110,
-              overHidden:true,
+              overHidden: true,
             },
             {
               width: 110,
@@ -240,12 +240,11 @@
               search: true,
               prop: "minors",
               type: "select",
-              align:"center",
-              dicData: [
-              {
+              align: "center",
+              dicData: [{
                   label: "全部",
                   value: ""
-                },{
+                }, {
                   label: "是",
                   value: 2
                 },
@@ -268,10 +267,10 @@
                 value: 1
               }, {
                 label: '通过',
-                value: 3
+                value: 2
               }, {
                 label: '驳回',
-                value: 4
+                value: 3
               }],
               align: 'center',
               labelWidth: 110,
@@ -322,12 +321,12 @@
               type: 'warning',
               text: '待审核'
             }
-          } else if (data == 3) {
+          } else if (data == 2) {
             tags = {
               type: 'danger',
               text: '通过'
             }
-          } else if (data == 4) {
+          } else if (data == 3) {
             tags = {
               type: 'warning',
               text: '驳回'

--
Gitblit v1.9.3