Merge branch 'yx-test' into yx-master

src/views/business/invoiceApply/ready.vue

@@ -572,7 +572,6 @@ export default {
     },
     //更新视图方法
     changeItemForceupdate() {
-      console.log('执行立刻', this.formApply.items);
       this.$forceUpdate()
     },
     //获取企业信息数据
@@ -636,8 +635,6 @@ export default {
       this.batchNos = selection.map(item => item.batchNo)
       this.single = selection.length !== 1
       this.multiple = !selection.length
-      console.log(this.ids);
-      console.log(this.batchNos);
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -733,7 +730,6 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            console.log(this.formApply)
             addApplyInvoice(this.formApply).then(response => {
               this.loading = false;
               if (response.code == 200) {
@@ -759,16 +755,35 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.openApply = true;
         //ids转字符串，逗号隔开
         this.formApply.batchPayIds = ids;
         this.formApply.batchPayOrderIds = ids.join(',');
         const selectItemList = this.payOrderList.filter(item => ids.includes(item.id));
+        const payAccNoSet = new Set(selectItemList.map(item => item.payerAccNo));
+        if (payAccNoSet.size > 1) {
+          this.$modal.msgWarning("您所选的数据不是同一个付款账户，无法进行合并开票操作")
+          return;
+        }
         let sumSuccessAmount = 0;
         selectItemList.forEach(item => {
           sumSuccessAmount += Number(item.successAmount);
         });
+        getSellerInvoiceInfo([...payAccNoSet][0]).then(resp => {
+          if (200 === resp.code) {
+            this.formApply.taxCompanyId = resp.data.taxUnitId
+            this.formApply.taxCompanyInvoice.companyId = resp.data.taxUnitId
+            this.formApply.taxCompanyInvoice.invoiceTitle = resp.data.taxUnitName
+            this.formApply.taxCompanyInvoice.companyName = resp.data.taxUnitName
+            this.formApply.taxCompanyInvoice.taxRegistrationNumber = resp.data.taxUnitCode
+            this.formApply.applyCompanyId = resp.data.inviterId
+            this.formApply.applyCompanyInvoice.companyId = resp.data.inviterId
+            this.formApply.applyCompanyInvoice.companyName = resp.data.inviterName
+            this.formApply.applyCompanyInvoice.invoiceTitle = resp.data.inviterName
+            this.formApply.applyCompanyInvoice.taxRegistrationNumber = resp.data.inviterCode
+          }
+        })
         this.formApply.totalAmountTax = Number.parseFloat(sumSuccessAmount).toFixed(2);
+        this.openApply = true;
       })
     },
     addItemClick() {
@@ -794,7 +809,6 @@ export default {
       classify.taxAmount = ''
       classify.freeType = ''
       this.formApply.items.push(classify)
-      console.log('表格数据', this.formApply);
       this.taxCategoryPanel.open = false
       // this.$forceUpdate()
 

src/views/business/payOrder/index.vue

@@ -6,11 +6,11 @@
       </el-form-item>
       <el-form-item label="业务名称" prop="batchPayName">
         <el-input v-model="queryParams.batchPayName" placeholder="请输入支付名称" clearable
-          @keyup.enter.native="handleQuery" />
+                  @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="付款账户名" prop="payerAccName">
         <el-input v-model="queryParams.payerAccName" placeholder="请输入付款账户名" clearable
-          @keyup.enter.native="handleQuery" />
+                  @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="支付状态" prop="payStatus">
         <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" @change="handleQuery" clearable>
@@ -23,7 +23,7 @@
       <el-form-item label="支付类型" prop="payTitle">
         <el-select v-model="queryParams.payTitle" placeholder="请选择支付类型" @change="handleQuery" clearable>
           <el-option v-for="dict in dict.type.pay_type_title" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+                     :value="dict.value" />
         </el-select>
       </el-form-item>
 
@@ -39,7 +39,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['business:payOrder:export']">导出</el-button>
+                   v-hasPermi="['business:payOrder:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -59,6 +59,13 @@
           <dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
         </template>
       </el-table-column>
+      <el-table-column label="支付类型" align="center" prop="payTitle" />
+      <el-table-column label="数据来源" align="center" prop="dataSource" width="180">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.dataSource && 2 === scope.row.dataSource">接口</el-tag>
+          <el-tag v-if="scope.row.dataSource && 1 === scope.row.dataSource">平台</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="详情预览" align="center">
         <template slot-scope="scope">
           <p style="margin: 0px;padding: 0px;">批次总笔数：{{ scope.row.totalCount }}</p>
@@ -76,20 +83,19 @@
           <span>{{ parseTime(scope.row.transactionTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="支付类型" align="center" prop="payTitle" />
-      <el-table-column label="支付备注" align="center" prop="payRemark" />
+      <!--      <el-table-column label="支付备注" align="center" prop="payRemark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.payStatus && scope.row.payStatus === 1" size="mini" type="text" icon="el-icon-money" @click="doPay(scope.row)">确认支付</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-order" @click="viewDetail(scope.row)">查看明细</el-button>
           <el-button v-if="scope.row.payStatus && scope.row.payStatus === 4 || scope.row.payStatus === 5" size="mini"
-            type="text" icon="el-icon-s-promotion" @click="doRepay(scope.row)">失败补发</el-button>
+                     type="text" icon="el-icon-s-promotion" @click="doRepay(scope.row)">失败补发</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+                @pagination="getList" />
 
     <el-dialog title="失败补发" :visible.sync="rePayPanel" width="90%" append-to-body class="dialogIp">
       <RePay ref="rePay" :batch-info="rePayObj" @closeRePayPanel="closeRePayPanel" />