From eed8a9a1cbc455b4089467383979e189901f8e2c Mon Sep 17 00:00:00 2001
From: xuxingjun <xu.xingjun@ebiz-digits.com>
Date: Tue, 19 Nov 2024 10:39:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20=E4=B8=9A=E5=8A=A1=E5=91=98=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/billingDetail/tableDetail2.vue       | 31 +++++---
 .../ebiz/billingDetail/billingDetail.vue      | 79 +++++++++++++++----
 .../ebiz/billingDetail/policyDetails.vue      |  2 +-
 src/views/ebiz/generateImg/generateImg.vue    |  4 +-
 4 files changed, 88 insertions(+), 28 deletions(-)

diff --git a/src/components/ebiz/billingDetail/tableDetail2.vue b/src/components/ebiz/billingDetail/tableDetail2.vue
index 3ceb0e518..3f0431ee7 100644
--- a/src/components/ebiz/billingDetail/tableDetail2.vue
+++ b/src/components/ebiz/billingDetail/tableDetail2.vue
@@ -11,8 +11,8 @@
           <tbody>
             <tr v-for="(item, index) in tableData" :key="index" :ref="'th' + index" @click="(e) => double_click(index, item)">
               <td class="th-fixed" @click="goLink(item)">{{ Number(index) + 1 }}</td>
-              <td v-if="timeShow == false">{{ item.signDate }}</td>
-              <td v-if="timeShow">{{ item.appntDate }}</td>
+              <td v-show="timeShow">{{ item.signDate }}</td>
+              <td v-show="timeShow == false">{{ item.appntDate }}</td>
               <td>{{ item.productName }}</td>
               <td>{{ item.prem }}</td>
               <td>
@@ -75,15 +75,28 @@ export default {
       timeShow: false,
     }
   },
