优化调整

src/api/api.js

@@ -12,6 +12,7 @@ const getQrCode = (params)=>getAction("/property-central/shop/shopInfo/getQrCode
 const shareBenefitShopByDepId = (params)=>getAction("/property-central/partners/shareBenefit/queryById",params);
 const shareBenefitList = (params)=>getAction("/property-central/partners/shareBenefit/list",params);
 const shareBalanceByDepId = (params)=>getAction("/property-central/partners/shareBalance/queryById",params);
+const getShareruleApi = (params)=>getAction("/property-central/sharerule/settlementSet/queryById",params);
 
 // 首页统计数据
 const getDataStatisticsApi = (params)=>getAction("/property-central/partners/partnersInfo/statistics",params);
@@ -123,6 +124,7 @@ export {
   shareBenefitShopByDepId,
   shareBenefitList,
   shareBalanceByDepId,
+  getShareruleApi,
   addRole,
   editRole,
   checkRoleCode,

src/mixins/JeecgListMixin.js

@@ -12,6 +12,7 @@ import store from '@/store'
 export const JeecgListMixin = {
   data(){
     return {
+      createTimeValue: [],
       /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
       queryParam: {},
       /* 数据源 */
@@ -155,6 +156,7 @@ export const JeecgListMixin = {
       this.$refs.superQueryModal.show();
     },
     searchReset() {
+      this.createTimeValue = []
       this.queryParam = {}
       this.initPageParams(this.queryParam);
       this.loadData(1);

src/views/benefiting/ReconciliationList.vue

@@ -22,10 +22,9 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="10">
+          <a-col :md="8" :sm="8">
             <a-form-item label="订单时间">
-              <a-date-picker placeholder="订单时间" format="YYYY-MM-DD HH:mm:ss"
-                v-model="queryParam.createTime"  :show-time="{ format: 'HH:mm:ss' }" @change="onChange" ></a-date-picker>
+              <a-range-picker @change="onChangeData" :value="createTimeValue" />
             </a-form-item>
           </a-col>
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -37,6 +36,10 @@
         </a-row>
       </a-form>
     </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" v-if="days">
+      数据列表（以下账单，展示{{days}}天前的账单金额）
+    </div>
     <!-- table区域-begin -->
     <div>
       <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
@@ -53,8 +56,8 @@
         </span>
         <span slot="action" slot-scope="text, record">
           <a type="primary" @click="toDetails(record.id)">详情</a>
-          <a type="primary" @click="toReconciliation(record)" v-if="record.reconciliationStatus === 1"
-            style="margin-left: 15px;">申请对账</a>
+          <a type="primary" @click="toReconciliation(record)"
+            v-if="record.reconciliationStatus === 1 && record.isShow === '1' " style="margin-left: 15px;">申请对账</a>
         </span>
       </a-table>
 
@@ -87,6 +90,7 @@
 </template>
 
 <script>
+import { getShareruleApi } from '@/api/api'
 import { httpAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
@@ -115,7 +119,7 @@ const columns = [
     key: 'shareMoney',
     align: 'center',
   },
-    {
+  {
     title: '订单金额',
     dataIndex: 'totalMoney',
     key: 'totalMoney',
@@ -169,8 +173,8 @@ export default {
   mixins: [JeecgListMixin],
   data() {
     return {
-      queryParam:{
-        platformType:'partner'
+      queryParam: {
+        platformType: 'partner',
       },
       info: {},
       model: {},
@@ -193,18 +197,31 @@ export default {
       url: {
         list: '/property-central/partners/shareBenefit/list',
         reconciliation: '/property-central/partners/shareBenefit/reconciliation',
+        getSharerule: '/property-central/sharerule/settlementSet/queryById',
       },
       dataSource: [],
       visibleReconciliation: false,
       confirmLoading: false,
+      days: '',
     }
   },
   created() {
     //let data = new Date().toLocaleString()
+    this.getSharerule()
   },
   methods: {
-    onChange(date, dateString) {
-      this.queryParam.createTime = dateString
+    async getSharerule() {
+      let { result } = await getShareruleApi({ id: 1 })
+      if (result.days) {
+        this.days = result.days
+      }
+    },
+    onChangeData(date, dateString) {
+      if (dateString.length > 0) {
+        this.createTimeValue = date
+        this.queryParam.createTime_begin = dateString[0]
+        this.queryParam.createTime_end = dateString[1]
+      }
     },
     initPageParams(params) {
       params['platformType'] = 'partner'

src/views/benefiting/SettlementList.vue

@@ -17,10 +17,9 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="10">
+          <a-col :md="8" :sm="8">
             <a-form-item label="订单时间">
-              <a-date-picker placeholder="订单时间" format="YYYY-MM-DD HH:mm:ss"
-                v-model="queryParam.createTime" :show-time="{ format: 'HH:mm:ss' }" @change="onChange" ></a-date-picker>
+              <a-range-picker @change="onChangeData" :value="createTimeValue" />
             </a-form-item>
           </a-col>
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -32,8 +31,8 @@
         </a-row>
       </a-form>
     </div>
-        <!-- 操作按钮区域 -->
-        <div class="table-operator">
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
       <a-button @click="propertyDetails(1)" type="primary">申请结算</a-button>
     </div>
     <!-- table区域-begin -->
@@ -114,7 +113,7 @@ const columns = [
 ]
 
 export default {
-  components: { },
+  components: {},
   name: 'SettlementList',
   mixins: [JeecgListMixin],
   data() {
@@ -143,8 +142,12 @@ export default {
     }
   },
   methods: {
-    onChange(date, dateString) {
-      this.queryParam.createTime = dateString
+    onChangeData(date, dateString) {
+      if (dateString.length > 0) {
+        this.createTimeValue = date
+        this.queryParam.createTime_begin = dateString[0]
+        this.queryParam.createTime_end = dateString[1]
+      }
     },
     initPageParams(params) {
       params['platformType'] = 'partner'
@@ -154,14 +157,12 @@ export default {
         this.$router.push({
           path: '/benefiting/SettlementDetails?type=add',
         })
-      }else if (type == 2) {
+      } else if (type == 2) {
         this.$router.push({
           path: '/benefiting/SettlementDetails?type=detail&id=' + id,
         })
       }
     },
-
-
   },
 }
 </script>

src/views/withdrawal/WithdrawalList.vue

@@ -9,18 +9,9 @@
               <j-input placeholder="请输入结算单号" v-model="queryParam.balanceNum"></j-input>
             </a-form-item>
           </a-col>
-          <!-- <a-col :md="5" :sm="8">
-            <a-form-item label="状态">
-              <a-select style="width: 100%" v-model="queryParam.balanceStatus" placeholder="请选择状态">
-                <a-select-option v-for="item in chargeList" :key="item.type"
-                  :value="item.type">{{item.name}}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col> -->
-          <a-col :md="7" :sm="10">
+          <a-col :md="8" :sm="8">
             <a-form-item label="订单时间">
-              <a-date-picker placeholder="订单时间" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.createTime"
-                :show-time="{ format: 'HH:mm:ss' }" @change="onChange"></a-date-picker>
+              <a-range-picker @change="onChangeData" :value="createTimeValue" />
             </a-form-item>
           </a-col>
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -144,8 +135,12 @@ export default {
     }
   },
   methods: {
-    onChange(date, dateString) {
-      this.queryParam.createTime = dateString
+    onChangeData(date, dateString) {
+      if (dateString.length > 0) {
+        this.createTimeValue = date
+        this.queryParam.createTime_begin = dateString[0]
+        this.queryParam.createTime_end = dateString[1]
+      }
     },
     initPageParams(params) {
       params['platformType'] = 'partner',