diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java
index 1eae515..dd7ced5 100644
--- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java
+++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java
@@ -28,8 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description 全电接口-金财数科
@@ -65,6 +63,16 @@ public class InvoiceAllController {
 
 
 
+    @ApiOperation("税号切地区")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true),
+            @ApiImplicitParam(name = "inoviceAllQdLoginDTO", value = "请求体",dataType = "java.lang.Void", required = true)})
+    @GetMapping("/api/invoice_all/v1/nsrsbhConvertAddr")
+    public Object nsrsbhConvertAddr(@RequestParam String nsrsbh) throws Exception{
+        return autonomousSqService.nsrsbhConvertAddr(nsrsbh);
+    }
+
+
     @ApiOperation("自主授权")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true),
@@ -93,7 +101,7 @@ public class InvoiceAllController {
         return autonomousSqService.submitNote(invoiceAllSubmitNoteDTO);
     }
 
-    @ApiOperation("获取提交短信验证码结果")
+    @ApiOperation("全电登录获取回调结果")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true),
             @ApiImplicitParam(name = "inoviceAllQdLoginDTO", value = "请求体",dataType = "java.lang.Void", required = true)})
@@ -103,7 +111,6 @@ public class InvoiceAllController {
     }
 
 
-
     @ApiOperation("用户登记接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true),
diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java
index c7ea91d..9d0b289 100644
--- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java
+++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java
@@ -35,9 +35,18 @@ public interface AutonomousSqService {
     Object autonomousAuthorization(AutonomousAuthorizationDTO autonomousAuthorization);
 
     /**
-     * 功能描述: 获取短信验证结果
+     * 功能描述: 全电登录获取回调结果
      * @param invoiceAllSubmitNoteDTO
      * @return : java.lang.Object
      */
     Object submitNoteResult(InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO);
+
+    /**
+     * 功能描述: 根据纳税人识别号转换地区
+     * @param nsrsbh
+     * @return : java.lang.Object
+     */
+    Object nsrsbhConvertAddr(String nsrsbh);
+
+
 }
diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
index 183b110..ff9b9c8 100644
--- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
+++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java
@@ -80,18 +80,18 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
     }
 
     /**
-     * 功能描述: 获取短信验证结果
+     * 功能描述: 全电登录获取回调结果
      *
      * @param invoiceAllSubmitNoteDTO
      * @return : java.lang.Object
      */
     @Override
     public Object submitNoteResult(InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO) {
-        log.info("获取短信验证结果入口，入参：{}", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO));
+        log.info("全电登录获取回调结果，入参：{}", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO));
         // 短信提交
         InvoiceAllLoginResult invoiceAllLoginResult = invoiceAllLoginResultMapper.findByQqlsh(invoiceAllSubmitNoteDTO.getTraceno());
         if (invoiceAllLoginResult == null) {
-            log.info("获取短信验证结果入口，未查询到该流水号相关信息，请确认后输入");
+            log.info("全电登录获取回调结果，未查询到该流水号相关信息，请确认后输入");
             return AjaxResult.success("未查询到该流水号相关信息，请确认后输入");
         }
         if ("F000".equals(invoiceAllLoginResult.getCode())) {
@@ -106,6 +106,90 @@ public class AutonomousSqServiceImpl implements AutonomousSqService {
         }
     }
 
