From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化

---
 src/views/place/components/baseAllInfo.vue |  142 ++++++++++++++++++++++++-----------------------
 1 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index 466487e..a5cfff3 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -18,8 +18,8 @@
         <box-title class="m10" :classVal="9" :title="'房东信息'"></box-title>
         <avue-form v-if="restShow" ref="restForm" :option="houseOwnerOption" v-model="placeForm"></avue-form>
 
-        <box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
-        <avue-form v-if="restShow" ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
+        <box-title class="m10" :classVal="9" :title="'学校信息'" v-if="schoolShow"></box-title>
+        <avue-form v-if="schoolShow" ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
 
         <box-title class="m10" :classVal="9" :title="'从业人员'"></box-title>
         <avue-crud :option="placeOption" :table-loading="loading" :data="placeExt" ref="crud" v-model="houseHoldForm"
@@ -30,7 +30,7 @@
       </div>
 
       <div class="footer-btn-box">
-        <el-button size="small" type="primary" @click="dataUpdate">保 存</el-button>
+        <el-button size="small" :disabled="disabled" type="primary" @click="dataUpdate">保 存</el-button>
 
         <el-button size="small" @click="roleBoxClose">关 闭</el-button>
       </div>
@@ -72,9 +72,11 @@
       }
 
       return {
+        disabled: false,
         roleBox: false,
         baseShow: false,
         restShow: false,
+        schoolShow: false,
 
         placeExt: [],
 
@@ -82,7 +84,7 @@
         option: {
           submitBtn: false,
           emptyBtn: false,
-
+          dialogMenuPosition: 'right',
           column: [{
               span: 12,
               label: "场所名称",
@@ -94,9 +96,6 @@
                 trigger: "blur",
               }, ],
             },
-
-
-
             {
               label: "负责人",
               prop: "principal",
@@ -146,7 +145,7 @@
               prop: "neiCode",
               search: false,
               type: "tree",
-              dicUrl: "/api/blade-system/region/tree",
+              dicUrl: "/api/blade-system/region/treeToCommunity",
               props: {
                 label: "name",
                 value: "id",
@@ -202,8 +201,11 @@
               }, ],
             },
             {
+              collapseTags: true,
+              maxCollapseTags: 3,
+              collapseTagsTooltip: true,
+              multiple: true,
               span: 5,
-              label: "",
               labelWidth: 20,
               prop: "smallLabel",
               type: "select",
@@ -336,8 +338,26 @@
                 required: false,
                 message: "请选择三级消防单位",
                 trigger: "blur",
-              }, ],
+              }],
             },
+
+            {
+              span: 12,
+              label: "无炸类型",
+              prop: "noExplosionCategory",
+              type: "select",
+              labelWidth: 120,
+              display: true,
+              row: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=noExplosionCategory",
+              dataType: "number",
+              hide: true,
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+
             {
               label: "场所照片",
               prop: "imageUrls",
@@ -383,34 +403,6 @@
               prop: "addressName",
               span: 12
             },
-
-            // {
-            //   width: 160,
-            //   overHidden: true,
-            //   slot: true,
-            //   label: "标准地址",
-            //   prop: "houseCodeBinds",
-            //   span: 24,
-            //   type: 'select',
-            //   labelWidth:120,
-            //   dataType: "object",
-            //   remote: true,
-            //   multiple: true,
-            //   hide: true,
-            //   display: false,
-            //   filterable:true,
-            //   dicUrl: `/api/blade-doorplateAddress/doorplateAddress/getPlaceList`,
-            //   props: {
-            //     label: 'addressName',
-            //     value: 'addressCode',
-            //   },
-            //   dicData: [],
-            //   rules: [{
-            //     required: false,
-            //     message: "请选择标准地址",
-            //     trigger: "blur",
-            //   }, ]
-            // },
             {
               span: 24,
               hide: true,
@@ -420,7 +412,6 @@
               labelWidth: 120,
 
             },
-
             {
               label: "备注",
               prop: "remark",
@@ -442,11 +433,41 @@
           submitBtn: false,
           emptyBtn: false,
           column: [{
+              label: "学生人数",
+              prop: "studentNumber",
+            },
+            {
+              label: "教职工人数",
+              prop: "workersNumber",
+            },
+            {
+              label: "专职保安",
+              prop: "securityNumber",
+            },
+            {
+              label: "专职门卫",
+              prop: "guardNumber",
+            },
+            {
+              label: "专兼职保卫人员",
+              prop: "temporarySecurityNumber",
+            },
+            {
+              label: "走读/寄宿",
+              prop: "dayStudentsNumber",
+            },
+            {
+              label: "住校生人数",
+              prop: "residentialStudentsNumber",
+            },
+            {
+              label: "宿舍管理人员",
+              prop: "housemasterNumber",
+            }, {
               labelWidth: 100,
               label: "法人信息",
               prop: "legalPerson",
             },
-
             {
               labelWidth: 100,
               label: "法人电话",
@@ -460,8 +481,6 @@
                 trigger: "blur",
               }, ],
             },
-
-
             {
               label: "营业执照",
               prop: "imageUrls",
@@ -497,7 +516,6 @@
             },
           ],
         },
