From 70d2aefcc0fb4614ada8d5bc506f51eaa65760fd Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 10 Feb 2026 17:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/addjigou/api/addjigou.js | 11 ++++++--
pages/addjigou/card.vue | 21 ++++++++++++---
pages/addjigou/name.vue | 21 ++++++++++++---
pages/addjigou/where.vue | 5 ++--
pages/addoldman/IDcard.vue | 21 ++++++++++++---
pages/addoldman/oldIDcard.vue | 21 ++++++++++++---
pages/addstaff/IDcard.vue | 23 +++++++++++++---
pages/addstaff/all.vue | 39 ++++++++++++++++------------
pages/addstaff/bankcard.vue | 24 ++++++++++++++---
pages/addstaff/healthcertificate.vue | 23 +++++++++++++---
pages/addstaff/information.vue | 28 ++++++++++++++++++--
pages/index/index.vue | 4 +--
pages/index/mine.vue | 10 +++----
pages/login/workjoin.vue | 8 +++---
pages/yuangongindex/api.js | 4 +--
pages/yuangongindex/index.vue | 33 ++++++++++++++++-------
pages/yuangongindex/workjoin.vue | 9 ++++---
request/index.js | 1 +
18 files changed, 233 insertions(+), 73 deletions(-)
diff --git a/pages/addjigou/api/addjigou.js b/pages/addjigou/api/addjigou.js
index 12ecc3c..38b58d2 100644
--- a/pages/addjigou/api/addjigou.js
+++ b/pages/addjigou/api/addjigou.js
@@ -14,13 +14,20 @@ export function changemessage(data,ukey){
//根据手机号获取机构加盟申请信息
export function getMessageList(id){
return request({
- url: `/api/orgApplyInfo/queryAuditInfo?openId=${id}&status=1,2,3`,
+ url: `/api/orgApplyInfo/queryOrgHomePageList?openId=${id}`,
method: 'get',
})
}
+export function queryOrgHis(id){
+ return request({
+ url: `/api/orgApplyInfo/queryOrgHis?openId=${id}&optType=rz,bg`,
+ method: 'get',
+ })
+}
+
export function getMessageListsuccess(id){
return request({
- url: `/api/orgApplyInfo/queryAuditInfo?status=0,2,4,5&openId=${id}`,
+ url: `/api/orgApplyInfo/queryOrgHis?openId=${id}&optType=rbg`,
method: 'get',
})
}
diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue
index 2fa2eba..7ba6e40 100644
--- a/pages/addjigou/card.vue
+++ b/pages/addjigou/card.vue
@@ -94,7 +94,10 @@
const nameArray = ["企业名称", "注册地址", "信用代码", "法人"];
const textArray = reactive(["", "", "", ""]);
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
@@ -116,7 +119,7 @@
}
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [headImge.value], // 必填，所有要预览的图片地址数组
current: headImge.value, // 可选，当前显示图片的地址，默认是 urls[0]
@@ -126,7 +129,19 @@
},
});
} else {
- getMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ tempImagePath.value = chooseRes.tempFilePaths[0]
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue
index be48ce7..6c6f83d 100644
--- a/pages/addjigou/name.vue
+++ b/pages/addjigou/name.vue
@@ -112,7 +112,10 @@
const bottomshow = ref(false);
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
@@ -134,7 +137,7 @@
}
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [headImge.value, backImge.value], // 必填，所有要预览的图片地址数组
current: targetphoto.value ? backImge.value : headImge.value, // 可选，当前显示图片的地址，默认是 urls[0]
@@ -144,7 +147,19 @@
},
});
} else {
- getMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ tempImagePath.value = chooseRes.tempFilePaths[0]
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue
index 8269c2f..7f45a1d 100644
--- a/pages/addjigou/where.vue
+++ b/pages/addjigou/where.vue
@@ -82,7 +82,8 @@
机构负责人
-
@@ -185,7 +186,7 @@
}
]
)
-
+ const fzrmax = ref(5)
function onSelect1(arr) {
form.orgPropertyType = arr[0].label
}
diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue
index 35dc6e2..e53ad07 100644
--- a/pages/addoldman/IDcard.vue
+++ b/pages/addoldman/IDcard.vue
@@ -118,13 +118,15 @@
relationship: ""
})
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
fontSize: 40
}]
-
function isValid11DigitNumber(val) {
// return /^(\d{11})$/.test(val);
return /^1[3-9]\d{9}$/.test(val);
@@ -134,7 +136,7 @@
return /^(\d{18})$/.test(val);
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [specialImgeshow.value], // 必填，所有要预览的图片地址数组
current: specialImgeshow.value, // 可选，当前显示图片的地址，默认是 urls[0]
@@ -144,7 +146,18 @@
},
});
} else {
- angetMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue
index f50cca8..ab52e30 100644
--- a/pages/addoldman/oldIDcard.vue
+++ b/pages/addoldman/oldIDcard.vue
@@ -194,7 +194,10 @@
const bottomshow = ref(false);
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
@@ -230,7 +233,7 @@
}
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [headImge.value, backImge.value, specialImgeshow.value], // 必填，所有要预览的图片地址数组
current: targetphoto.value ? (targetphoto.value == 1 ? backImge.value : specialImgeshow
@@ -241,7 +244,19 @@
},
});
} else {
- getMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ tempImagePath.value = chooseRes.tempFilePaths[0]
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue
index d80805c..1c7441e 100644
--- a/pages/addstaff/IDcard.vue
+++ b/pages/addstaff/IDcard.vue
@@ -8,7 +8,7 @@
-->
-
+
入职登记表
@@ -118,7 +118,10 @@
const bottomshow = ref(false);
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
@@ -140,7 +143,7 @@
}
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [headImge.value, backImge.value], // 必填，所有要预览的图片地址数组
current: targetphoto.value ? backImge.value : headImge.value, // 可选，当前显示图片的地址，默认是 urls[0]
@@ -150,7 +153,19 @@
},
});
} else {
- getMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ // tempImagePath.value = chooseRes.tempFilePaths[0]
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addstaff/all.vue b/pages/addstaff/all.vue
index d83d425..15cbcdb 100644
--- a/pages/addstaff/all.vue
+++ b/pages/addstaff/all.vue
@@ -23,22 +23,30 @@
个人信息
-
+
-
+
编辑
+
+ 待审核
+ 审核通过
+ 审核驳回
+ 待审核
+ 审核驳回
+
-
+
驳回原因：
- {{contentred}}
+ {{alldata.auditContent}}
@@ -94,7 +102,7 @@
{{item}}
- {{textArray[index] ? textArray[index] : "自动获取" }}
+ {{textArray[index] ? textArray[index] : "无" }}
@@ -146,7 +154,7 @@
{{item}}
- {{textArray0[index] ? textArray0[index] : "自动获取" }}
+ {{textArray0[index] ? textArray0[index] : "无" }}
@@ -329,19 +337,16 @@
uni.navigateBack()
}
const alldata = ref("");
- const contentred = ref("")
- const applyStatus = ref(false);
+ const applyStatus = ref("")
+ const code = ref(-1);
onLoad((options) => {
- if (options.applyStatus) {
- applyStatus.value = options.applyStatus
+ if(options.code==1){
+ code.value = 1
}
alldata.value = JSON.parse(options.element);
// console.log("???")
let data = alldata.value
console.log("00000",data)
- if (options.auditContent) {
- contentred.value = options.auditContent
- }
textArray[0] = data.name;
textArray[1] = data.sex;
textArray[2] = data.idCard;
@@ -373,7 +378,9 @@
"contactTel",
"contactRelationship",
"hukouType",
- "currentAddress"
+ "currentAddress",
+ "applyStatus",
+ "auditContent"
]
keys.forEach((key, index) => {
@@ -385,7 +392,7 @@
})
const changeMessage = () => {
// console.log("????", alldata.value)
- if (alldata.value.modifyState == '1') {
+ if (alldata.value.applyStatus == '1') {
openLook("该信息正在审核中，请等待")
} else {
uni.setStorageSync("baddata", alldata.value)
diff --git a/pages/addstaff/bankcard.vue b/pages/addstaff/bankcard.vue
index f762c26..aae31d1 100644
--- a/pages/addstaff/bankcard.vue
+++ b/pages/addstaff/bankcard.vue
@@ -8,7 +8,7 @@
-->
-
+
入职登记表
@@ -101,7 +101,10 @@
const bottomshow = ref(false);
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
@@ -123,7 +126,7 @@
}
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [headImge.value, backImge.value], // 必填，所有要预览的图片地址数组
current: targetphoto.value ? backImge.value : headImge.value, // 可选，当前显示图片的地址，默认是 urls[0]
@@ -133,7 +136,20 @@
},
});
} else {
- getMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ tempImagePath.value = chooseRes.tempFilePaths[0]
+ // 拍照成功后，调用上传函数
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue
index 838740e..e141b2c 100644
--- a/pages/addstaff/healthcertificate.vue
+++ b/pages/addstaff/healthcertificate.vue
@@ -8,7 +8,7 @@
-->
-
+
入职登记表
@@ -147,7 +147,10 @@
const nameArray = ["企业名称", "注册地址", "信用代码", "法人"];
const textArray = reactive(["", "", "", ""]);
const bottomlist = [{
- text: '拍摄图片',
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
fontSize: 40
}, {
text: '图片预览',
@@ -173,7 +176,7 @@
}
const photoclick = (element) => {
- if (element) {
+ if (element==2) {
uni.previewImage({
urls: [`${media_base_url}${imgArray[imgetarget.value]}`], // 必填，所有要预览的图片地址数组
// current: headImge.value, // 可选，当前显示图片的地址，默认是 urls[0]
@@ -183,7 +186,19 @@
},
});
} else {
- getMessage()
+ uni.chooseImage({
+ count: 1,
+ sourceType: element == 0 ? ['camera'] : ['album'],
+ success: chooseRes => {
+ tempImagePath.value = chooseRes.tempFilePaths[0]
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
}
}
diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue
index 0dfb613..d4a1b71 100644
--- a/pages/addstaff/information.vue
+++ b/pages/addstaff/information.vue
@@ -18,6 +18,27 @@
个人信息
+
+
+ 待确认
+
+
+ 已接受
+
+
+ 已拒绝
+
+ 待审核
+ 审核通过
+ 审核驳回
+ 待审核
+ 审核驳回
+
+
+
+ 驳回原因：
+ {{form.auditContent}}
@@ -88,7 +109,7 @@
紧急联系人
-
+
@@ -147,6 +168,7 @@
// const showmarry
+ const jjlxrmax = ref(8)
const nameArray = ["姓名", "性别", "身份证号码", "民族", "出生日期", "住址", "签发机关", "有效期限"];
const textArray = reactive(["", "", "", "", "", "", "", ""]);
@@ -378,7 +400,9 @@
"contactTel",
"contactRelationship",
"hukouType",
- "currentAddress"
+ "currentAddress",
+ 'auditContent',
+ "applyStatus"
]
keys.forEach(key => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6213ba1..b325120 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -168,12 +168,12 @@
- 后勤
+ 机构信息
- 公区
+ 信息变更
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index fa8d9c2..85a6d5f 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -28,7 +28,7 @@
{{item}}
- 变更机构信息
+
@@ -66,7 +66,7 @@
// uni.setStorageSync('platId', res.result.platId);
})
- const cardMenu = [`机构信息`, `加盟审核`, `机构功能`]
+ const cardMenu = [ `审核记录`, `机构功能`]
const change = () => {
uni.navigateTo({
@@ -81,18 +81,18 @@
const clickButton = (index) => {
switch (index) {
- case 0:
+ case 3:
uni.navigateTo({
url: `/pages/login/workjoinsuccess`
});
break;
- case 1:
+ case 0:
uni.navigateTo({
url: `/pages/login/workjoin`
});
break;
- case 2:
+ case 1:
// uni.navigateTo({
// url: `/pages/login/special?no=true`
// });
diff --git a/pages/login/workjoin.vue b/pages/login/workjoin.vue
index c1238d7..dcec391 100644
--- a/pages/login/workjoin.vue
+++ b/pages/login/workjoin.vue
@@ -9,7 +9,7 @@
- 加盟审核
+ 审核记录
@@ -74,7 +74,7 @@
onPullDownRefresh
} from '@dcloudio/uni-app'
import {
- getMessageList,
+ queryOrgHis,
getMessageListsuccess
} from '@/pages/addjigou/api/addjigou.js'
const type = ref(0)
@@ -86,7 +86,7 @@
uni.getStorage({
key: 'openid',
success: function(res) {
- getMessageList(res.data).then(res => {
+ queryOrgHis(res.data).then(res => {
workArray.value = res.result
})
}
@@ -97,7 +97,7 @@
uni.getStorage({
key: 'openid',
success: function(res) {
- getMessageList(res.data).then(res => {
+ queryOrgHis(res.data).then(res => {
workArray.value = res.result
})
}
diff --git a/pages/yuangongindex/api.js b/pages/yuangongindex/api.js
index 3355c31..2130e6f 100644
--- a/pages/yuangongindex/api.js
+++ b/pages/yuangongindex/api.js
@@ -27,9 +27,9 @@ export function getOrgInfo(title){
}
//获取审核的列表
-export function getEmployeesOrgRela(openId){
+export function getEmployeesOrgRela(openId,orgCode){
return request({
- url: `/api/employeesapply/getEmployeesOrgRela?openId=${openId}&invited=0,1,2`,
+ url: `/api/employeesapply/getEmployeesOrgRela?openId=${openId}&invited=0,1,2&orgCode=${orgCode}`,
method: 'get',
})
}
diff --git a/pages/yuangongindex/index.vue b/pages/yuangongindex/index.vue
index 88611b1..586cf33 100644
--- a/pages/yuangongindex/index.vue
+++ b/pages/yuangongindex/index.vue
@@ -495,16 +495,31 @@
}
const hong = ref(0);
const changeStatus = (item, status) => {
- let data = {
- employeeId: item.employeesId,
- status: status ? 2 : 3,
- orgCode: item.orgCode
- }
- invitedConfirm(data).then(res => {
- if (res.success) {
- loadingData()
+ uni.showModal({
+ title: '提示',
+ content: status?'是否接受邀请':'是否拒绝邀请',
+ success: function (res) {
+ if (res.confirm) {
+ let data = {
+ employeeId: item.employeesId,
+ status: status ? 2 : 3,
+ orgCode: item.orgCode
+ }
+ invitedConfirm(data).then(res => {
+ if (res.success) {
+ loadingData()
+ }
+ })
+
+
+ } else if (res.cancel) {
+ console.log('用户点击取消');
+ }
}
- })
+ });
+
+
+
}
const clickButton = (item, index) => {
diff --git a/pages/yuangongindex/workjoin.vue b/pages/yuangongindex/workjoin.vue
index 16e59f6..b35a4cb 100644
--- a/pages/yuangongindex/workjoin.vue
+++ b/pages/yuangongindex/workjoin.vue
@@ -25,7 +25,7 @@
-
+
{{item.departName}}
@@ -41,7 +41,7 @@
- {{item.createTime}}
+ {{item.auditTime}}
{{ item.applyType =='0' ?`待确认`:`待审核` }}
@@ -181,10 +181,11 @@
}
const jumpToAll = (element) => {
- getMessageList().then(res => {
+
+ getMessageList(element.orgCode).then(res => {
if (res.success) {
uni.navigateTo({
- url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&applyStatus=${element.applyStatus}`
+ url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&applyStatus=${element.applyStatus}&code=1`
});
}
diff --git a/request/index.js b/request/index.js
index f9cb5f2..7597bd5 100644
--- a/request/index.js
+++ b/request/index.js
@@ -3,6 +3,7 @@
export const base_url = 'https://www.focusnu.com/opeapi'
export const media_base_url = 'https://www.focusnu.com/media/'
+// export const base_url = 'http://192.168.2.24:8081/opeapi'
// export const base_url = 'http://192.168.2.27:8081/opeapi'
// 请求超出时间
const timeout = 5000