lilei 1 năm trước cách đây
mục cha
commit
8b7c0d07ac

+ 16 - 14
src/views/salesManagement/salesCollection/detailModal.vue

@@ -160,19 +160,19 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       spinning: false,
-      showDetailModal: false,
-      handlePlData: [],
-      applyDate: [],
+      showDetailModal: false, // 财务收款详情
+      handlePlData: [], // 批量操作数据
+      applyDate: [], // 申请时间默认值
       queryParam: {
-        payerName: undefined,
-        bookNo: '',
-        bookReason: '',
-        applyPersonSn: undefined,
-        status: 'AUDIT_PASS',
-        auditBeginDate: undefined,
-        auditEndDate: undefined
+        payerName: undefined, // 付款方
+        bookNo: '', // 收款单号
+        bookReason: '', // 财务收款事由
+        applyPersonSn: undefined, // 申请人
+        status: 'AUDIT_PASS', // 状态
+        auditBeginDate: undefined, // 审核开始时间
+        auditEndDate: undefined // 审核结束时间
       },
-      chooseData: [],
+      chooseData: [], // 已选数据
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '8%', align: 'center' },
@@ -188,7 +188,7 @@ export default {
         { title: '状态', dataIndex: 'statusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
-      orginData: [],
+      orginData: [], // 原始数据
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -214,6 +214,7 @@ export default {
     }
   },
   computed: {
+    // 总金额
     totalAmount () {
       let ret = 0
       this.handlePlData.map(item => {
@@ -230,10 +231,12 @@ export default {
         this.$refs.detailModal.pageInit(row.bookSn)
       })
     },
+    // 赋值
     setData (data, snList) {
       this.handlePlData = data
       this.snList = snList
     },
+    // 选择申请时间
     dateApplyChange (date) {
       this.queryParam.auditBeginDate = date[0]
       this.queryParam.auditEndDate = date[1]
@@ -252,7 +255,6 @@ export default {
       row.checked = true
       this.chooseData.push(row)
     },
-    // 获取sn
     // 确定收款
     handleCommonOk () {
       const snList = this.snList
@@ -260,7 +262,7 @@ export default {
       this.chooseData.map(item => {
         bookSnList.push(item.bookSn)
       })
-
+      // 有财务收款单
       if (bookSnList.length) {
         this.spinning = true
         settleReceiptBookBatch({

+ 46 - 36
src/views/salesManagement/salesCollection/list.vue

@@ -236,42 +236,42 @@ export default {
   data () {
     return {
       spinning: false,
-      showDetail: false,
-      showSkModal: false,
-      showVoucher: false,
-      showDetailModal: false,
-      detailType: 2,
-      bizSn: null,
-      tableHeight: 0,
+      showDetail: false, // 详情弹框
+      showSkModal: false, // 收款弹框
+      showVoucher: false, // 凭证弹框
+      showDetailModal: false, // 详情弹框
+      detailType: 2, // 详情类型
+      bizSn: null, // 单据sn
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        beginDate: '',
-        endDate: '',
-        bizNo: '',
-        dispatchBillNo: '',
-        beginDateSettle: '',
-        endDateSettle: '',
-        settleClientName: '',
-        receiverName: '',
-        dealerLevel: undefined,
-        settleStyle: undefined,
-        keepType: undefined,
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        bizNo: '', // 单据号
+        dispatchBillNo: '', // 配送单号
+        beginDateSettle: '', // 收款开始时间
+        endDateSettle: '', // 收款结束时间
+        settleClientName: '', // 结算客户
+        receiverName: '', // 收货人
+        dealerLevel: undefined, // 客户级别
+        settleStyle: undefined, // 收款方式
+        keepType: undefined, // 收款类型
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined // 分区
         },
-        billStatus: undefined,
-        settleState: undefined,
-        voidFlag: undefined,
-        dealerProvinceSn: undefined,
-        dealerCitySn: undefined,
-        dealerCountySn: undefined,
-        checkStatus: undefined,
-        bizUserSn: undefined
+        billStatus: undefined, // 业务状态
+        settleState: undefined, // 财务状态
+        voidFlag: undefined, // 单据状态
+        dealerProvinceSn: undefined, // 地区 省
+        dealerCitySn: undefined, // 市
+        dealerCountySn: undefined, // 县
+        checkStatus: undefined, // 对单状态
+        bizUserSn: undefined // 客服
       },
       disabled: false, //  查询、重置按钮是否可操作
       auditDate: [], //  审核时间
-      settleDate: [],
-      advanced: true,
+      settleDate: [], // 收款时间默认值
+      advanced: true, // 收起展开
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -303,6 +303,7 @@ export default {
     showSelect () {
       return this.$hasPermissions('B_salesCollection_receipt')
     },
+    // 总售价计算
     totalAmount () {
       let ret = 0
       this.handlePlData.map(item => {
@@ -321,7 +322,6 @@ export default {
         { title: '收货客户名称', dataIndex: 'receiverName', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '收款类型', dataIndex: 'keepTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款时间', dataIndex: 'settleTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -338,9 +338,11 @@ export default {
     }
   },
   methods: {
+    // 客户名称
     custChange (val) {
       this.queryParam.settleClientName = val.name
     },
+    // 收货客户名称
     receiverChange (val) {
       this.queryParam.receiverName = val.name
     },
@@ -348,25 +350,27 @@ export default {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
     },
-    //  审核时间  change
+    //  选择审核时间  change
     dateAuditChange (date) {
       this.queryParam.beginDate = date[0] ? date[0] : ''
       this.queryParam.endDate = date[1] ? date[1] : ''
     },
-    //  收款时间  change
+    //  选择收款时间  change
     dateSettleChange (date) {
       this.queryParam.beginDateSettle = date[0] ? date[0] : ''
       this.queryParam.endDateSettle = date[1] ? date[1] : ''
     },
+    // 查询列表
     searchTable () {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
+    // 区域分区
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
-    //  重置
+    //  重置查询
     resetSearchForm () {
       this.auditDate = []
       this.$refs.rangeAuditDate.resetDate(this.auditDate)
@@ -403,12 +407,14 @@ export default {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
+    // 备货单详情或销售单详情
     handleDetail (row, type) {
       this.detailType = type
       this.bizSn = type == 0 ? row.bizSn : row.dispatchBillSn
       this.$store.state.app.curActionPermission = type == 0 ? 'B_salesDetail' : 'B_dispatchDetail'
       this.showDetailModal = true
     },
+    // 详情弹框关闭
     cancelDetail () {
       this.showDetailModal = false
       this.detailType = 2
@@ -438,7 +444,7 @@ export default {
         })
       }
     },
-    // 凭证
+    // 凭证弹框
     handleVoucher (row) {
       this.$store.state.app.curActionPermission = 'B_salesCollection_record'
       this.showVoucher = true
@@ -446,16 +452,18 @@ export default {
         this.$refs.voucherModal.getData(row)
       })
     },
+    // 凭证弹框关闭
     closeVoucherModal () {
       this.showVoucher = false
       this.$store.state.app.curActionPermission = ''
     },
-    // 点击收款
+    // 点击打开收款弹框
     handleColle (row) {
       this.handlePlData = [row]
       this.$store.state.app.curActionPermission = 'B_salesCollection_receipt'
       this.showSkModal = true
     },
+    // 销售收款弹框关闭
     closeColleModal () {
       this.showSkModal = false
       this.$store.state.app.curActionPermission = ''
@@ -482,12 +490,14 @@ export default {
         }
       })
     },
+    // 初始页面
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 表格高度计算
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 237

+ 10 - 7
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -140,11 +140,11 @@ export default {
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
-      showTipModal: false,
-      showDetailModal: false,
+      showTipModal: false, // 收款打印预览弹框
+      showDetailModal: false, // 财务收款详情弹框
       disabled: false,
       spinning: false,
-      detail: null,
+      detail: null, // 单据详情数据
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款单号', scopedSlots: { customRender: 'bookNo' }, width: '10%', align: 'center' },
@@ -158,10 +158,10 @@ export default {
         { title: '审核时间', dataIndex: 'auditDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'statusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
-      tableData: [],
-      associatedLoading: false,
-      showCollectDetail: false,
-      handlePlData: null
+      tableData: [], // 列表数据
+      associatedLoading: false, // 关联收款单 按钮 loading
+      showCollectDetail: false, // 关联收款单弹窗
+      handlePlData: null // 批量操作数据
     }
   },
   methods: {
@@ -172,11 +172,13 @@ export default {
         this.$refs.detailModal.pageInit(row.bookSn)
       })
     },
+    // 获取列表数据
     getData (data) {
       this.handlePlData = data
       this.spinning = true
       settleReceiptFindBySn({ sn: data.accountReceiptSn }).then(res => {
         this.detail = res.data || null
+        // 收款类型
         if (res.data.keepType !== 'LABEL_RECEIPT') {
           this.tableData = res.data && res.data.financeBookList || []
           const no = 1
@@ -248,6 +250,7 @@ export default {
         this.$refs.printModel.getData(row, list, true)
       })
     },
+    // 打印预览弹框关闭
     canselPrintView () {
       this.spinning = false
       this.showTipModal = false