diff --git a/src/views/charge-query/lpjManageDetail.vue b/src/views/charge-query/lpjManageDetail.vue index 724b2ab9b2deee4bdc0e679e1307ec35fa61c96e..12ed1390b5dcc451347a178ad7acb6bdcac9a2cd 100644 --- a/src/views/charge-query/lpjManageDetail.vue +++ b/src/views/charge-query/lpjManageDetail.vue @@ -66,7 +66,7 @@ <div class="btn-div flex"> <span></span> <a-form-model-item label="button"> - <a-button class="mar-left10" type="primary" @click="addNewCharge"> + <a-button class="mar-left10" type="primary" @click.stop="addNewCharge"> <Icon :name="sendBatchNo?'ssibaocun':'ssiadd'" :size="14" />{{sendBatchNo?'ä¿å˜å¯„é€':'新建寄é€'}}</a-button> </a-form-model-item> </div> @@ -128,7 +128,7 @@ <a-button class="mar-left10" type="primary" @click="exportEvt"> <Icon name="ssidaochu" :size="14" />导出 </a-button> - <a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit"> + <a-button class="mar-left10" type="primary" @click.stop="addNewBill" v-if="isEdit"> <Icon :name="isEditNewBill?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewBill? 'ä¿å˜è´¦å•': 'æ·»åŠ è´¦å•'}}</a-button> </a-form-model-item> </div> @@ -292,7 +292,7 @@ export default { { title: "å‡å…金é¢", dataIndex: "reduceAmount", width: 100, align: 'center' }, { title: "客户自付", dataIndex: "selfpaidAmount", width: 100, align: 'center' }, { title: "ç†èµ”金é¢", dataIndex: "actualAmount", width: 100, align: 'center' }, - { title: "è´¦å•ç¼–å·", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136}, + { title: "è´¦å•ç¼–å·", dataIndex: "receiptNo", key:"receiptNo",align:'center'}, ]; if(this.sendBatchNo && ! this.isEditNewBill && this.isEdit){ // 编辑状æ€ä¸‹å·²ç»ä¿å˜çš„æ•°æ®æ‰å¯è¿›è¡Œæ“作 return base.concat([ @@ -360,6 +360,7 @@ export default { }, // 分页回调 getPageData(pager) { + console.log(pager, 1111) if(pager){ this.pagination = { ...this.pagination, @@ -549,7 +550,6 @@ export default { }, //æ·»åŠ è´¦å• addNewBill(){ - // this.isEditNewBill = !this.isEditNewBill; if(this.isEditNewBill){ //ä¿å˜ this.addNewCharge() .then(()=>{ @@ -560,13 +560,14 @@ export default { this.isEditNewBill = true; this.cacheDataList = {} if(this.isEditNewBill) { // æ–°å¢žæ—¶æ·»åŠ äº†è´¦å•ä¿¡æ¯ é‚£åˆ†é¡µä¹Ÿåº”è¯¥æ˜¯è°ƒè´¦å•ä¿¡æ¯æŽ¥å£ - this._getNewBillList() + this._getNewBillList() } else { this.getData() } } }, _getNewBillList() { + console.log(2133) this.$apis.queryNoSendReceipList({ pageNum: this.pagination.pageNum, pageSize: this.pagination.pageSize, @@ -648,7 +649,7 @@ export default { this.$message.success("æˆåŠŸ"); // this.selectedRowKeys = []; this.cacheDataList = {} - if(this.isEditNewBill) { // æ–°å¢žæ—¶æ·»åŠ äº†è´¦å•ä¿¡æ¯ é‚£åˆ†é¡µä¹Ÿåº”è¯¥æ˜¯è°ƒè´¦å•ä¿¡æ¯æŽ¥å£ + if(!this.isEditNewBill) { // æ–°å¢žæ—¶æ·»åŠ äº†è´¦å•ä¿¡æ¯ é‚£åˆ†é¡µä¹Ÿåº”è¯¥æ˜¯è°ƒè´¦å•ä¿¡æ¯æŽ¥å£ this._getNewBillList() } else { this.getData()