diff --git a/api/index.js b/api/index.js
index 07f04b2..1808746 100644
--- a/api/index.js
+++ b/api/index.js
@@ -11,6 +11,7 @@ export const getElectronicWorkCard = (params) => post("/app/user/getUserDetailIn
 export const getElectronicWorkCardQRCode = (params) => post("/app/user/generateQRCodeImageByUserId", params) // 电子工牌二维码
 export const getEmployedBy = (params) => post("/app/employmentApplyManagement/getEmploymentRecordByUserIdOrCorpInfoId", params) // 就职单位列表
 export const setResignationApplication = (params) => post("/app/employmentApplyManagement/edit", params) // 离职申请
+export const resign = (params) => post("/app/user/resign", params) // 离职申请
 export const setRelatedPartyScanning = (params) => post("/app/user/updateUserInfoAfterScanQRCode", params) // 相关方扫码
 export const getDataDictionary = (params) => post("/app/dictionaries/getLevels", params) // 数据字典
 export const setUploadAttachments = (params) => upload("/app/imgFiles/addSingleImg", params) // 上传附件
@@ -26,6 +27,7 @@ export const getVersion = (params) => post("/app/versionmanager/getVersion", par
 export const setUpdatePassword = (params) => post("/app/user/editUserPasswordByUserId", params) //修改密码
 export const getUserInfo = (params) => post("/app/user/getDetailByUserIdAndCorpInfoId", params) //用户信息
 export const setUserInfo = (params) => post("/app/user/edit", params) //修改用户信息
+export const setEntry = (params) => post("/app/user/entry", params) //用户入职
 export const getCertificateInformationList = (params) => post("/app/specialUser/list", params) //证书信息列表
 export const getCertificateInformationView = (params) => post("/app/specialUser/goEdit", params) //证书信息查看
 export const setCertificateInformationAdd = (params) => uploads("/app/specialUser/add", params) //证书信息添加
diff --git a/pages/employed_by/index.vue b/pages/employed_by/index.vue
index d162ccc..4fe1361 100644
--- a/pages/employed_by/index.vue
+++ b/pages/employed_by/index.vue
@@ -43,7 +43,7 @@
               <u-button type="primary" text="查看" size="mini"
                         @click="fnView(item.EMPLOYMENT_APPLY_MANAGEMENT_ID, item.CORPINFO_ID, item.DEPART_STATE)"></u-button>
               <view class="ml-10">
-                <u-button type="primary" text="离职申请" size="mini"
+                <u-button type="primary" text="离职" size="mini"
                           v-if="item.DEPART_STATE === '0'"
                           @click="fnResignationApplication(item.EMPLOYMENT_APPLY_MANAGEMENT_ID,item.RELEVANT_UNIT_NAME)">
                 </u-button>
diff --git a/pages/employed_by/resignation_application.vue b/pages/employed_by/resignation_application.vue
index 6a0a748..65cc510 100644
--- a/pages/employed_by/resignation_application.vue
+++ b/pages/employed_by/resignation_application.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import {setResignationApplication} from "../../api";
+import {setResignationApplication,resign} from "../../api";
 
 export default {
   data() {
@@ -52,11 +52,12 @@ export default {
         return
       }
       this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID = this.EMPLOYMENT_APPLY_MANAGEMENT_ID
-      await setResignationApplication({
-        ...this.form,
-        OPERATOR: this.userInfo.USER_ID
+      await resign({
+        LEAVE_REASON: this.form.LEAVE_REASON,
+        OPERATOR_ID: this.userInfo.USER_ID,
+        USER_ID: this.userInfo.USER_ID
       })
-      uni.$u.toast('申请成功')
+      uni.$u.toast('离职成功')
       setTimeout(() => {
         uni.navigateBack()
       }, 2000)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9e25416..5ef432e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,7 +39,7 @@
 
 <script>
 import updateVersion from "../../utils/updateVersion";
-import {setRelatedPartyScanning} from "../../api";
+import {setEntry} from "../../api";
 
 export default {
   mixins: [updateVersion],
@@ -88,21 +88,23 @@ export default {
     this.fnUpdateVersion(false)
   },
   methods: {
-    fnScan() {
+   async fnScan() {
       uni.scanCode({
         success: async (res) => {
           let obj = JSON.parse(res.result)
           let type = obj[0].CODE_TYPE
           if (type === '0') {
-            // type=0时跳转注册相关方企业页面
-            await setRelatedPartyScanning({CORPINFO_ID: obj[0].CORPINFO_ID})
-            uni.$u.route({
-              url: '/pages/related_party_units/add',
-              params: {
-                CORPINFO_ID: obj[0].CORPINFO_ID,
-                RELEVANT_UNIT_NAME: obj[0].RELEVANT_UNIT_NAME
-              }
-            })
+            let info = await setEntry({
+              USER_ID: this.userInfo.USER_ID,
+              CORPINFO_ID: obj[0].CORPINFO_ID,
+              RELEVANT_UNIT_NAME: obj[0].RELEVANT_UNIT_NAME
+            });
+            if (info.code === 200){
+              uni.$u.toast('入职成功')
+            }else {
+              uni.$u.toast('入职失败，请联系管理员')
+            }
+
           } else if (type === '1') {
             // type=1时跳转电子工牌页面
             uni.$u.route({