关于核心系统套餐功能对接金掌桂系统的申请默认的执业类型增加字段执业类型

src/api/ebiz/sale/sale.js

@@ -390,3 +390,10 @@ export function saveOrderType(data) {
   })
 }
 
+export function changeOrderStatus(data) {
+  return request({
+    url: getUrl('/sale/order/changeOrderStatus', 1),
+    method: 'post',
+    data
+  })
+}

src/assets/js/utils/countCredentialValidity.js

@@ -16,12 +16,12 @@ export default {
       if(date2_29 == '02-29'){
         let thisyear = Number(endDate.slice(0, 4)) - 5
         if (thisyear % 4 == 0 && thisyear % 100 != 0 || thisyear % 400 == 0){
-          return startDate = thisyear + '-02-29'
+          startDate = thisyear + '-02-29'
         } else {
-          return startDate = thisyear + '-02-28'
+          startDate = thisyear + '-02-28'
         }
       }else{
-        return startDate = String(Number(endDate.slice(0, 4)) - 5) + endDate.slice(4, 11)
+        startDate = String(Number(endDate.slice(0, 4)) - 5) + endDate.slice(4, 11)
       }
     }
     /**
@@ -37,12 +37,12 @@ export default {
         if(date2_29 == '02-29') {
           let thisyear = Number(endDate.slice(0, 4)) - 10
           if (thisyear % 4 == 0 && thisyear % 100 != 0 || thisyear % 400 == 0){
-            return startDate = thisyear + '-02-29'
+            startDate = thisyear + '-02-29'
           } else {
-            return startDate = thisyear + '-02-28'
+            startDate = thisyear + '-02-28'
           }
         } else {
-          return startDate
+          startDate
         }
       }
     }
@@ -59,12 +59,12 @@ export default {
         if(date2_29 == '02-29') {
           let thisyear = Number(endDate.slice(0, 4)) - 20
           if (thisyear % 4 == 0 && thisyear % 100 != 0 || thisyear % 400 == 0){
-            return startDate = thisyear + '-02-29'
+            startDate = thisyear + '-02-29'
           } else {
-            return startDate = thisyear + '-02-28'
+            startDate = thisyear + '-02-28'
           }
         } else {
-          return startDate
+          startDate
         }
       }
     }
@@ -74,8 +74,12 @@ export default {
      * @Date: 2023/7/4
      **/
     else if (endage - 20 >= 46) {
-      return startDate
+      startDate
     }
+    if(new Date(birthday).getTime() >= new Date(startDate).getTime() || new Date().getTime() < new Date(startDate).getTime()){
+      startDate = ''
+    }
+    return startDate
   },
 
   //计算身份证截止日期

src/views/ebiz/YB_agentSign/step2.vue

@@ -149,7 +149,8 @@
           keyWord: '乙方锟斤拷：'
         }
         window.sessionStorage.setItem('signInfo',JSON.stringify(signInfo))
