Merge remote-tracking branch 'origin/dev-new' into release/【20241120】关于金掌桂开发机构实时出单功能和动态贺报生成的请示

src/api/ebiz/billingDetail/billingDetail.js

@@ -25,3 +25,11 @@ export function queryOutOrderList(data) {
       data
     })
   }
+  // 出单详情
+  export function queryOutOrderDetail(data) {
+    return request({
+      url: getUrl(`/sale/order/queryOutOrderDetail`, 1),
+      method: 'post',
+      data
+    })
+  }

src/components/ebiz/billingDetail/tableDetail2.vue

@@ -11,13 +11,20 @@
           <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>{{ item.signDate }}</td>
+              <td class="timeDate" v-show="timeShow">{{ item.signDate }}</td>
-              <td>{{ item.appntDate }}</td>
+              <td class="timeDate" v-show="timeShow == false">{{ item.appntDate }}</td>
-              <td>{{ item.productName }}</td>
+              <td class="productName">{{ item.productName }}</td>
-              <td>{{ item.prem }}</td>
+              <td class="prem">{{ item.prem }}</td>
-              <td>{{ item.name }}</td>
+              <td>
+                <span class="td-sheng">{{ item.name }}</span>
+              </td>
               <td>{{ item.manageComName }}</td>
+              <td class="chakan">
+                <van-button size="mini" type="danger" @click="download(item)">下载贺报</van-button>
+                <van-button size="mini" type="info" @click="look(item.orderNo)">查看</van-button>
+              </td>
 <!--              <td>{{ item.branchTypeName }}</td>-->
+
             </tr>
           </tbody>
         </table>
@@ -28,6 +35,8 @@
       <div type="text" @click="pageUp" :style="pageNum > 1 ? 'color:red' : ''">上一页</div>
       <div style="color: red">{{ pageNum }}/{{ Math.ceil(total / pageSize) }}</div>
       <div @click="pageDown" :style="pageNum < Math.ceil(total / pageSize) ? 'color:red' : ''">下一页 ></div>
+      <div v-if="pageNum == 1" class="shangzheBox"></div>
+      <div v-if="pageNum >= Math.ceil(total / pageSize)" class="xiazheBox"></div>
     </div>
   </div>
 </template>
@@ -62,9 +71,32 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      timeShow: false,
+    }
+  },
+  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
+        }
+      }
   },
-  created() {},
   methods: {
     double_click(index, fn, data) {
       let timestamp = 0
@@ -98,7 +130,22 @@ export default {
       if (this.isLink) {
         this.$emit('goLink', item)
       }
-    }
+    },
+    // 跳转至下载贺报页面
+    download(data){
+      this.$emit('from-child', data);
+    },
+    // 查看详情 跳转至详情页面
+    look(num) {
+      this.$emit('fro-child', num);
+      // console.log(num);
+      // this.$router.push({
+      //   path: '/policyDetails',
+      //   query: {
+      //     orderNo: num,
+      //   }
+      // })
+    },
   }
 }
 </script>
@@ -110,6 +157,21 @@ export default {
   margin-bottom: 10px;
   justify-content: space-between;
   align-items: center;
+  position: relative;
+  .shangzheBox {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 70px;
+    height: 30px;
+  }
+  .xiazheBox {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 70px;
+    height: 30px;
+  }
 }
 .statisticsTable_table {
   height: 82.5vh;
@@ -117,14 +179,35 @@ export default {
   //width: 1000px;
 }
 .statisticsTable_table .table {
-  width: 1000px;
+  width: 195.6vw !important;
+}
+.timeDate {
+  width: 90px !important;
+}
+.productName {
+  width: 35vw;
+}
+.chakan {
+  width: 130px;
+}
+.prem {
+  text-align: right !important;
+  width: 90px !important;
+  padding-right: 7px !important;
 }
 .statisticsTable th {
-  width: 800px;
+  width: 90px;
 }
 table {
   // width: 200vw;
 }
+.th-fixed {
+  position: sticky;
+  border: 1px solid #999 !important;
+  left: 0;
+  width: 35px !important;
+  padding: 0 5px;
+}
 .statisticsTable {
   width: 100%;
   overflow-x: hidden;
@@ -150,17 +233,22 @@ table {
     }
   }
 }
-.th-fixed {
+
-  // position: sticky;
-  left: 0;
-  width: 150px;
-  padding: 0 5px;
-}
 .td-fixed {
   // position: sticky;
-  width: 150px;
+  width: 33px !important;
   padding: 0 5px;
   left: 0;
   text-decoration: underline;
 }
