bug

src/views/invoice/components/addInvoice.vue

@@ -190,9 +190,6 @@ export default {
             this.baseRequest('getById', postData).then(res => {
                 if (res.data) {
                     this.form = res.data
-                    if (res.data.sendStatus == '0') {
-                        this.getBankTaxRateByFloor()
-                    }
                 }
             }).catch(err => {
                 this.$message.error(err)
@@ -203,8 +200,8 @@ export default {
                 this.bankOptions = res.data || []
             })
         },
-        getBankTaxRateByFloor() {
-            this.baseRequest('getBankTaxRateByFloor', { id: this.form.id }).then(res => {
+        getBankTaxRateByFloor(data) {
+            this.baseRequest('getBankTaxRateByFloor_2', data).then(res => {
                 if (res.data) {
                     this.form.invoiceSellerBank = res.data.invoiceSellerBank
                     this.form.invoiceTax = res.data.invoiceTax
@@ -240,11 +237,18 @@ export default {
             console.log('data', data)
             this.dialogVisible = false
             const postData = {
-                id: data
+                id: data,
+                invoiceGoodsName: '*房地产预收款*&'
             }
             this.baseRequest('getByContractId', postData).then(res => {
                 if (res.data) {
                     this.form = res.data
+                    // 带出银行
+                    const postData = {
+                        contractId: data,
+                        paymentType: '房款'
+                    }
+                    this.getBankTaxRateByFloor(postData)
                 }
             })
         },

src/views/invoice/formalInvoiceManage.vue

@@ -5,19 +5,19 @@
         <span>买受人</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input style="width: 100%" v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.buyerName" style="width: 100%" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>房屋</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input style="width: 100%" v-model="search.houseName" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.houseName" style="width: 100%" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>推送状态</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-select style="width: 100%" v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
+        <el-select v-model="search.sendStatus" style="width: 100%" placeholder="请选择" popper-class="statistic_base">
           <el-option
             v-for="item in dc_data.SEND_STATUS"
             :key="item.value"
@@ -31,8 +31,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-select
-            style="width: 100%"
           v-model="search.invoiceStatus"
+          style="width: 100%"
           filterable
           popper-class="statistic_base"
         >
@@ -51,8 +51,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
-            style="width: 100%"
           v-model="search.sendDateFrom"
+          style="width: 100%"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -64,8 +64,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
-            style="width: 100%"
           v-model="search.sendDateTo"
+          style="width: 100%"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -77,8 +77,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
-            style="width: 100%"
           v-model="search.invoiceDateFrom"
+          style="width: 100%"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -90,8 +90,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-date-picker
-            style="width: 100%"
           v-model="search.invoiceDateTo"
+          style="width: 100%"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -103,7 +103,7 @@
       <el-col :span="24" style="margin-top: 20px">
         <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
         <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
-        <el-button size="small" class="ch-button-export" @click="batchInvoice()">批量开票</el-button>
+        <el-button size="small" class="ch-button-export" @click="batchInvoice()">批量推送</el-button>
         <!--        <el-button size="small" type="danger" @click="handleBatchBadDebt()">红冲</el-button>-->
         <el-button size="small" class="ch-button-export" :loading="excelFlag" @click="handleExportAll()">导出</el-button>
       </el-col>
@@ -156,7 +156,7 @@
           </el-table-column>
           <el-table-column header-align="center" label="操作" width="180">
             <template scope="scope">
-              <el-button v-if="scope.row.sendStatus === '0'" type="text" size="mini" @click="handleInvoice(scope.row)">开票</el-button>
+              <el-button v-if="scope.row.sendStatus === '0'" type="text" size="mini" @click="handleInvoice(scope.row)">推送</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
             </template>
           </el-table-column>
@@ -221,7 +221,7 @@ import BatchInvoice from '@/views/invoice/components/batchInvoice.vue'
 
 export default {
     name: 'FormalInvoiceManage',
-    components: { FormalInvoiceManageEdit,BatchInvoice },
+    components: { FormalInvoiceManageEdit, BatchInvoice },
     mixins: [Base, BaseData],
     data() {
         return {
@@ -313,7 +313,7 @@ export default {
         },
         batchInvoice() {
             if (!this.selected.length) {
-                this.$message.warning('请先勾选要批量开票的数据')
+                this.$message.warning('请先勾选要批量推送的数据')
                 return
             }
             let check = true
@@ -323,11 +323,11 @@ export default {
                 }
             })
             if (!check) {
-                this.$message.warning('仅可对待推送的数据进行批量开票')
+                this.$message.warning('仅可对待推送的数据进行批量推送')
                 return
             }
             this.dialogBatchVisible = true
-            this.dialogBatchTitle = '批量开票'
+            this.dialogBatchTitle = '批量推送'
             this.$nextTick(() => {
                 this.$refs.batchInvoice.initData(this.selected)
             })

src/views/invoice/invoiceManage.vue

@@ -5,19 +5,19 @@
         <span>买受人</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input style="width: 100%" v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.buyerName" style="width: 100%" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>房屋</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input style="width: 100%" v-model="search.houseName" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.houseName" style="width: 100%" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>推送状态</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-select style="width: 100%" v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
+        <el-select v-model="search.sendStatus" style="width: 100%" placeholder="请选择" popper-class="statistic_base">
           <el-option
             v-for="item in dc_data.SEND_STATUS"
             :key="item.value"
@@ -31,8 +31,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-select
-            style="width: 100%"
           v-model="search.invoiceStatus"
+          style="width: 100%"
           filterable
           popper-class="statistic_base"
         >
@@ -260,10 +260,12 @@ export default {
             item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.collectionStatus]
             return item
         },
-        handleAdd(val) {
+        handleAdd() {
             this.dialogVisible = true
             this.dialogTitle = ''
-            val.isView = false
+            const val = {
+                isView: false
+            }
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addInvoice.initData(val)

src/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue

@@ -127,7 +127,7 @@
     </el-form>
     <div style="text-align: right">
       <el-button @click="cancel">取 消</el-button>
-      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">提 交</el-button>
+      <el-button v-if="!isView" :loading="loading" type="primary" @click="confirmSubmit()">提 交</el-button>
     </div>
 
   </div>
@@ -157,7 +157,8 @@ export default {
             isView: false,
             bankOptions: [],
             bankObject: '',
-            contractId: ''
+            contractId: '',
+            loading: false
         }
     },
     mounted() {
@@ -205,6 +206,7 @@ export default {
             const _this = this
             this.$refs.form.validate(valid => {
                 if (valid) {
+                    _this.loading = true
                     const soaUrl = 'add'
                     const extraData = {
                         paymentVoucher: JSON.stringify(_this.fileList),
@@ -224,6 +226,7 @@ export default {
                                 type: 'warning'
                             })
                         }
+                        _this.loading = false
                     }).catch(err => {
                         _this.$message({
                             message: err,

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -141,7 +141,7 @@
     </el-form>
     <div style="text-align: right">
       <el-button @click="cancel">取 消</el-button>
-      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">提 交</el-button>
+      <el-button v-if="!isView" :loading="loading" type="primary" @click="confirmSubmit()">提 交</el-button>
     </div>
 
   </div>
@@ -230,6 +230,7 @@ export default {
             const _this = this
             this.$refs.form.validate(valid => {
                 if (valid) {
+                    this.loading = true
                     const soaUrl = 'add'
                     const extraData = {
                         fileList: JSON.stringify(_this.fileList),
@@ -252,6 +253,7 @@ export default {
                                 type: 'warning'
                             })
                         }
+                        this.loading = false
                     }).catch(err => {
                         _this.$message({
                             message: err,