页面修改

src/components/SalesModule/addPassenger.vue

@@ -447,15 +447,14 @@
             护照
             <div v-show="templateType==2"></div>
           </li>
-          <li v-show="templateType==2">
+          <!-- <li v-show="templateType==2">
             <el-select class='w200' v-model='templateSign'>
               <el-option label='中国护照' value='2625f80ec957a0c837ca14f8ce608a51'></el-option>
-              <!-- <el-option label='台湾护照' value='7224a048d0fcc94413c3a729e481a775'></el-option>
-             
+              <el-option label='台湾护照' value='7224a048d0fcc94413c3a729e481a775'></el-option>
               <el-option label='中国护照旧版' value='2dc78a37e516f18ebe56aeacc6d49203'></el-option>
-              <el-option label='台湾通行证' value='2cd1d05f5efc5eec23ffad6358bdb70f'></el-option> -->
+              <el-option label='台湾通行证' value='2cd1d05f5efc5eec23ffad6358bdb70f'></el-option> 
             </el-select>
-          </li>
+          </li> -->
         </div>
         <p>
         </p>
@@ -468,6 +467,8 @@
           </label>
         </div>
         <input type="button" value="开始识别" class="normalBtn" @click="commonTextDiscern" />
+        <br/>
+        <span style="color:red;font-weight:bold">请认真核对识别结果,如有不正确的请手动调整。</span>
       </div>
     </div>
     <p class="btmTitle">日本签证补录资料</p>
@@ -982,10 +983,31 @@
           this.loading = false;
           if (res.data.StatusCode == 1) {
             var tempObj = res.data;
-            console.log("tempObj", tempObj);
-            //大陆护照
-            if (params.Type == 1) {
-              if (tempObj) {
+            if (tempObj) {
+              //中文姓
+              if (tempObj.SurName && tempObj.SurName != '') {
+                this.addMsg.SurName = tempObj.SurName;
+                this.Transformation(this.addMsg.SurName, 'SurName');
+              }
+              //中文名
+              if (tempObj.Name && tempObj.Name != '') {
+                this.addMsg.Name = tempObj.Name;
+                this.Transformation(this.addMsg.Name, 'Name');
+              }
+              //性别
+              if (tempObj.Gender && tempObj.Gender != '') {
+                if (tempObj.Gender == '男') {
+                  this.addMsg.Sex = "1";
+                } else {
+                  this.addMsg.Sex = "2";
+                }
+              }
+              //出生日期
+              if (tempObj.BirthDate && tempObj.BirthDate != '') {
+                this.addMsg.Birthday = tempObj.BirthDate;
+              }
+              //大陆护照
+              if (params.Type == 1) {
                 //护照号
                 if (tempObj.PassportNumber && tempObj.PassportNumber != '') {
                   this.addMsg.PassportNo = tempObj.PassportNumber;
@@ -994,14 +1016,6 @@
                 if (tempObj.BirthAddress && tempObj.BirthAddress != '') {
                   this.addMsg.BirthdayAddress = tempObj.BirthAddress;
                 }
-                //性别
-                if (tempObj.Gender && tempObj.Gender != '') {
-                  if (tempObj.Gender == '男') {
-                    this.addMsg.Sex = "1";
-                  } else {
-                    this.addMsg.Sex = "2";
-                  }
-                }
                 //护照签发日期
                 if (tempObj.IssueDate && tempObj.IssueDate != '') {
                   this.addMsg.PassportIssued = tempObj.IssueDate;
@@ -1014,26 +1028,20 @@
                 if (tempObj.Placoofissue && tempObj.Placoofissue != '') {
                   this.addMsg.PassportAddress = tempObj.Placoofissue;
                 }
-                //出生日期
-                if (tempObj.BirthDate && tempObj.BirthDate != '') {
-                  this.addMsg.Birthday = tempObj.BirthDate;
-                }
-
-                  //英文姓
-                if (tempObj.ESName && tempObj.ESName != '') {
-                  this.addMsg.ESurName = tempObj.ESName;
+              }
+              //大陆身份证
+              else if (params.Type == 2) {
+                //家庭居住地、家庭详细地址
+                if (tempObj.BirthAddress && tempObj.BirthAddress != '') {
+                  this.addMsg.Address = tempObj.BirthAddress;
+                  this.addMsg.AddressDetail = tempObj.BirthAddress;
                 }
-
-                     //英文名
-                if (tempObj.EName && tempObj.EName != '') {
-                  this.addMsg.EName = tempObj.EName;
+                //身份证号
+                if (tempObj.PassportNumber && tempObj.PassportNumber != '') {
+                  this.addMsg.IdCard = tempObj.PassportNumber;
                 }
               }
             }
-            //大陆身份证
-            else if (params.Type == 2) {
-
-            }
           }
         });
       },