Merge branch 'fsms_3.0'

src/api/financialMana.js

@@ -296,13 +296,15 @@ export function prePlacementDelete(data) {
   * @param data.page_size - 每页数据量 - 必填
   * @param data.current - 页码 - 必填
   * @param data.keyword - 关键词-客户姓名 - 非必填
+  * @param data.is_export - 是否是导出：0-否 1-是
  * @returns 
  */
 export function getPreRegistrationList(data) {
   return request({
       url:'/contract/pre_register/list',
       method:'get',
-      params:data
+      params:data,
+      responseType:data.is_export==1?'blob':'text'
   })
 }
  /**

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>

src/views/financialManagement/registrationPre.vue

@@ -8,6 +8,7 @@ import {getServiceList,getPreRegistrationList,preRegistrationAdd,preRegistration
   preRegistrationDetail,preRegistrationEdit,preRegistrationDelete,preRegistrationSave} from '@/api/financialMana'
 import financialCommon from './composition/common'
 import serviceCascader from './composition/serivceCascader.js'
+import {downloadByFlow} from '@/utils/common-methods'
 // 套餐的composition
 const serviceComposition = serviceCascader()
 // 合同类型数组
@@ -318,6 +319,13 @@ const editRegistrationPre=(row)=>{
   })
 }
 
+// 导出数据
+const exportData=()=>{
+  getPreRegistrationList({...placemenetPre.searchParams,is_export:1}).then(res=>{
+    downloadByFlow(res,'xlsx',`财务预登记列表`)
+  })
+}
+
 //弹窗关闭动画 回调
 const dialogClosed=()=>{
   hasDeleteContractInvoiceIds=[]
@@ -697,14 +705,16 @@ placementPreList()
     <div class="placemenetPre-top-zone">
       <div class="placemenetPre-top-search-zone">
         <el-input v-model="placemenetPre.searchParams.keyword" placeholder="客户姓名" :prefix-icon="Search"
-        style="width: 240px;" @input="searchPlacementPre" clearable />
+        style="width: 240px;margin-right: 30px;" @input="searchPlacementPre" clearable />
       </div>
       <!-- 按钮区域 -->
       <div class="placemenetPre-top-option-zone">
         <el-button type="primary" @click="addRegistrationPre('开票')" class="main-button-large" 
-        style="margin-left: 30px;" v-permission="'financial:registrationPre:AEDInvoice'">开票预登记</el-button>         
-        <el-button type="primary" @click="addRegistrationPre('到款')" class="main-button-large" style="margin-left: 30px;"
-        v-permission="'financial:registrationPre:AEDPayment'">到款预登记</el-button>         
+        v-permission="'financial:registrationPre:AEDInvoice'">开票预登记</el-button>         
+        <el-button type="primary" @click="addRegistrationPre('到款')" class="main-button-large"
+        v-permission="'financial:registrationPre:AEDPayment'">到款预登记</el-button>
+        <el-button type="primary" class="main-button-large"
+        v-permission="'financial:registrationPre:export'" @click="exportData">导出</el-button>     
       </div>
     </div>
     <div class="placemenetPre-table-zone">
@@ -713,18 +723,17 @@ placementPreList()
       size="default"> 
         <el-table-column label="客户名称" prop="company_name"
         show-overflow-tooltip min-width="120"></el-table-column>
-        <el-table-column label="约定有效期" width="210" prop="start_date">
-          <template #default="{row}">
-            {{row.start_date&&row.start_date!='0001-01-01'?(row.start_date+' 至 '+row.end_date):''}}
-          </template>
-        </el-table-column>
+        <el-table-column label="约定起始日期" width="110" prop="start_date"></el-table-column>
+        <el-table-column label="约定结束日期" width="110" prop="end_date"></el-table-column>
         <el-table-column label="合同类型" align="center" width="90" prop="contract_type_string"></el-table-column>
         <el-table-column label="套餐" prop="services" show-overflow-tooltip></el-table-column>
         <el-table-column label="开票日" prop="invoice_time" width="110"></el-table-column>
         <el-table-column label="开票金额" prop="origin_amount" width="120"></el-table-column>
+        <el-table-column label="开票换算金额（元）" prop="amount" width="151"></el-table-column>
         <el-table-column label="开票销售" width="100" prop="seller_name"></el-table-column>
         <el-table-column label="到款日" prop="arrive_time" width="110"></el-table-column>
         <el-table-column label="到款金额" prop="arrive_origin_amount" width="120"></el-table-column>
+        <el-table-column label="到款换算金额（元）" prop="arrive_amount" width="151"></el-table-column>
         <el-table-column label="到款销售" width="100" prop="payment_seller_name"></el-table-column>
         <el-table-column label="操作" fixed="right" min-width="100">
           <template #default="{row}">
@@ -983,6 +992,12 @@ placementPreList()
         align-items: center;
         margin-bottom: 8px;
       }
+      .placemenetPre-top-option-zone{
+        margin-left: -30px;
+        .main-button-large{
+          margin-left: 30px;
+        }
+      }
     }
     .placemenetPre-table-zone{
       margin-top: 20px;

src/views/financialStatistics/commodityPayment.vue

@@ -73,7 +73,7 @@ const moment = inject('$moment')
         item.invoice_payment_list.map((it,ind) =>{
           commodityPData.tableData.push({
             serialNumber:searchParams.page_size*(searchParams.current-1)+index+1,
-            ...item,date:item.start_date+'至'+item.end_date,...it
+            ...item,...it
           })
         })
       })
@@ -402,11 +402,14 @@ const moment = inject('$moment')
               {{ row.contract_type==0?'/':row.contract_type==1?'是':'否' }}
             </template>
           </el-table-column>
-          <el-table-column label="合同有效期" prop="date" align="center" show-overflow-tooltip ></el-table-column>
+          <el-table-column label="合同起始日期" prop="start_date" align="center" show-overflow-tooltip ></el-table-column>
+          <el-table-column label="合同结束日期" prop="end_date" align="center" show-overflow-tooltip ></el-table-column>
           <el-table-column label="开票日" show-overflow-tooltip sortable="custom" prop="invoice_time" align="center" id="spc-column"></el-table-column>
-          <el-table-column label="开票金额" prop="invoice_amount" align="center"></el-table-column>
+          <el-table-column label="开票金额" prop="invoice_origin_amount" align="center"></el-table-column>
+          <el-table-column label="开票换算金额（元）" prop="invoice_amount" align="center"></el-table-column>
           <el-table-column label="到款日" show-overflow-tooltip sortable="custom" prop="payment_date" align="center"></el-table-column>
-          <el-table-column label="到款金额" prop="payment_amount" align="center"></el-table-column>
+          <el-table-column label="到款金额" prop="payment_origin_amount" align="center"></el-table-column>
+          <el-table-column label="到款换算金额（元）" prop="payment_amount" align="center"></el-table-column>
           <el-table-column label="付款方式" prop="pay_type" align="center">
             <template #default="{row,$index}">
               <span v-if="row.pay_type!='5'">{{ row.pay_type!=0?payTypeArray[row.pay_type].type:'' }}</span>

src/views/financialStatistics/waitInvoice.vue

@@ -69,7 +69,9 @@
             tableData.list.push({
               serial_number:searchParams.page_size*(searchParams.current-1)+index+1,
               ...item,
-              ...{not_invoiced_amount_total:it.not_invoiced_amount_total,
+              ...{
+                not_invoiced_amount_origin_total:it.not_invoiced_amount_origin_total,
+                not_invoiced_amount_total:it.not_invoiced_amount_total,
                 service_product_id:it.service_product_id,
                 seller_name:it.seller_name,
                 rai_seller_name:it.rai_seller_name,
@@ -146,7 +148,7 @@
         <el-table-column label="合同结束时间" align="center" prop="end_date" sortable="custom"></el-table-column>
         <el-table-column label="合同金额" align="center" prop="contract_amount"></el-table-column>
         <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
-        <el-table-column label="未开票金额" align="center" prop="not_invoiced_amount_total">
+        <el-table-column label="未开票金额" align="center" prop="not_invoiced_amount_origin_total">
           <template #header>
             <el-tooltip content="未开票未到款金额" placement="top">
               <span style="display: inline-flex;align-items: center;">未开票金额
@@ -155,6 +157,15 @@
             </el-tooltip>
           </template>
         </el-table-column>
+        <el-table-column label="未开票换算金额（元）" align="center" prop="not_invoiced_amount_total">
+          <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="service_type">
           <template #header>
             <el-tooltip content="合同套餐类型" placement="top">

src/views/financialStatistics/waitPayment.vue

@@ -106,11 +106,8 @@ getList()
             <el-table-column label="序号" prop="serial_number" width="70px" align="center"></el-table-column>
             <el-table-column label="客户名称" align="center" prop="company_name" show-overflow-tooltip></el-table-column>
             <el-table-column label="合同编号" align="center" prop="contract_code" show-overflow-tooltip></el-table-column>
-            <el-table-column label="合同有效期" align="center" prop="start_date">
-                <template #default="{ row }">
-                    {{ (row.start_date + ' 至 ' + row.end_date) }}
-                </template>
-            </el-table-column>
+            <el-table-column label="合同起始日期" align="center" prop="start_date"></el-table-column>
+            <el-table-column label="合同结束日期" align="center" prop="end_date"></el-table-column>
             <el-table-column label="套餐类型" align="center" prop="service_type">
                 <template #header>
                     <el-tooltip content="开票套餐类型" placement="top">
@@ -123,7 +120,7 @@ getList()
                     {{ row.service_product_id==1?'FICC套餐':row.service_product_id==2?'权益套餐':'--' }}
                 </template>
             </el-table-column>
-            <el-table-column label="开票金额" align="center" prop="not_payment_amount">
+            <el-table-column label="开票金额" align="center" prop="not_payment_origin_amount">
                 <template #header>
                     <el-tooltip content="开票未到款金额" placement="top">
                         <span style="display: inline-flex;align-items: center;">开票金额
@@ -133,6 +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">
+                <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>