+    /**
+     * 功能描述: 根据纳税人识别号转换地区
+     * @param nsrsbh
+     * @return : java.lang.Object
+     */
+    @Override
+    public Object nsrsbhConvertAddr(String nsrsbh) {
+        if (nsrsbh.length() < 6){
+            return AjaxResult.success("");
+        }
+        String subNsrsbh = nsrsbh.substring(2, 4);
+        if ("15".equals(subNsrsbh)){
+            return AjaxResult.success("neimeng");
+        }else if ("21".equals(subNsrsbh)){
+            String substringNsrsbh = nsrsbh.substring(2, 6);
+            if ("2102".equals(substringNsrsbh)){
+                return AjaxResult.success("dalian");
+            }
+            return AjaxResult.success("liaoning");
+        }else if ("22".equals(subNsrsbh)){
+            return AjaxResult.success("jilin");
+        }else if ("23".equals(subNsrsbh)){
+            return AjaxResult.success("heilongjiang");
+        }else if ("31".equals(subNsrsbh)){
+            return AjaxResult.success("shanghai");
+        }else if ("32".equals(subNsrsbh)){
+            return AjaxResult.success("jiangsu");
+        }else if ("33".equals(subNsrsbh)){
+            String substringNsrsbh = nsrsbh.substring(2, 6);
+            if ("3302".equals(substringNsrsbh)){
+                return AjaxResult.success("ningbo");
+            }
+            return AjaxResult.success("zhejiang");
+        }else if ("34".equals(subNsrsbh)){
+            return AjaxResult.success("anhui");
+        }else if ("35".equals(subNsrsbh)){
+            String substringNsrsbh = nsrsbh.substring(2, 6);
+            if ("3502".equals(substringNsrsbh)){
+                return AjaxResult.success("xiamen");
+            }
+            return AjaxResult.success("fujian");
+        }else if ("36".equals(subNsrsbh)){
+            return AjaxResult.success("jiangxi");
+        }else if ("37".equals(subNsrsbh)){
+            String substringNsrsbh = nsrsbh.substring(2, 6);
+            if ("3702".equals(substringNsrsbh)){
+                return AjaxResult.success("qingdao");
+            }
+            return AjaxResult.success("shandong");
+        }else if ("41".equals(subNsrsbh)){
+            return AjaxResult.success("henan");
+        }else if ("42".equals(subNsrsbh)){
+            return AjaxResult.success("hubei");
+        }else if ("43".equals(subNsrsbh)){
+            return AjaxResult.success("hunan");
+        }else if ("44".equals(subNsrsbh)){
+            String substringNsrsbh = nsrsbh.substring(2, 6);
+            if ("4403".equals(substringNsrsbh)){
+                return AjaxResult.success("shenzhen");
+            }
+            return AjaxResult.success("guangdong");
+        }else if ("45".equals(subNsrsbh)){
+            return AjaxResult.success("guangxi");
+        }else if ("46".equals(subNsrsbh)){
+            return AjaxResult.success("hainan");
+        }else if ("50".equals(subNsrsbh)){
+            return AjaxResult.success("chongqing");
+        }else if ("51".equals(subNsrsbh)){
+            return AjaxResult.success("sichuan");
+        }else if ("61".equals(subNsrsbh)){
+            return AjaxResult.success("shanxi");
+        }else if ("62".equals(subNsrsbh)){
+            return AjaxResult.success("gansu");
+        }else if ("63".equals(subNsrsbh)){
+            return AjaxResult.success("qinghai");
+        }else if ("64".equals(subNsrsbh)){
+            return AjaxResult.success("ningxia");
+        }else if ("65".equals(subNsrsbh)){
+            return AjaxResult.success("xinjiang");
+        }else {
+            return AjaxResult.success("");
+        }
+    }
+
     /**
      * 功能描述: 全电登录
      *
diff --git a/jianshui-ui/src/api/freedom/login.js b/jianshui-ui/src/api/freedom/login.js
index e2f0b9a..3b8789c 100644
--- a/jianshui-ui/src/api/freedom/login.js
+++ b/jianshui-ui/src/api/freedom/login.js
@@ -40,4 +40,15 @@ export function submitNoteResult(traceno,nsrsbh,smsCode,zjh) {
   })
 }
 
+export function getAddress(par) {
+
+  return request({
+    url: '/api/invoice_all/v1/nsrsbhConvertAddr',
+    method: 'get',
+    params: {
+      nsrsbh: par
+    }
+  })
+}
+
 
diff --git a/jianshui-ui/src/views/freedom/login.vue b/jianshui-ui/src/views/freedom/login.vue
index 2be7c6a..15b36e4 100644
--- a/jianshui-ui/src/views/freedom/login.vue
+++ b/jianshui-ui/src/views/freedom/login.vue
@@ -4,7 +4,7 @@
 
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="ruleForm.showone" v-loading="loadingone">
       <el-form-item label="税号" prop="nsrsbh">
-        <el-input v-model="ruleForm.nsrsbh" placeholder="请输入纳税人识别号"></el-input>
+        <el-input v-model="ruleForm.nsrsbh" placeholder="请输入纳税人识别号" @blur="fetchRegionData()"></el-input>
       </el-form-item>
       <el-form-item label="地区" prop="nsrdq">
         <el-select v-model="ruleForm.nsrdq" placeholder="请选择地区" style="width: 100%">
@@ -107,7 +107,7 @@
 </template>
 
 <script>
-import {login,submitNote,submitNoteResult} from "@/api/freedom/login";
+import {login,submitNote,submitNoteResult,getAddress} from "@/api/freedom/login";
 export default {
   name: "Login",
   data() {
@@ -171,6 +171,18 @@ export default {
     };
   },
   methods: {
+    fetchRegionData() {
+      const taxNumber = this.ruleForm.nsrsbh;
+      // 发送请求到后端，获取地区数据
+      getAddress(taxNumber).then(res => {
+          console.log(res.msg);
+          const regionData = res.msg;
+          this.ruleForm.nsrdq = regionData;
+        })
+        .catch(error => {
+          console.error(error);
+        });
+    },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -208,7 +220,7 @@ export default {
         .then(res=>{
           if (res.code == "200"){
             let  timer = setInterval(() => {
-              this.fun(timer)
+              this.fun1(timer)
             }, 5000)
           }else {
             this.loading = false;
@@ -257,6 +269,29 @@ export default {
         });
       }, 0)
     },
+    fun1 (timer) {
+      setTimeout(()=>{
+        // 这里ajax 请求的代码片段和判断是否停止定时器
+        submitNoteResult(this.ruleForm.traceno,this.ruleForm.nsrsbh,this.ruleForm.smsCode,this.ruleForm.nsrInfo.zjh)
+          .then(res=>{
+            if (res.msg == "10012"){
+              this.ruleForm.showone = false;
+              this.ruleForm.showtwo = false;
+              this.ruleForm.showthree = true;
+              this.loading = false;
+              this.loadingone = false;
+              clearInterval(timer)
+            }
+          }).catch(()=>{
+          this.ruleForm.showone = false;
+          this.ruleForm.showtwo = true;
+          this.ruleForm.showthree = false;
+          this.loading = false;
+          this.loadingone = false;
+          clearInterval(timer)
+        });
+      }, 0)
+    },
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },