hbchen 11 months ago
parent
commit
0104404951
2 changed files with 15 additions and 2 deletions
  1. 6 1
      src/components/SvgIcon/index.vue
  2. 9 1
      src/views/financialStatistics/waitPayment.vue

+ 6 - 1
src/components/SvgIcon/index.vue

@@ -13,6 +13,10 @@ const props = defineProps({
   size: {
     type: String,
     default: '1em'
+  },
+  setMini:{
+    type: Boolean,
+    default: true
   }
 })
 
@@ -20,7 +24,8 @@ const symbolId = computed(() => `#${props.name}`)
 </script>
 
 <template>
-  <svg aria-hidden="true" class="svg-icon" :width="props.size" :height="props.size">
+  <svg aria-hidden="true" class="svg-icon" :style="props.setMini?{minWidth:props.size+'px',minHeight:props.size+'px'}:''" 
+  :width="props.size" :height="props.size">
     <use :xlink:href="symbolId" :fill="props.color" />
   </svg>
 </template>

+ 9 - 1
src/views/financialStatistics/waitPayment.vue

@@ -130,7 +130,15 @@ getList()
                 </template>
             </el-table-column>
             <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
-            <el-table-column label="开票换算金额(元)" align="center" prop="not_payment_amount"></el-table-column>
+            <el-table-column label="开票换算金额(元)" align="center" prop="not_payment_amount">
+                <template #header>
+                    <el-tooltip content="开票未到款换算金额" placement="top">
+                        <span style="display: inline-flex;align-items: center;">开票换算金额(元)
+                            <svg-Icon name="svgIcon-financial-info" size="18" style="margin-left: 5px;color: white;"/>
+                        </span>
+                    </el-tooltip>
+                </template>
+            </el-table-column>
             <el-table-column label="开票日" align="center" prop="invoice_time" sortable="custom"></el-table-column>
             <el-table-column label="开票销售" align="center" prop="seller_name"></el-table-column>
             <el-table-column label="销售组别" align="center" prop="seller_group_name"></el-table-column>