+.td-sheng {
+  display: block;
+  width: 65px; /* 设置span的宽度 */
+  white-space: nowrap; /* 确保文本不换行 */
+  overflow: hidden; /* 隐藏超出span宽度的文本 */
+  text-overflow: ellipsis; /* 超出部分显示为省略号 */
+  text-align: left; /* 文本对齐方式 */
+  margin: 0 auto;
+  text-align: center;
+}
 </style>

src/router/ebiz/billingDetail.js

@@ -1,5 +1,7 @@
 const billingDetail = () => import('@/views/ebiz/billingDetail/billingDetail')
 const generateImg = () => import('@/views/ebiz/generateImg/generateImg')
+const policyDetails = () => import('@/views/ebiz/billingDetail/policyDetails')
+
 
 export default [
   {
@@ -18,5 +20,13 @@ export default [
     meta: {
       title: '业绩贺报'
     }
+  },
+  {
+    path: '/policyDetails',
+    name: 'policyDetails',
+    component: policyDetails,
+    meta: {
+      title: '保单详情',
     }
+  },
 ]

src/views/ebiz/billingDetail/billingDetail.vue

@@ -1,10 +1,24 @@
 <template>
-  <div style="background: #fff">
+  <div style="background: #fff;height: 100vh">
     <div class="search_col">
-      <div class="shouButton">
+      <div class="topBox">
-        <van-button size="small">{{ outOrderType === 'accept' ? '承保' : '预收' }}</van-button>
+        <div class="shouButton" @click="openPopup">
+          <van-button size="small">
+            {{ outOrderType === 'accept' ? '承保' : '预收' }}
+            <van-icon size="12" name="arrow-down" />
+          </van-button>
         </div>
-      <div class="group">
+        <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">
           <van-radio name="all">
             <template #icon="props">
@@ -22,7 +36,10 @@
             </template>
           </van-radio>
         </van-radio-group>
-      </div>
+        <button class="titlebtn">{{ titleText }}</button>
+        <van-icon size="12" name="arrow-down" />
+
+      </div> -->
       <div class="icon">
         <van-icon name="filter-o" @click="openPopup" />
       </div>
@@ -40,22 +57,21 @@
       </span>-->
 
       <template>
-        <span v-if="!isJzg" style="margin-right: 10px">
+        <!-- <span v-if="!isJzg" style="margin-right: 10px">
           <span>{{ OrgLvName }}</span>
-          <!-- <van-icon name="arrow-down" /> -->
+        </span> -->
-        </span>
         <span @click="isOrgLv2ConditionShow = true">
           <span>{{ OrgLv2Name }}</span>
-          <van-icon name="arrow-down" />
+          <van-icon size="12" name="arrow-down" />
         </span>
         <span @click="isOrgLv3ConditionShow = true">
           <span>{{ OrgLv3Name }}</span>
-          <van-icon name="arrow-down" />
+          <van-icon size="12" name="arrow-down" />
         </span>
 
         <span @click="isOrgLv4ConditionShow = true">
           <span>{{ OrgLv4Name }}</span>
-          <van-icon name="arrow-down" />
+          <van-icon size="12" name="arrow-down" />
         </span>
       </template>
     </div>
@@ -89,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"
@@ -98,10 +114,12 @@
         :page-size="pageSize"
         :page-num="pageNum"
         @currentChange="currentChange"
-        @double_click="double_click"
+        @from-child="double_click"
+        @fro-child="xiangqing"
       ></tableDetail2>
       <!--      </van-list>-->
     </div>
+    <p v-else class="noList">当前条件查无数据</p>
 
     <!-- 二级机构筛选栏 -->
     <van-popup v-model="isOrgLv2ConditionShow" position="bottom" :style="{ height: '40vh' }">
@@ -122,11 +140,15 @@
         <div style="margin-top: 10px">
           <div>时间</div>
           <div class="button_times">
-            <van-button size="small" :class="dialogForm.dateFlag === 'all' ? 'checked' : ''" @click="dialogForm.dateFlag = '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="dialogForm.dateFlag = 'm'">最近一月</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="dialogForm.dateFlag = 'y'">最近一年</van-button>
+            <van-button size="small" :class="dialogForm.dateFlag === 'y' ? 'checked' : ''" @click="typeCheck('y')">按时间范围查询</van-button>
           </div>
-          <div style="display: flex; align-items: center; justify-content: space-between; justify-items: center; margin-top: 20px">
+          <div v-if="dialogForm.dateFlag === 'm'" style="display: flex; align-items: center; justify-content: space-between; justify-items: center; margin-top: 20px">
+            <p @click="typeCheck('m')">当前选择月份:  {{ monthValue }}</p>
+            
+          </div>
+          <div v-if="dialogForm.dateFlag === 'y'" style="display: flex; align-items: center; justify-content: space-between; justify-items: center; margin-top: 20px">
             <van-field
               @click="openTime('startDate')"
               class="timeField"
@@ -221,12 +243,42 @@
         :max-date="timeMaxDate"
       />
     </van-popup>
+    <van-popup v-model="overlayShow" position="bottom" round>
+      <van-datetime-picker
+        title="请选择月份"
+        v-model="currentDate"
+        type="year-month"
+        :min-date="minDate"
+        :max-date="maxDate"
+        :formatter="formatter"
+        @confirm="confirmChange"
+        @cancel="cancelChange"
+      />
+    </van-popup>
+    <div class="hebao" v-if="hebaoShow">
+      <generateImg
+        @child-colse="closeHebao"
+      ></generateImg>
+    </div>
+    <van-popup v-model="xiangqingShow" position="right" :style="{ width: '100%', height: '100%' }">
+      <policyDetails
+        v-if="xiangqingShow"
+        :orderNo="orderNo"
+        @child-back="closeDetails"
+      >
+      </policyDetails>
+    </van-popup>
+    <!-- <div class="xiangqing" v-if="xiangqingShow" >
+      
+    </div> -->
   </div>
 </template>
 
 <script>
-import { Icon, RadioGroup, Radio, DatetimePicker } from 'vant'
+import { Icon, RadioGroup, Radio, DatetimePicker, Toast } from 'vant'
 import tableDetail2 from '@/components/ebiz/billingDetail/tableDetail2'
+import generateImg from '../generateImg/generateImg.vue'
+import policyDetails from './policyDetails.vue'
 import { getMisBranchComList2 } from '@/api/ebiz/branchOffice/branchOffice'
 import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import { queryOutOrderList, getBranchByUser } from '@/api/ebiz/billingDetail/billingDetail'
@@ -238,10 +290,13 @@ export default {
   name: 'billingDetail',
   components: {
     tableDetail2,
+    generateImg,
+    policyDetails,
     [Icon.name]: Icon,
     [RadioGroup.name]: RadioGroup,
     [Radio.name]: Radio,
     [DatetimePicker.name]: DatetimePicker,
+    [Toast.name]: Toast,
 
     FieldDatePicter
   },
@@ -278,24 +333,25 @@ 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,
       dialogForm: {
         outOrderType: '',
-        dateFlag: '',
+        dateFlag: 'm',
         startDate: '',
         endDate: ''
       },
       show: false,
       outOrderType: 'accept', // advance
-      dateFlag: '',
+      dateFlag: 'm',
       style02: 'style02', //style02 时，显示红字红三角的样式，不写的话展示默认样式
       currentIndex: 0, //0 当月 1当天
-      theads: ['序号', '承保时间', '预收时间', '产品名称', '保费', '业务员姓名', '机构'],
+      theads: ['序号', '承保时间', '预收时间', '产品名称', '保费（元）', '业务员', '机构','查看'],
       tableData: [],
       total: 0,
+      minDate: '',
       maxDate: new Date(),
       filterDate: '',
       postDate: '', //实际给后台传的时间
@@ -333,10 +389,25 @@ export default {
         // 1: 中心支公司, 2: 营销服务部, 3: 下辖营业区
         queryCom: ''
       },
-      isJzg: false //是否是内勤账号 branchType=JZG  、N 开头的是 (fasle)内勤账号   ；branchType= 数字的是外勤(true)
+      isJzg: false, //是否是内勤账号 branchType=JZG  、N 开头的是 (fasle)内勤账号   ；branchType= 数字的是外勤(true)
+      titleText: '全部',
+      firstTime: true,
+      monthValue: '',
+      maxDate: new Date(),
+      monthDate: new Date(),
+      overlayShow: false,
+      hebaoShow: false,
+      xiangqingShow: false,
+      orderNo: '',
+      listShow: false,
     }
   },
