财务2.4 暂存

src/views/financialManagement/composition/IandPList.js

@@ -8,6 +8,8 @@ export default function getIandPListCom(type) {
 
   const dateButtonData=[{text:'本月',tabId:1},{text:'上月',tabId:2},{text:'前月',tabId:3}]
 
+  const serviceTypeArray=[{label:'FICC套餐',value:1},{label:'权益套餐',value:2}]
+
   const placement=reactive({
     searchParams:{
       current:1,
@@ -18,6 +20,8 @@ export default function getIandPListCom(type) {
       min_amount:'',
       max_amount:'',
       invoice_type:type,
+      sellerId:[],
+      service_type:'',
       is_export:0
     },
     dateRange:[],
@@ -143,6 +147,7 @@ export default function getIandPListCom(type) {
     changePageNo,
     changePageSize,
     checkMoney,
-    changeDateType
+    changeDateType,
+    serviceTypeArray
   }
 }

src/views/financialManagement/financialList.vue

@@ -68,9 +68,33 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
 //  --------------------------method
   //获取套餐列表
   const getServiceListFun=()=>{
-    getServiceList().then(res=>{
-      financial.serviceTypeArray=res.data || []
-    })
+    // getServiceList().then(res=>{
+      // financial.serviceTypeArray=res.data || []
+    // })
+    financial.serviceTypeArray=[{
+      label:'FICC套餐',
+      value:"FICC",
+      children:[{
+        label:'FICC大套餐',
+        value:"FICC大",
+      },
+      {
+        label:'FICC小套餐',
+        value:"FICC小",
+      }]
+    },
+    {
+      label:'权益套餐',
+      value:"权益套餐",
+      children:[{
+        label:'医药',
+        value:"医药",
+      },
+      {
+        label:'消费',
+        value:"消费",
+      }]
+    }]
   }
   // 请求财务列表
   const financialList=()=>{
@@ -89,6 +113,11 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
     financial.searchParams.current = pageNo
     financialList()
   }
+
+  const serviceTypeChange=(value)=>{
+    console.log(value);
+  }
+
   const searchFinancial=()=>{
     financial.searchParams.current = 1
     financialList()
@@ -209,11 +238,17 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
             <el-date-picker v-model="financial.createtime" start-placeholder="登记日期-开始"
             end-placeholder="登记日期-结束" style="margin-right: 30px;max-width: 286px;margin-bottom: 8px;"
             value-format="YYYY-MM-DD" type="daterange"></el-date-picker>
-            <el-select v-model="financial.searchParams.service_type" placeholder="请选择套餐类型" clearable
+            <!-- <el-select v-model="financial.searchParams.service_type" placeholder="请选择套餐类型" clearable
             @change="searchFinancial" style="width: 286px;margin-bottom: 8px;">
               <el-option v-for="item in financial.serviceTypeArray" :key="item.service_template_id"
               :label="item.title" :value="item.service_template_id"></el-option>
-            </el-select>
+            </el-select> -->
+            <el-cascader :options="financial.serviceTypeArray" style="width: 286px;margin-bottom: 8px;margin-right: 30px;"
+             v-model="financial.searchParams.service_type" @change="serviceTypeChange" 
+             placeholder="请选择套餐" clearable collapse-tags :show-all-levels="false"
+            :props="{multiple:true,label:'label',value:'value',children:'children',emitPath:false}"
+            collapse-tags-tooltip>
+            </el-cascader>
             <el-select v-model="financial.searchParams.contract_type" placeholder="请选择合同类型" clearable
             @change="searchFinancial" style="width: 286px;margin-bottom: 8px;">
               <el-option :label="item.label" :value="item.id" v-for="item in contractTypeArray" :key="item.id"></el-option>

src/views/financialManagement/invoice/invoiceList.vue

@@ -6,17 +6,59 @@ import '../style/iandPList.scss'
 const invoice=getCom(1)
 const data = invoice.data
 
+const sellerArray=[{
+      label:'FICC套餐',
+      value:"FICC",
+      children:[{
+        label:'FICC大套餐',
+        value:"FICC大",
+      },
+      {
+        label:'FICC小套餐',
+        value:"FICC小",
+      }]
+    },
+    {
+      label:'权益套餐',
+      value:"权益套餐",
+      children:[{
+        label:'医药',
+        value:"医药",
+      },
+      {
+        label:'消费',
+        value:"消费",
+      }]
+    }]
+
+const sellerChange=(value)=>{
+  console.log(value);
+}
+
 // --------created
 invoice.placementList()
 
+
+
 </script>
 
 <template>
     <div id="iandP-list-container">
       <div class="iandP-search-zone">
         <div class="iandP-search-box">
-          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号/销售"
+          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号"
           style="width: 309px;margin-left: 40px;margin-bottom: 8px;" clearable @input="invoice.searchPlacement" ></el-input>
+          <el-cascader :options="sellerArray" style="width: 286px;margin-bottom: 8px;margin-left: 40px;"
+            v-model="data.searchParams.sellerId" @change="sellerChange" 
+            placeholder="请选择销售" clearable collapse-tags :show-all-levels="false"
+            :props="{multiple:true,label:'label',value:'value',children:'children',emitPath:false}"
+            collapse-tags-tooltip >
+          </el-cascader>
+          <el-select v-model="data.searchParams.service_type" placeholder="请选择套餐类型" clearable
+          @change="invoice.searchPlacement" style="width: 286px;margin-bottom: 8px;margin-left: 40px;">
+            <el-option v-for="item in invoice.serviceTypeArray" :key="item.value"
+            :label="item.label" :value="item.value"></el-option>
+          </el-select>
           <div class="date-box">
             <el-date-picker v-model="data.dateRange" start-placeholder="起始日期"
             end-placeholder="结束日期" style="max-width: 321px;margin-right: 12px;"
@@ -58,6 +100,7 @@ invoice.placementList()
         <!-- 表格 -->
         <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
           <el-table-column label="合同编号" align="center" prop="contract_code" show-overflow-tooltip></el-table-column>
+          <el-table-column label="套餐类型" align="center" prop="service_type">FICC套餐</el-table-column>
           <el-table-column label="开票金额" align="center" prop="origin_amount" show-overflow-tooltip></el-table-column>
           <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
           <el-table-column label="换算金额（元）" align="center" prop="amount" show-overflow-tooltip></el-table-column>

src/views/financialManagement/placement/placementList.vue

@@ -19,6 +19,11 @@ placement.placementList()
         <div class="iandP-search-box">
           <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号"
           style="width: 309px;margin-left: 40px;margin-bottom: 8px;" clearable @input="placement.searchPlacement" ></el-input>
+          <el-select v-model="data.searchParams.service_type" placeholder="请选择套餐类型" clearable
+          @change="placement.searchPlacement" style="width: 286px;margin-bottom: 8px;margin-left: 40px;">
+            <el-option v-for="item in placement.serviceTypeArray" :key="item.value"
+            :label="item.label" :value="item.value"></el-option>
+          </el-select>
           <div class="date-box">
             <el-date-picker v-model="data.dateRange" start-placeholder="起始日期"
             end-placeholder="结束日期" style="max-width: 321px;margin-right: 12px;"
@@ -61,6 +66,7 @@ placement.placementList()
         <!-- 表格 -->
         <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
           <el-table-column label="合同编号" align="center" prop="contract_code" show-overflow-tooltip></el-table-column>
+          <el-table-column label="套餐类型" align="center" prop="service_type">FICC套餐</el-table-column>
           <el-table-column label="到款金额" align="center" prop="origin_amount" show-overflow-tooltip></el-table-column>
           <el-table-column label="金额单位" align="center" prop="unit_name"></el-table-column>
           <el-table-column label="换算金额（元）" align="center" prop="amount" show-overflow-tooltip></el-table-column>

src/views/financialStatistics/commodityPayment.vue

@@ -9,8 +9,8 @@ import {downloadByFlow} from '@/utils/common-methods'
   
   const dateTypeList=[{id:1,type:'开票时间'},{id:2,type:'到款时间'}]
 
-  const groupList=ref([])
-  const serviceList=ref([])
+  // const groupList=ref([])
+
 
   const searchParams=reactive({
     current:1,
@@ -23,9 +23,9 @@ import {downloadByFlow} from '@/utils/common-methods'
     // 1-开票时间 2-到款时间
     time_type:1,
     // 1-已开票
-    has_invoice:0,
+    has_invoice:1,
     // 1-已到款
-    has_payment:0,
+    has_payment:1,
     is_export:0
   })
   const searchDate=ref(null)
@@ -58,17 +58,17 @@ import {downloadByFlow} from '@/utils/common-methods'
   // method
 
   //获取销售组别
-  const getSellerGroupListFun=()=>{
-    getSellerGroupList().then(res=>{
-      groupList.value=res.data || []
-    })
-  }
+  // const getSellerGroupListFun=()=>{
+  //   getSellerGroupList().then(res=>{
+  //     groupList.value=res.data || []
+  //   })
+  // }
   // 获取套餐列表
-  const getServiceListFun=()=>{
-    getServiceList().then(res=>{
-      serviceList.value=res.data || []
-    })
-  }
+  // const getServiceListFun=()=>{
+  //   getServiceList().then(res=>{
+  //     serviceList.value=res.data || []
+  //   })
+  // }
 
 
   const commodityPList=()=>{
@@ -159,9 +159,66 @@ import {downloadByFlow} from '@/utils/common-methods'
     }else{
       invoiceIsFold.value = !invoiceIsFold.value
     }
-    console.log(type,invoiceIsFold.value);
+    // console.log(type,invoiceIsFold.value);
+  }
+  // --------------------------销售选择
+  const sellerArray=[{
+      label:'FICC套餐',
+      value:"FICC",
+      children:[{
+        label:'FICC大套餐',
+        value:"FICC大",
+      },
+      {
+        label:'FICC小套餐',
+        value:"FICC小",
+      }]
+    },
+    {
+      label:'权益套餐',
+      value:"权益套餐",
+      children:[{
+        label:'医药',
+        value:"医药",
+      },
+      {
+        label:'消费',
+        value:"消费",
+      }]
+    }]
+  const sellerChange=(value)=>{
+    console.log(value);
   }
 
+  // -------------------套餐选择
+  const serviceList=[{
+    label:'FICC套餐',
+    value:"FICC",
+    children:[{
+      label:'FICC大套餐',
+      value:"FICC大",
+    },
+    {
+      label:'FICC小套餐',
+      value:"FICC小",
+    }]
+  },
+  {
+    label:'权益套餐',
+    value:"权益套餐",
+    children:[{
+      label:'医药',
+      value:"医药",
+    },
+    {
+      label:'消费',
+      value:"消费",
+    }]
+  }]
+
+  const serviceChange=(value)=>{
+    console.log(value);
+  }
   //  -----------------------------------------------------弹窗
   // ---------------------------------编辑付款方式
   const payTypeArray=[{id:0,type:'无'},{id:1,type:'年付'},{id:2,type:'半年付'},{id:3,type:'季付'},{id:4,type:'次付'},{id:5,type:'异常'}]
@@ -215,6 +272,7 @@ import {downloadByFlow} from '@/utils/common-methods'
 
   const setServiceInfo=(row)=>{
     rowItem=row
+    // console.log(row.isAverage);
     setServiceInfoDia.dataForm.contract_register_id=row.contract_register_id
     setServiceInfoDia.dataForm.contract_payment_id=row.payment_id
     setServiceInfoDia.dataForm.list=row.service_amount_list?JSON.parse(JSON.stringify(row.service_amount_list)):[]
@@ -257,8 +315,8 @@ import {downloadByFlow} from '@/utils/common-methods'
 
 
   // created
-  getSellerGroupListFun()
-  getServiceListFun()
+  // getSellerGroupListFun()
+  // getServiceListFun()
   commodityPList()
 
 </script>
@@ -266,16 +324,26 @@ import {downloadByFlow} from '@/utils/common-methods'
 <template>
     <div id="commodity-payment-container" class="commodity-payment-container">
       <div class="search-zone">
-        <el-input v-model="searchParams.keyword" placeholder="请输入客户名称/销售" clearable 
+        <el-input v-model="searchParams.keyword" placeholder="请输入客户名称" clearable 
         @input="searchCommodityP" :prefix-icon="Search" style="width: 286px;margin: 0 30px 10px 0;" ></el-input>
-        <el-select v-model="searchParams.sell_group_id" placeholder="请选择销售组别" clearable style="width: 240px;margin: 0 30px 10px 0;"
+        <!-- <el-select v-model="searchParams.sell_group_id" placeholder="请选择销售组别" clearable style="width: 240px;margin: 0 30px 10px 0;"
         @change="searchCommodityP">
           <el-option :label="item.group_name" :value="item.group_id" v-for="item in groupList"></el-option>
-        </el-select>
-        <el-select v-model="searchParams.service_type" placeholder="请选择套餐信息" clearable style="width: 240px;margin: 0 30px 10px 0;"
+        </el-select> -->
+        <el-cascader :options="sellerArray" style="width: 286px;margin:0 30px 10px 0"
+          @change="sellerChange" placeholder="请选择销售" clearable collapse-tags :show-all-levels="false"
+          :props="{multiple:true,label:'label',value:'value',children:'children',emitPath:false}"
+          collapse-tags-tooltip key="seller" >
+        </el-cascader>
+        <el-cascader :options="serviceList" style="width: 286px;margin:0 30px 10px 0"
+          @change="serviceChange" placeholder="请选择套餐信息" clearable collapse-tags :show-all-levels="false"
+          :props="{multiple:true,label:'label',value:'value',children:'children',emitPath:false}"
+          collapse-tags-tooltip key="serivce" >
+        </el-cascader>
+        <!-- <el-select v-model="searchParams.service_type" placeholder="请选择套餐信息" clearable style="width: 240px;margin: 0 30px 10px 0;"
         @change="searchCommodityP">
           <el-option :label="item.title" :value="item.service_template_id" v-for="item in serviceList"></el-option>
-        </el-select>
+        </el-select> -->
         <el-date-picker v-model="searchDate" type="daterange" style="max-width: 240px;margin: 0 20px 10px 0;"
         value-format="YYYY-MM-DD" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <el-dropdown size="large" trigger="click" style="margin:0 60px 10px 0;" @command="dateTypeCommand">
@@ -368,7 +436,8 @@ import {downloadByFlow} from '@/utils/common-methods'
             </template>
           </el-table-column>
           <el-table-column label="销售" prop="seller_name" align="center"></el-table-column>
-          <el-table-column label="组别" prop="seller_group_name" align="center"></el-table-column>
+          <el-table-column label="销售组别" prop="seller_group_name" align="center"></el-table-column>
+          <el-table-column label="销售类型" prop="seller_type" align="center">权益销售</el-table-column>
           <el-table-column label="套餐信息" prop="services_name" align="center">
             <template #default="{row}">
               <span v-if="row.payment_amount&&row.payment_amount!=0" @click="setServiceInfo(row)"

src/views/financialStatistics/salesStatistics.vue

@@ -24,6 +24,7 @@
     // 排序方式: 1-正序; 2-倒序
     sort_type:'',
     // 是否导出：0-否；1-是
+    service_type:1,
     is_export:0
   })
   // 搜索参数-创建时间数组
@@ -135,12 +136,17 @@
       </div>
       <div class="statistics-top-zone">
         <div class="statistics-search-zone">
-          <el-select v-model="searchParams.group_id" placeholder="请选择销售组别" style="width: 300px;margin-right: 30px;"
+          <el-select v-model="searchParams.service_type" placeholder="请选择销售类型"
+          @change="searchStatistics" style="width: 300px;margin: 0 30px 8px 0;">
+            <el-option label="FICC销售" :value="1"></el-option>
+            <el-option label="权益销售" :value="2"></el-option>
+          </el-select>
+          <el-select v-model="searchParams.group_id" placeholder="请选择销售组别" style="width: 300px;margin: 0 30px 8px 0;"
           @change="searchStatistics" v-show="tabType==2" clearable >
             <el-option :label="item.group_name" :value="item.group_id" v-for="item in groupList"></el-option>
           </el-select>
           <el-date-picker v-model="createtime" type="daterange" 
-          value-format="YYYY-MM-DD" style="width:300px"
+          value-format="YYYY-MM-DD" style="width:300px;margin: 0 30px 8px 0;"
           start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         </div>
         <div class="statistice-buttons-zone">
@@ -155,6 +161,7 @@
               {{ searchParams.page_size*(searchParams.current-1)+$index+1}}
             </template>
           </el-table-column>
+          <el-table-column label="销售类型" prop="service_type" align="center">FICC销售</el-table-column>
           <el-table-column label="销售员" prop="seller_name" align="center" v-if="tabType==2"></el-table-column>
           <el-table-column label="销售组别" prop="group_name" align="center"></el-table-column>
           <!-- <el-table-column label="开票金额" prop="invoice_amount" align="center" sortable="custom" ></el-table-column> -->
@@ -210,12 +217,14 @@
     }
     .statistics-top-zone{
       display: flex;
-      align-items: center;
+      // align-items: center;
       justify-content: space-between;
-      margin-bottom: 26px;
+      margin-bottom: 20px;
       .statistics-search-zone{
         display: flex;
         align-items: center;
+        flex-wrap: wrap;
+        margin-right: 30px;
       }
     }
   }