Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -43,6 +43,13 @@
         prop="taxrate"
         :label="$t(`税率`)">
       </el-table-column>
+      <el-table-column
+          prop="taxincludedamount"
+          :label="$t(`开票金额`)">
+        <template slot-scope="scope">
+          {{tool.formatAmount(scope.row.taxincludedamount,2)}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" width="120" fixed="right">
         <template slot-scope="scope">
           <editmx class="inline-16" :status="(status !== '新建' && status !== '提交')" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="onSuccess"></editmx>

src/HDrpManagement/invoiceapp/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -43,6 +43,13 @@
         prop="taxrate"
         :label="$t(`税率`)">
       </el-table-column>
+      <el-table-column
+          prop="taxincludedamount"
+          :label="$t(`开票金额`)">
+        <template slot-scope="scope">
+          {{tool.formatAmount(scope.row.taxincludedamount,2)}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" width="150" fixed="right">
         <template slot-scope="scope">
           <edit class="inline-16" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="onSuccess" :isStatus="isStatus"></edit>

src/SDrpManagement/invoiceapp_saler/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -23,6 +23,11 @@
         </template>
       </el-table-column>
       <el-table-column prop="taxrate" :label="$t(`税率`)"> </el-table-column>
+      <el-table-column prop="taxincludedamount" :label="$t(`开票金额`)">
+        <template slot-scope="scope">
+          {{ tool.formatAmount(scope.row.taxincludedamount, 2) }}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" width="120" fixed="right">
         <template slot-scope="scope">
           <editmx

src/SDrpManagement/invoiceapp_saler/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -42,6 +42,11 @@
         prop="taxrate"
         :label="$t(`税率`)">
       </el-table-column>
+      <el-table-column prop="taxincludedamount" :label="$t(`开票金额`)">
+        <template slot-scope="scope">
+          {{ tool.formatAmount(scope.row.taxincludedamount, 2) }}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" width="150" fixed="right">
         <template slot-scope="scope">
           <edit class="inline-16" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="listData(param.content.sa_invoicebillid)"></edit>

src/SDrpManagement/sinvoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -43,6 +43,11 @@
         prop="taxrate"
         :label="$t(`税率`)">
       </el-table-column>
+      <el-table-column prop="taxincludedamount" :label="$t(`开票金额`)">
+        <template slot-scope="scope">
+          {{ tool.formatAmount(scope.row.taxincludedamount, 2) }}
+        </template>
+      </el-table-column>
     </el-table>
     <div class="container" style="text-align:right">
       <el-pagination

src/SDrpManagement/sinvoiceapp/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -19,6 +19,11 @@
         </template>
       </el-table-column>
       <el-table-column prop="taxrate" :label="$t(`税率`)"> </el-table-column>
+      <el-table-column prop="taxincludedamount" :label="$t(`开票金额`)">
+        <template slot-scope="scope">
+          {{ tool.formatAmount(scope.row.taxincludedamount, 2) }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column :label="$t('操作')" width="90" fixed="right">
         <template slot-scope="scope">