解决bug

2c47334f · 宋雄 · d818f5c3 · 2c47334f · 2c47334f · 2c47334f
--- a/.env.development
+++ b/.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.113:9999'
 # VUE_APP_API_BASE_URL='http://192.168.0.101:9999'
 VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas

--- a/src/api/api.js
+++ b/src/api/api.js
@@ -69,7 +69,7 @@ const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
 const deleteLogList = (params)=>deleteAction("/sys/log/deleteBatch",params);

 //收费类型列表
-const getChargeListApi = (params)=>getAction("/property-community/system/chargeType/chargeTypelist",params);
+const getChargeListApi = (params)=>getAction("/property-company/system/chargeType/chargeTypelist",params);
 const addReceiptTemplate = (params)=>postAction("/property-community/system/receiptTemplate/add",params);
 // 楼栋列表、单元列表、房间列表
 const getBuildingListApi = (params)=>getAction("/property-community/building/communityBuilding/buildingList",params);
@@ -108,9 +108,14 @@ const auditCommunityComplaintApi = (params)=>postAction("/property-community/pro
 const auditMoveComplaintApi = (params)=>getAction("/property-community/property/communityComplaint/moveComplaint",params);

 // 对账管理
-const auditPropertyApi = (params)=>postAction("/property-central/property/propertySettled/audit",params);
 const freezeOrPropertyApi = (params)=>getAction(`/property-central/property/propertySettled/freezeOrThaw/${params.id}/${params.status}`,{});
 const getPropertyChargruleListApi = (params)=>getAction("/property-central/property/propertyChargrule/propertyChargruleList",params);
+const addCommunityAccountPageApi = (params)=>postAction("/property-community/property/communityReconciliation/add",params);
+const getDetailReconciliationApi = (params)=>getAction("/property-community/property/communityReconciliation/queryById",params);
+const getAccountListByIdApi = (params)=>getAction("/property-community/property/communityReconciliation/getAccountListById",params);
+const communityAuditAccountPageApi = (params)=>postAction("/property-community/property/communityReconciliation/communityAudit",params);
+const getCommunityRecordListApi = (params)=>getAction("/property-central/property/auditRecord/getRecordList",params);
+const communitySubCompanyApi = (params)=>postAction("/property-community/property/communityReconciliation/communitySubCompany",params);

 //数据字典
 const addDict = (params)=>postAction("/sys/dict/add",params);
@@ -244,7 +249,12 @@ export {
  auditCommunityComplaintApi,
  auditMoveComplaintApi,
  getPropertyChargruleListApi,
-  auditPropertyApi,
+  addCommunityAccountPageApi,
+  getDetailReconciliationApi,
+  getAccountListByIdApi,
+  communityAuditAccountPageApi,
+  getCommunityRecordListApi,
+  communitySubCompanyApi,
  freezeOrPropertyApi,
  setOwnerLabelApi,
  editOwnerLabelApi,

--- a/src/assets/static.js
+++ b/src/assets/static.js
@@ -77,6 +77,29 @@ export const OWNER_LEBEL = [
  {label: '残', value: 'labelDestituteCan'}
 ]

+// 付费周期
+export const CHARGING_CYCLE = [
+  {label: '每月', value: '1'},
+  {label: '每季度', value: '2'},
+  {label: '每年', value: '3'},
+  {label: '一次性付清', value: '4'},
+  {label: '预付', value: '5'}
+]
+
+// 小区对账审核状态
+export const RECONCILIATION_STATUS = [
+  {label: '小区待审核', value: 'communityWaitAudit'},
+  {label: '小区审核通过', value: 'communityAuditPass'},
+  {label: '小区审核驳回', value: 'communityRefuse'}
+]
+
+// 物业对账审核状态
+export const COMPANY_AUDIT_STATUS = [
+  {label: '物业待审核', value: 'companyWaitAudit'},
+  {label: '物业审核通过', value: 'companyAuditPass'},
+  {label: '物业审核驳回', value: 'companyRefuse'}
+]
+
 /**
 * 翻译字段值对应的文本
 * @param children

--- a/src/views/property/advertisement/advertisement.vue
+++ b/src/views/property/advertisement/advertisement.vue
@@ -78,7 +78,7 @@
    </div>
    <!-- table区域-end -->

-    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
+    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
  </a-card>
 </template>


--- a/src/views/property/living/living-detail.vue
+++ b/src/views/property/living/living-detail.vue
@@ -20,11 +20,6 @@
                <a-input v-model="model.roomAllName" placeholder="请输入"></a-input>
              </a-form-model-item>
            </a-col>
-            <a-col :span="12">
-              <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ownerName">
-                <a-input v-model="model.ownerName" placeholder="请输入"></a-input>
-              </a-form-model-item>
-            </a-col>
            <a-col :span="12">
              <a-form-model-item label="与业主关系" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="relationShip">
                <!-- <a-input v-model="model.relationShip" placeholder="请输入"></a-input> -->
@@ -220,7 +215,6 @@ export default {
        roomId: '',
        roomName: '',
        floorSpace: '',
-        ownerName: '',
        ownerPhone: '',
        residentName: '',
        residentPhone: '',

--- a/src/views/property/living/living.vue
+++ b/src/views/property/living/living.vue
@@ -5,8 +5,8 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :md="6" :sm="8">
-            <a-form-item label="业主姓名">
-              <j-input placeholder="请输入业主姓名" v-model="queryParam.ownerName"></j-input>
+            <a-form-item label="住户姓名">
+              <j-input placeholder="请输入住户姓名" v-model="queryParam.residentName"></j-input>
            </a-form-item>
          </a-col>

@@ -62,9 +62,6 @@
              onChange: onSelectChange,
              getCheckboxProps: onCheckboxProps
            }" class="j-table-force-nowrap" @change="handleTableChange">
-            <span slot="ownerId" slot-scope="text, record">
-              <span>{{record.ownerName}}，{{record.ownerPhone}}</span>
-            </span>
            <span slot="residentPhone" slot-scope="text, record">
              <span>{{record.residentName}}，{{record.residentPhone}}</span>
            </span>
@@ -87,7 +84,7 @@
      </div>
    </div>

-    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
+    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
  </a-card>
 </template>

@@ -111,14 +108,6 @@ const columns = [
    key: 'chargeItem',
    align: 'center',
  },
-  {
-    title: '业主',
-    dataIndex: 'ownerId',
-    key: 'ownerId',
-    scopedSlots: { customRender: 'ownerId' },
-    align: 'center',
-    ellipsis: true
-  },
  {
    title: '与业主关系',
    dataIndex: 'relationShip',

--- a/src/views/property/living/modules/NoticeForm.vue
+++ b/src/views/property/living/modules/NoticeForm.vue
@@ -42,13 +42,13 @@
        </a-row>
        <a-row>
          <a-col :span="12">
-            <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ownerName">
-              <a-input v-model="model.ownerName" placeholder="请输入" disabled></a-input>
+            <a-form-model-item label="住户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentName">
+              <a-input v-model="model.residentName" placeholder="请输入" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
-            <a-form-model-item label="住户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentName">
-              <a-input v-model="model.residentName" placeholder="请输入" disabled></a-input>
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentPhone">
+              <a-input v-model="model.residentPhone" placeholder="请输入" disabled></a-input>
            </a-form-model-item>
          </a-col>

@@ -143,8 +143,6 @@
          roomId: '',
          roomName: '',
          floorSpace: '',
-          ownerName: '',
-          ownerPhone: '',
          residentName: '',
          residentPhone: '',
          relationShip: '',
@@ -254,7 +252,7 @@
        }
      },
      async onqueryLastDegreesById() {
-        let res = await queryLastDegreesByIdApi({ownerId: this.model.ownerId,chargeTypeId: this.model.chargeTypeId})
+        let res = await queryLastDegreesByIdApi({roomId: this.model.roomId,chargeTypeId: this.model.chargeTypeId})
        this.model.lastDegrees = res.result
        if(this.model.currentDegrees) {
          this.onDegreesChange(this.model.currentDegrees)
@@ -263,12 +261,12 @@
      async onqueryByRoomId() {
        let res = await queryByRoomIdApi({roomId: this.model.roomId})
        if(res.code === 200) {
-          this.model.ownerName = res.result.ownerName
-          this.model.ownerPhone = res.result.ownerPhone
-          this.model.residentName = res.result.residentName
-          this.model.residentPhone = res.result.residentPhone
-          this.model.relationShip = res.result.relationShip
-          this.model.ownerId = res.result.id
+          let ownerRow = res.result.find(item=>item.relationShip === 'self')
+          if(!ownerRow) ownerRow = {...res.result[0]}
+          this.model.residentName = ownerRow.residentName
+          this.model.residentPhone = ownerRow.residentPhone
+          this.model.relationShip = ownerRow.relationShip
+          this.model.ownerId = ownerRow.id
          if(this.model.designFormulas === 3 && this.model.chargeTypeId) {
            this.onqueryLastDegreesById()
          }

--- a/src/views/property/propertyfee/modules/NoticeForm.vue
+++ b/src/views/property/propertyfee/modules/NoticeForm.vue
@@ -3,13 +3,20 @@
    <j-form-container :disabled="formDisabled">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="收费标准" :labelCol="{ xs: { span: 24 }, sm: { span: 2 } }" :wrapperCol="wrapperCol" prop="chargingStandardId">
-              <a-select style="width:50%" v-model="model.chargingStandardId" placeholder="请选择收费标准" @change="onStandardChange">
+          <a-col :span="12">
+            <a-form-model-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargingStandardId">
+              <a-select v-model="model.chargingStandardId" placeholder="请选择收费标准" @change="onStandardChange">
                <a-select-option v-for="item in ruleList" :key="item.id" :value="item.id">{{item.chargeTypeCodeName}}</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="chargeCycle">
+              <a-select v-model="model.chargeCycle" placeholder="请选择收费周期" disabled>
+                <a-select-option v-for="item in chargingCycle" :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="chargeTypeName">
              <a-input v-model="model.chargeTypeName" placeholder="请输入" disabled></a-input>
@@ -42,13 +49,13 @@
        </a-row>
        <a-row>
          <a-col :span="12">
-            <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ownerName">
-              <a-input v-model="model.ownerName" placeholder="请输入" disabled></a-input>
+            <a-form-model-item label="住户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentName">
+              <a-input v-model="model.residentName" placeholder="请输入" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
-            <a-form-model-item label="住户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentName">
-              <a-input v-model="model.residentName" placeholder="请输入" disabled></a-input>
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentPhone">
+              <a-input v-model="model.residentPhone" placeholder="请输入" disabled></a-input>
            </a-form-model-item>
          </a-col>

@@ -107,6 +114,7 @@
  import { httpAction, getAction } from '@/api/manage'
  import { formatDate } from '@/utils/util'
  import { getBuildingListApi, getUnitListApi, getRoomListApi, companyPropertyChargerulesApi, queryByRoomIdApi, queryLastDegreesByIdApi} from '@/api/api'
+  import { CHARGING_CYCLE } from '@/assets/static.js'

  export default {
    name: 'PropertyChargruleForm',
@@ -123,6 +131,7 @@
    data () {
      return {
        ruleList: [],
+        chargingCycle: CHARGING_CYCLE,
        treeData: [],
        amount: 0,
        model:{
@@ -143,8 +152,6 @@
          roomId: '',
          roomName: '',
          floorSpace: '',
-          ownerName: '',
-          ownerPhone: '',
          residentName: '',
          residentPhone: '',
          relationShip: '',
@@ -219,11 +226,17 @@
        this.model.designFormulas = row.designFormulas
        this.amount = row.amount
        this.model.unitPrice = this.model.designFormulas === 1 ? '' : row.amount
-        if(this.model.designFormulas === 1) {
+        if(this.model.designFormulas === 1) {   // 固定金额
          this.model.totalAmount = this.amount.toFixed(2)
        }
-        if(this.model.designFormulas === 2 && this.model.roomId) {  // 获取上期度数
-          this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace).toFixed(2)
+        if(this.model.designFormulas === 2 && this.model.roomId) {  // 建面 * 单价
+          if(this.model.chargeCycle === '2') {  // 每季度
+            this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace * 3).toFixed(2)
+          } else if(this.model.chargeCycle === '3') {  // 每年
+            this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace * 12).toFixed(2)
+          } else {
+            this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace).toFixed(2)
+          }
        }
        if(this.model.designFormulas === 3 && this.model.roomId) {  // 获取上期度数
          this.onqueryLastDegreesById()
@@ -250,7 +263,13 @@
        this.model.buildingName = data.parent.parent.label
        this.onqueryByRoomId()
        if(this.model.designFormulas === 2) {
-          this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace).toFixed(2)
+          if(this.model.chargeCycle === '2') {  // 每季度
+            this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace * 3).toFixed(2)
+          } else if(this.model.chargeCycle === '3') {  // 每年
+            this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace * 12).toFixed(2)
+          } else {
+            this.model.totalAmount = (this.model.unitPrice * this.model.floorSpace).toFixed(2)
+          }
        }
      },
      async onqueryLastDegreesById() {
@@ -263,12 +282,12 @@
      async onqueryByRoomId() {
        let res = await queryByRoomIdApi({roomId: this.model.roomId})
        if(res.code === 200) {
-          this.model.ownerName = res.result.ownerName
-          this.model.ownerPhone = res.result.ownerPhone
-          this.model.residentName = res.result.residentName
-          this.model.residentPhone = res.result.residentPhone
-          this.model.relationShip = res.result.relationShip
-          this.model.ownerId = res.result.id
+          let ownerRow = res.result.find(item=>item.relationShip === 'self')
+          if(!ownerRow) ownerRow = {...res.result[0]}
+          this.model.residentName = ownerRow.residentName
+          this.model.residentPhone = ownerRow.residentPhone
+          this.model.relationShip = ownerRow.relationShip
+          this.model.ownerId = ownerRow.id
          if(this.model.designFormulas === 3 && this.model.chargeTypeId) {
            this.onqueryLastDegreesById()
          }

--- a/src/views/property/propertyfee/propertyfee-detail.vue
+++ b/src/views/property/propertyfee/propertyfee-detail.vue
@@ -20,11 +20,11 @@
                <a-input v-model="model.roomAllName" placeholder="请输入"></a-input>
              </a-form-model-item>
            </a-col>
-            <a-col :span="12">
-              <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ownerName">
-                <a-input v-model="model.ownerName" placeholder="请输入"></a-input>
+            <!-- <a-col :span="12">
+              <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentName">
+                <a-input v-model="model.residentName" placeholder="请输入"></a-input>
              </a-form-model-item>
-            </a-col>
+            </a-col> -->
            <a-col :span="12">
              <a-form-model-item label="与业主关系" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="relationShip">
                <!-- <a-input v-model="model.relationShip" placeholder="请输入"></a-input> -->
@@ -220,8 +220,6 @@ export default {
        roomId: '',
        roomName: '',
        floorSpace: '',
-        ownerName: '',
-        ownerPhone: '',
        residentName: '',
        residentPhone: '',
        relationShip: '',

--- a/src/views/property/propertyfee/propertyfee.vue
+++ b/src/views/property/propertyfee/propertyfee.vue
@@ -5,8 +5,8 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :md="6" :sm="8">
-            <a-form-item label="业主姓名">
-              <j-input placeholder="请输入业主姓名" v-model="queryParam.ownerName"></j-input>
+            <a-form-item label="住户姓名">
+              <j-input placeholder="请输入住户姓名" v-model="queryParam.residentName"></j-input>
            </a-form-item>
          </a-col>

@@ -62,9 +62,6 @@
              onChange: onSelectChange,
              getCheckboxProps: onCheckboxProps
            }" class="j-table-force-nowrap" @change="handleTableChange">
-            <span slot="ownerId" slot-scope="text, record">
-              <span>{{record.ownerName}}，{{record.ownerPhone}}</span>
-            </span>
            <span slot="residentPhone" slot-scope="text, record">
              <span>{{record.residentName}}，{{record.residentPhone}}</span>
            </span>
@@ -87,7 +84,7 @@
      </div>
    </div>

-    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
+    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
  </a-card>
 </template>

@@ -113,14 +110,6 @@ const columns = [
    width: 220,
    align: 'center',
  },
-  {
-    title: '业主',
-    dataIndex: 'ownerId',
-    key: 'ownerId',
-    width: 160,
-    scopedSlots: { customRender: 'ownerId' },
-    align: 'center',
-  },
  {
    title: '与业主关系',
    dataIndex: 'relationShip',
@@ -199,7 +188,7 @@ const columns = [
    align: 'center',
    width: 150,
    fixed: 'right',
-  },
+  }
 ]

 export default {

--- a/src/views/property/receipt/modules/NoticeForm.vue
+++ b/src/views/property/receipt/modules/NoticeForm.vue
@@ -14,8 +14,8 @@
            </a-form-model-item>
          </a-col> -->
          <a-col :span="12">
-            <a-form-model-item label="业主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ownerName">
-              <a-input v-model="model.ownerName" placeholder="请输入业主"></a-input>
+            <a-form-model-item label="住户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="residentName">
+              <a-input v-model="model.residentName" placeholder="请输入住户"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -35,7 +35,10 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="缴费周期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chargeCycle">
-              <a-input v-model="model.chargeCycle" placeholder="请输入缴费周期"></a-input>
+              <!-- <a-input v-model="model.chargeCycle" placeholder="请输入缴费周期"></a-input> -->
+              <a-select v-model="model.chargeCycle" placeholder="请选择缴费周期">
+                <a-select-option v-for="item in chargingCycle" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
+              </a-select>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -64,9 +67,9 @@

 <script>

-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
+  import { httpAction } from '@/api/manage'
  import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
+  import { CHARGING_CYCLE } from '@/assets/static.js'

  export default {
    name: 'PropertyChargruleForm',
@@ -82,6 +85,7 @@
    },
    data () {
      return {
+        chargingCycle: CHARGING_CYCLE,
        dictOptions: [],
        model:{
          employeeName: '',

--- a/src/views/property/receipt/receipt.vue
+++ b/src/views/property/receipt/receipt.vue
@@ -71,8 +71,8 @@
        <span slot="roomName" slot-scope="text, record">
          <span>{{record.buildingName}}{{record.unitName}}{{record.roomName}}</span>
        </span>
-        <span slot="ownerName" slot-scope="text, record">
-          <span>{{record.ownerName}}，{{record.ownerPhone}}</span>
+        <span slot="residentName" slot-scope="text, record">
+          <span>{{record.residentName}}，{{record.residentPhone}}</span>
        </span>
        <span slot="receiptStatus" slot-scope="text, record">
          <span :style="{'color': record.receiptStatus === '1' ? 'green' : 'red'}">{{record.receiptStatus === '1' ? '是' : '否'}}</span>
@@ -80,7 +80,10 @@
        <span slot="action" slot-scope="text, record">
          <!-- <a @click="handleEdit(record)">编辑</a> -->
          <a @click="handleDetail(record)">查看</a>
-          <a @click="onIssueReceipt(record)" style="margin-left: 10px;">开收据</a>
+          <template v-if="record.receiptStatus !== '1'">
+            <a-divider type="vertical" />
+            <a @click="onIssueReceipt(record)">开收据</a>
+          </template>
        </span>
      </a-table>

@@ -107,10 +110,10 @@
      align: 'center'
    },
    {
-      title: '业主',
-      dataIndex: 'ownerName',
-      scopedSlots: { customRender: 'ownerName' },
-      key: 'ownerName',
+      title: '住户',
+      dataIndex: 'residentName',
+      scopedSlots: { customRender: 'residentName' },
+      key: 'residentName',
      align: 'center'
    },
    {
@@ -188,8 +191,7 @@
    },
    methods: {
      onIssueReceipt(row) {
-        console.log(this.$refs.templateModal)
-        this.$refs.templateModal.onLoadTemplate()
+        this.$refs.templateModal.onLoadTemplate(row)
      },
      handleOk() {},
      handleCancel() {},

--- a/src/views/property/receipt/templateModal.vue
+++ b/src/views/property/receipt/templateModal.vue
--- a/src/views/property/record/RecordDetails.vue
+++ b/src/views/property/record/RecordDetails.vue
--- a/src/views/property/record/RecordList.vue
+++ b/src/views/property/record/RecordList.vue