Merge branch 'redUrgent' into testToMerge

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -91,9 +91,13 @@ export default {
           value:this.mainData.invoiceline === 'bs' || this.mainData.invoiceline === 's' ?'专用发票':'普通发票'
         },
         {
-          label:'开票金额',
+          label:'申请开票金额',
           value:this.tool.formatAmount(this.mainData.suminvoiceamount,2)
         },
+        {
+          label:'实际开票金额',
+          value:this.tool.formatAmount(this.mainData.factamount,2)
+        },
         {
           label:'开票方式',
           value:this.mainData.byhand === 1?'手工开票':'线上开票'

src/HDrpManagement/invoiceapp/index.vue

@@ -65,6 +65,9 @@
         <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
           <span>{{tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'factamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.factamount,2)}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'redamount'">
           <span>{{tool.formatAmount(scope.data.column.data.redamount,2)}}</span>
         </div>

src/SDrpManagement/invoiceapp_saler/detail/detail.vue

@@ -123,9 +123,13 @@ export default {
               : "普通发票",
         },
         {
-          label: "开票金额",
+          label: "申请开票金额",
           value: this.tool.formatAmount(this.mainData.suminvoiceamount, 2),
         },
+        {
+          label:'实际开票金额',
+          value:this.tool.formatAmount(this.mainData.factamount,2)
+        },
         {
           label: "开票方式",
           value: this.mainData.byhand === 1 ? "手工开票" : "线上开票",

src/SDrpManagement/invoiceapp_saler/index.vue

@@ -70,6 +70,9 @@
             tool.formatAmount(scope.data.column.data.suminvoiceamount, 2)
           }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'factamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.factamount,2)}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'status'">
           <span
             :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])"

src/SDrpManagement/sinvoiceapp/detail/detail.vue

@@ -113,9 +113,13 @@ export default {
           value: this.mainData.bank + this.mainData.bankcardno,
         },
         {
-          label: "开票金额",
+          label: "申请开票金额",
           value: this.tool.formatAmount(this.mainData.suminvoiceamount, 2),
         },
+        {
+          label:'实际开票金额',
+          value:this.tool.formatAmount(this.mainData.factamount,2)
+        },
         {
           label: "发票限额",
           value: this.mainData.quota,

src/SDrpManagement/sinvoiceapp/index.vue

@@ -67,6 +67,9 @@
             )
           }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'factamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.factamount,2)}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'redamount'">
           <span>{{
             tool.formatAmount(