wucl il y a 6 mois
Parent
commit
4757e6233e
3 fichiers modifiés avec 8 ajouts et 11 suppressions
  1. 1 1
      .env.development
  2. 1 4
      src/views/finance/fundClaim.vue
  3. 6 6
      src/views/finance/settleMajor.vue

+ 1 - 1
.env.development

@@ -49,4 +49,4 @@ VUE_APP_PRODUCTIVITY_PLATFORM_URL=http://127.0.0.1:8080/#/home/index
 
 # 只有以VUE_APP_开头的变量才会被webpack.DefinePlugin静态嵌入到客户端侧的包中
 
-VUE_APP_WEBSOCKET = ws://127.0.0.1:8088/ws/api/ws
+VUE_APP_WEBSOCKET = ws://127.0.0.1:8088/api/ws

+ 1 - 4
src/views/finance/fundClaim.vue

@@ -1,8 +1,5 @@
 <template>
   <div class="app-container">
-    <div class="title-container">
-      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
-    </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="未认领" name="notClaim">
         <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList" :pageSizes="pageSizes">
@@ -113,7 +110,7 @@
           </parentTable>
         </y-page-list-layout>
       </el-tab-pane>
-      <el-tab-pane label="已认领" name="claimed">
+      <el-tab-pane label="我的已认领" name="claimed">
         <y-page-list-layout :page-list="pageData1" :page-para="listQuery1" :get-page-list="getList1" :pageSizes="pageSizes">
           <template slot="left">
             <el-input v-model="listQuery1.keyword" placeholder="关键字搜索..." clearable style="margin-left: 20px;width: 300px;float: left;"></el-input>

+ 6 - 6
src/views/finance/settleMajor.vue

@@ -7,7 +7,7 @@
       <el-tab-pane label="评估人员" name="evaluate">
         <y-page-list-layout :get-page-list="majorEvaluatorSettleProd" :page-list="evaluatorProd" :page-para="listQuery1" :pageSizes="[10, 20, 30, 50, 100, 200, 500, 1000]">
           <template slot="left">
-            <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、负责人、客户经理" clearable
+            <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、负责人、客户经理、结算金额" clearable
               style="width: 300px;float: left;">
             </el-input>
             <el-date-picker clearable v-model="findDate" type="daterange" align="center" unlink-panels range-separator="至"
@@ -119,7 +119,7 @@
                 <span>{{ row.evaluateAmount / 10000 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
+            <!-- <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
               </template>
@@ -133,14 +133,14 @@
               <template slot-scope="{row}">
                 <span v-for="(item, index) in row.invoices">{{ item.invoiceDate }} <br> </span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </parentTable>
         </y-page-list-layout>
       </el-tab-pane>
       <el-tab-pane label="市场人员" name="market">
         <y-page-list-layout :get-page-list="majorMarketSettleProd" :page-list="marketProd" :page-para="listQuery2" :pageSizes="[10, 20, 30, 50, 100, 200, 500, 1000]">
           <template slot="left">
-            <el-input v-model="listQuery2.keyword" placeholder="项目编号、产品号、负责人、客户经理" clearable
+            <el-input v-model="listQuery2.keyword" placeholder="项目编号、产品号、负责人、客户经理、结算金额" clearable
               style="width: 300px;float: left;">
             </el-input>
             <el-date-picker clearable v-model="findDate1" type="daterange" align="center" unlink-panels
@@ -252,7 +252,7 @@
                 <span>{{ row.evaluateAmount / 10000 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
+            <!-- <el-table-column prop="invoiceUser" label="开票人" align="center" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span v-for="(item, index) in row.invoices">{{ item.invoiceUser }} <br> </span>
               </template>
@@ -266,7 +266,7 @@
               <template slot-scope="{row}">
                 <span v-for="(item, index) in row.invoices">{{ item.invoiceDate }} <br> </span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </parentTable>
         </y-page-list-layout>
       </el-tab-pane>