增加对账

.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.119:9999'
 # VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
-# VUE_APP_API_BASE_URL='http://220.203.25.212: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

@@ -77,6 +77,13 @@
             </a-form-model-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="管理员头像" :labelCol="{ xs:{ span: 24 }, sm:{ span: 3 } }" :wrapperCol="wrapperCol" prop="adminAvatar">
+              <j-image-upload :isMultiple="false" text="点击上传" bizPath="scott/pic" v-model="model.adminAvatar"></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
       </a-form-model>
     </j-form-container>
   </a-spin>
@@ -87,6 +94,7 @@
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
+  import { isMobile } from '@/utils/validate'
   const columns = [
     {
       title: '序号',
@@ -122,6 +130,13 @@
       }
     },
     data () {
+      const validateToNextPhone = (rule, value, callback)=> {
+        if (value && isMobile(value)) {
+          callback();
+        } else {
+          callback('请输入正确的联系人电话！');
+        }
+      }
       return {
         dictOptions: [],
         model:{
@@ -132,7 +147,8 @@
           communityUnitList: [],
           haveLift: '1',
           buildingAdmin: '',
-          adminPhone: ''
+          adminPhone: '',
+          adminAvatar: ''
          },
         labelCol: {
           xs: { span: 24 },
@@ -146,7 +162,13 @@
         validatorRules: {
           buildingName: [{ required: true, message: '请输入楼宇名称', trigger: 'blur' }],
           communityUnitList: [{ required: true, message: '请输入单元数量', trigger: 'change' }],
-          useTo: [{ required: true, message: '请选择房屋用途', trigger: 'change' }]
+          useTo: [{ required: true, message: '请选择房屋用途', trigger: 'change' }],
+          buildingAdmin: [{ required: true, message: '请输入楼栋管理员', trigger: 'blur' }],
+          adminPhone: [
+            { required: true, message: '请输入管理员联系电话', trigger: 'blur' },
+            { validator: validateToNextPhone }
+          ],
+          adminAvatar: [{ required: true, message: '请上传管理员头像', trigger: 'blur' }]
         },
         url: {
           add: "/property-community/building/communityBuilding/add",

src/views/property/complaint/complaint-detail.vue

@@ -53,7 +53,7 @@
               <a-form-model-item label="处理状态" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol"
                 prop="handleStatus">
                 <a-select v-model="form.handleStatus" placeholder="请选择处理状态" style="width:50%">
-                  <a-select-option value="pending">处理中</a-select-option>
+                  <a-select-option value="pending" v-if="model.handleStatus !== 'pending'">处理中</a-select-option>
                   <a-select-option value="finish">处理完成</a-select-option>
                 </a-select>
               </a-form-model-item>
@@ -114,6 +114,9 @@ export default {
       this.confirmLoading = true
       let { result } = await querycommunityComplaintApi({ id: this.$route.query.id })
       this.model = { ...result }
+      if (this.model.handleStatus == 'pending') {
+        this.form.handleStatus = 'finish'
+      }
       if (this.model.handleStatus == 'finish') {
         this.form.handleStatus = this.model.handleStatus
         this.form.handleResult = this.model.handleResult

src/views/property/complaint/complaint.vue

@@ -69,7 +69,7 @@
 
           <template v-if="record.handleStatus !== 'finish'">
             <a-divider type="vertical"/>
-            <a @click="onDetail(record.id, '2')">处理</a>
+            <a @click="onDetail(record.id, '2')">{{record.handleStatus === 'pending' ? '去完成' : '处理'}}</a>
           </template>
         </span>
       </a-table>
@@ -133,7 +133,8 @@
       dataIndex: 'action',
       scopedSlots: { customRender: 'action' },
       align: 'center',
-      width: 150
+      width: 150,
+      fixed: 'right'
     }
   ]
 

src/views/property/living/living.vue

@@ -110,7 +110,7 @@ const columns = [
     title: '收费项目',
     dataIndex: 'chargeItem',
     key: 'chargeItem',
-    width: 120,
+    width: 220,
     align: 'center',
   },
   {