-
         loading: true,
         placeOption: {
           menu: true,
@@ -557,7 +575,6 @@
               label: "身份证号",
               prop: "idCard",
             },
-
             {
               labelWidth: 100,
               label: "电话号码",
@@ -571,7 +588,6 @@
                 trigger: "blur",
               }, ],
             },
-
             {
               labelWidth: 100,
               label: "现居住地",
@@ -585,7 +601,6 @@
               prop: "jobNature",
               // hide: true
             },
-
             {
               label: "从业人员照片",
               prop: "employerImg",
@@ -629,8 +644,6 @@
               type: "datetime",
               format: "yyyy-MM-dd",
               valueFormat: "yyyy-MM-dd",
-              // format: "yyyy-MM-dd hh:mm:ss",
-              // valueFormat: "yyyy-MM-dd hh:mm:ss",
               rules: [{
                 required: false,
                 message: "请选择离职时间",
@@ -654,7 +667,6 @@
                 }
               ],
             },
-
           ]
         },
         holdPage: {
@@ -686,7 +698,6 @@
               slot: true,
               overHidden: true,
               rules: [{
-                // validator: validatorPhone,
                 trigger: "blur",
               }, ],
             },
@@ -708,9 +719,7 @@
         userOption: {
           submitBtn: false,
           emptyBtn: false,
-          column: [
-
-            {
+          column: [{
               width: 96,
               label: "电话",
               prop: "legalTel",
@@ -736,12 +745,8 @@
                 trigger: "blur",
               }, ],
             },
-
-
-
           ],
         },
-
         standardAddressList: [], //标准地址数据
         standardAddress: "",
         standardAddressSearchKey: ""
@@ -813,6 +818,7 @@
         this.roleBox = true
         this.baseShow = false
         this.restShow = false
+        this.schoolShow = false
         this.form = {}
         this.placeForm = {}
 
@@ -845,10 +851,7 @@
                   .join(",")
               }
 
-              if (
-                that.form.placePoiLabelVOList &&
-                that.form.placePoiLabelVOList.length
-              ) {
+              if (that.form.placePoiLabelVOList && that.form.placePoiLabelVOList.length) {
                 let lebelTwo = that.form.placePoiLabelVOList.find((item) => {
                   return item.type == 2
                 })
@@ -864,9 +867,6 @@
 
               that.baseShow = true
               const data = restInfo.data.data
-
-
-
 
               if (data) {
                 let imageUrls = data.imageUrls
@@ -896,7 +896,10 @@
 
                 }
               }
-
+              console.log("***********1**********", that.form)
+              if (that.form.label === '1601') {
+                that.schoolShow = true
+              }
               that.restShow = true
             })
           )
@@ -1027,7 +1030,7 @@
 
       dataUpdate() {
         const that = this
-
+        that.disabled = true;
         let imageUrls = this.desposeImage(this.form.imageUrls)
         let placeImages = this.desposeImage(this.placeForm.imageUrls)
         let placePlanImageUrls = this.desposeImage(this.placeForm.planImageUrls)
@@ -1074,12 +1077,12 @@
                     that.placeElement.page,
                     that.placeElement.query
                   )
-
                   done()
                 })
               )
           } else {
             console.log("error submit!!")
+            that.disabled = false;
             return false
           }
         })
@@ -1088,11 +1091,12 @@
       roleBoxClose() {
         this.form = {}
         this.placeForm = {}
-
+        this.disabled = false
         this.$refs.baseForm && this.$refs.baseForm.resetForm()
         this.$refs.restForm && this.$refs.restForm.resetForm()
         this.baseShow = false
         this.restShow = false
+        this.schoolShow = false
         this.roleBox = false
       },
 
@@ -1143,4 +1147,4 @@
       justify-content: center;
     }
   }
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.3