From 335642b3d8a4cdda3d43ea5a784087bdccdd2f73 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 05 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/place/index.vue |   56 +++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index fb3f85f..152f6d9 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -28,8 +28,8 @@
             </template>
 
             <template slot-scope="scope" slot="menu">
-                <el-button type="text" :disabled="scope.row.confirmFlag == 2" icon="el-icon-s-check" size="small"
-                    v-if="permission.place_audit_cur && scope.row.confirmFlag != 4" @click="auditCur(scope.row)">审核
+                <el-button type="text" :disabled="scope.row.confirmFlag == 2 || scope.row.confirmFlag != 4"
+                    icon="el-icon-s-check" size="small" v-if="permission.place_audit_cur" @click="auditCur(scope.row)">审核
                 </el-button>
 
                 <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.place_manage_tenants"
@@ -69,6 +69,19 @@
 
 export default {
     data () {
+
+        //手机号格式校验
+        let validatorPhone = function (rule, value, callback) {
+            if (value) {
+                if (!/^1[3456789]\d{9}$/.test(value)) {
+                    callback(new Error('手机号格式有误!'))
+                } else {
+                    callback()
+                }
+            }
+            callback()
+        }
+
         return {
             curRow: {},
             roleBox: false,
@@ -100,14 +113,16 @@
                 selection: true,
                 dialogClickModal: false,
                 menuFixed: 'right',
+                labelWidth: 120,
                 column: [
                     {
                         width: 160,
                         span: 12,
                         label: "场所名称",
                         prop: "placeName",
-                        searchSpan: 4,
+                        searchSpan: 5,
                         search: true,
+                        overHidden: true,
                         rules: [{
                             required: true,
                             message: "请输入场所名称",
@@ -151,9 +166,11 @@
                     },
 
                     {
-                        label: "负责人",
+                        width: 96,
+                        searchLabelWidth: 120,
+                        label: "场所负责人",
                         prop: "principal",
-                        searchSpan: 4,
+                        searchSpan: 5,
                         search: true,
                         rules: [{
                             required: false,
@@ -163,33 +180,41 @@
                     },
 
                     {
-                        width: 110,
-                        label: "电话",
+                        width: 96,
+                        label: "手机号码",
                         prop: "principalPhone",
                         search: true,
-                        searchSpan: 3,
+                        searchSpan: 4,
                         slot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                validator: validatorPhone,
+                                trigger: 'blur'
+                            }
+                        ],
                     },
 
                     {
+                        width: 110,
+                        label: "所属街道",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
-                        width: 96,
-                        label: "所属街道",
                         prop: "townStreetName",
                         search: true,
                         searchSpan: 4
                     },
                     {
+                        width: 156,
+                        overHidden: true,
+                        label: "所属社区",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
-                        label: "所属社区",
                         prop: "neiName",
                         search: true,
                         searchSpan: 4,
-                        width: 150,
                         rules: [
                             {
                                 required: true,
@@ -222,12 +247,13 @@
                     },
 
                     {
+                        width: 110,
+                        overHidden: true,
+                        label: "所属网格",
                         addDisplay: false,
                         editDisplay: false,
                         viewDisplay: false,
-                        label: "所属网格",
                         prop: "gridName",
-                        width: 150,
                         rules: [
                             {
                                 required: true,
@@ -339,7 +365,7 @@
                         prop: 'source',
                         type: "select",
                         search: true,
-                        searchSpan: 4,
+                        searchSpan: 5,
                         dicData: [{
                             label: '是',
                             value: 1

--
Gitblit v1.9.3