功能优化

.env.development

 NODE_ENV=development
-# VUE_APP_API_BASE_URL='http://192.168.0.119:9999'
-VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
+VUE_APP_API_BASE_URL='http://192.168.0.104: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/api/api.js

@@ -74,6 +74,13 @@ const callAssetSubmitApi = (params)=>postAction("/property-community/asset/prope
 // 公告详情
 const queryNoticeCommunityApi = (params)=>getAction("/property-company/notice/companyNotice/queryNoticeCommunityRefByMainId",params);
 
+// 对账管理
+const getDetailReconciliationApi = (params)=>getAction("/property-community/property/communityReconciliation/queryById",params);
+const getAccountListByIdApi = (params)=>getAction("/property-community/property/communityReconciliation/getAccountListById",params);
+const companyAuditAccountPageApi = (params)=>postAction("/property-community/property/communityReconciliation/companyAudit",params);
+const getCommunityRecordListApi = (params)=>getAction("/property-central/property/auditRecord/getRecordList",params);
+const companySubCentralApi = (params)=>getAction("/property-community/property/communityReconciliation/companySubCentral",params);
+
 //数据字典
 const addDict = (params)=>postAction("/sys/dict/add",params);
 const editDict = (params)=>putAction("/sys/dict/edit",params);
@@ -183,7 +190,12 @@ export {
   getCommunityListApi,
   getCapitalCommunityListApi,
   callAssetSubmitApi,
-  queryNoticeCommunityApi
+  queryNoticeCommunityApi,
+  getDetailReconciliationApi,
+  getAccountListByIdApi,
+  companyAuditAccountPageApi,
+  getCommunityRecordListApi,
+  companySubCentralApi,
 }
 
 

src/assets/static.js

+// 与业主关系
+export const RELATION_SHIP = [
+  {label: '业主', value: 'self'},
+  {label: '租户', value: 'tenant'},
+  {label: '亲人', value: 'relative'},
+  {label: '朋友', value: 'friend'},
+  {label: '其他', value: 'other'}
+]
+
 // 紧急程度
 export const URGENT_DEGREE = [
   {label: '一般', value: 'usual'},
@@ -16,6 +25,29 @@ export const NOTICE_STATUS = [
   {label: '待发布', value: 'waitPublish'}
 ]
 
+// 付费周期
+export const CHARGING_CYCLE = [
+  {label: '每月', value: '1'},
+  {label: '每季度', value: '2'},
+  {label: '每年', value: '3'},
+  {label: '一次性付清', value: '4'},
+  {label: '预付', value: '5'}
+]
+
+// 物业对账审核状态
+export const COMPANY_AUDIT_STATUS = [
+  {label: '物业待审核', value: 'companyWaitAudit'},
+  {label: '物业审核通过', value: 'companyAuditPass'},
+  {label: '物业审核驳回', value: 'companyRefuse'}
+]
+
+// 总平台对账审核状态
+export const CENTRAL_AUDIT_STATUS = [
+  {label: '总平台待审核', value: 'centralWaitAudit'},
+  {label: '总平台审核通过', value: 'centralAuditPass'},
+  {label: '总平台审核驳回', value: 'centralRefuse'}
+]
+
 /**
  * 翻译字段值对应的文本
  * @param children
@@ -25,5 +57,6 @@ export function filterDictTextByStatic(dictList, value) {
   if(!dictList || dictList.length === 0){
     return;
   }
-  return dictList.find(item=>item.value === value).label
+  let obj = dictList.find(item=>item.value == value)
+  return obj ? obj.label : ''
 }
\ No newline at end of file

src/components/menu/SideMenu.vue

@@ -5,7 +5,7 @@
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo :showTitle="false" />
+    <logo :showTitle="true" />
     <s-menu
       :collapsed="collapsed"
       :menu="menus"

src/components/tools/Logo.vue

@@ -24,7 +24,7 @@
     props: {
       title: {
         type: String,
-        default: '汉星科技',
+        default: '物业集团管理后台',
         required: false
       },
       showTitle: {

src/views/charge/templateSettings/add.vue

@@ -79,7 +79,6 @@
 import {getChargeListApi, addReceiptTemplate} from '@/api/api'
 import MyEditorWithMention from './components/MyEditorWithMention'
 import VueHtml2pdf from "vue-html2pdf";
-const tableHtml = '<table border="1" cellspacing="0" style="width: 100%;"><tbody><tr><th colSpan="1" rowSpan="1">序号</th><th colSpan="1" rowSpan="1">品名</th><th colSpan="1" rowSpan="1">产地品牌</th><th colSpan="1" rowSpan="1">规格型号</th><th colSpan="1" rowSpan="1">数量</th><th colSpan="1" rowSpan="1">税率</th><th colSpan="1" rowSpan="1">单位</th><th colSpan="1" rowSpan="1">单价</th><th colSpan="1" rowSpan="1">总金额（不含税）</th><th colSpan="1" rowSpan="1">税额</th><th colSpan="1" rowSpan="1">总金额（含税）</th><th colSpan="1" rowSpan="1">备注</th></tr><tr><td colspan="1" rowspan="1" style="text-align: center;">1</td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td></tr><tr><td colSpan="1" rowSpan="1">合计</td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td><td colSpan="1" rowSpan="1"></td></tr><tr><td colSpan="3" rowSpan="1" style="text-align: center;">合同金额（大写）：</td><td colSpan="9" rowSpan="1"></td></tr></tbody></table>'
 
 export default {
   name: 'templateContractAdd',
@@ -139,7 +138,7 @@ export default {
             typeName: this.model.templateType.label,
             templateStyle: this.content
           }).then(res=> {
-            this.$message.warning(res.message);
+            this.$message.success(res.message);
             this.backbtn()
           }).finally(() => {
             this.confirmLoading = false;
@@ -149,12 +148,11 @@ export default {
     },
     handleSaveToPdf() {
       this.pdfOptions.filename = '收费模板'
-      this.content = this.$refs.editorHtml.curHtml.replace('<p><span data-w-e-type="mention" data-w-e-is-void data-w-e-is-inline data-value="产品列表" data-info="%7B%22id%22%3A%22e%22%7D">@产品列表</span></p>', tableHtml)
-      console.log(this.content)
+      // this.content = this.$refs.editorHtml.curHtml.replace('<p><span data-w-e-type="mention" data-w-e-is-void data-w-e-is-inline data-value="产品列表" data-info="%7B%22id%22%3A%22e%22%7D">@产品列表</span></p>', tableHtml)
       this.$refs.html2PdfDownLoad.generatePdf();
     },
     handlePreviewPdf() {
-      this.content = this.$refs.editorHtml.curHtml.replace('<p><span data-w-e-type="mention" data-w-e-is-void data-w-e-is-inline data-value="产品列表" data-info="%7B%22id%22%3A%22e%22%7D">@产品列表</span></p>', tableHtml)
+      // this.content = this.$refs.editorHtml.curHtml.replace('<p><span data-w-e-type="mention" data-w-e-is-void data-w-e-is-inline data-value="产品列表" data-info="%7B%22id%22%3A%22e%22%7D">@产品列表</span></p>', tableHtml)
       // this.downloadFile = false
       // this.previewModal = true
       this.$refs.html2PdfPreview.generatePdf()

src/views/property/NoticeList.vue

@@ -28,7 +28,7 @@
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px">批量操作 <a-icon type="down" /></a-button>
+        <a-button type="primary" style="margin-left: 8px">批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>