소스 검색

Merge branch 'develop_szhj' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_szhj

chenrui 3 년 전
부모
커밋
40c6bdf66e

+ 7 - 1
src/api/merchant.js

@@ -31,6 +31,12 @@ export const queryTradeFlowPage = (params) => {
   })
 }
 
+export const merchantCashOut = params => {
+  return axios({
+    url: `/shelf/findShelfSettleRuleByShelfSn/${params.shelfSn}`,
+    method: 'get'
+  })
+}
 export const merchantCashOutDetail = (params) => {
   return axios({
     url: '/merchant/queryMerchantAccount',
@@ -90,4 +96,4 @@ export const queryOrderBillDetailCount = (params) => {
     data: params,
     method: 'post'
   })
-}
+}

+ 28 - 43
src/views/numsGoodsShelves/settlementManagement/detailModal.vue

@@ -1,7 +1,6 @@
 <template>
   <a-modal
     centered
-    class="chooseImport-modal"
     :footer="null"
     :maskClosable="false"
     title="结算明细"
@@ -9,32 +8,30 @@
     @cancle="isShow=false"
     width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div class="chooseImport-con">
-        <a-descriptions :column="3">
-          <a-descriptions-item label="结算时间">
-            {{ this.settleData &&this.settleData.payDate?this.settleData.payDate:'--' }}
-          </a-descriptions-item>
-          <a-descriptions-item label="结算金额">
-            {{ this.settleData &&this.settleData.settleAmount?toThousands(this.settleData.settleAmount,2):'--' }}
-          </a-descriptions-item>
-          <a-descriptions-item label="支付方式">
-            {{ this.settleData&&this.settleData.payWayDictValue?this.settleData.payWayDictValue:'--' }}
-          </a-descriptions-item>
-        </a-descriptions>
-        <!-- 可导入数据 -->
-        <s-table
-          class="sTable fixPagination"
-          ref="table"
-          size="small"
-          :rowKey="(record) => record.allocateSn"
-          :columns="nowColumns"
-          :data="loadData"
-          :loading="loading"
-          :defaultLoadData="true"
-          :scroll="{ y: 600 }"
-          bordered>
-        </s-table>
-      </div>
+      <a-descriptions :column="3">
+        <a-descriptions-item label="结算时间">
+          {{ this.settleData &&this.settleData.payDate?this.settleData.payDate:'--' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="结算金额">
+          {{ this.settleData &&this.settleData.settleAmount?toThousands(this.settleData.settleAmount,2):'--' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="支付方式">
+          {{ this.settleData&&this.settleData.payWayDictValue?this.settleData.payWayDictValue:'--' }}
+        </a-descriptions-item>
+      </a-descriptions>
+      <!-- 可导入数据 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.allocateSn"
+        :columns="nowColumns"
+        :data="loadData"
+        :loading="loading"
+        :defaultLoadData="true"
+        :scroll="{ y: 600 }"
+        bordered>
+      </s-table>
     </a-spin >
   </a-modal>
 </template>
@@ -106,7 +103,9 @@ export default {
       if (!newValue) {
         this.$emit('close')
       } else {
-        this.$refs.table.refresh(true)
+        this.$nextTick(() => {
+          this.$refs.table.refresh(true)
+        })
       }
     },
     settleData (newValue, oldValue) {
@@ -117,19 +116,5 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
-  .chooseImport-modal{
-    .chooseImport-con{
-      .red{
-        color: #f30;
-      }
-      .btn-con{
-        text-align: center;
-        margin: 30px 0 20px;
-        .button-cancel,.button-error{
-          font-size: 12px;
-        }
-      }
-    }
-  }
+<style lang="less">
 </style>

+ 3 - 3
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -32,7 +32,7 @@
                 <span>{{ total && toThousands(total.freezeAmount,2) }}</span>
               </a-descriptions-item>
               <a-descriptions-item label="可用额度">
-                <span>{{ total && toThousands(total.activeAmount,2) }}</span>
+                <span>{{ total && toThousands(total.usableAmount,2) }}</span>
               </a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
@@ -91,7 +91,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { toThousands } from '@/libs/tools.js'
 import moment from 'moment'
-import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOutDetail } from '@/api/merchant'
+import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOut } from '@/api/merchant'
 export default {
   mixins: [commonMixin],
   components: { STable, VSelect, commonMixin },
@@ -177,7 +177,7 @@ export default {
     getPageInfo () {
       this.spinning = true
       const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
-      merchantCashOutDetail({}).then(res => {
+      merchantCashOut({shelfSn:this.$route.params.shelfSn}).then(res => {
         console.log(res, info, '===========')
         if (res.status == 200) {
           this.total = res.data