-  created() {},
+  created() {
+    this.getyaerMonth();
+    this.getmonthList();
+    this.getdayList();
+    this.outOrderTypeChange();
+  },
   mounted() {
     // this.getInfo()
     let date = new Date()
@@ -349,6 +420,7 @@ export default {
     this.initData()
   },
   methods: {
+    
     async getInfo() {
       // let userInfo = JSON.parse(localStorage.getItem('userInfo'))
       // // 获取代理人信息
@@ -357,18 +429,20 @@ export default {
       // }
     },
     openTime(flag) {
+      //禁止软键盘弹出
+      document.activeElement.blur();
       this.TimeFlag = flag
-      this.dialogForm.dateFlag = ''
+      // this.dialogForm.dateFlag = ''
       this.timeShow = true
     },
     timeConfirm(t) {
       this.$nextTick(() => {
-        console.log(this.currentDate)
+        // console.log(this.currentDate)
         let time = new Date(t)
         let y = time.getFullYear()
         let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
         let d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate()
-        console.log(y, m, d)
+        // console.log(y, m, d)
         this.dialogForm[this.TimeFlag] = y + '-' + m + '-' + d
         this.timeShow = false
       })
@@ -402,6 +476,14 @@ export default {
       this.queryOutOrderListFunc()
     },
     popupOnConfirm() {
+      if(this.dialogForm.dateFlag == 'y') {
+        if(this.isStartDateInvalid()) {
+          Toast({message: '开始日期不能小于结束日期!',size: 'large'});
+          return
+        } else {
+          this.titleText = this.dialogForm.startDate.toString() + '~' + this.dialogForm.endDate.toString()
+        }
+      }
       if (!this.dialogForm.dateFlag) {
         this.startDate = this.dialogForm.startDate
         this.endDate = this.dialogForm.endDate
@@ -413,19 +495,30 @@ export default {
       this.outOrderType = this.dialogForm.outOrderType
       this.dateFlag = this.dialogForm.dateFlag
       this.show = false
+      if(this.dateFlag == 'all') {
+        this.titleText = '全部'
+      }
+      if(this.dateFlag == 'm') {
+        this.titleText = this.monthValue
+      }
+      
+      
+      this.outOrderTypeChange()
       this.queryOutOrderListFunc()
     },
     openPopup() {
-      this.dialogForm = {
+      
-        outOrderType: this.outOrderType,
+      this.dialogForm.outOrderType = this.outOrderType;
-        dateFlag: this.dateFlag,
+      this.dialogForm.dateFlag = this.dateFlag;
-        startDate: this.startDate,
+      // if (this.dateFlag) {
-        endDate: this.endDate
+      //   this.dialogForm.startDate = ''
-      }
+      //   this.dialogForm.endDate = ''
-      if (this.dateFlag) {
+      // }
-        this.dialogForm.startDate = ''
+      if(this.firstTime == true) {
-        this.dialogForm.endDate = ''
+        this.dialogForm.dateFlag = 'm'
+        this.firstTime = false
       }
+      // console.log(this.dialogForm.dateFlag);
       this.show = true
     },
     //时间筛选
@@ -461,10 +554,10 @@ export default {
           this.OrgLv3Name = '营业部'
           this.OrgLv4Name = '营业组'
         } else {
-          this.OrgLvName = '总公司'
+          this.OrgLvName = '全部'
-          this.OrgLv2Name = '分公司'
+          this.OrgLv2Name = '全部'
-          this.OrgLv3Name = '中支公司'
+          this.OrgLv3Name = '全部'
-          this.OrgLv4Name = '支公司'
+          this.OrgLv4Name = '全部'
         }
         const resf = await getMisBranchComList2({
           // isJzg: this.isJzg,
@@ -537,19 +630,35 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-
+      let data = {}
-      queryOutOrderList({
+      if(this.dateFlag == 'all') {
+        data = {
           outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance
-        startDate: this.startDate, // "2024-09-01",
+          // dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
-        endDate: this.endDate, //"2024-09-30",
+          dateFlag: '', // 暂不使用改参数，默认给空 
-        dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
           // appntDate: this.postDate,
           distCode: this.OrgLv2Code,
           depCode: this.OrgLv3Code,
           orgCode: this.OrgLv4Code,
           pageNum: this.pageNum,
           pageSize: this.pageSize
-      }).then((res) => {
+        }
+      } else {
+        data = {
+          outOrderType: this.outOrderType, // "accept",//--出单类型 承保 accept 预收 advance
+          startDate: this.dialogForm.startDate, // "2024-09-01",
+          endDate: this.dialogForm.endDate, //"2024-09-30",
+          // dateFlag: this.dateFlag, //  -最近一月-m,最近一年y  ,全部-all
+          dateFlag: '', // 暂不使用改参数，默认给空 
+          // appntDate: this.postDate,
+          distCode: this.OrgLv2Code,
+          depCode: this.OrgLv3Code,
+          orgCode: this.OrgLv4Code,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize
+        }
+      }
+      queryOutOrderList(data).then((res) => {
         this.$toast.clear()
         if (res.result == 0) {
           if (res.content) {
@@ -562,18 +671,22 @@ 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
           }
         }
       })
     },
     // 双击事件
     double_click(data) {
-      console.log(JSON.parse(JSON.stringify(data)), '发生了点击')
+      // console.log(JSON.parse(JSON.stringify(data)), '发生了点击')
-      this.$router.push({
+      this.hebaoShow = true
-        path: '/generateImg'
+      // this.$router.push({
-      })
+      //   path: '/generateImg'
+      // })
       localStorage.setItem('orderList', JSON.stringify(data))
     },
 
@@ -596,8 +709,8 @@ export default {
       //   this.params.manageLv = '01'
       // }
       this.OrgLv2Name = data
-      this.OrgLv3Name = this.isJzg ? '营业部' : '中支公司'
+      this.OrgLv3Name = this.isJzg ? '营业部' : '全部'
-      this.OrgLv4Name = this.isJzg ? '营业组' : '支公司'
+      this.OrgLv4Name = this.isJzg ? '营业组' : '全部'
       this.OrgLv3Code = ''
       this.OrgLv4Code = ''
       // 点击其他筛选条件-重置当前页为第一页
@@ -632,7 +745,7 @@ export default {
         this.OrgLv3Code = ''
       }
       this.OrgLv4Code = ''
-      this.OrgLv4Name = this.isJzg ? '营业组' : '支公司'
+      this.OrgLv4Name = this.isJzg ? '营业组' : '全部'
       // this.OrgLv2Code = ''
       // this.OrgLv4Code = ''
       // 点击其他筛选条件-重置当前页为第一页
@@ -670,14 +783,107 @@ export default {
       this.pageNum = 1
       this.tableData = []
       this.queryOutOrderListFunc()
+    },
+    getyaerMonth() {
+      var currentDate = new Date();
+      var currentYear = currentDate.getFullYear();
+      var currentMonth = currentDate.getMonth() + 1; // 月份从0开始，所以要加1
+      this.monthValue = currentYear + '-' + currentMonth
+      this.dialogForm.startDate = currentYear + '-' + currentMonth + '-' + '01' // "2024-09-01",
+      this.dialogForm.endDate = currentYear + '-' + currentMonth + '-' + '30'//"2024-09-30",
+      this.titleText = this.monthValue
+    },
+    typeCheck(e) {
+      this.dialogForm.dateFlag = e
+      if(e == 'all') {
+        // this.titleText = '全部'
+        console.log(this.titleText);
       }
+      if(e == 'm') {
+        this.overlayShow = true
+        // this.titleText = this.monthValue
+        this.getyaerMonth();
+      }
+      if(e == 'y') {
+        this.dialogForm.startDate = ''
+        this.dialogForm.endDate = ''
+      }
+
+    },
+    isStartDateInvalid() {
+      return this.dialogForm.endDate && new Date(this.dialogForm.startDate) > new Date(this.dialogForm.endDate);
+    },
+    // 选择月份事件
+    formatter(type, value) {
+      if (type === 'year') {
+        return `${value}年`;
+      } else if (type === 'month') {
+        return `${value}月`
+      }
+      return value
+    },
+    // 月份选择取消按钮
+    cancelChange() {
+      this.overlayShow = false
+    },
+    // 月份选择确认按钮
+    confirmChange(t) {
+      this.$nextTick(() => {
+        let time = new Date(t)
+        let y = time.getFullYear()
+        let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
+        console.log(y, m)
+        this.monthValue = y + '-' + m
+        this.dialogForm.startDate = y + '-' + m + '-' + '01' // "2024-09-01",
+        this.dialogForm.endDate = y + '-' + m + '-' + '30'//"2024-09-30",
+      })
+      this.overlayShow = false
+    },
+    outOrderTypeChange() {
+      this.theads = ['序号', '承保时间', '预收时间', '产品名称', '保费（元）', '业务员', '机构','查看']
+      if (this.outOrderType === 'accept') {
+        this.theads.splice(2,1)
+      } else {
+        this.theads.splice(1,1)
+
+      }
+      
+    },
+    xiangqing(num) {
+      this.orderNo = num
+      this.xiangqingShow = true;
+    },
+    closeDetails() {
+      this.xiangqingShow = !this.xiangqingShow
+    },
+    closeHebao() {
+      this.hebaoShow = !this.hebaoShow
+    },
+    getmonthList() {
+      function getOneYearAgoDate() {
+          const now = new Date();
+          now.setFullYear(now.getFullYear() - 1);
+          return now;
+      }
+      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>
 
 <style lang="scss" scoped>
 .classification {
-  font-size: 14px;
+  font-size: 12px;
   padding: 10px;
   //background: #ee3030;
   //color: #fff;
@@ -685,7 +891,14 @@ export default {
 .van-icon {
   font-weight: bolder;
 }
-
+.titlebtn {
+  background-color: #fff;
+  border: none;
+  font-size: 12px;
+  color: #333;
+  padding: 8px 17px;
+  border-radius: 2px;
+}
 ::v-deep .classification .van-icon {
   vertical-align: middle;
   margin-right: 5px;
@@ -716,7 +929,7 @@ export default {
   background: #fff;
 }
 .table th {
-  width: 130px;
+  width: 100px;
 }
 table {
   width: 180vw;
@@ -775,6 +988,14 @@ table {
   justify-content: space-between;
   background: #ee3030;
 }
+.topBox {
+  display: flex;
+  align-items: center;
+  justify-content: start;
+}
+.shouButton {
+  margin-right: 10px;
+}
 .checked {
   color: #ee3030;
 }
@@ -790,8 +1011,9 @@ table {
   margin-top: 5px;
   display: flex;
   justify-content: space-between;
+  padding: 0 30px;
   .van-button {
-    padding: 2px 20px;
+    padding: 2px 10px;
   }
 }
 .timeField {
@@ -809,4 +1031,21 @@ table {
     border-color: #ee3030;
   }
 }
+.hebao,
+.xiangqing {
+  width: 100%;
+  height: 100vh;
+  background-color: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+.noList {
+  font-size: 18px;
+  text-align: center;
+  margin-top: 100px;
+}
+/deep/.van-toast--text {
+    width: 230px !important;
+}
 </style>

src/views/ebiz/billingDetail/policyDetails.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="content">
+      <!-- 保单详情 -->
+      <van-collapse v-model="activeName">
+        <van-collapse-item title="投保单信息" name="1">
+          <div class="row">
+            <span class="title">投保单号</span>
+            <span class="main">{{ policyData.orderNo }}</span>
+          </div>
+          <div class="row">
+            <span class="title">投保日期</span>
+            <span class="main">{{ policyData.appntDate }}</span>
+          </div>
+          <div class="row">
+            <span class="title">承保日期</span>
+            <span class="main">{{ policyData.signDate }}</span>
+          </div>
+          <div class="row">
+            <span class="title">总保费</span>
+            <span class="main">{{ policyData.orderAmount }}元</span>
+          </div>
+        </van-collapse-item>
+        <van-collapse-item title="主险" name="2">
+          <p class="list" v-show="mainShow" v-for="(item, index) in policyData.mainRiskNameList" :key="index">{{ item }}</p>
+          <p class="list" v-show="mainShow == false">暂无主险信息</p>
+        </van-collapse-item>
+        <van-collapse-item title="附加险" name="3">
+          <p class="list" v-show="subRiskShow" v-for="(itemm, index) in policyData.subRiskNameList" :key="index">{{ itemm }}</p>
+          <p class="list" v-show="subRiskShow == false" >暂无附加险信息</p>
+        </van-collapse-item>
+      </van-collapse>
+      <div class="bottom">
+        <button class="back" @click="goback()">返回</button>
+      </div>
+  </div>
+</template>
+
+<script>
+import { Collapse, CollapseItem } from 'vant'
+import { queryOutOrderDetail } from '@/api/ebiz/billingDetail/billingDetail'
+// 当前时间
+const currentDate = new Date()
+export default {
+  name: 'policyDetails',
+  components: {
+    [Collapse.name]: Collapse,
+    [CollapseItem.name]: CollapseItem,
+  },
+  props: {
+    orderNo: {
+      type: String,
+      default: false
+    }
+  },
+  data() {
+    return {
+        currentDate: '',
+        // orderNo: '',
+        activeName: ['1','2','3'],
+        policyData: {},
+        mainShow: false,
+        subRiskShow: false,
+    }
+  },
+  created() {
+    console.log(this.orderNo);
+    this.getpolicyInfo();
+  },
+  mounted() {
+    // console.log(this.orderNo);
+    // this.getpolicyInfo();
+  },
+  methods: {
+      getpolicyInfo() {
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+        queryOutOrderDetail({
+            orderNo: this.orderNo, 
+        }).then((res) => {
+            this.policyData = res.content;
+            if(this.policyData.mainRiskNameList == []) {
+              this.mainShow = false
+            } else {
+              this.mainShow = true
+            }
+            if(this.policyData.subRiskNameList.length == 0) {
+              this.subRiskShow = false
+            } else {
+              this.subRiskShow =  true
+            }
+        })
+      },
+      goback() {
+        this.$emit('child-back', '1');
+      }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .van-cell {
+    font-size: 18px;
+    font-weight: 500;
+}
+::v-deep .van-collapse-item__content {
+    padding: 0px 35px;
+}
+.content {
+  height: 100vh;
+  background-color: #fff;
+}
+.row {
+  display: flex;
+  align-items: strat;
+  padding: 7px 0px;
+  border-bottom: 0.5px #ccc solid;
+  .title {
+    width: 110px;
+    font-size: 16px;
+    color: #333;
+  }
+  .main {
+    font-size: 14px;
+    max-width: 200px;
+    word-break: normal;
+    display: block;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    overflow: hidden;
+  }
+}
+.list {
+  padding: 12px 0;
+}
+.bottom {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  .back {
+    width: 100%;
+    background-color: #e9332e;
+    border: none;
+    padding: 12px 0px;
+    border-radius: 28px;
+    color: #fff;
+    font-size: 20px;
+    text-align: center;
+  }
+}
+::v-deep .van-cell__right-icon {
+    margin-left: 1.33333vw;
+    color: #969799;
+    display: none;
+}
+</style>

src/views/ebiz/common/CalculatePremium.vue

@@ -102,6 +102,7 @@
           <div class="border-bottom" v-if="riskFactor.type == 3">
             <div class="pv12 border-bd">{{ riskFactor.name }}</div>
             <div class="duty">
+              <div class="zhe"></div>
               <div class="flex justify-content-s border-bd pv10 align-items-c" v-for="(dutyItem, dutyItemIndex) in riskFactor.rules" :key="dutyItemIndex">
                 <span
                   v-if="
@@ -115,7 +116,8 @@
                       item.productCode == 'GFRS_M0073' ||
                       item.productCode == 'GFRS_M0057' ||
                       item.productCode == 'GFRS_M0086' ||
-                      item.productCode == 'GFRS_M0092'
+                      item.productCode == 'GFRS_M0092' ||
+                      item.productCode == 'GFRS_M0096'
                     )
                   "
                   class="fs14 w100"
@@ -135,7 +137,8 @@
                         item.productCode == 'GFRS_M0073' ||
                         item.productCode == 'GFRS_M0057' ||
                         item.productCode == 'GFRS_M0086' ||
-                        item.productCode == 'GFRS_M0092'
+                        item.productCode == 'GFRS_M0092' ||
+                        item.productCode == 'GFRS_M0096'
                       )
                     "
                     v-model="dutyItem.defaultDutyAmt"
@@ -171,6 +174,7 @@
                     :disabled="dutyItem.defaultValue == '0'"
                     shape="square"
                     @change="changeChecked(index, riskFactorIndex, dutyItemIndex, dutyItem)"
+                    :class="dutyItemIndex == 1 ? 'checked' : ''"
                   ></van-checkbox>
                 </div>
               </div>
@@ -2440,6 +2444,11 @@ export default {
                 })
               }
             })
+            result.push({
+              amt: "100000.00",
+              dutyCode: "jhblxbase21",
+              dutyName: "基本责任二方案1(身故保险金或全残保险金（保额）)"
+            })
             trialInfo.duty = result
           }
         })
@@ -3115,7 +3124,8 @@ export default {
               this.trialList[index].productCode == 'GFRS_M0077' ||
               this.trialList[index].productCode == 'GFRS_M0057' ||
               this.trialList[index].productCode == 'GFRS_M0086' ||
-              this.trialList[index].productCode == 'GFRS_M0092'
+              this.trialList[index].productCode == 'GFRS_M0092' ||
+                this.trialList[index].productCode == 'GFRS_M0096'
             ) {
               riskItem['dutyLst'] = this.trialInfos[index].duty
             }
@@ -3431,4 +3441,25 @@ export default {
     border: 1px solid red;
   }
 }
+
+.checked {
+  color: #fff !important;
+  background-color: #E9332E !important; 
+  border-color: #E9332E;
+}
+/deep/ .van-icon {
+    border-color: #e9332e;
+    color: #fff !important;
+}
+.duty {
+  position: relative;
+}
+.zhe {
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    top: 24.66667vw;
+    right: -4px;
+    z-index: 9;
+}
 </style>

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>
@@ -17,6 +17,9 @@
       <van-button square type="default" size="large" @click="shareImg" v-no-more-click="1000"> 分享 </van-button>
       <van-button square type="danger" size="large" @click="downLoadImagesFunc" v-no-more-click="1000"> 下载 </van-button>
     </div>
+    <div class="close" @click="close()">
+      <van-icon name="cross" size="38" color="#fff" />
+    </div>
   </div>
 </template>
 
@@ -25,9 +28,23 @@ import html2canvas from 'html2canvas'
 import { base64Excel } from '@/api/ebiz/nbs'
 export default {
   name: 'generateImg',
+  // generateImgData
+  props: {
+    // generateImgData: {
+    //   type: Object,
+    //   default: {}
+    // },
+  },
   data() {
     return {
-      orderList: {}
+      orderList: {},
+      isIOS: false,
+    }
+  },
+  created() {
+    this.isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+    if(this.isIOS) {
+      document.getElementsByClassName('box').style.top = '38%'
     }
   },
   mounted() {
@@ -122,6 +139,9 @@ export default {
     },
     downLoadImagesFunc() {
       this.domToImage(this.$refs.generateImg)
+    },
+    close() {
+      this.$emit('child-colse', '1')
     }
   }
 }
@@ -216,10 +236,18 @@ img {
   border: 2px solid;
   border-image: radial-gradient(circle, rgba(255, 233, 124, 1), rgba(222, 144, 34, 1)) 2 2;
 }
-
+/deep/ .van-button {
+  border-radius: 12px;
+  width: 42%;
+}
 /deep/ .van-button--danger {
   background: linear-gradient(to right, #f26e43, #ac0209) !important;
   /*设置按钮为渐变颜色*/
   border: none !important;
 }
+.close {
+  position: fixed;
+  top: 0;
+  right: 0;
+}
 </style>

src/views/ebiz/goodStart/PerformanceReport.vue

@@ -29,7 +29,7 @@
             <!-- <span>{{ levelNames[level] }}</span> -->
             <span>{{ levelNames[levelLength + index] }}</span>
             <van-icon name="arrow-down" />
-          </span>
+          </span>lanC
         </div>
       </div>
       <div class="content">

src/views/ebiz/sale/InsuredInfo.vue

@@ -993,6 +993,7 @@
       },
       //证件起始截止日期
       onDateConfirm(val, type) {
+        console.log(val,type,);
         switch (type) {
           case '0':
           {
@@ -1009,9 +1010,10 @@
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
-              if(this.userInfo.birthday){
+              if(this.userInfo.birthday && !this.userInfo.certiexpiredate){
                 this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,val)
                 if(this.userInfo.certiexpiredate) {
+                  this.userInfo.certiexpiredate= this.userInfo.certiexpiredate
                   this.effectiveDateTypeAble = true
                   this.userInfo.effectiveDateType = false
                 }
@@ -1030,9 +1032,9 @@
             }
             //身份证证件类型的判断
             if (this.userInfo.idType == '1') {
-              if(this.userInfo.birthday){
+              // if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
+                // this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
-              }
+              // }
             }
           }
             break

src/views/ebiz/sale/InsuredPerson.vue

@@ -1109,9 +1109,10 @@
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
-              if(this.userInfo.birthday){
+              if(this.userInfo.birthday && !this.userInfo.certiexpiredate){
                 this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,val)
                 if(this.userInfo.certiexpiredate) {
+                  this.userInfo.certiexpiredate= this.userInfo.certiexpiredate
                   this.effectiveDateTypeAble = true
                   this.userInfo.effectiveDateType = false
                 }
@@ -1142,9 +1143,9 @@
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               console.log(age)
-              if(this.userInfo.birthday){
+              // if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
+              //   this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
-              }
+              // }
             }
           }
             break