Merge branch 'hotfix/修改国籍编码使用字符串比较问题' into dev

# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/request.js
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/List.vue

src/api/ebiz/sale/sale.js

@@ -236,8 +236,8 @@ export function revokeOrder(data) {
     data
   })
 }
-// 获取产品允许投保人单位列表
 
+// 获取产品允许投保人单位列表
 export function getCompany(data) {
   return request({
     url: getUrl('/sale/product/company', 1),

src/assets/js/utils/request.js

@@ -39,7 +39,6 @@ let sale = [
   '/sale/order/orderDetail',
   '/customer/authcode/loginedSend',
   '/uploadImage',
-  // '/customer/recognition',
   '/sale/insure/underWrite',
   '/sale/insure/acceptInsurance',
   '/app/code/getCodeValue',
@@ -51,9 +50,9 @@ let sale = [
   '/ppf/sign',
   '/ppf/check',
   '/sale/insure/selfToHuman',
-  '/sale/insure/orderPayStatusQuery'
-]
-//入司
+  '/sale/insure/orderPayStatusQuery',
+  '/sale/order/revokeOrder'
+] //在线投保
 let agentEnter = [
   '/agent/enter/share',
   '/agent/enter/query',

src/views/ebiz/sale/InsuredPerson.vue

@@ -1392,7 +1392,7 @@ export default {
 
         // 通过国籍判断 证件是否符合要求
         // 如果是国籍选择中国大陆
-        if (this.userInfo.nativeplace <= '4') {
+        if (Number(this.userInfo.nativeplace) <= 4) {
           // “身份证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证”
           let obj = {
             '1': true,

src/views/ebiz/sale/List.vue

@@ -128,15 +128,6 @@
                   round
                   >撤单</van-button
                 >
-                <!-- <van-button
-                  @click="goNucleus(order)"
-                  v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '46'"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >提交人工核保</van-button
-                > -->
                 <van-button @click="seePolicy(order)" v-if="active == 'commit'" size="small" type="danger" round>查看投保单</van-button>
               </div>
             </div>
@@ -211,8 +202,8 @@ export default {
       pageSize: 5, //每页数据条数
       isSuccess: false,
       canRevoke: {
-        '02': true,
         '19': true,
+        '02': true,
         '48': true,
         '49': true,
         '55': true,
@@ -382,33 +373,6 @@ export default {
         routerInfo: { path: url }
       })
     },
-    // 去人工核保
-    // goNucleus() {
-    //   let data = {
-    //     orderNo: this.underWriteData.orderNo
-    //   }
-    //   selfToHuman(data).then(res => {
-    //     if (res.result == '0') {
-    //       Dialog.alert({
-    //         title: '提示',
-    //         message: '提交人工核保成功'
-    //       }).then(() => {
-    //         this.$jump({
-    //           flag: 'h5',
-    //           extra: {
-    //             url: location.origin + '/#/sale/list',
-    //             backToFirst: '1'
-    //           },
-    //           routerInfo: {
-    //             path: '/sale/list'
-    //           }
-    //         })
-    //       })
-    //     } else {
-    //       this.$toast(res.resultMessage)
-    //     }
-    //   })
-    // },
     //去支付
     goPay(order) {
       localStorage.orderNo = order.orderInfoDTO.orderNo
@@ -598,13 +562,6 @@ export default {
     add() {
       localStorage.orderNo = ''
       localStorage.chooseProductCodes = '' //置空所选险种
-      //清空附件管理的影像信息
-      // localStorage.imgfront = ''
-      // localStorage.imgfrontPath = ''
-      // localStorage.imgfrontInsured = ''
-      // localStorage.imgfrontInsuredPath = ''
-      // localStorage.bankCardUrl = ''
-      // localStorage.bankCardUrlInsured = ''
       this.$jump({
         flag: 'h5',
         extra: {