-        window.location.href = 'http://'+window.location.host + '/signH5/1.html'
+        // window.location.href = 'http://'+window.location.host + '/signH5/1.html'
+        window.location.href = this.$mainUrl + '/signH5/1.html'
       },
       goNext(){
         let params = {

src/views/ebiz/cardList/information.vue

@@ -1725,6 +1725,7 @@ export default {
          || this.itemProductDTOS.productCode === 'GFRS_M0062' || this.itemProductDTOS.productCode === 'GFRS_M0063'||this.itemProductDTOS.productCode === 'GFRS_M0064') {
           this.insuredInfo.occupationCode = '2099907'
           this.insuredInfo.occupationName = '一般学生'
+          this.insuredInfo.occupationType = '1'
         } else {
           this.insuredInfo.occupationCode = data.occupationCode
           this.insuredInfo.occupationName = data.occupationName
@@ -2618,6 +2619,7 @@ export default {
            || this.itemProductDTOS.productCode === 'GFRS_M0064') {
             this.insuredInfo.occupationCode = '2099907'
             this.insuredInfo.occupationName = '一般学生'
+            this.insuredInfo.occupationType = '1'
             this.insuredInfo.marriage = '2'
             this.insuredInfo.mobile = this.userInfo.mobile
             this.insuredInfo.email = this.userInfo.email
@@ -2631,6 +2633,7 @@ export default {
           } else if (this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode === 'GFRS_M0063') {
             this.insuredInfo.occupationCode = '2099908'
             this.insuredInfo.occupationName = '学龄前儿童'
+            this.insuredInfo.occupationType = '1'
             this.insuredInfo.marriage = '2'
             this.insuredInfo.idType = '2'
             // this.insuredInfo.effectiveDateType = true
@@ -2647,6 +2650,7 @@ export default {
             // this.insuredInfo.effectiveDateType = true
             this.insuredInfo.occupationCode = '2099907'
             this.insuredInfo.occupationName = '一般学生'
+            this.insuredInfo.occupationType = '1'
             this.insuredInfo.marriage = '2'
             // 去掉--选择户口本时，是否长期默认为是，不可点击，有效止期隐藏（证件类型为户口本时，被保人年龄小于16周岁时，户口本有效止期长期变更为第16周岁日期）
             this.effectiveDateTypeAbleInsured = true

src/views/ebiz/sale/answerPage.vue

@@ -31,7 +31,8 @@
               data-vv-name="单选"
               v-for="(items, indexs) in item.options" :key="indexs"
             >
-              <van-radio :name="items.option"  :label="items.option" class="mr150 ml70">{{items.item}} ({{items.score}}分)</van-radio>
+<!--              <van-radio :name="items.option"  :label="items.option" class="mr150 ml70">{{items.item}} ({{items.score}}分)</van-radio>-->
+              <van-radio :name="items.option"  :label="items.option" class="mr150 ml70">{{items.item}}</van-radio>
             </van-radio-group>
               <div style=" font-size:13px" v-if="item.remarks" v-html="item.remarks">
               </div>
@@ -43,11 +44,23 @@
      <div  class="bottom-btn bg-white">
       <van-button type="danger" size="large" @click="next" :disabled="isDisabled" v-no-more-click="1000">提交问卷</van-button>
     </div>
+        <van-dialog v-model="thisdialogshow" :showConfirmButton="false">
+            <div slot="title">
+                <p style="color: #E9332E;">提示</p>
+            </div>
+            <div style="padding: 20px 30px 20px;font-size: 14px;">
+                <div style="line-height: 20px;">根据风险测评结果，您不适合投保万能型或分红型保险产品，建议您停止投保。</div>
+            </div>
+            <div style="text-align: center;display: flex;align-items: end;">
+                <van-button type="danger" style="font-size: 12px;background: #fff;color: #e9332e;line-height: 15px;width: 50%;padding: 0px 2px;" @click="thisdialogfunc1">已知晓不适宜继续投保，但本人仍申请继续投保</van-button>
+                <van-button type="danger" style="font-size: 14px;width: 50%;" @click="thisdialogfunc2">停止投保</van-button>
+            </div>
+        </van-dialog>
   </div>
 </template>
 <script>
 import { Collapse, CollapseItem, RadioGroup, Radio, Field, CellGroup, Icon } from 'vant'
-import { saveInformation, getOrderDetail } from '@/api/ebiz/sale/sale'
+import { saveInformation, getOrderDetail, changeOrderStatus } from '@/api/ebiz/sale/sale'
 import IndexBar from '@/components/ebiz/sale/IndexBar'
 export default {
   data() {
@@ -56,6 +69,8 @@ export default {
         ],
         isDisabled:true,
         salePageFlag: '6',
+          thisdialogshow:false,
+          productType:'',
       }
    },
   components: {
@@ -72,6 +87,7 @@ created(){
     getOrderDetail({ orderNo: this.$route.query.orderNo }).then(res => {
       if (res.result == 0) {
         this.question =JSON.parse( res.orderDTO.riskEvaluationDTO.quentionAnswer)
+          this.productType = res.orderDTO.orderInfoDTO.productType
         this.isDisabledType()
       } else {
         this.$toast(res.resultMessage)
@@ -100,6 +116,38 @@ mounted(){
     }
 },
 methods:{
+    thisdialogfunc1(){
+        this.$jump({
+            flag: 'h5',
+            extra: {
+                url: location.origin + '/#/sale/answerSuccess?orderNo=' + this.$route.query.orderNo,
+            },
+            routerInfo: {
+                path: '/sale/answerSuccess?orderNo=' + this.$route.query.orderNo
+            }
+        })
+    },
+    thisdialogfunc2(){
+        let params = {
+            orderNO:this.$route.query.orderNo
+        }
+        changeOrderStatus(params).then(res=>{
+            if(res.result == 0){
+                this.$jump({
+                    flag: 'h5',
+                    extra: {
+                        url: location.origin + '/#/sale/list',
+                    },
+                    routerInfo: {
+                        path: '/sale/list'
+                    }
+                })
+            } else {
+                this.$toast(res.resultMessage)
+            }
+        })
+
+    },
       appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         return this.$dialog
@@ -159,21 +207,42 @@ methods:{
             }
             saveInformation(data).then(res => {
               if (res.result == '0') {
-                let that = this
                 localStorage.removeItem('changeCard')
                 if (!this.$route.query.salePageFlag) {
                   //不是从导航栏进入
                   localStorage.salePageFlag = '7'
                 }
-                that.$jump({
-                  flag: 'h5',
-                  extra: {
-                    url: location.origin + '/#/sale/answerSuccess?orderNo=' + this.$route.query.orderNo,
-                  },
-                  routerInfo: {
-                    path: '/sale/answerSuccess?orderNo=' + this.$route.query.orderNo
-                  }
-                })
+              if(this.productType == '1' || this.productType == '2') {
+                  getOrderDetail({ orderNo: this.$route.query.orderNo }).then(res => {
+                      if (res.result == 0) {
+                          if(res.orderDTO.riskEvaluationDTO.totalScore >= 60 && res.orderDTO.riskEvaluationDTO.totalScore <= 85){
+                              this.thisdialogshow = true
+                          } else {
+                              this.$jump({
+                                  flag: 'h5',
+                                  extra: {
+                                      url: location.origin + '/#/sale/answerSuccess?orderNo=' + this.$route.query.orderNo,
+                                  },
+                                  routerInfo: {
+                                      path: '/sale/answerSuccess?orderNo=' + this.$route.query.orderNo
+                                  }
+                              })
+                          }
+                      } else {
+                          this.$toast(res.resultMessage)
+                      }
+                  })
+              } else {
+                  this.$jump({
+                      flag: 'h5',
+                      extra: {
+                          url: location.origin + '/#/sale/answerSuccess?orderNo=' + this.$route.query.orderNo,
+                      },
+                      routerInfo: {
+                          path: '/sale/answerSuccess?orderNo=' + this.$route.query.orderNo
+                      }
+                  })
+              }
               } else {
                 this.$toast(res.resultMessage)
               }