浏览代码

增加财务管理页面

1004749546@qq.com 4 年之前
父节点
当前提交
510cea625b

+ 13 - 7
src/config/router.config.js

@@ -48,16 +48,22 @@ export const asyncRouterMap = [{
 	  path: '/FinancialManagement',
 	  name: 'FinancialManagement',
 	  component: PageView,
-	  meta: { title: '财务管理', icon: 'account-book',permission:'M_cwgn' },
+	  meta: { title: '财务管理', icon: 'account-book', permission: 'M_cwgn' },
 	  children: [
 	    {
-	      path: 'PaySettlementRecords/list',
-	      name: 'PaySettlementRecords',
-	      component: () => import(/* webpackChunkName: "writeOff" */ '@/views/FinancialManagement/PaySettlementRecords.vue'),
-	      meta: { title: '应付结算记录', icon: 'form', permission: 'M_yfjs_js_list' }
-	    }
+	      path: 'LedgerRecords/list',
+	      name: 'LedgerRecords',
+	      component: () => import(/* webpackChunkName: "FinancialManagement" */ '@/views/FinancialManagement/LedgerRecords.vue'),
+	      meta: { title: '分账记录', icon: 'form' }
+	    },
+      {
+        path: 'CashOutManagement/list',
+        name: 'CashOutManagement',
+        component: () => import(/* webpackChunkName: "FinancialManagement" */ '@/views/FinancialManagement/CashOutManagement.vue'),
+        meta: { title: '提现管理', icon: 'property-safety' }
+      }
 	  ]
-  },
+  }
   // {
   //   path: '/auth',
   //   redirect: '/auth/userList',

+ 85 - 76
src/views/FinancialManagement/PaySettlementRecords.vue → src/views/FinancialManagement/CashOutManagement.vue

@@ -4,22 +4,18 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="refresh">
         <a-row :gutter="48">
-          <a-col :lg="6" :sm="12">
-            <a-form-item label="结算时间:">
+          <a-col :lg="8" :sm="12">
+            <a-form-item label="提现时间" :label-col="{ span:4 }" :wrapper-col="{ span:16}">
               <a-range-picker
-                style="width:100%"
                 id="PaySettlementRecords-queryOrderDate"
                 :disabledDate="disabledDate"
+                style="width: 100%;"
                 v-model="queryOrderDate"
-                format="YYYY-MM-DD"
+                :show-time="{ format: 'HH:mm' }"
+                format="YYYY-MM-DD HH:mm"
                 :placeholder="['开始时间', '结束时间']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :sm="12">
-            <a-form-item label="结算单号">
-              <a-input class="full-width" v-model="queryParam.settleNo" placeholder="请输入" allowClear id="PaySettlementRecords-queryOrderDate"/>
-            </a-form-item>
-          </a-col>
           <a-col :lg="6" :sm="12">
             <a-button type="primary" @click="refresh" id="PaySettlementRecords-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" id="PaySettlementRecords-resetSearchForm">重置</a-button>
@@ -28,9 +24,9 @@
       </a-form>
     </div>
     <!-- 合计 -->
-    <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amountTotal }}</span>元</div>
-    </a-alert>
+    <div class="ftext" >
+      <a-button class="btn-cont" type="primary" @click="openModal" id="PaySettlementRecords-refresh">申请提现</a-button>
+      可提现余额:<span>{{ amountTotal }}</span>元</div>
     <!-- 列表 -->
     <div>
       <s-table
@@ -40,16 +36,10 @@
         bordered
         :columns="columns"
         :data="loadData">
-        <template slot="action" slot-scope="text, record">
-          <!-- <a-icon type="eye" title="查看" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleDetail(record)" /> -->
-          <a-button type="primary" @click="handleDetail(record)" id="PaySettlementRecords-handleDetail">详情</a-button>
-        </template>
       </s-table>
     </div>
-    <!-- 应收结算记录详情弹窗 -->
-    <pay-settlement-records-details-modal :itemId="itemId" :openModalDetails="openModalDetails" @close="openModalDetails=false"></pay-settlement-records-details-modal>
-    <!-- 核销详情弹窗 -->
-    <WriteOffDetailsModal :settleId="settleId" :openWriteOffModal="openWriteOffModal" @close="openWriteOffModal=false"></WriteOffDetailsModal>
+    <!-- 申请提现弹窗 -->
+    <cashOut-modal :openCashOutModal="openCashOutModal" @close="openCashOutModal=false" @refresh="refresh"></cashOut-modal>
   </a-card>
 </template>
 
