Merge branch 'yll-fix-1225' of git.ssish.com:sunhailiang/bims into test

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()