修改bug

.env.development

 NODE_ENV=development
 # VUE_APP_API_BASE_URL='http://192.168.0.119:9999'
-VUE_APP_API_BASE_URL='http://192.168.0.103:9999'
+VUE_APP_API_BASE_URL='http://192.168.0.102:9999'
 # VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

src/views/information/building/modules/NoticeForm.vue

@@ -13,13 +13,6 @@
               <j-date placeholder="请选择建成日期" v-model="model.completedDate"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="房屋用途" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useTo">
-              <a-select style="width: 100%" v-model="model.useTo" placeholder="请选择房屋用途">
-                <a-select-option v-for="item in dictOptions" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="12">
             <a-form-model-item label="楼宇面积" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="buildingArea">
               <a-input type="number" v-model="model.buildingArea" placeholder="请输入楼宇面积"></a-input>
@@ -138,11 +131,9 @@
         }
       }
       return {
-        dictOptions: [],
         model:{
           buildingName: '',
           completedDate: '',
-          useTo: '',
           buildingArea: '',
           communityUnitList: [],
           haveLift: '1',
@@ -162,7 +153,6 @@
         validatorRules: {
           buildingName: [{ required: true, message: '请输入楼宇名称', trigger: 'blur' }],
           communityUnitList: [{ required: true, message: '请输入单元数量', trigger: 'change' }],
-          useTo: [{ required: true, message: '请选择房屋用途', trigger: 'change' }],
           buildingAdmin: [{ required: true, message: '请输入楼栋管理员', trigger: 'blur' }],
           adminPhone: [
             { required: true, message: '请输入管理员联系电话', trigger: 'blur' },
@@ -186,22 +176,8 @@
     created () {
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
-      this.initDictData()
     },
     methods: {
-      initDictData() {
-        //优先从缓存中读取字典配置
-        if(getDictItemsFromCache('house_purpose')){
-          this.dictOptions = getDictItemsFromCache('house_purpose');
-          return
-        }
-        // //根据字典Code, 初始化字典数组
-        ajaxGetDictItems('house_purpose', null).then((res) => {
-          if (res.success) {
-            this.dictOptions = res.result;
-          }
-        })
-      },
       ruleNumberInput(event) {
         let rateValue = event.target.value.replace(/[^\d]/g,"");//清除"数字"和"."和"-"以外的字符
         this.model['empowerDays'] = rateValue

src/views/information/owner/modules/NoticeForm.vue

@@ -32,13 +32,26 @@
               <a-input v-model="model.ownerPhone" placeholder="请输入业主联系方式"></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="性别" :labelCol=" { xs: { span: 24 }, sm: { span: 3 } }" :wrapperCol="wrapperCol" prop="sex">
               <a-radio-group v-model="model.sex">
                 <a-radio :value="1">男</a-radio>
                 <a-radio :value="2">女</a-radio>
               </a-radio-group>
             </a-form-model-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-radio-group v-model="model.sex">
+                <a-radio :value="1">男</a-radio>
+                <a-radio :value="2">女</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
+              <a-input-number v-model="model.age" style="width:100%" placeholder="请输入年龄" :min="0" />
+            </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="certificateType">
@@ -121,6 +134,7 @@
           floorSpace: '',
           ownerName: '',
           sex: 1,
+          age: undefined,
           ownerPhone: '',
           certificateType: '1',
           certificateNo: '',

src/views/information/owner/owner-add.vue

@@ -81,9 +81,17 @@
           </a-row>
         </a-form-model>
       </j-form-container>
-      <h4 style="padding:20px 0 0 50px;line-height:30px;">审核意见</h4>
-      <div class="row-box">
-        <a-textarea style="width:500px" v-model="auditOpinion" placeholder="请输入" allow-clear />
+      <!-- <h4 style="padding:20px 0 0 50px;line-height:30px;">审核意见</h4> -->
+      <div>
+        <a-form-model>
+          <a-row>
+            <a-col :span="12">
+              <a-form-model-item label="审核意见" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-textarea style="width:600px" v-model="auditOpinion" placeholder="请输入" allow-clear />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
         <a-row type="flex" justify="end">
           <a-button @click="onCancel">取消</a-button>
           <a-button @click="onSubmit('auditPass')" type="primary" style="margin-left: 10px;">审核通过</a-button>
@@ -210,7 +218,7 @@
       },
       async getPageDetail() {
         let {result} = await geCommunityOwnertInfoApi({id: this.$route.query.id})
-        this.edit(result)
+        this.edit(result.communityOwner)
       },
       async edit(record) {
         if(record.buildingId) {

src/views/information/owner/owner.vue

@@ -113,12 +113,12 @@
                       <a @click="handlePerssion(record.id)">授权</a>
                     </a-menu-item>
                     <a-menu-item>
-                      <a href="javascript:;" @click="handleDetail(record)">详情</a>
+                      <a href="javascript:;" @click="onHandleSetting(record.id, '3')">详情</a>
                     </a-menu-item>
                     <a-menu-item v-if="!record.labelCommitteeCode">
                       <a href="javascript:;" @click="onHandleSetting(record.id, '1')">设置业委会</a>
                     </a-menu-item>
-                    <a-menu-item>
+                    <a-menu-item v-if="record.destituteAuditStatus !== 'auditPass'">
                       <a href="javascript:;" @click="onHandleSetting(record.id, '2')">设置特困人员</a>
                     </a-menu-item>
                     <a-menu-item v-if="!!record.labelCommitteeCode">

src/views/property/complaint/complaint.vue

@@ -93,7 +93,8 @@
       dataIndex: 'complaintNo',
       key: 'complaintNo',
       align: 'center',
-      width: 270
+      width: 270,
+      ellipsis: true
     },
     {
       title: '投诉主题',

src/views/property/record/RecordList.vue

@@ -141,6 +141,7 @@ const columns = [
     title: '公司审核状态',
     dataIndex: 'companyAuditStatus',
     key: 'companyAuditStatus',
+    align: 'center',
     // customRender: function (text) {
     //   return filterDictTextByCache('companyAuditStatus', text)
     // },
@@ -249,6 +250,9 @@ export default {
     },
     handlePerssion(roleId) {
       this.$refs.modalUserRole.show(roleId)
+    },
+    loadData() {
+      console.log('不请求')
     }
   },
 }

src/views/user/LoginAccount.vue

@@ -2,7 +2,7 @@
     <div>
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-form-model-item required prop="username">
-          <a-input v-model="model.username" size="large" placeholder="请输入帐户">
+          <a-input v-model="model.username" size="large" placeholder="请输入帐号">
             <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
           </a-input>
         </a-form-model-item>