@@ -59,43 +49,33 @@ import {
   STable,
   VSelect
 } from '@/components'
+import cashOutModal from './CashOutModal.vue'
 import {
   settlementRecordsList,
   settlementRecordsListTotal
 } from '@/api/FinancialManagement'
-import PaySettlementRecordsDetailsModal from './PaySettlementRecordsDetailsModal.vue'
-import WriteOffDetailsModal from './WriteOffDetailsModal.vue'
 export default {
-  name: 'SettlementRecordsList',
+  name: 'CashOutManagement',
   components: {
     VSelect,
     STable,
-    PaySettlementRecordsDetailsModal,
-    WriteOffDetailsModal
+    cashOutModal
   },
   data () {
     return {
-      loadData: parameter => {
-        const searchData = Object.assign(parameter, this.queryParam)
-        console.log(this.queryOrderDate, 'this.queryOrderDate')
-        if (this.queryOrderDate && this.queryOrderDate.length) {
-          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-        } else {
-          searchData.beginDate = ''
-          searchData.endDate = ''
-        }
-        return settlementRecordsList(searchData).then(res => {
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          for (let i = 0; i < res.data.list.length; i++) {
-            const _item = res.data.list[i]
-            _item.no = no + i + 1
-          }
-          return res.data
-        })
-      },
+      openCashOutModal: false, // 是否打开申请提现弹窗
       queryOrderDate: undefined,
+      storeList: [
+        { id: 11, name: '常青二路店' },
+        { id: 112, name: '西部大道店' },
+        { id: 114, name: '渭滨路店' },
+        { id: 115, name: '未央店' },
+        { id: 116, name: '凤城八路店' }
+      ],
       queryParam: {
+        storeName: '', // 客户名称
+        partName: '', // 配件名称
+        status: '', // 分账状态
         settleNo: '',
         beginDate: '',
         endDate: ''
@@ -104,51 +84,80 @@ export default {
       amountTotal: 0, // 实收总金额
       itemId: '', // 每条数据id
       settleId: '',
-      openModalDetails: false, // 默认关闭详情弹窗
-      openWriteOffModal: false,
       columns: [{
         title: '序号',
         dataIndex: 'no',
-        width: '60px',
+        width: 60,
         align: 'center'
       },
       {
-        title: '结算单号',
-        dataIndex: 'settleNo',
-        width: '150px',
+        title: '提现时间',
+        dataIndex: 'settleDate',
+        width: 200,
         align: 'center'
       },
       {
-        title: '结算时间',
-        dataIndex: 'settleDate',
-        width: '150px',
+        title: '提现单号',
+        dataIndex: 'settleNo',
+        width: 150,
         align: 'center'
       },
       {
-        title: '结算订单数',
+        title: '申请提现金额',
         dataIndex: 'orderNum',
-        width: '150px',
+        width: 150,
         align: 'center',
         scopedSlots: {
           customRender: 'userInfo'
         }
       },
       {
-        title: '结算金额',
+        title: '开户名',
         dataIndex: 'realAmount',
         align: 'center',
-        width: '150px'
+        width: 150
       },
       {
-        title: '操作',
-        dataIndex: 'action',
-        width: '100px',
+        title: '银行卡号',
+        dataIndex: 'code',
         align: 'center',
-        scopedSlots: {
-          customRender: 'action'
+        width: 150
+      },
+      {
+        title: '状态',
+        dataIndex: 'status',
+        align: 'center',
+        width: 150
+      },
+      {
+        title: '备注',
+        dataIndex: 'remarks',
+        width: 100,
+        align: 'center',
+        customRender: (text) => {
+          return text || '--'
         }
       }
-      ]
+      ],
+      loadData: parameter => {
+        const searchData = Object.assign(parameter, this.queryParam)
+        console.log(this.queryOrderDate, 'this.queryOrderDate')
+        if (this.queryOrderDate && this.queryOrderDate.length) {
+          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
+          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+        } else {
+          searchData.beginDate = ''
+          searchData.endDate = ''
+        }
+        return settlementRecordsList(searchData).then(res => {
+          const no = (res.data.pageNo - 1) * res.data.pageSize
+          for (let i = 0; i < res.data.list.length; i++) {
+            const _item = res.data.list[i]
+            _item.no = no + i + 1
+          }
+          return res.data
+        })
+      }
     }
   },
   methods: {
@@ -156,18 +165,6 @@ export default {
     disabledDate (current) {
       return current && current > moment().endOf('day')
     },
-    // 查看详情
-    handleDetail (record) {
-      this.itemId = record.settleNo
-      this.settleId = record.settleNo
-      console.log(this.itemId, record.settleType)
-      if (record.settleType === 'BUNDLE_SALE') {
-        this.openModalDetails = true
-        console.log(this.openModalDetails)
-      } else {
-        this.openWriteOffModal = true
-      }
-    },
     // 查询
     refresh () {
       this.$refs.table.refresh(true)
@@ -211,7 +208,12 @@ export default {
           }
         }
       })
+    },
+    // 打开提现弹窗
+    openModal () {
+      this.openCashOutModal = true
     }
+    //
 
   },
   beforeRouteEnter (to, from, next) {
@@ -222,7 +224,14 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+  .ftext{
+    margin-bottom: 15px;
+    font-size: 18px;
+    .btn-cont{
+      margin-right: 20px;
+    }
+  }
 	.ftext span {
 		color: #fa8c16;
 		font-weight: bold;

+ 107 - 0
src/views/FinancialManagement/CashOutModal.vue

@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <a-modal
+      class="modalBox"
+      title="申请提现"
+      v-model="isshow"
+      @cancle="cancel"
+      :footer="null"
+      :width="600"
+      :centered="true">
+      <a-form-model ref="ruleForm" :model="form" :rules="rules" :labelCol="{span:5}" :wrapperCol="{span:15}">
+        <a-form-model-item required label="申请提现金额" prop="money">
+          <a-input-number style="width: 100%;" placeholder="请输入提现金额" :min="1" :max="10000" v-model="form.money" />
+        </a-form-model-item>
+        <a-form-model-item label="实际扣除金额" prop="finalMoney">
+          <span>{{ finalMoney }} &nbsp;&nbsp;元</span>&nbsp;&nbsp;&nbsp;&nbsp;(申请提现金额+提现手续费)
+        </a-form-model-item>
+        <a-form-model-item label="提现账户" >
+          <div >中国农业银行(阳光)</div>
+          <div>12345454679874</div>
+        </a-form-model-item>
+        <a-form-model-item class="submit-cont" :wrapper-col="{ span: 14, offset: 9 }">
+          <a-button type="primary" @click="submitForm('ruleForm')">
+            提交
+          </a-button>
+          <a-button style="margin-left: 10px" @click="cancel">
+            取消
+          </a-button>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import {
+  SettlementRecordsDetailsList
+} from '@/api/FinancialManagement'
+export default {
+  props: {
+    openCashOutModal: {
+      type: Boolean,
+      default: false
+    },
+    settleId: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      isshow: this.openCashOutModal,
+      form: {
+        money: ''
+      },
+      rules: {
+        money: [{ required: true, message: '请输入提现金额', trigger: ['change', 'blur'] }]
+      }
+    }
+  },
+  computed: {
+    finalMoney () {
+      return this.form.money ? (this.form.money + 0.5).toFixed(2) : 0
+    }
+  },
+  methods: {
+    // 提交
+    submitForm (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          alert('submit!')
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+	  // 关闭弹窗
+	  cancel () {
+	    this.$refs['ruleForm'].resetFields()
+	    this.$emit('close')
+	  }
+  },
+  watch: {
+	  openCashOutModal (newValue, oldValue) {
+	  		  this.isshow = newValue
+	  },
+	  isshow (val) {
+	    if (!val) {
+        this.$refs['ruleForm'].resetFields()
+	      this.$emit('close')
+	    }
+	  },
+	  settleId (newValue, oldValue) {
+	    if (newValue && this.isshow) {
+	       this.$refs.table.refresh(newValue)
+	    }
+	  }
+  }
+}
+</script>
+
+<style scoped="scoped">
+  .submit-cont{
+    padding-top: 50px;
+  }
+</style>

+ 270 - 0
src/views/FinancialManagement/LedgerRecords.vue

@@ -0,0 +1,270 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 搜索条件 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="refresh">
+        <a-row :gutter="48">
+          <a-col :lg="8" :sm="12">
+            <a-form-item label="分账时间" :label-col="{ span:4 }" :wrapper-col="{ span:16}">
+              <a-range-picker
+                id="PaySettlementRecords-queryOrderDate"
+                :disabledDate="disabledDate"
+                style="width: 100%;"
+                v-model="queryOrderDate"
+                :show-time="{ format: 'HH:mm' }"
+                format="YYYY-MM-DD HH:mm"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :sm="12">
+            <a-form-item label="客户名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-select
+                show-search
+                allowClear
+                placeholder="请输入客户名称"
+                option-filter-prop="children"
+                v-model="queryParam.storeName"
+              >
+                <a-select-option v-for="item in storeList" :key="item.id" :value="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :sm="12">
+            <a-form-item label="配件名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-input class="full-width" v-model="queryParam.partName" placeholder="请输入配件名称" allowClear id="PaySettlementRecords-queryOrderDate"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :sm="12">
+            <a-form-item label="配件编码" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-input class="full-width" v-model="queryParam.settleNo" placeholder="请输入配件编码" allowClear id="PaySettlementRecords-queryOrderDate"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :sm="12">
+            <a-form-item label="分账状态" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <v-select
+                v-model="queryParam.status"
+                ref="ledgerStatus"
+                id="purchasedSetmeal-status"
+                code="SETTLE_STATUS_ALL"
+                placeholder="请选择分账状态"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :sm="12">
+            <a-button type="primary" @click="refresh" id="PaySettlementRecords-refresh">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" id="PaySettlementRecords-resetSearchForm">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 合计 -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div class="ftext" slot="message">总计:<span>{{ orderTotal }}</span>条,分账金额<span>¥{{ amountTotal }}</span>元</div>
+    </a-alert>
+    <!-- 列表 -->
+    <div>
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        bordered
+        :columns="columns"
+        :data="loadData">
+      </s-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import {
+  STable,
+  VSelect
+} from '@/components'
+import {
+  settlementRecordsList,
+  settlementRecordsListTotal
+} from '@/api/FinancialManagement'
+export default {
+  name: 'LedgerRecords',
+  components: {
+    VSelect,
+    STable
+  },
+  data () {
+    return {
+      queryOrderDate: undefined,
+      storeList: [
+        { id: 11, name: '常青二路店' },
+        { id: 112, name: '西部大道店' },
+        { id: 114, name: '渭滨路店' },
+        { id: 115, name: '未央店' },
+        { id: 116, name: '凤城八路店' }
+      ],
+      queryParam: {
+        storeName: '', // 客户名称
+        partName: '', // 配件名称
+        status: '', // 分账状态
+        settleNo: '',
+        beginDate: '',
+        endDate: ''
+      },
+      orderTotal: 0, // 订单数量
+      amountTotal: 0, // 实收总金额
+      itemId: '', // 每条数据id
+      settleId: '',
+      columns: [{
+        title: '序号',
+        dataIndex: 'no',
+        width: 60,
+        align: 'center'
+      },
+      {
+        title: '分账时间',
+        dataIndex: 'settleDate',
+        width: 200,
+        align: 'center'
+      },
+      {
+        title: '客户名称',
+        dataIndex: 'settleNo',
+        width: 150,
+        align: 'center'
+      },
+      {
+        title: '关联工单号',
+        dataIndex: 'orderNum',
+        width: 150,
+        align: 'center',
+        scopedSlots: {
+          customRender: 'userInfo'
+        }
+      },
+      {
+        title: '配件名称',
+        dataIndex: 'realAmount',
+        align: 'center',
+        width: 150
+      },
+      {
+        title: '配件编码',
+        dataIndex: 'code',
+        align: 'center',
+        width: 150
+      },
+      {
+        title: '分账类型',
+        dataIndex: 'type',
+        align: 'center',
+        width: 150
+      },
+      {
+        title: '分账金额(¥)',
+        dataIndex: 'money',
+        align: 'center',
+        width: 150
+      },
+      {
+        title: '分账状态',
+        dataIndex: 'status',
+        align: 'center',
+        width: 150
+      },
+      {
+        title: '备注',
+        dataIndex: 'remarks',
+        width: 100,
+        align: 'center',
+        customRender: (text) => {
+          return text || '--'
+        }
+      }
+      ],
+      loadData: parameter => {
+        const searchData = Object.assign(parameter, this.queryParam)
+        console.log(this.queryOrderDate, 'this.queryOrderDate')
+        if (this.queryOrderDate && this.queryOrderDate.length) {
+          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
+          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+        } else {
+          searchData.beginDate = ''
+          searchData.endDate = ''
+        }
+        return settlementRecordsList(searchData).then(res => {
+          const no = (res.data.pageNo - 1) * res.data.pageSize
+          for (let i = 0; i < res.data.list.length; i++) {
+            const _item = res.data.list[i]
+            _item.no = no + i + 1
+          }
+          return res.data
+        })
+      }
+    }
+  },
+  methods: {
+    // 禁止不可选日期
+    disabledDate (current) {
+      return current && current > moment().endOf('day')
+    },
+    // 查询
+    refresh () {
+      this.$refs.table.refresh(true)
+      this.getListTotal()
+    },
+    // 重置
+    resetSearchForm () {
+      this.queryOrderDate = undefined
+      this.queryParam = {
+        settleNo: '',
+        beginDate: '',
+        endDate: ''
+      }
+      this.$refs.table.refresh(true)
+      this.getListTotal()
+    },
+    // 合计
+    getListTotal () {
+      const params = {
+        settleNo: this.queryParam.settleNo,
+        beginDate: this.queryParam.beginDate,
+        endDate: this.queryParam.endDate
+      }
+      if (this.queryOrderDate && this.queryOrderDate.length) {
+        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
+        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+      } else {
+        params.beginDate = ''
+        params.endDate = ''
+      }
+      //    params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
+      //    params.endDate == null ? params.endDate = getDate.getToday().endtime : null
+      settlementRecordsListTotal(params).then(res => {
+        if (res.status == 200) {
+          if (res.data) {
+            this.orderTotal = res.data.orderNum || 0
+            this.amountTotal = res.data.amount || 0
+          } else {
+            this.orderTotal = 0
+            this.amountTotal = 0
+          }
+        }
+      })
+    }
+
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.resetSearchForm()
+    })
+  }
+}
+</script>
+
+<style scoped>
+	.ftext span {
+		color: #fa8c16;
+		font-weight: bold;
+	}
+</style>

+ 0 - 108
src/views/FinancialManagement/PaySettlementRecordsDetailsModal.vue

@@ -1,108 +0,0 @@
-<template>
-	<div>
-		<a-modal class="modalBox" title="详情" v-model="isshow" @cancle="cancel" :footer="null" width="60%" :centered="true">
-			<s-table ref="table" size="default" :rowKey="(record) => record.id" bordered :columns="columns" :data="loadData">
-			</s-table>
-		</a-modal>
-	</div>
-</template>
-
-<script>
-	import { STable } from '@/components'
-	import { SettlementRecordsDetailsList } from '@/api/FinancialManagement'
-	export default {
-		name: 'SettlementRecordsDetailsModal',
-		components: {
-			STable
-		},
-		props: {
-			openModalDetails: {
-				type: Boolean,
-				default: false
-			},
-			itemId: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				loadData: parameter => {
-					return SettlementRecordsDetailsList({
-						settleNo: this.itemId,
-						pageNo: 1,
-						pageSize: 10
-					}).then(res => {
-						const no = (res.data.pageNo - 1) * res.data.pageSize
-						for (let i = 0; i < res.data.list.length; i++) {
-							const _item = res.data.list[i]
-							_item.no = no + i + 1
-						}
-						return res.data
-					})
-				},
-				isshow: this.openModalDetails,
-				settleId: '', // 套餐名称
-				openWriteOffModal: false, // 核销弹窗默认关闭
-				columns: [
-					{
-						title: '序号',
-						dataIndex: 'no',
-						width: '60px',
-						align: 'center'
-					},
-					{
-						title: '订单号',
-						dataIndex: 'orderBundleNo',
-						width: '150px',
-						align: 'center'
-					},
-					{
-						title: '下单时间',
-						dataIndex: 'orderDate',
-						width: '150px',
-						align: 'center'
-					},
-					{
-						title: '套餐名称',
-						dataIndex: 'bundleName',
-						width: '150px',
-						align: 'center'
-					},
-					{
-						title: '结算金额',
-						dataIndex: 'settleAmount',
-						align: 'center',
-						width: '150px'
-					}
-				]
-			}
-		},
-		methods: {
-			// 关闭弹窗
-			cancel(e) {
-				this.$emit('close')
-			}
-		},
-		watch: {
-			openModalDetails(newValue, oldValue) {
-				this.isshow = newValue
-				console.log(this.isshow)
-			},
-			isshow(val) {
-				if (!val) {
-					this.$emit('close')
-				}
-			},
-			itemId(newValue, oldValue) {
-				console.log(newValue)
-				if (newValue && this.isshow) {
-					this.$refs.table.refresh(newValue)
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-</style>

+ 0 - 133
src/views/FinancialManagement/WriteOffDetailsModal.vue

@@ -1,133 +0,0 @@
-<template>
-  <div>
-    <a-modal
-      class="modalBox"
-      title="详情"
-      v-model="isshow"
-      @cancle="cancel"
-      :footer="null"
-      width="60%"
-      :centered="true">
-      <s-table
-        ref="table"
-        size="default"
-        :rowKey="(record) => record.id"
-        bordered
-        :columns="columns"
-        :data="loadData">
-      </s-table>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { STable } from '@/components'
-import {
-  SettlementRecordsDetailsList
-} from '@/api/FinancialManagement'
-export default {
-  components: {
-    STable
-  },
-  props: {
-    openWriteOffModal: {
-      type: Boolean,
-      default: false
-    },
-    settleId: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      loadData: parameter => {
-        return SettlementRecordsDetailsList({
-          settleNo: this.itemId,
-          pageNo: 1,
-          pageSize: 10
-        }).then(res => {
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          for (let i = 0; i < res.data.list.length; i++) {
-            const _item = res.data.list[i]
-            _item.no = no + i + 1
-          }
-          return res.data
-        })
-      },
-      isshow: this.openWriteOffModal,
-	  columns: [{
-	    title: '序号',
-	    dataIndex: 'no',
-	    width: '60px',
-	    align: 'center'
-	  },
-	  {
-	    title: '核销单号',
-	    dataIndex: 'verificationNo',
-	    width: '150px',
-	    align: 'center'
-	  },
-	  {
-	    title: '核销时间',
-	    dataIndex: 'usedTime',
-	    width: '150px',
-	    align: 'center'
-	  },
-	  {
-	    title: '套餐名称',
-	    dataIndex: 'bundleName',
-	    width: '150px',
-	    align: 'center'
-	  },
-	  {
-	    title: '服务名称',
-	    dataIndex: 'bundleItemName',
-	    width: '150px',
-	    align: 'center',
-	    scopedSlots: {
-	      customRender: 'userInfo'
-	    }
-	  },
-	  {
-	    title: '结算金额',
-	    dataIndex: 'settleAmount',
-	    align: 'center',
-	    width: '150px'
-	  },
-	  {
-	    title: '核销门店',
-	    dataIndex: 'usedStoreName',
-	    width: '100px',
-	    align: 'center'
-	  }
-	  ]
-    }
-  },
-  methods: {
-	  // 关闭弹窗
-	  cancel (e) {
-	    this.clear()
-	    this.$emit('close')
-	  }
-  },
-  watch: {
-	  openWriteOffModal (newValue, oldValue) {
-	  		  this.isshow = newValue
-	  },
-	  isshow (val) {
-	    if (!val) {
-	      this.$emit('close')
-	    }
-	  },
-	  settleId (newValue, oldValue) {
-	    if (newValue && this.isshow) {
-	       this.$refs.table.refresh(newValue)
-	    }
-	  }
-  }
-}
-</script>
-
-<style>
-</style>

+ 0 - 206
src/views/RefundRecord/RefundRecord.vue

@@ -1,206 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 搜索条件 -->
-    <div class="orderCenter-searchForm">
-      <a-form ref="searchForm">
-        <a-row :gutter="48">
-          <a-col :span="8">
-            <a-form-item label="创建时间" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="关联订单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear  />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.name" placeholder="请选择" allowClear ></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="4">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button type="" @click="resetForm">重置</a-button>
-          </a-col>
-        </a-row>
-        <a-row :gutter="48">
-          <a-col :span="8">
-            <a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.fwname" placeholder="请选择" allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="退款状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.status" placeholder="请选择" allowClear ></v-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 合计 -->
-    <div class="total">
-      <a-icon type="info-circle" class="iconImg"/>
-      <strong>合计:</strong><span v-model="countHJ">{{countHJ}} 单</span><strong style="margin-left: 15px;">实收:</strong><span v-model="incomeHJ">{{incomeHJ}} 元</span>
-    </div>
-    <!-- 列表 -->
-    <s-table ref="table" size="default" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
-      <!-- 退款状态 -->
-      <span slot="status" slot-scope="text, record">
-        <template></template>
-      </span>
-    </s-table>
-  </a-card>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  import getDate from '../../libs/getDate.js'
-  import moment from 'moment'
-  export default {
-    components: {
-      STable,
-      VSelect
-    },
-    data() {
-      return {
-        // 查询参数
-        searchForm: {
-          beginDate: null,  // 创建的开始时间
-          endDate: null,    // 创建的结束时间
-          name: '',         // 网点名称
-          num: '',          // 单号
-          fwname:'',        // 服务项目
-          status:''         // 状态
-        },
-        time: [
-          moment(getDate.getToday().starttime, this.dateFormat),
-          moment(getDate.getToday().endtime, this.dateFormat)
-        ],
-        dateFormat: 'YYYY-MM-DD',
-        countHJ:'40',
-        incomeHJ:'2000',
-        columns: [{
-            title: '创建时间',
-            dataIndex: 'createTime',
-            minWidth: '100',
-            align: 'center'
-
-          },
-          {
-            title: '交易流水号',
-            dataIndex: 'createTime',
-            minWidth: '100',
-            align: 'center'
-
-          },
-          {
-            title: '关联订单号',
-            dataIndex: 'createTime',
-            width: '100',
-            align: 'center'
-
-          },
-          {
-            title: '网点名称',
-            dataIndex: 'createTime',
-            minWidth: '100',
-            align: 'center'
-
-          },
-          {
-            title: '退款项目',
-            dataIndex: 'createTime',
-            minWidth: '100',
-            align: 'center'
-
-          },
-          {
-            title: '退款金额(¥)',
-            dataIndex: 'createTime',
-            minWidth: '40',
-            align: 'center'
-
-          },
-          {
-            title: '退款人',
-            dataIndex: 'createTime',
-            minWidth: '100',
-            align: 'center'
-
-          },
-          {
-            title: '退款状态',
-            dataIndex: 'createTime',
-            minWidth: '100',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'status'
-            }
-          },
-          {
-            title: '备注',
-            dataIndex: 'status',
-            minWidth: '100',
-            align: 'center',
-          },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          // this.searchData.beginDate == null ? this.searchData.beginDate = getDate.getToday().starttime : null
-          // this.searchData.endDate == null ? this.searchData.endDate = getDate.getToday().endtime : null
-          // return getTenantsList(Object.assign(parameter, this.searchForm)).then(res => {
-          //   if (res.status == 200) {
-          //     const no = (res.data.pageNo - 1) * res.data.pageSize
-          //     for (let i = 0; i < res.data.list.length; i++) {
-          //       const _item = res.data.list[i]
-          //       _item.no = no + i + 1
-          //       _item.status = _item.status + '' === '1'
-          //     }
-          //     return res.data
-          //   }
-          // })
-        }
-      }
-    },
-    methods: {
-      // 创建时间change
-      onChange(dates, dateStrings) {
-        if ((dates, dateStrings)) {
-          this.searchForm.beginDate = dateStrings[0]
-          this.searchForm.endDate = dateStrings[1]
-        }
-        console.log(this.searchForm.beginDate, this.searchForm.endDate)
-      },
-      // 重置
-      resetForm() {
-        this.$refs.searchForm.resetFields()
-        this.$refs.table.refresh(true)
-      },
-    },
-  }
-</script>
-
-<style lang="less">
-  .orderCenter-searchForm,
-  .addButton {
-    margin-bottom: 0;
-  }
-
-  .orderCenter-searchForm .ant-form-inline .ant-form-item {
-    margin-bottom: 15px;
-  }
-
-  .total {
-    margin-bottom: 24px;
-    width:100%;
-    background-color: #e6f7ff;
-    border: 1px solid #91d5ff;
-    padding: 8px 15px 8px 27px;
-    border-radius: 4px;
-    .iconImg{
-      color: #1890FF;
-      margin-right: 10px;
-    }
-  }
-</style>