Przeglądaj źródła

完善id和注释

lilei 11 miesięcy temu
rodzic
commit
3bf3b0658a

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1720771956051
+  "version": 1721009994868
 }

+ 2 - 1
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -100,6 +100,7 @@ export default {
     }
   },
   computed: {
+    // 折让金额
     discountAmount () {
       let val = 0
       if (this.basicInfoData && this.basicInfoData.discountAmount) {
@@ -111,7 +112,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyCollectionPayment/list' })
+      this.$router.push({ name: 'companyCollectionPaymentList' })
     },
     // 详情
     getDetail () {

+ 13 - 11
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -40,7 +40,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="结算时间">
-                  <rangeDate ref="rangeDate" @change="dateChange" />
+                  <rangeDate id="companyCollectionPaymentList-rangeDate" ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -59,7 +59,7 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyCollectionPaymentList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyCollectionPaymentList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <a @click="advanced=!advanced" style="margin-left: 8px" id="companyCollectionPaymentList-advanced">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
@@ -97,7 +97,7 @@
         </template>
         <!-- 结算单号 -->
         <template slot="unitSettleNo" slot-scope="text, record">
-          <span :class="$hasPermissions('M_companyCollectionPayment_detail')?'table-td-link':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
+          <span :id="'companyCollectionPaymentList-detail-'+record.id" :class="$hasPermissions('M_companyCollectionPayment_detail')?'table-td-link':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
         </template>
       </s-table>
     </a-spin>
@@ -122,13 +122,13 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        beginDate: '',
-        endDate: '',
-        settleClientNameCurrent: '',
-        settleClientType: undefined,
-        settleType: undefined,
-        unitSettleNo: '',
-        settleStyleSn: undefined
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        settleClientNameCurrent: '', // 客户名称
+        settleClientType: undefined, // 单位类型
+        settleType: undefined, // 结算类型
+        unitSettleNo: '', // 结算单号
+        settleStyleSn: undefined // 结算方式
       },
       // 表头
       columns: [
@@ -163,7 +163,7 @@ export default {
         })
       },
       total: 0, //  总条数
-      productTotal: null
+      productTotal: null // 合计
     }
   },
   methods: {
@@ -202,12 +202,14 @@ export default {
       this.queryParam.settleStyleSn = undefined
       this.$refs.table.refresh(true)
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 230

+ 16 - 14
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -31,12 +31,12 @@
             </a-col>
             <a-col :md="10" :sm="24">
               <a-form-item label="关联单据创建时间">
-                <rangeDate ref="createDate" @change="createDateChange" />
+                <rangeDate id="chooseBillModal-createDate" ref="createDate" @change="createDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="7" :sm="24">
               <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="chooseBillModal-auditTime" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -83,17 +83,17 @@ export default {
       type: Boolean,
       default: false
     },
-    nowChoose: {
+    nowChoose: { // 已选数据
       type: Array,
       default: () => {
         return []
       }
     },
-    settleClientSn: {
+    settleClientSn: { // 结算客户sn
       type: String,
       default: ''
     },
-    settleClientType: {
+    settleClientType: { // 结算客户类型
       type: String,
       default: ''
     }
@@ -105,12 +105,12 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       queryParam: {
-        auditBeginDate: '',
-        auditEndDate: '',
-        bizNo: '',
-        bizType: undefined,
-        bizCreateBeginDate: undefined,
-        bizCreateEndDate: undefined
+        auditBeginDate: '', // 审核时间开始
+        auditEndDate: '', // 审核时间结束
+        bizNo: '', // 单据号
+        bizType: undefined, // 单据类型
+        bizCreateBeginDate: undefined, // 创建时间开始
+        bizCreateEndDate: undefined // 创建时间结束
       },
       allData: [],
       // 表头
@@ -136,20 +136,22 @@ export default {
             for (var i = 0; i < data.length; i++) {
               data[i].no = i + 1
               data[i].settleAmount = data[i].unsettleAmount
+              // 格式化已选数据
               const ind = this.nowChoose.findIndex(item => item.id == data[i].id)
               if (ind != -1) {
                 selectedRowKeys.push(data[i].id)
                 selectedRows.push(data[i])
               }
             }
-            this.$refs.table.setTableSelected(selectedRowKeys, selectedRows) // 设置表格选中项
+            // 设置表格已选中项
+            this.$refs.table.setTableSelected(selectedRowKeys, selectedRows)
             this.disabled = false
           }
           this.spinning = false
           return data
         })
       },
-      rowSelectionInfo: null
+      rowSelectionInfo: null // 选择的数据
     }
   },
   methods: {
@@ -162,7 +164,7 @@ export default {
       this.queryParam.bizCreateBeginDate = date[0]
       this.queryParam.bizCreateEndDate = date[1]
     },
-    //  时间  change
+    //  审核时间  change
     dateChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditEndDate = date[1]

+ 25 - 23
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -163,6 +163,7 @@
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
     </div>
+    <!-- 选择单据 -->
     <choose-bill-modal
       ref="chooseBillModal"
       :openModal="openModal"
@@ -198,8 +199,8 @@ export default {
       spinning: false,
       loading: false, //  表格加载中
       chooseQueryParam: {
-        productCode: '',
-        productName: ''
+        productCode: '', // 产品编码
+        productName: '' // 产品名称
       },
       // 表头
       chooseColumns: [
@@ -213,19 +214,19 @@ export default {
         { title: '本次结算金额', scopedSlots: { customRender: 'settleAmount' }, width: '15%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
-      chooseLoadData: [],
+      chooseLoadData: [], // 已选数据
       formItemLayout: {
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
       },
       form: {
-        amountSettled: 0,
+        amountSettled: 0, // 本次结算金额
         discountAmount: 0, //  折让金额
-        settleStyleSn: undefined,
-        settleClientName: '',
-        settleAccountSn: undefined,
-        settleAccountName: undefined,
-        remark: ''
+        settleStyleSn: undefined, // 结算方式
+        settleClientName: '', // 客户名称
+        settleAccountSn: undefined, // 结算账户
+        settleAccountName: undefined, // 结算账户名称
+        remark: '' // 备注
       },
       rules: {
         amountSettled: [{ required: true, message: '请输入本次结算金额,系统将自动分配到已选单据上', trigger: 'change' }],
@@ -235,9 +236,9 @@ export default {
       },
       openModal: false, //  弹框
       isPositive: true, // 是否是正值
-      isChangeAs: false,
-      maxAmountSettled: 0,
-      enableFundAccount: false
+      isChangeAs: false, // 防止重复计算
+      maxAmountSettled: 0, // 本次结算金额最大值
+      enableFundAccount: false // 结算账户状态是否启用
     }
   },
   computed: {
@@ -294,12 +295,12 @@ export default {
         this.form.settleAccountSn = undefined
       }
     },
+    // 选择结算账户
     settleAccountChange (v, name) {
       this.form.settleAccountName = name
     },
     // 应结算金额
     amountSettledChange () {
-      console.log(this.isChangeAs)
       if (!this.isChangeAs) {
         let val = 0
         this.chooseLoadData.map(item => {
@@ -313,7 +314,6 @@ export default {
     },
     // 修改本次结算金额,自动分配
     amountSettledTotalChange (v) {
-      console.log(this.isChangeAs, v, this.totalBalance, this.isPositive)
       if (v <= Math.abs(this.totalBalance)) {
         this.isChangeAs = true
         const sa = v
@@ -333,7 +333,6 @@ export default {
             break
           }
         }
-        console.log(ti, temp, sa)
         list[ti].settleAmount = (list[ti].settleAmount - (temp - sa) * (this.isPositive ? 1 : -1)).toFixed(2)
         // ti 之后的都改成0
         for (let i = ti + 1; i < list.length; i++) {
@@ -353,6 +352,7 @@ export default {
       this.chooseLoadData.splice(ind, 1)
       this.amountSettledChange()
     },
+    // 获取已选数字,并格式化
     getParams () {
       const _this = this
       const form = _this.form
@@ -393,25 +393,25 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
     },
+    // 返回列表
+    handleBack () {
+      this.$router.push({ name: `companyReceivablePayableList` })
+    },
+    // 选择单据成功
     handleOk (selectedRows) {
       this.chooseLoadData = selectedRows.sort((a, b) => {
         const at = new Date(a.auditTime).getTime()
         const bt = new Date(b.auditTime).getTime()
         return at - bt
       })
-      // this.chooseLoadData = selectedRows.reverse()
+      // 重新应结算金额计算
       this.amountSettledChange()
     },
-    // 返回列表
-    handleBack () {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayable/list` })
-    },
-    // 关闭
+    // 关闭选择单据弹框
     handleClose () {
       this.openModal = false
     },
@@ -426,9 +426,11 @@ export default {
         this.chooseLoadData = res.data || []
         this.loading = false
         this.disabled = false
+        // 应结算金额计算
         this.amountSettledChange()
       })
     },
+    // 初始化页面
     pageInit () {
       this.chooseLoadData = []
       this.getsettleInfoAllList()
@@ -448,7 +450,7 @@ export default {
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
       this.pageInit()
     }
-    // 结算账户状态查询
+    // 结算账户启用状态查询
     if (this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')) {
       this.GetSettleAccountState().then(res => {
         if (res.status == 200) {

+ 5 - 22
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -20,20 +20,13 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="审核时间">
-                  <rangeDate ref="rangeDate" @change="dateChange" />
+                  <rangeDate id="companyReceivablePayableDetail-auditTime" ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableDetail-refresh">查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="companyReceivablePayableDetail-reset">重置</a-button>
-                  <!-- <a-button
-                    type="danger"
-                    style="margin-left: 8px"
-                    @click="handleExport"
-                    :disabled="disabled"
-                    :loading="exportLoading"
-                    id="companyReceivablePayableDetail-export-btn">导出</a-button> -->
                 </span>
               </a-col>
             </a-row>
@@ -73,7 +66,6 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-// import { downloadExcel } from '@/libs/JGPrint.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { settleInfoList, settleInfoQueryReceiptOrPaySum } from '@/api/settle'
@@ -88,9 +80,9 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {
-        auditBeginDate: '',
-        auditEndDate: '',
-        bizNo: ''
+        auditBeginDate: '', // 开始审核时间
+        auditEndDate: '', // 结束审核时间
+        bizNo: '' // 单据号
       },
       exportLoading: false, // 导出loading
       // 表头
@@ -136,7 +128,7 @@ export default {
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyReceivablePayable/list' })
+      this.$router.push({ name: 'companyReceivablePayableList' })
     },
     // 合计
     getTotal (param) {
@@ -155,15 +147,6 @@ export default {
       this.queryParam.auditEndDate = ''
       this.queryParam.bizNo = ''
       this.$refs.table.refresh(true)
-    },
-    //  导出
-    handleExport () {
-      // const params = this.queryParam
-      // this.exportLoading = true
-      // customerBundleExportDelay(params).then(res => {
-      //   this.exportLoading = false
-	  // downloadExcel(res, '单位应收应付')
-      // })
     }
   },
   mounted () {

+ 8 - 6
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -64,14 +64,14 @@
             type="link"
             class="button-primary"
             @click="handleCollectionPayment(record)"
-            id="companyReceivablePayableList-collectionPayment-btn">收付款</a-button>
+            :id="'companyReceivablePayableList-collectionPayment-'+record.id">收付款</a-button>
           <a-button
             v-if="$hasPermissions('M_companyReceivablePayable_detail')"
             size="small"
             type="link"
             class="button-success"
             @click="handleDetail(record)"
-            id="companyReceivablePayableList-detail-btn">详情</a-button>
+            :id="'companyReceivablePayableList-detail-'+record.id">详情</a-button>
           <span v-if="!$hasPermissions('M_collectionPayment') && !$hasPermissions('M_companyReceivablePayable_detail')">--</span>
         </template>
       </s-table>
@@ -95,8 +95,8 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        settleClientNameCurrent: '',
-        settleClientType: undefined
+        settleClientNameCurrent: '', // 客户名称
+        settleClientType: undefined // 单位类型
       },
       // 表头
       columns: [
@@ -130,7 +130,7 @@ export default {
         })
       },
       total: 0, //  总条数
-      productTotal: null
+      productTotal: null // 金额合计数据
     }
   },
   methods: {
@@ -166,15 +166,17 @@ export default {
       this.queryParam.settleClientType = undefined
       this.$refs.table.refresh(true)
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 236
     }
   },
   watch: {

+ 29 - 22
src/views/financialManagement/companyReceivablePayableNew/chooseBillModal.vue

@@ -31,12 +31,12 @@
             </a-col>
             <a-col :md="10" :sm="24">
               <a-form-item label="关联单据创建时间">
-                <rangeDate ref="createDate" @change="createDateChange" />
+                <rangeDate id="chooseBillModal-createDate" ref="createDate" @change="createDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="7" :sm="24">
               <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate id="chooseBillModal-auditDate" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
@@ -48,7 +48,13 @@
       </div>
       <div class="btn-cont">
         <a-button type="primary" id="chooseBillModal-modal-save" @click="handleSave">批量添加</a-button>
-        <a-button v-if="nowChoose.length" type="primary" ghost style="margin-left: 15px;" id="chooseBillModal-modal-reSel" @click="handleReSel">重新选择</a-button>
+        <a-button
+          v-if="nowChoose.length"
+          type="primary"
+          ghost
+          style="margin-left: 15px;"
+          id="chooseBillModal-modal-reSel"
+          @click="handleReSel">重新选择</a-button>
         <span v-if="totalNums" style="margin-left: 15px;">已选{{ totalNums }}项</span>
       </div>
       <!-- 列表 -->
@@ -85,23 +91,24 @@ export default {
       type: Boolean,
       default: false
     },
-    nowChoose: {
+    nowChoose: { // 已选数据
       type: Array,
       default: () => {
         return []
       }
     },
-    settleClientSn: {
+    settleClientSn: { // 结算账户sn
       type: String,
       default: ''
     },
-    settleClientType: {
+    settleClientType: { // 结算账户类型
       type: String,
       default: ''
     }
   },
-  computed:{
-    totalNums(){
+  computed: {
+    // 已选总记录数
+    totalNums () {
       return this.rowSelectionInfo && this.rowSelectionInfo.selectedRows && this.rowSelectionInfo.selectedRows.length
     }
   },
@@ -112,14 +119,14 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       queryParam: {
-        auditBeginDate: '',
-        auditEndDate: '',
-        bizNo: '',
-        bizType: undefined,
-        bizCreateBeginDate: undefined,
-        bizCreateEndDate: undefined
+        auditBeginDate: '', // 审核开始时间
+        auditEndDate: '', // 审核结束时间
+        bizNo: '', // 单据号
+        bizType: undefined, // 单据类型
+        bizCreateBeginDate: undefined, // 创建开始时间
+        bizCreateEndDate: undefined // 创建结束时间
       },
-      allData: [],
+      allData: [], // 全部单据数据
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
@@ -154,17 +161,16 @@ export default {
           return data
         })
       },
-      rowSelectionInfo: null
+      rowSelectionInfo: null // 已选数据
     }
   },
   methods: {
     // 表格选中项
     rowSelectionFun (obj) {
-      console.log(obj)
       this.rowSelectionInfo = obj || null
     },
     // 重新选择
-    handleReSel(){
+    handleReSel () {
       this.$emit('ok', [])
       this.resetSearchForm()
     },
@@ -173,18 +179,18 @@ export default {
       this.queryParam.bizCreateBeginDate = date[0]
       this.queryParam.bizCreateEndDate = date[1]
     },
-    //  时间  change
+    //  审核时间  change
     dateChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditEndDate = date[1]
     },
     // 确定
     handleSave () {
-      if(this.totalNums){
+      if (this.totalNums) {
         this.$emit('ok', this.rowSelectionInfo && this.rowSelectionInfo.selectedRows)
         this.resetSearchForm()
-      }else{
-        this.$message.info("请选择单据")
+      } else {
+        this.$message.info('请选择单据')
       }
     },
     // 重置
@@ -211,6 +217,7 @@ export default {
       const _this = this
       if (!newValue) {
         _this.$emit('close')
+        // 重置
         _this.$refs.table.clearSelected() // 清空表格选中项
         _this.selectedRowKeys = []
         _this.selectedRows = []

+ 43 - 40
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="jg-page-wrap collectionPayment-wrap">
+  <div class="jg-page-wrap collectionPaymentNew-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="collectionPayment-back" >
+      <a-page-header :ghost="false" :backIcon="false" class="collectionPaymentNew-back" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <span style="margin-right:30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
-          <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
+          <a-button id="collectionPayEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <div style="margin-top: 5px;">
@@ -16,14 +16,14 @@
               </div> -->
             </PrintPanel>
             <a-divider type="vertical" />
-            <a-button id="salesNewOrderEdit-del-btn" class="button-default" type="link" @click="handleOk([])"><a-icon type="close" />清空单据</a-button>
+            <a-button id="scollectionPayEdit-del-btn" class="button-default" type="link" @click="handleOk([])"><a-icon type="close" />清空单据</a-button>
             <a-divider type="vertical" />
-            <a-button id="salesNewOrderEdit-add-btn" type="link" @click="openModal=true"><a-icon type="plus" />选择单据</a-button>
+            <a-button id="scollectionPayEdit-add-btn" type="link" @click="openModal=true"><a-icon type="plus" />选择单据</a-button>
           </div>
         </template>
       </a-page-header>
       <!-- 已选单据 -->
-      <a-card size="small" :bordered="false" class="collectionPayment-cont">
+      <a-card size="small" :bordered="false" class="collectionPaymentNew-cont">
         <div class="table-operator">
           <div class="alert-message">
             共 <strong>{{ chooseLoadData.length }}</strong>条明细 ,
@@ -52,7 +52,7 @@
           <!-- 本次结算金额 -->
           <template slot="settleAmount" slot-scope="text, record">
             <a-input-number
-              id="collectionPayment-settleAmount"
+              :id="'collectionPaymentNew-settleAmount-'+record.id"
               v-model="record.settleAmount"
               :precision="2"
               :min="record.unsettleAmount<0 ? record.unsettleAmount : 0"
@@ -64,15 +64,15 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="collectionPayment-del-btn">移除</a-button>
+            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" :id="'collectionPaymentNew-del-'+record.id">移除</a-button>
           </template>
         </a-table>
       </a-card>
-      <a-card size="small" :bordered="false" class="collectionPayment-cont">
+      <a-card size="small" :bordered="false" class="collectionPaymentNew-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="收付款信息">
             <a-form-model
-              id="collectionPayment-form"
+              id="collectionPaymentNew-form"
               ref="ruleForm"
               :model="form"
               :rules="rules"
@@ -85,7 +85,7 @@
                       本次结算金额(<span :class="isPositive ? 'green':'red'">{{ isPositive ? '收款' : '付款' }}</span>)
                     </template>
                     <a-input-number
-                      id="collectionPayment-amountSettled"
+                      id="collectionPaymentNew-amountSettled"
                       v-model="form.amountSettled"
                       @change="amountSettledTotalChange"
                       :precision="2"
@@ -97,7 +97,7 @@
                 <a-col span="12">
                   <a-form-model-item label="折让金额" prop="discountAmount">
                     <a-input-number
-                      id="collectionPayment-discountAmount"
+                      id="collectionPaymentNew-discountAmount"
                       v-model="form.discountAmount"
                       :precision="2"
                       :min="0"
@@ -113,7 +113,7 @@
                       本次实际结算金额(<span :class="isPositive ? 'green':'red'">{{ isPositive ? '收款' : '付款' }}</span>)
                     </template>
                     <a-input-number
-                      id="collectionPayment-actualSettlementAmount"
+                      id="collectionPaymentNew-actualSettlementAmount"
                       v-model="actualSettlementAmount"
                       disabled
                       :precision="2"
@@ -125,7 +125,7 @@
                   <a-form-model-item label="结算方式" prop="settleStyleSn">
                     <v-select
                       code="SETTLE_STYLE"
-                      id="collectionPayment-settleStyleSn"
+                      id="collectionPaymentNew-settleStyleSn"
                       v-model="form.settleStyleSn"
                       @change="settleStyleChange"
                       allowClear
@@ -136,7 +136,7 @@
                 <a-col span="12">
                   <a-form-model-item v-if="enableFundAccount" label="结算账户" prop="settleAccountSn">
                     <settleAccount
-                      id="collectionPayment-settleAccountSn"
+                      id="collectionPaymentNew-settleAccountSn"
                       v-model="form.settleAccountSn"
                       :settleStyleSn="form.settleStyleSn"
                       @change="settleAccountChange"
@@ -146,7 +146,7 @@
                 </a-col>
                 <a-col span="24">
                   <a-form-model-item label="备注" prop="remark" :label-col="{ span: 3 }" :wrapper-col="{ span: 20 }">
-                    <a-textarea id="collectionPayment-remark" :maxLength="100" v-model="form.remark" placeholder="请输入备注(最多100个字符)" allowClear />
+                    <a-textarea id="collectionPaymentNew-remark" :maxLength="100" v-model="form.remark" placeholder="请输入备注(最多100个字符)" allowClear />
                   </a-form-model-item>
                 </a-col>
               </a-row>
@@ -158,13 +158,14 @@
     <div class="affix-cont">
       <a-button
         type="primary"
-        id="collectionPayment-submit"
+        id="collectionPaymentNew-submit"
         size="large"
         :disabled="spinning"
         class="button-primary"
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
     </div>
+    <!-- 单据选择 -->
     <choose-bill-modal
       ref="chooseBillModal"
       :openModal="openModal"
@@ -201,8 +202,8 @@ export default {
       spinning: false,
       loading: false, //  表格加载中
       chooseQueryParam: {
-        productCode: '',
-        productName: ''
+        productCode: '', // 产品编码
+        productName: '' // 产品名称
       },
       // 表头
       chooseColumns: [
@@ -224,13 +225,13 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        amountSettled: 0,
+        amountSettled: 0, // 本次结算金额
         discountAmount: 0, //  折让金额
-        settleStyleSn: undefined,
-        settleClientName: '',
-        settleAccountSn: undefined,
-        settleAccountName: undefined,
-        remark: ''
+        settleStyleSn: undefined, // 结算方式sn
+        settleClientName: '', // 客户名称
+        settleAccountSn: undefined, // 结算账户sn
+        settleAccountName: undefined, // 结算账户名称
+        remark: '' // 备注
       },
       rules: {
         amountSettled: [{ required: true, message: '请输入本次结算金额,系统将自动分配到已选单据上', trigger: 'change' }],
@@ -240,11 +241,11 @@ export default {
       },
       openModal: false, //  弹框
       isPositive: true, // 是否是正值
-      isChangeAs: false,
-      maxAmountSettled: 0,
-      enableFundAccount: false,
+      isChangeAs: false, // 防止重复计算
+      maxAmountSettled: 0, // 结算金额最大值
+      enableFundAccount: false, // 结算账户是否开启
       printTotalKs: false, // 打印原创编码
-      printTotalNums: false, // 打印全部名称
+      printTotalNums: false // 打印全部名称
     }
   },
   computed: {
@@ -284,12 +285,12 @@ export default {
     handlePrint (type, printerType) {
       const _this = this
       const params = _this.getParams()
-      
+
       _this.spinning = true
       let url = ''
       if (type == 'export') { //  导出
         url = settleUnitExport
-      }else{
+      } else {
         url = settleUnitPrint
         // 打印
         // params.printTotalKs = params.printTotalKs ? 1 : 0
@@ -307,6 +308,7 @@ export default {
         this.form.settleAccountSn = undefined
       }
     },
+    // 选择结算账户
     settleAccountChange (v, name) {
       this.form.settleAccountName = name
     },
@@ -326,7 +328,6 @@ export default {
     },
     // 修改本次结算金额,自动分配
     amountSettledTotalChange (v) {
-      console.log(this.isChangeAs, v, this.totalBalance, this.isPositive)
       if (v <= Math.abs(this.totalBalance)) {
         this.isChangeAs = true
         const sa = v
@@ -346,7 +347,6 @@ export default {
             break
           }
         }
-        console.log(ti, temp, sa)
         list[ti].settleAmount = (list[ti].settleAmount - (temp - sa) * (this.isPositive ? 1 : -1)).toFixed(2)
         // ti 之后的都改成0
         for (let i = ti + 1; i < list.length; i++) {
@@ -366,6 +366,7 @@ export default {
       this.chooseLoadData.splice(ind, 1)
       this.amountSettledChange()
     },
+    // 获取格式化后的提交参数
     getParams () {
       const _this = this
       const form = _this.form
@@ -411,22 +412,23 @@ export default {
         }
       })
     },
+    // 选择单据成功
     handleOk (selectedRows) {
-      if(selectedRows.length){
+      if (selectedRows.length) {
         this.chooseLoadData = this.chooseLoadData.concat(selectedRows).sort((a, b) => {
           const at = new Date(a.auditTime).getTime()
           const bt = new Date(b.auditTime).getTime()
           return at - bt
         })
-      }else{
+      } else {
         this.chooseLoadData = selectedRows
       }
-      
+      // 计算结算金额
       this.amountSettledChange()
     },
     // 返回列表
     handleBack () {
-      this.$router.push({ path: `/financialManagement/companyReceivablePayableNew/list` })
+      this.$router.push({ name: `companyReceivablePayableNewList` })
     },
     // 关闭
     handleClose () {
@@ -446,6 +448,7 @@ export default {
         this.amountSettledChange()
       })
     },
+    // 初始化页面
     pageInit () {
       const vm = this
       vm.$nextTick(() => {
@@ -484,7 +487,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .collectionPayment-wrap{
+  .collectionPaymentNew-wrap{
     position: relative;
     height: 100%;
     padding-bottom: 51px;
@@ -493,7 +496,7 @@ export default {
       overflow-y: auto;
       height: 100%;
     }
-    .collectionPayment-cont{
+    .collectionPaymentNew-cont{
       margin-top: 6px;
       .green{
         color: #19be6b;
@@ -502,6 +505,6 @@ export default {
         color: #ed1c24;
       }
     }
-    
+
   }
 </style>

+ 6 - 23
src/views/financialManagement/companyReceivablePayableNew/detail.vue

@@ -20,20 +20,13 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="审核时间">
-                  <rangeDate ref="rangeDate" @change="dateChange" />
+                  <rangeDate id="companyReceivablePayableDetail-auditTime" ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableDetail-refresh">查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="companyReceivablePayableDetail-reset">重置</a-button>
-                  <!-- <a-button
-                    type="danger"
-                    style="margin-left: 8px"
-                    @click="handleExport"
-                    :disabled="disabled"
-                    :loading="exportLoading"
-                    id="companyReceivablePayableDetail-export-btn">导出</a-button> -->
                 </span>
               </a-col>
             </a-row>
@@ -73,7 +66,6 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-// import { downloadExcel } from '@/libs/JGPrint.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { settleInfoList, settleInfoQueryReceiptOrPaySum } from '@/api/settle'
@@ -88,9 +80,9 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {
-        auditBeginDate: '',
-        auditEndDate: '',
-        bizNo: ''
+        auditBeginDate: '', // 开始审核时间
+        auditEndDate: '', // 结束审核时间
+        bizNo: '' // 单据号
       },
       exportLoading: false, // 导出loading
       // 表头
@@ -131,14 +123,14 @@ export default {
     }
   },
   methods: {
-    //  时间  change
+    //  审核时间  change
     dateChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditEndDate = date[1]
     },
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/companyReceivablePayableNew/list' })
+      this.$router.push({ name: 'companyReceivablePayableNewList' })
     },
     // 合计
     getTotal (param) {
@@ -157,15 +149,6 @@ export default {
       this.queryParam.auditEndDate = ''
       this.queryParam.bizNo = ''
       this.$refs.table.refresh(true)
-    },
-    //  导出
-    handleExport () {
-      // const params = this.queryParam
-      // this.exportLoading = true
-      // customerBundleExportDelay(params).then(res => {
-      //   this.exportLoading = false
-	  // downloadExcel(res, '单位应收应付')
-      // })
     }
   },
   mounted () {

+ 1 - 1
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -174,7 +174,7 @@ export default {
     // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 260
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 9 - 7
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -43,8 +43,8 @@
             allowClear />
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" size="large" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="fundAount-btn-submit">保存</a-button>
+          <a-button @click="isShow=false" size="large" style="margin-left: 15px" id="fundAount-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>
@@ -76,10 +76,10 @@ export default {
         wrapperCol: { span: 18 }
       },
       form: {
-        settleStyleSn: '',
-        settleStyleName: '',
-        accountName: '',
-        accountNo: ''
+        settleStyleSn: '', // 账户类型sn
+        settleStyleName: '', // 账户类型名称
+        accountName: '', // 账户名称
+        accountNo: '' // 账户号
       },
       rules: {
         settleStyleSn: [
@@ -95,6 +95,7 @@ export default {
     }
   },
   methods: {
+    // 重置表单
     resetForm () {
       this.$refs.ruleForm.resetFields()
       this.form = {
@@ -105,6 +106,7 @@ export default {
       }
       this.isEdit = false
     },
+    // 选择账户类型
     settleStyleChange (v, name) {
       this.form.settleStyleName = name.dispName
     },
@@ -130,7 +132,7 @@ export default {
         }
       })
     },
-    // 编辑信息
+    // 编辑信息,获取详情数据
     setData (data) {
       if (data && data.settleAccountSn) {
         settleAccountDetail({ settleAccountSn: data.settleAccountSn }).then(res => {

+ 16 - 11
src/views/financialManagement/fundAccountManagement/detail.vue

@@ -46,7 +46,7 @@
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="fundAcountDetail-refresh">查询</a-button>
                   <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="fundAcountDetail-reset">重置</a-button>
-                  <a @click="advanced=!advanced" style="margin-left: 8px">
+                  <a @click="advanced=!advanced" style="margin-left: 8px" id="fundAcountDetail-advanced" >
                     {{ advanced ? '收起' : '展开' }}
                     <a-icon :type="advanced ? 'up' : 'down'"/>
                   </a>
@@ -91,13 +91,13 @@ export default {
       type: String,
       default: 'pages'
     },
-    paramsData: {
+    paramsData: { // 参数
       type: Object,
       default: function () {
         return null
       }
     },
-    saveing: {
+    saveing: { // 按钮loading
       type: Boolean,
       default: false
     }
@@ -105,17 +105,17 @@ export default {
   data () {
     return {
       spinning: false,
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       disabled: false, //  查询、重置按钮是否可操作
       advanced: true, //  高级搜索 展开/关闭
       detailData: null, // 详细基础信息
       // 查询参数
       queryParam: {
-        beginDate: '',
-        endDate: '',
-        bizType: '',
-        bizNo: '',
-        settleClientNameCurrent: ''
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        bizType: '', // 单据类型
+        bizNo: '', // 单据号
+        settleClientNameCurrent: '' // 客户名称
       },
       // 表头
       columns: [
@@ -149,7 +149,7 @@ export default {
     }
   },
   methods: {
-    //  时间  change
+    // 选择时间  change
     dateChange (date) {
       if (date.length) {
         this.queryParam.beginDate = date[0]
@@ -171,6 +171,7 @@ export default {
       }
       this.$refs.table.refresh(true)
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -178,18 +179,22 @@ export default {
       })
       this.getDetail()
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270
     },
-    //  返回
+    // 返回
     handleBack () {
+      // 页面形式
       if (this.pageType == 'pages') {
         this.$router.push({ name: 'fundAccountList' })
       } else {
+        // 弹框形式
         this.$emit('cansel')
       }
     },
+    // 获取详情数据
     getDetail () {
       settleAccountDetail({ settleAccountSn: this.$route.params.sn }).then(res => {
         if (res.status == '200') {

+ 18 - 11
src/views/financialManagement/fundAccountManagement/list.vue

@@ -44,7 +44,7 @@
               v-if="(record.state == 'ENABLE'||record.state == 'DISABLE')&&$hasPermissions('B_FA_QYJY')"
               class="button-primary"
               @click="handleEnable(record)"
-              id="foundAcount-enable-btn">
+              :id="'foundAcount-enable-'+record.id">
               {{ record.state == 'ENABLE'?'禁用':'' }}
               {{ record.state == 'DISABLE'?'启用':'' }}
             </a-button>
@@ -54,28 +54,32 @@
               v-if="(record.state == 'ENABLE'||record.state == 'DISABLE')&&$hasPermissions('M_fundAccount_detail')"
               class="button-primary"
               @click="handleDetail(record)"
-              id="foundAcount-detail-btn">资金明细</a-button>
+              :id="'foundAcount-detail-'+record.id"
+            >资金明细</a-button>
             <a-button
               size="small"
               type="link"
               v-if="record.state == 'WAIT'&&$hasPermissions('B_FA_Audit')"
               class="button-primary"
               @click="handleAudit(record)"
-              id="foundAcount-audit-btn">审核</a-button>
+              :id="'foundAcount-audit-'+record.id"
+            >审核</a-button>
             <a-button
               size="small"
               type="link"
               v-if="record.state == 'WAIT'&&$hasPermissions('B_FA_Edit')"
               class="button-primary"
               @click="handleEdit(record)"
-              id="foundAcount-edit-btn">编辑</a-button>
+              :id="'foundAcount-edit-'+record.id"
+            >编辑</a-button>
             <a-button
               size="small"
               type="link"
               v-if="record.state == 'WAIT'&&$hasPermissions('B_FA_delete')"
               class="button-error"
               @click="handleDel(record)"
-              id="foundAcount-del-btn">删除</a-button>
+              :id="'foundAcount-del-'+record.id"
+            >删除</a-button>
           </template>
         </s-table>
       </a-card>
@@ -101,7 +105,7 @@ export default {
     const _this = this
     return {
       spinning: false,
-      tableHeight: 0,
+      tableHeight: 0, // 表格高度
       disabled: false, //  查询、重置按钮是否可操作
       advanced: true, //  高级搜索 展开/关闭
       enableFundAccount: '', // 结算管理开启状态
@@ -142,6 +146,7 @@ export default {
   },
   methods: {
     ...mapActions(['UpdateSettleAccount', 'GetSettleAccountState']),
+    // 资金账户功能 启用禁用
     enableFundAccountChange (v) {
       this.UpdateSettleAccount({ enableFlag: v.target.value }).then(res => {
         if (res.status == 200) {
@@ -162,6 +167,7 @@ export default {
         this.$refs.addModal.setData(row)
       })
     },
+    // 新增编辑成功刷新列表
     addSuccess () {
       this.$refs.table.refresh()
     },
@@ -243,13 +249,14 @@ export default {
       })
       // 结算账户状态查询
       if (this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')) {
-      	this.GetSettleAccountState().then(res => {
-      	  if (res.status == 200) {
-      		this.enableFundAccount = res.data.functionEnableFlag
-      	  }
-      	})
+        this.GetSettleAccountState().then(res => {
+          if (res.status == 200) {
+            this.enableFundAccount = res.data.functionEnableFlag
+          }
+        })
       }
     },
+    // 表格计算高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 270

+ 3 - 3
src/views/financialManagement/ledgerRecord/list.vue

@@ -6,12 +6,12 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="分账时间">
-              <rangeDate ref="rangeDate" :value="createDate" @change="dateChange" />
+              <rangeDate id="ledgerRecordList-time" ref="rangeDate" :value="createDate" @change="dateChange" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="客户名称">
-              <custList ref="custSatelliteList" :satelliteFlag="true" @change="custSatelliteChange"></custList>
+              <custList id="ledgerRecordList-cust" ref="custSatelliteList" :satelliteFlag="true" @change="custSatelliteChange"></custList>
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24">
@@ -30,7 +30,7 @@
             <span class="table-page-search-submitButtons">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="ledgerRecordList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="ledgerRecordList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced" style="margin-left: 8px" id="ledgerRecordList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>

+ 7 - 5
src/views/financialManagement/settleModal/settleModal.vue

@@ -45,8 +45,8 @@
           </settleAccount>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="expenseManagementEdit-submit">保存</a-button>
+          <a-button @click="isShow=false" style="margin-left: 15px" id="expenseManagementEdit-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>
@@ -78,9 +78,9 @@ export default {
         wrapperCol: { span: 18 }
       },
       form: {
-        settleStyleSn: '',
-        settleStyleName: '',
-        settleAccountSn: ''
+        settleStyleSn: '', // 结算方式
+        settleStyleName: '', // 结算方式名称
+        settleAccountSn: ''// 结算账户
       },
       rules: {
         settleStyleSn: [
@@ -92,6 +92,7 @@ export default {
     }
   },
   methods: {
+    // 重置表单
     resetForm () {
       this.$refs.ruleForm.resetFields()
       this.form = {
@@ -100,6 +101,7 @@ export default {
         settleAccountSn: ''
       }
     },
+    // 选择结算方式
     settleStyleChange (v, name) {
       this.form.settleStyleName = name.dispName
       if (this.form.settleAccountSn) {

+ 7 - 5
src/views/financialManagement/withdrawalManagement/cashOutModal.vue

@@ -38,8 +38,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">提交</a-button>
-          <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+          <a-button type="primary" id="cashOutModal-modal-save" @click="handleSave">提交</a-button>
+          <a-button id="cashOutModal-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>
@@ -57,7 +57,7 @@ export default {
       type: Boolean,
       default: false
     },
-    nowData: {
+    nowData: { // 当前操作数据
       type: Object,
       default: null
     }
@@ -70,7 +70,7 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        amount: ''
+        amount: '' // 提现账户
       },
       rules: {
         amount: [
@@ -81,6 +81,7 @@ export default {
     }
   },
   computed: {
+    // 提现金额最大值
     maxAmount () {
       const balance = this.nowData && this.nowData.balance ? this.nowData.balance : 0
       const serviceCharge = this.nowData && this.nowData.serviceCharge ? this.nowData.serviceCharge : 0
@@ -90,6 +91,7 @@ export default {
         return (Number(balance) * 100 - Number(serviceCharge) * 100) / 100
       }
     },
+    // 实际扣除金额
     deductionAmount () {
       const amount = this.form.amount || 0
       const serviceCharge = this.nowData && this.nowData.serviceCharge ? this.nowData.serviceCharge : 0
@@ -101,7 +103,7 @@ export default {
     }
   },
   methods: {
-    //  提现
+    //  提交提
     handleSave () {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {

+ 8 - 4
src/views/financialManagement/withdrawalManagement/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="提现时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="withdrawalManagementList-time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -71,8 +71,8 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        beginDate: '',
-        endDate: ''
+        beginDate: '', // 开始时间
+        endDate: '' // 结束时间
       },
       // 表头
       columns: [
@@ -106,7 +106,7 @@ export default {
       openModal: false, //  弹框
       itemId: '', //  当前id
       nowData: null, //  当前记录数据
-      accountInfo: null
+      accountInfo: null // 账户信息
     }
   },
   methods: {
@@ -137,10 +137,12 @@ export default {
         }
       }
     },
+    // 申请提现成功
     handleOk () {
       this.$refs.table.refresh(true)
       this.getAccount()
     },
+    // 申请提现取消
     closeModal () {
       this.openModal = false
     },
@@ -151,6 +153,7 @@ export default {
       this.queryParam.endDate = ''
       this.$refs.table.refresh(true)
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -158,6 +161,7 @@ export default {
       })
       this.getAccount()
     },
+    // 表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235 - 217.5