个贷列表暂时最新备注字段

src/components/MoreSearchBar/index.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="bar-container">
             <el-row>
-                <el-col :xs="24" :sm="12" :lg="6" :span="6" style="margin-right: 8px;"> 
+                <el-col :xs="24" :sm="12" :lg="4" :span="6" style="margin-right: 8px;"> 
                     <el-input v-if="keyword" v-model="listQuery.keyword" placeholder="关键字搜索..." clearable>
                     </el-input>
                 </el-col>
@@ -18,7 +18,7 @@
                             value-format="yyyy-MM-dd">
                         </el-date-picker>
                     </el-col>
-                <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                <el-col :xs="24" :sm="12" :lg="9" :span="6">
                     <el-button class="filter-item"  type="success" @click="searchList" round>搜索
                     </el-button>
                     <el-button class="filter-item" round type="info" @click="resetSearch()">重置

src/views/personal/pendingList.vue

@@ -7,8 +7,7 @@
       <template slot="left">
         <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery">
           <template v-slot:otherButton>
-            <el-button class="filter-item" round @click="showAllLabel()">显示全部字段
-            </el-button>
+            <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
           </template>
         </MoreSearchBar>
       </template>
@@ -23,7 +22,7 @@
             <span class="enableClick" @click="orderDetail(row)">{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130" v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
+        <el-table-column label="当前节点" align="center" width="130"  v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
           <template slot-scope="{row}">
             <span>{{ row.currentNodeName }}</span>
           </template>
@@ -33,54 +32,59 @@
             <span>{{ row.handlerName }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="最新备注" align="center" width="150" v-if="!hiddenLabels.includes('comments')" prop="comments">
+          <template slot-scope="{row}">
+            <span>{{ row.comments?row.comments:'-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
-            <span>{{ row.acreage?row.acreage:'--' }}</span>
+            <span>{{ row.acreage? row.acreage: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" width="130" v-if="!hiddenLabels.includes('price')" prop="price">
           <template slot-scope="{row}">
-            <span>{{ row.price?row.price:'--' }}</span>
+            <span>{{ row.price? row.price: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center" width="130" v-if="!hiddenLabels.includes('amount')" prop="amount">
           <template slot-scope="{row}">
-            <span>{{ row.amount?row.amount:'--' }}</span>
+            <span>{{ row.amount? row.amount: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户名称" align="center" width="130" v-if="!hiddenLabels.includes('clientName')" prop="clientName">
           <template slot-scope="{row}">
-            <span>{{ row.clientName==null?'--': row.clientName }}</span>
+            <span>{{ row.clientName?row.clientName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="业务来源" align="center" width="130" v-if="!hiddenLabels.includes('clientSubName')" prop="clientSubName">
           <template slot-scope="{row}">
-            <span>{{ row.clientSubName }}</span>
+            <span>{{ row.clientSubName?row.clientSubName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="中介" align="center" width="130" v-if="!hiddenLabels.includes('agent')" prop="agent">
           <template slot-scope="{row}">
-            <span>{{ row.agent==null?'--': row.agent }}</span>
+            <span>{{ row.agent?ow.agent:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="联系人" align="center" width="130" v-if="!hiddenLabels.includes('contactName')" prop="contactName">
           <template slot-scope="{row}">
-            <span>{{ row.contactName}}</span>
+            <span>{{ row.contactName?row.contactName:'-'}}</span>
           </template>
         </el-table-column>
         <el-table-column label="联系人电话" align="center" width="130" v-if="!hiddenLabels.includes('contactTel')" prop="contactTel">
           <template slot-scope="{row}">
-            <span>{{ row.contactTel }}</span>
+            <span>{{ row.contactTel?row.contactTel:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="委托人" align="center" v-if="!hiddenLabels.includes('bailorA')" prop="bailorA">
           <template slot-scope="{row}">
-            <span>{{ row.bailorA}}{{ row.bailorB}}</span>
+            <span>{{ row.bailorA?row.bailorA:(row.bailorB?row.bailorB:'-')}}</span>
           </template>
         </el-table-column>
         <el-table-column label="委托人电话" align="center" width="130" v-if="!hiddenLabels.includes('bailoraTel')" prop="bailoraTel">
           <template slot-scope="{row}">
-            <span>{{ row.bailoraTel===null?row.bailorbTel:row.bailoraTel }}</span>
+            <span>{{ row.bailorATel?row.bailorATel:(row.bailorBTel?row.bailorBTel:'-')}}</span>
           </template>
         </el-table-column>
         <el-table-column label="客户经理" align="center" v-if="!hiddenLabels.includes('clientManager')" prop="clientManager">
@@ -90,17 +94,17 @@
         </el-table-column>
         <el-table-column label="实勘人" align="center" width="130" v-if="!hiddenLabels.includes('outwardStaffName')" prop="outwardStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.outwardStaffName?row.outwardStaffName:'--' }}</span>
+            <span>{{ row.outwardStaffName? row.outwardStaffName: '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="内业人员" align="center" width="130" v-if="!hiddenLabels.includes('inwardStaffName')" prop="inwardStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.inwardStaffName }}</span>
+            <span>{{ row.inwardStaffName?row.inwardStaffName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="定价人员" align="center" width="130" v-if="!hiddenLabels.includes('pricingStaffName')" prop="pricingStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.pricingStaffName?row.pricingStaffName:'--' }}</span>
+            <span>{{ row.pricingStaffName?row.pricingStaffName:'-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="下单时间" align="center" width="110" v-if="!hiddenLabels.includes('created')" prop="created">
@@ -108,6 +112,11 @@
             {{ row.created }}
           </template>
         </el-table-column>
+        <el-table-column label="节点生成时间" align="center" width="110" v-if="!hiddenLabels.includes('nodeTime')" prop="nodeTime" >
+          <template slot-scope="{row}">
+            {{ row.nodeTime }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot-scope="{row}">
             <el-button type="text" @click="orderDetail(row)">详情</el-button>
@@ -148,7 +157,6 @@ export default {
         endDate:null
       },
       personalNodes:[],
-      currentNodeName:false,
       hiddenLabels:[]
     }
   },

src/views/personal/todoDetail.vue

@@ -387,7 +387,7 @@
             </el-col>
             <el-col :xs="12" :sm="12" :lg="6" :span="6">
               <el-form-item label="打印二维码：" prop="validateCode" label-width="140px" class="postInfo-container-item">
-                <a @mouseenter="showQrCode('http://47.108.172.52:81/test/code/2024/08/05/川友土预2024080001号.png')">出入库二维码</a> <a @mouseenter="showQrCode('http://47.108.172.52:81/test/code/2024/08/05/川友土预2024080001号_validate.png')" style="margin-left: 5px">验证二维码</a>
+                <a @mouseenter="showQrCode(target.qrCode)">出入库二维码</a> <a @mouseenter="showQrCode(target.validateCode)" style="margin-left: 5px">验证二维码</a>
                 <div class="qr-code-div">
                   <img id="validateCode" class="qr-code" :src="qrCodeUrl" alt="未定价" @click="printQR()"/>
                 </div>

src/views/personal/todoList.vue

@@ -8,108 +8,114 @@
         <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes" :handlerName="false" @fliterSearch="fliterSearch" 
         @resetParams="resetParams" :listQuery="listQuery">
           <template v-slot:otherButton>
-            <PermissionButton menu-code="_views_personal_batch_allot" class-name="filter-item" type="danger" icon="el-icon-paperclip"
-             :page-jump="false" round  @click="openBatchAllotDialog()"/>
+              <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
+              <PermissionButton menu-code="_views_personal_batch_allot" class-name="filter-item" type="danger" icon="el-icon-paperclip"
+              :page-jump="false" round  @click="openBatchAllotDialog()"/>
           </template>
         </MoreSearchBar>
       </template>
-      <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="项目编号" align="center" width="150" >
+      <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @headerClick="switchHeader">
+        <el-table-column label="项目编号" align="center" width="150" v-if="!hiddenLabels.includes('orderId')" prop="orderId" >
           <template slot-scope="{row}">
             <span class="enableClick" @click="orderDetail(row)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="坐落" align="center" width="300" >
+        <el-table-column label="坐落" align="center" width="300" v-if="!hiddenLabels.includes('location')" prop="location">
           <template slot-scope="{row}">
             <span class="enableClick" @click="orderDetail(row)">{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130">
+        <el-table-column label="当前节点" align="center" width="130"  v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
           <template slot-scope="{row}">
             <span>{{ row.nodeName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="处理人" align="center" width="130">
+        <el-table-column label="处理人" align="center" width="130" v-if="!hiddenLabels.includes('handlerName')" prop="handlerName">
           <template slot-scope="{row}">
             <span>{{ row.handlerName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="面积" align="center" width="130">
+        <el-table-column label="最新备注" align="center" width="150" v-if="!hiddenLabels.includes('comments')" prop="comments">
+          <template slot-scope="{row}">
+            <span>{{ row.comments?row.comments:'-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
             <span>{{ row.acreage? row.acreage: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" width="130">
+        <el-table-column label="单价" align="center" width="130" v-if="!hiddenLabels.includes('price')" prop="price">
           <template slot-scope="{row}">
             <span>{{ row.price? row.price: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="总价" align="center" width="130">
+        <el-table-column label="总价" align="center" width="130" v-if="!hiddenLabels.includes('amount')" prop="amount">
           <template slot-scope="{row}">
             <span>{{ row.amount? row.amount: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="客户名称" align="center" width="130">
+        <el-table-column label="客户名称" align="center" width="130" v-if="!hiddenLabels.includes('clientName')" prop="clientName">
           <template slot-scope="{row}">
-            <span>{{ row.clientName==null?'-': row.clientName }}</span>
+            <span>{{ row.clientName?row.clientName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="业务来源" align="center" width="130">
+        <el-table-column label="业务来源" align="center" width="130" v-if="!hiddenLabels.includes('clientSubName')" prop="clientSubName">
           <template slot-scope="{row}">
-            <span>{{ row.clientSubName }}</span>
+            <span>{{ row.clientSubName?row.clientSubName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="中介" align="center" width="130">
+        <el-table-column label="中介" align="center" width="130" v-if="!hiddenLabels.includes('agent')" prop="agent">
           <template slot-scope="{row}">
-            <span>{{ row.agent==null?'-': row.agent }}</span>
+            <span>{{ row.agent?row.agent:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="联系人" align="center" width="130">
+        <el-table-column label="联系人" align="center" width="130" v-if="!hiddenLabels.includes('contactName')" prop="contactName">
           <template slot-scope="{row}">
-            <span>{{ row.contactName}}</span>
+            <span>{{ row.contactName?row.contactName:'-'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="联系人电话" align="center" width="130">
+        <el-table-column label="联系人电话" align="center" width="130" v-if="!hiddenLabels.includes('contactTel')" prop="contactTel">
           <template slot-scope="{row}">
-            <span>{{ row.contactTel }}</span>
+            <span>{{ row.contactTel?row.contactTel:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人" align="center">
+        <el-table-column label="委托人" align="center" v-if="!hiddenLabels.includes('bailorA')" prop="bailorA">
           <template slot-scope="{row}">
-            <span>{{ row.bailorA}}{{ row.bailorB}}</span>
+            <span>{{ row.bailorA ==null?(row.bailorB?row.bailorB:'-'):row.bailorA}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人电话" align="center" width="130">
+        <el-table-column label="委托人电话" align="center" width="130" v-if="!hiddenLabels.includes('bailoraTel')" prop="bailoraTel">
           <template slot-scope="{row}">
-            <span>{{ row.bailorATel===null?row.bailorBTel:row.bailorATel }}</span>
+            <span>{{ row.bailorATel==null?(row.bailorBTel?row.bailorBTel:'-'):row.bailorATel }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="客户经理" align="center">
+        <el-table-column label="客户经理" align="center" v-if="!hiddenLabels.includes('clientManager')" prop="clientManager">
           <template slot-scope="{row}">
             <span>{{ row.clientManager }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="实勘人" align="center" width="130">
+        <el-table-column label="实勘人" align="center" width="130" v-if="!hiddenLabels.includes('outwardStaffName')" prop="outwardStaffName">
           <template slot-scope="{row}">
             <span>{{ row.outwardStaffName? row.outwardStaffName: '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="内业人员" align="center" width="130">
+        <el-table-column label="内业人员" align="center" width="130" v-if="!hiddenLabels.includes('inwardStaffName')" prop="inwardStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.inwardStaffName }}</span>
+            <span>{{ row.inwardStaffName?row.inwardStaffName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="定价人员" align="center" width="130">
+        <el-table-column label="定价人员" align="center" width="130" v-if="!hiddenLabels.includes('pricingStaffName')" prop="pricingStaffName">
           <template slot-scope="{row}">
-            <span>{{ row.pricingStaffName }}</span>
+            <span>{{ row.pricingStaffName?row.pricingStaffName:'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="110" >
+        <el-table-column label="下单时间" align="center" width="110" v-if="!hiddenLabels.includes('created')" prop="created">
           <template slot-scope="{row}">
             {{ row.created }}
           </template>
         </el-table-column>
-        <el-table-column label="节点生成时间" align="center" width="110"  >
+        <el-table-column label="节点生成时间" align="center" width="110" v-if="!hiddenLabels.includes('nodeCreated')" prop="nodeCreated" >
           <template slot-scope="{row}">
             {{ row.nodeCreated }}
           </template>
@@ -202,7 +208,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import PermissionButton from '@/components/PermissionButton/PermissionButton'
 import MoreSearchBar from '@/components/MoreSearchBar'
 import TransferDialog from '@/components/TaskTransferDialog'
-import { getCookie } from '@/utils/auth'
+import { getCookie,setCookie,removeCookie } from '@/utils/auth'
 
 export default {
   name: 'personalTodoList',
@@ -241,7 +247,8 @@ export default {
       allotOrderData: { records: [] },
       outwardUsers:[],
       batchOrders:[],
-      orderKeyword:null
+      orderKeyword:null,
+      hiddenLabels:[]
     }
 
   },
@@ -257,6 +264,9 @@ export default {
     }
   },
   created() {
+    if (getCookie("personalTodoList-hiddenLabels")!=undefined){
+      this.hiddenLabels = JSON.parse(getCookie("personalTodoList-hiddenLabels"))
+    }
     this.getPage();
     this.getNodeEnum();
   },
@@ -390,6 +400,14 @@ export default {
         this.$message.error('取消分单');
       });
       
+    },
+    switchHeader(data){
+      this.hiddenLabels.push(data);
+      setCookie("personalTodoList-hiddenLabels",this.hiddenLabels);
+    },
+    showAllLabel(){
+      removeCookie("personalTodoList-hiddenLabels");
+      location.reload();
     }
   },