Merge branch 'CD_techPool_345' into debug

src/views/financialManagement/composition/IandPList.js

@@ -14,7 +14,7 @@ export default function getIandPListCom(type) {
     searchParams:{
       current:1,
       page_size:10,
-      contract_code:'',
+      keyword:'',
       start_date:'',
       end_date:'',
       min_amount:'',

src/views/financialManagement/invoice/invoiceList.vue

@@ -31,7 +31,7 @@ invoice.placementList()
     <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.keyword" placeholder="请输入合同编号/客户名称"
           class="iandP-search-item" clearable @input="invoice.searchPlacement" ></el-input>
           <el-cascader :options="sellerArray" class="iandP-search-item" filterable 
              @change="sellerChange" placeholder="请选择销售" clearable collapse-tags :show-all-levels="false"
@@ -81,7 +81,8 @@ invoice.placementList()
           <el-button class="element-common-button" style="margin-bottom: 10px;" size="large" @click="invoice.placementExport">导出</el-button>
         </div>
         <!-- 表格 -->
-        <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
+        <el-table :data="data.tableData" border max-height="560px" size="default"> 
+          <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="service_product_id">
             <template #default="{row}">

src/views/financialManagement/placement/placementList.vue

@@ -17,7 +17,7 @@ placement.placementList()
     <div id="iandP-list-container">
       <div class="iandP-search-zone">
         <div class="iandP-search-box">
-          <el-input v-model="data.searchParams.contract_code" placeholder="请输入合同编号" class="iandP-search-item"
+          <el-input v-model="data.searchParams.keyword" placeholder="请输入合同编号/客户名称" class="iandP-search-item"
           clearable @input="placement.searchPlacement" ></el-input>
           <el-select v-model="data.searchParams.service_product_id" placeholder="请选择套餐类型" clearable
           @change="placement.searchPlacement" class="iandP-search-item">
@@ -64,7 +64,8 @@ placement.placementList()
           <el-button class="element-common-button" style="margin-bottom: 10px;" size="large" @click="placement.placementExport">导出</el-button>
         </div>
         <!-- 表格 -->
-        <el-table :data="data.tableData" border max-height="560px" size="default" style="position: sticky;"> 
+        <el-table :data="data.tableData" border max-height="560px" size="default"> 
+          <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="service_product_id">
             <template #default="{row}">