修改二期bug

.env.development

 NODE_ENV=development
-VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
-# VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
+# VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
+VUE_APP_API_BASE_URL='http://192.168.0.106: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/assets/static.js

@@ -78,6 +78,13 @@ export const REFUND_STATUS = [
   {label: '已退款', value: 'refunded'}
 ]
 
+// 支付详情
+export const PAY_WAY = [
+  {label: '抵扣物业费', value: 'payPropertyFee'},
+  {label: '申请退款', value: 'refundOrder'},
+  {label: '扫码支付', value: 'scanQrCodePay'}
+]
+
 /**
  * 翻译字段值对应的文本
  * @param children

src/views/benefits/reconciliation/ReconciliationDetails.vue

@@ -28,19 +28,19 @@
                 <a-input v-model="model.buyerName" placeholder="请输入账户"></a-input>
               </a-form-model-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-model-item label="提交人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createBy">
                 <a-input v-model="model.createBy" 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="totalMoney">
                 <a-input-number v-model="model.totalMoney" :min="1" placeholder="请输入订单金额" style="width: 100%" />
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payWay">
-                <a-input v-model="model.payWay" placeholder="请输入支付方式"></a-input>
+              <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payWayName">
+                <a-input v-model="model.payWayName" placeholder="请输入支付方式"></a-input>
               </a-form-model-item>
             </a-col>
             
@@ -111,7 +111,7 @@
 <script>
 import { getshareBenefitApi, auditshareBenefitApi } from '@/api/api'
 import { httpAction, getAction } from '@/api/manage'
-import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js'
+import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
 
 const columns = [
   {
@@ -180,6 +180,7 @@ export default {
     async getPageDetail() {
       let { result } = await getshareBenefitApi({ id: this.$route.query.id })
       result.shareBenefit['orderSourceName'] = result.shareBenefit.orderSource === 'miniapp' ? '小程序' : 'pc'
+      result.shareBenefit['payWayName'] = filterDictTextByStatic(PAY_WAY, result.shareBenefit.payWay)
       result.shareBenefit['reconciliationStatusName'] = filterDictTextByStatic(FENLICENTRAL_AUDIT_STATUS, result.shareBenefit.reconciliationStatus)
       this.model = {...result.shareBenefit}
       this.dataSource = [...result.list]

src/views/benefits/reconciliation/ReconciliationList.vue

@@ -88,7 +88,7 @@
 <script>
 import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js'
+import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
 
 const columns = [
   {
@@ -125,7 +125,10 @@ const columns = [
     title: '支付方式',
     dataIndex: 'payWay',
     key: 'payWay',
-    align: 'center'
+    align: 'center',
+    customRender: function (text) {
+      return filterDictTextByStatic(PAY_WAY, text)
+    }
   },
   {
     title: '订单来源',

src/views/benefitsAudit/reconciliation/ReconciliationDetails.vue

@@ -28,19 +28,19 @@
                 <a-input v-model="model.buyerName" placeholder="请输入账户"></a-input>
               </a-form-model-item>
             </a-col>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-model-item label="提交人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createBy">
                 <a-input v-model="model.createBy" 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="totalMoney">
                 <a-input-number v-model="model.totalMoney" :min="1" placeholder="请输入订单金额" style="width: 100%" />
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
-              <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payWay">
-                <a-input v-model="model.payWay" placeholder="请输入支付方式"></a-input>
+              <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payWayName">
+                <a-input v-model="model.payWayName" placeholder="请输入支付方式"></a-input>
               </a-form-model-item>
             </a-col>
             
@@ -99,7 +99,7 @@
 <script>
 import { getshareBenefitApi, auditshareBenefitApi } from '@/api/api'
 import { httpAction, getAction } from '@/api/manage'
-import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js'
+import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
 
 const columns = [
   {
@@ -162,6 +162,7 @@ export default {
     async getPageDetail() {
       let { result } = await getshareBenefitApi({ id: this.$route.query.id })
       result.shareBenefit['orderSourceName'] = result.shareBenefit.orderSource === 'miniapp' ? '小程序' : 'pc'
+      result.shareBenefit['payWayName'] = filterDictTextByStatic(PAY_WAY, result.shareBenefit.payWay)
       result.shareBenefit['reconciliationStatusName'] = filterDictTextByStatic(FENLICENTRAL_AUDIT_STATUS, result.shareBenefit.reconciliationStatus)
       this.model = {...result.shareBenefit}
       this.dataSource = [...result.list]

src/views/benefitsAudit/reconciliation/ReconciliationList.vue

@@ -76,7 +76,7 @@
 <script>
 import { getRuleDayDetailApi } from '@/api/api'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js'
+import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
 import PropertyAdvModal from './modules/PropertyAdvModal'
 
 const columns = [
@@ -114,7 +114,10 @@ const columns = [
     title: '支付方式',
     dataIndex: 'payWay',
     key: 'payWay',
-    align: 'center'
+    align: 'center',
+    customRender: function (text) {
+      return filterDictTextByStatic(PAY_WAY, text)
+    }
   },
   {
     title: '订单来源',

src/views/dashboard/IndexChart.vue

 <template>
   <div class="page-header-index-wide">
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+    <a-row :gutter="12">
+      <a-col :sm="24" :md="8" :xl="4" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <div class="icon" style="color:#1890ff;"><a-icon type="home" color="#1890ff" /></div>
           <div>
@@ -13,16 +13,16 @@
           </div>
         </div>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+      <a-col :sm="24" :md="8" :xl="4" :style="{ marginBottom: '12px' }">
         <div class="statistics">
-          <div class="icon" style="color:#7262fd;"><a-icon type="team" /></div>
+          <div class="icon" style="color:#7262fd;"><a-icon type="bank" /></div>
           <div>
             <p style="color:#666;margin-bottom:5px;">累计物业社区数量</p>
             <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.communityNum}}</p>
           </div>
         </div>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+      <a-col :sm="24" :md="8" :xl="4" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <div class="icon" style="color:#ffaa00;"><a-icon type="bar-chart" /></div>
           <div>
@@ -31,7 +31,7 @@
           </div>
         </div>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
+      <a-col :sm="24" :md="8" :xl="4" :style="{ marginBottom: '12px' }">
         <div class="statistics">
           <div class="icon" style="color:#52c41a;"><a-icon type="line-chart" /></div>
           <div>
@@ -43,8 +43,33 @@
           </div>
         </div>
       </a-col>
+
+      <a-col :sm="24" :md="8" :xl="4" :style="{ marginBottom: '12px' }">
+        <div class="statistics">
+          <div class="icon" style="color:#de3840;"><a-icon type="team" /></div>
+          <div>
+            <p style="color:#666;margin-bottom:5px;">合作伙伴数量</p>
+            <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.partnersNum}}
+              <span v-if="statistical.monthPartnersNum > 0"><a-icon type="arrow-up"
+                  color="#1890ff" />{{ statistical.monthPartnersNum }}</span>
+            </p>
+          </div>
+        </div>
+      </a-col>
+      <a-col :sm="24" :md="8" :xl="4" :style="{ marginBottom: '12px' }">
+        <div class="statistics">
+          <div class="icon" style="color:#9C27B0;"><a-icon type="shop" /></div>
+          <div>
+            <p style="color:#666;margin-bottom:5px;">推广商铺数量</p>
+            <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.shopNum}}
+              <span v-if="statistical.monthShopNum > 0"><a-icon type="arrow-up"
+                  color="#1890ff" />{{ statistical.monthShopNum }}</span>
+            </p>
+          </div>
+        </div>
+      </a-col>
     </a-row>
-    <div class="wait-box" style="margin-bottom: 25px;">
+    <div class="wait-box" style="margin-bottom: 12px;">
       <h3 class="box-title">待处理事务（入驻待审核）</h3>
       <div class="content" v-if="waitAuditList.length > 0">
         <div class="item" v-for="(item, index) in waitAuditList" :key="index">
@@ -134,7 +159,7 @@ export default {
       loginfo: {},
       visitFields: ['ip', 'visit'],
       visitInfo: [],
-      indicator: <a-icon type="loading" style="font-size: 24px" spin />,
+      indicator: <a-icon type="loading" style="font-size: 12px" spin />,
     }
   },
   created() {
@@ -162,13 +187,14 @@ export default {
     },
     async getDataStatistics() {
       let { result } = await getDataStatisticsApi()
-      this.statistical = {
-        settledNum: result.settledNum,
-        communityNum: result.communityNum,
-        ownerNum: result.ownerNum,
-        monthOwnerNum: result.monthOwnerNum,
-        monthSettledNum: result.monthSettledNum,
-      }
+      // this.statistical = {
+      //   settledNum: result.settledNum,
+      //   communityNum: result.communityNum,
+      //   ownerNum: result.ownerNum,
+      //   monthOwnerNum: result.monthOwnerNum,
+      //   monthSettledNum: result.monthSettledNum,
+      // }
+      this.statistical = {...result}
       let propertyList = result.waitAuditList[0] || []
       let communityList = result.waitAuditList[1] || []
       this.waitAuditList = propertyList.concat(communityList)
@@ -272,7 +298,7 @@ export default {
 
 <style lang="less" scoped>
 .page-header-index-wide {
-  padding: 16px;
+  // padding: 16px;
   .statistics {
     // flex: none;
     background: #fff;
@@ -293,7 +319,7 @@ export default {
       align-items: center;
       justify-content: center;
       .anticon {
-        font-size: 50px;
+        font-size: 36px;
       }
     }
     span {

src/views/integral/IntegralDetails.vue

@@ -69,7 +69,7 @@
         @change="handleTableChange"
       >
         <span slot="paymentNo" slot-scope="text, record">
-          <span style="color:blue;cursor:pointer">{{record.paymentNo}}</span>              
+          <span style="color:blue;cursor:pointer" @click="onPayDetail(record.id)">{{record.paymentNo}}</span>              
         </span>
         <span slot="type" slot-scope="text, record">
           <span>{{record.type === 'scanQrCodePay' ? '扫码支付' : '抵扣物业费'}}</span>              
@@ -82,6 +82,7 @@
 <script>
 import { queryByIdIntegralDetailApi } from '@/api/api'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { filterDictTextByStatic, PAY_WAY } from '@/assets/static.js'
 const columns = [
   {
     title: '支付订单编号',
@@ -95,7 +96,9 @@ const columns = [
     dataIndex: 'type',
     key: 'type',
     align: 'center',
-    scopedSlots: { customRender: 'type' }
+    customRender: function (text) {
+      return filterDictTextByStatic(PAY_WAY, text)
+    }
   },
   {
     title: '优币变化',
@@ -138,9 +141,10 @@ export default {
       let { result } = await queryByIdIntegralDetailApi({ id: this.$route.query.id })
       this.model = {...result}
     },
-    async getPageList() {
-      let { result } = await getPropertyDetailApi({ id: this.$route.query.id })
-      
+    onPayDetail(id) {
+      this.$router.push({
+        path: '/refund/RefundDetails?id=' + id +'&type=1'
+      })      
     },
     onCancel() {
       this.closeCurrent()

src/views/refund/RefundDetails.vue

@@ -199,6 +199,7 @@ export default {
         id: this.$route.query.id,
         ...this.remarksModel
       }).then((res) => {
+        this.remarksVisible = false
         this.$message.success(`${this.remarksModel.auditStatus === 'auditPass' ? '审核通过' : '审核驳回'}成功`)
         this.closeCurrent()
       })

src/views/refund/RefundList.vue

@@ -115,8 +115,8 @@ const columns = [
   },
   {
     title: '提交时间',
-    dataIndex: 'createTime',
-    key: 'createTime',
+    dataIndex: 'updateTime',
+    key: 'updateTime',
     align: 'center',
   },
   {

src/views/rule/RuleDetails.vue

@@ -41,7 +41,7 @@
                 <a-input-group compact>
                   <a-select style="width: 30%" v-model="model.judgingCondition">
                     <a-select-option value=">">{{'>'}}</a-select-option>
-                    <a-select-option value="≤">≤</a-select-option>
+                    <!-- <a-select-option value="≤">≤</a-select-option> -->
                   </a-select>
                   <!-- <a-input style="width: 50%" placeholder="商铺数量" v-model="model.shopNum" /> -->
                   <a-input-number
@@ -385,6 +385,30 @@ export default {
     submitForm() {
       this.$refs.form.validate((valid) => {
         if (valid) {
+          let isOk = true
+          for(let i = 0;i < this.villageDataSource.length;i++) {
+            if(this.villageDataSource[i].saasBenefits == null) {
+              isOk = false
+              this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的总平台分利`);
+              break
+            }
+            if(this.villageDataSource[i].partnerBenefits == null) {
+              isOk = false
+              this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的合作伙伴分利`);
+              break
+            }
+            if(this.villageDataSource[i].communityBenefits == null) {
+              isOk = false
+              this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的小区分利`);
+              break
+            }
+            if((this.villageDataSource[i].communityBenefits + this.villageDataSource[i].communityBenefits + this.villageDataSource[i].communityBenefits) > 100) {
+              isOk = false
+              this.$message.warning(`${this.villageDataSource[i].communityName}小区的分利比率不能大于100%`);
+              break
+            }
+          }
+          if(isOk) {
             this.confirmLoading = true
             let shareRuleRefList = this.villageDataSource.map(item=> {
               return {
@@ -417,6 +441,7 @@ export default {
               })
             }
           }
+        }
       })
     }
   },