-  created() {
-    for(let i=0;i<this.theads.length;i++) {
-      if(this.theads[i] == '承保时间') {
-        this.timeShow = false
-      } else {
-        this.timeShow = true
+  watch: {
+    theads(newVal) {
+      if (newVal) {
+        for(let i=0;i<this.theads.length;i++) {
+          if(this.theads[i] == '承保时间') {
+            this.timeShow = true
+          } else if(this.theads[i] == '预收时间') {
+            this.timeShow = false
+          }
+        }
       }
     }
   },
+  created() {
+      for(let i=0;i<this.theads.length;i++) {
+        if(this.theads[i] == '承保时间') {
+          this.timeShow = true
+        } else if(this.theads[i] == '预收时间') {
+          this.timeShow = false
+        }
+      }
+  },
   methods: {
     double_click(index, fn, data) {
       let timestamp = 0
@@ -132,7 +145,7 @@ export default {
       //     orderNo: num,
       //   }
       // })
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/ebiz/billingDetail/billingDetail.vue b/src/views/ebiz/billingDetail/billingDetail.vue
index 494dcb70b..bb87eb8cb 100644
--- a/src/views/ebiz/billingDetail/billingDetail.vue
+++ b/src/views/ebiz/billingDetail/billingDetail.vue
@@ -1,14 +1,25 @@
 <template>
-  <div style="background: #fff">
+  <div style="background: #fff;height: 100vh">
     <div class="search_col">
-      <div class="shouButton" @click="openPopup">
-        <van-button size="small">
-          {{ outOrderType === 'accept' ? '承保' : '预收' }}
-          <van-icon size="12" name="arrow-down" />
-        </van-button>
+      <div class="topBox">
+        <div class="shouButton" @click="openPopup">
+          <van-button size="small">
+            {{ outOrderType === 'accept' ? '承保' : '预收' }}
+            <van-icon size="12" name="arrow-down" />
+          </van-button>
+        </div>
+        <div class="group" @click="openPopup">
+          <van-button size="small">
+            {{ titleText }}
+            <van-icon size="12" name="arrow-down" />
+          </van-button>
+          
+        </div>
+
       </div>
-      <div class="group" @click="openPopup">
-        <!-- <van-radio-group class="groups" v-model="dateFlag" direction="horizontal" @change="queryOutOrderListFunc">
+      
+      <!-- <div class="group" @click="openPopup">
+        <van-radio-group class="groups" v-model="dateFlag" direction="horizontal" @change="queryOutOrderListFunc">
           <van-radio name="all">
             <template #icon="props">
               <van-button size="small" :class="props.checked ? 'checked' : ''">全部</van-button>
@@ -24,9 +35,11 @@
               <van-button size="small" :class="props.checked ? 'checked' : ''">最近一年</van-button>
             </template>
           </van-radio>
-        </van-radio-group> -->
+        </van-radio-group>
         <button class="titlebtn">{{ titleText }}</button>
-      </div>
+        <van-icon size="12" name="arrow-down" />
+
+      </div> -->
       <div class="icon">
         <van-icon name="filter-o" @click="openPopup" />
       </div>
@@ -92,7 +105,7 @@
     <!--&lt;!&ndash;        <van-button type="danger" @click="switchDayOrMonth(1)" :plain="currentIndex == 1 ? true : false" size="small">当天</van-button>&ndash;&gt;-->
     <!--&lt;!&ndash;      </div>&ndash;&gt;-->
     <!--    </div>-->
-    <div class="table">
+    <div class="table" v-if="listShow">
       <!--      <van-list v-model="loading" :finished="finished" @load="queryOutOrderListFunc" :immediate-check="false" finished-text="没有更多数据了">-->
       <tableDetail2
         :theads="theads"
@@ -107,6 +120,7 @@
       ></tableDetail2>
       <!--      </van-list>-->
     </div>
+    <p v-else class="noList">当前条件查无数据</p>
 
     <!-- 二级机构筛选栏 -->
     <van-popup v-model="isOrgLv2ConditionShow" position="bottom" :style="{ height: '40vh' }">
@@ -127,7 +141,7 @@
         <div style="margin-top: 10px">
           <div>时间</div>
           <div class="button_times">
-            <van-button size="small" :class="dialogForm.dateFlag === 'all' ? 'checked' : ''" @click="typeCheck('all')">全部</van-button>
+            <!-- <van-button size="small" :class="dialogForm.dateFlag === 'all' ? 'checked' : ''" @click="typeCheck('all')">全部</van-button> -->
             <van-button size="small" :class="dialogForm.dateFlag === 'm' ? 'checked' : ''" @click="typeCheck('m')">按月份查询</van-button>
             <van-button size="small" :class="dialogForm.dateFlag === 'y' ? 'checked' : ''" @click="typeCheck('y')">按时间范围查询</van-button>
           </div>
@@ -319,7 +333,7 @@ export default {
   data() {
     return {
       timeMinDate: new Date(new Date().getFullYear() - 3, new Date().getMonth() + 1, new Date().getDate()),
-      timeMaxDate: new Date(new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()),
+      timeMaxDate: new Date(),
       TimeFlag: '',
       currentDate: '',
       timeShow: false,
@@ -334,7 +348,7 @@ export default {
       dateFlag: 'm',
       style02: 'style02', //style02 时，显示红字红三角的样式，不写的话展示默认样式
       currentIndex: 0, //0 当月 1当天
-      theads: ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员姓名', '机构','查看'],
+      theads: ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员', '机构','查看'],
       tableData: [],
       total: 0,
       minDate: '',
@@ -385,11 +399,13 @@ export default {
       hebaoShow: false,
       xiangqingShow: false,
       orderNo: '',
+      listShow: false,
     }
   },
   created() {
     this.getyaerMonth();
     this.getmonthList();
+    this.getdayList();
     this.outOrderTypeChange();
   },
   mounted() {
@@ -647,8 +663,11 @@ export default {
             }
             this.tableData = this.tableData = res.content.list
             this.total = res.content.total
-            // this.tableData.push(...res.content.list)
             this.loading = false
+            this.listShow = true
+          } else{
+            this.tableData = []
+            this.listShow = false
           }
         }
       })
@@ -775,6 +794,11 @@ export default {
       if(e == 'm') {
         this.overlayShow = true
         // this.titleText = this.monthValue
+        this.getyaerMonth();
+      }
+      if(e == 'y') {
+        this.dialogForm.startDate = ''
+        this.dialogForm.endDate = ''
       }
 
     },
@@ -805,13 +829,14 @@ export default {
       this.overlayShow = false
     },
     outOrderTypeChange() {
-      this.theads = ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员姓名', '机构','查看']
+      this.theads = ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员', '机构','查看']
       if (this.outOrderType === 'accept') {
         this.theads.splice(2,1)
       } else {
         this.theads.splice(1,1)
 
       }
+      
     },
     xiangqing(num) {
       this.orderNo = num
@@ -832,6 +857,15 @@ export default {
       const oneYearAgoDate = getOneYearAgoDate();
       this.minDate = oneYearAgoDate
     },
+    getdayList() {
+      function getOneYearAgoDate() {
+          const now = new Date();
+          now.setFullYear(now.getFullYear() - 2);
+          return now;
+      }
+      const oneYearAgoDate = getOneYearAgoDate();
+      this.timeMinDate = oneYearAgoDate
+    },
   }
 }
 </script>
@@ -943,6 +977,14 @@ table {
   justify-content: space-between;
   background: #ee3030;
 }
+.topBox {
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+.shouButton {
+  margin-right: 10px;
+}
 .checked {
   color: #ee3030;
 }
@@ -986,4 +1028,9 @@ table {
   top: 0;
   left: 0;
 }
+.noList {
+  font-size: 18px;
+  text-align: center;
+  margin-top: 100px;
+}
 </style>
diff --git a/src/views/ebiz/billingDetail/policyDetails.vue b/src/views/ebiz/billingDetail/policyDetails.vue
index dd255f6a3..3f5ce5740 100644
--- a/src/views/ebiz/billingDetail/policyDetails.vue
+++ b/src/views/ebiz/billingDetail/policyDetails.vue
@@ -119,7 +119,7 @@ export default {
   padding: 7px 0px;
   border-bottom: 0.5px #ccc solid;
   .title {
-    width: 150px;
+    width: 110px;
     font-size: 16px;
     color: #333;
   }
diff --git a/src/views/ebiz/generateImg/generateImg.vue b/src/views/ebiz/generateImg/generateImg.vue
index a07f14ac9..8f831fc91 100644
--- a/src/views/ebiz/generateImg/generateImg.vue
+++ b/src/views/ebiz/generateImg/generateImg.vue
@@ -4,10 +4,10 @@
       <img src="@/assets/images/list_img.png" alt="" />
       <div class="box">
         <div class="title">
-          <p class="organ">{{ orderList.manageComName }}</p>
+          <p class="organ">{{ orderList.manageComNameFull }}</p>
           <p class="name">{{ orderList.name }}</p>
         </div>
-        <div class="pName">{{ orderList.productName }}</div>
+        <div class="pName">{{ orderList.productNameFull }}</div>
         <div class="type">{{ orderList.outOrderType == 'accept' ? '承保规保' : '预收规保' }}</div>
         <div class="yuan">{{ orderList.prem }}<span>元</span></div>
         <div class="time">{{ orderList.outOrderType == 'accept' ? '承保时间：' : '预收时间：' }}{{ orderList.appntDate }}</div>