chenrui il y a 11 mois
Parent
commit
53be2c9170

+ 9 - 1
src/views/promotionRulesManagement/dealerPromotions/chooseDealer.vue

@@ -140,9 +140,11 @@ export default {
     }
   },
   methods: {
+    // 表格选中项
     onSelectChange (selectedRowKeys) {
       this.selectedRowKeys = selectedRowKeys
     },
+    // 操作分页事件
     handlePage (pagination, filters, sorter) {
       const pager = { ...this.pagination }
       pager.pageNo = pagination.pageSize != pager.pageSize ? 1 : pagination.current
@@ -151,10 +153,10 @@ export default {
       this.pagination = pager
       this.loadData()
     },
+    // 获取列表数据
     loadData () {
       this.spinning = true
       const params = { pageSize: 20, pageNo: 1, ...this.pagination, promotionSn: this.promotionSn }
-
       queryDealerPage(Object.assign(params, this.queryParam)).then(res => {
         let data
         if (res.status == 200) {
@@ -182,19 +184,23 @@ export default {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
     },
+    // 商户类型 change
     getDealerType (v, o) {
       this.queryParam.dealerType1 = v[0]
       this.queryParam.dealerType2 = v[1]
     },
+    // 地区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.districtSn = val[2] ? val[2] : ''
     },
+    // 查询
     searchForm () {
       this.loadData()
       // this.spinning = false
     },
+    // 区域/分区
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -234,6 +240,7 @@ export default {
       this.spinning = false
       this.$emit('plAdd', dealerInfoList.data)
     },
+    // 初始化
     pageInit (data) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -243,6 +250,7 @@ export default {
       this.chooseInfo = data || []
       this.resetSearchForm()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 285

+ 2 - 2
src/views/purchasingManagement/purchaseReceipt/list.vue

@@ -289,12 +289,12 @@ export default {
     },
     // 是否显示上传凭证按钮
     isShowUploadBtn (con) {
-      const res = ((con.state === 'PASS' && con.thirdpartyBizState === 'AUDIT_PASS') || (con.state === 'WAIT_PUT' && con.thirdpartyBizState === 'WAIT_RECEIVE') || (con.state === 'WAIT_PUT' && con.thirdpartyBizState === 'FINISH') || (con.state === 'FINISH' && con.thirdpartyBizState === 'FINISH')) && !con.attachmentList
+      const res = ((con.state === 'PASS' && con.thirdpartyBizState === 'AUDIT_PASS') || (con.state === 'PASS' && con.thirdpartyBizState === 'WAIT_RECEIVE') || (con.state === 'WAIT_PUT' && con.thirdpartyBizState === 'FINISH') || (con.state === 'FINISH' && con.thirdpartyBizState === 'FINISH')) && !con.attachmentList
       return res
     },
     // 是否显示查看凭证按钮
     isShowCheckBtn (con) {
-      const res = ((con.state === 'PASS' && con.thirdpartyBizState === 'AUDIT_PASS') || (con.state === 'WAIT_PUT' && con.thirdpartyBizState === 'WAIT_RECEIVE') || (con.state === 'WAIT_PUT' && con.thirdpartyBizState === 'FINISH') || (con.state === 'FINISH' && con.thirdpartyBizState === 'FINISH')) && (con.attachmentList && con.attachmentList.length > 0)
+      const res = ((con.state === 'PASS' && con.thirdpartyBizState === 'AUDIT_PASS') || (con.state === 'PASS' && con.thirdpartyBizState === 'WAIT_RECEIVE') || (con.state === 'WAIT_PUT' && con.thirdpartyBizState === 'FINISH') || (con.state === 'FINISH' && con.thirdpartyBizState === 'FINISH')) && (con.attachmentList && con.attachmentList.length > 0)
       return res
     },
     // 是否显示 --