diff --git a/compontent/public/camera.vue b/compontent/public/camera.vue
index 36a4805..71489e3 100644
--- a/compontent/public/camera.vue
+++ b/compontent/public/camera.vue
@@ -1,7 +1,7 @@
-
+
@@ -30,8 +30,8 @@
//type是一个页面有两个照相的时候做个类型区分
type.value = options.type
if(options.size){
- width.value = 1500;
- height.value = 1000;
+ width.value =options.width?options.width: 1500;
+ height.value = options.height?options.height:1000;
}
});
\ No newline at end of file
diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue
index 8e3e859..688eb9c 100644
--- a/pages/addjigou/all.vue
+++ b/pages/addjigou/all.vue
@@ -130,11 +130,26 @@
+
机构信息
+
+
+ 头像
+
+
+
+
+
+
+
+
机构信息
+
+
+ 头像
+ 请上传头像
+
+
+
+
+
+
机构位置
-
+
@@ -102,7 +115,7 @@
房屋性质
-
+
@@ -118,7 +131,7 @@
-
+
上一步
@@ -143,9 +156,9 @@
} from '@dcloudio/uni-app';
import exit from "@/compontent/public/exit.vue"
import {
+ media_base_url,
base_url
} from '@/request/index.js'
-
import {
changemessage,
getdate
@@ -184,6 +197,45 @@
}
]
)
+ const bottomshow = ref(false);
+ const bottomlist = [{
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
+ fontSize: 40
+ }, {
+ text: '图片预览',
+ fontSize: 40
+ }]
+
+ const photoclick = (element) => {
+ if (element==2) {
+ uni.previewImage({
+ urls: [data.headPath], // 必填，所有要预览的图片地址数组
+ current: data.headPath, // 可选，当前显示图片的地址，默认是 urls[0]
+ indicator: 'default', // 可选，指示器样式，H5/App 有效，值为 'default'（圆点）或 'number'（数字）
+ longPressActions: { // 可选，仅 App 支持，长按图片时弹出的操作项
+ itemList: ['保存图片到相册'],
+ },
+ });
+ } else {
+ 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&height=1500`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
+ }
+
+ }
const fzrmax = ref(5)
function onSelect1(arr) {
form.orgPropertyType = arr[0].label
@@ -301,6 +353,7 @@
data.orgPropertyType = form.orgPropertyType
data.orgBuildingArea = form.orgBuildingArea
data.izSkipRepetVali = izSkipRepetVali.value
+ data.headPath = form.headPath;
// if (data.id === null) {
// data.status = `4`
// } else {
@@ -515,6 +568,72 @@
});
}
}
+ const targetphoto = ref(0)
+ const selectphoto = (number) => {
+ if (!uping.value) {
+ return
+ }
+ if (form.headPath) {
+ targetphoto.value = number
+ bottomshow.value = true;
+ } else {
+ getMessage()
+ }
+ }
+ onShow(() => {
+ const img = uni.getStorageSync('imgkey0')
+ if (img) {
+ uploadImage(img)
+ uni.removeStorageSync('imgkey0')
+ }
+ })
+ const uping = ref(true)
+ function uploadImage(filePath) {
+ uping.value = false;
+ uni.showLoading()
+ uni.uploadFile({
+ url: `${base_url}/sys/common/upload`, // 替换为您的POST接口地址
+ filePath,
+ name: 'file', // 后端接收时的字段名
+ header: {
+ 'X-Access-Token': uni.getStorageSync('token') || '',
+ },
+ formData: {
+ biz:'headPath'
+ },
+ success: uploadRes => {
+ let data = JSON.parse(uploadRes.data)
+ form.headPath = data.message;
+ console.log(form.headPath,1111111111111111111)
+ uping.value = true;
+ uni.hideLoading()
+ },
+ fail: err => {
+ uni.showToast({
+ title: '上传出错',
+ icon: 'none'
+ })
+ uni.hideLoading()
+ }
+ })
+ }
+ function getMessage() {
+ // 使用 UniApp 的 API 调用摄像头
+ uni.chooseImage({
+ count: 1,
+ sourceType: ['album', 'camera'],
+ success: chooseRes => {
+ tempImagePath.value = chooseRes.tempFilePaths[0]
+ // 拍照成功后，调用上传函数
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1&height=1500&width=1500`
+ });
+ },
+ fail: err => {
+ console.error('拍照失败：', err)
+ }
+ })
+ }
onLoad(() => {
getdate(`xzqhdm`).then(res => {
list.value = dedupeFirstLetter(res.result)
@@ -530,6 +649,7 @@
form.orgLeaderPhone = data.orgLeaderPhone;
form.orgPropertyType = data.orgPropertyType;
form.orgBuildingArea = data.orgBuildingArea;
+ form.headPath = data.headPath;
} else if (uni.getStorageSync('baddata')) {
let data = uni.getStorageSync('baddata');
if (data.orgProvince_dictText) {
@@ -544,6 +664,7 @@
form.orgLeaderPhone = data.orgLeaderPhone;
form.orgPropertyType = data.orgPropertyType;
form.orgBuildingArea = data.orgBuildingArea;
+ form.headPath = data.headPath;
} else {
form.orgLeaderPhone = uni.getStorageSync('tel');
diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue
index ef7b633..97f43cf 100644
--- a/pages/addoldman/oldIDcard.vue
+++ b/pages/addoldman/oldIDcard.vue
@@ -120,7 +120,7 @@
医保类型
-
+
失能等级
-
+
失能等级
{{form.medicalTypename?'无':'请先选择医保类型'}}
+
diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue
index 9adc49a..907a375 100644
--- a/pages/addstaff/IDcard.vue
+++ b/pages/addstaff/IDcard.vue
@@ -23,7 +23,7 @@
人像面
-
+ 请上传身份证人像面
国徽面
-
+ 请上传身份证国徽面
-
+
身份证信息
@@ -124,6 +138,7 @@
const fontphoto = ref("");
const endphoto = ref("");
+ const avaphoto = ref("");
const statesTarget = ref(0);
const shenhe = () => {
@@ -149,9 +164,16 @@
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`
- });
+ if(targetphoto.value==2){
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1&height=1500`
+ });
+ }else{
+ 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 360f48e..876cd97 100644
--- a/pages/addstaff/all.vue
+++ b/pages/addstaff/all.vue
@@ -267,10 +267,25 @@
+
+
+ 头像
+
+
+
+ 头像
+
+
+
+
+
+
-
+
上一步
@@ -321,7 +336,7 @@
const fontphoto0 = ref("")
const endphoto0 = ref("")
- const imgArray = ref(["", "", "", ""])
+ const imgArray = ref(["", "", "", "",""])
const nameArray0 = ["开户行", "开户行卡号"];
const textArray0 = reactive(["", "", ]);
@@ -416,6 +431,7 @@
imgArray.value[1] = data.healthFmPath
imgArray.value[2] = data.qualificationPath
imgArray.value[3] = data.noCrimeCertificate
+ imgArray.value[4] = data.headPath
const keys = [
diff --git a/pages/addstaff/bankcard.vue b/pages/addstaff/bankcard.vue
index 398f508..5e8f0b8 100644
--- a/pages/addstaff/bankcard.vue
+++ b/pages/addstaff/bankcard.vue
@@ -63,6 +63,7 @@
{{item}}
+
@@ -524,7 +525,25 @@
display: flex;
align-items: center;
margin-bottom: 10rpx;
-
+ position: relative;
+
+ .one-left-imge {
+ width: 35rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 50%;
+ right: 8rpx;
+ transform: translateY(-50%);
+ }
+
+ .triangle-down {
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+ right: 26rpx;
+ width: 20rpx;
+ height: 20rpx;
+ }
.one-left {
margin-left: 10rpx;
font-size: 30rpx;
diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue
index c112f0e..a07d6ae 100644
--- a/pages/addstaff/healthcertificate.vue
+++ b/pages/addstaff/healthcertificate.vue
@@ -22,8 +22,8 @@
- 健康证正面
- 请上传健康证正面
+ 健康证
+ 请上传健康证
+
+
+
+
+ 头像
+ (选填)
+
+
+
+ 头像
+ 请上传头像
+
+
+
+
+
+
@@ -142,9 +162,9 @@
const show = ref(false);
const content = ref("");
- const imgArray = reactive(["", "", "", ""])
+ const imgArray = reactive(["", "", "", "",""])
- const nameArray = ["企业名称", "注册地址", "信用代码", "法人"];
+ const nameArray = ["企业名称", "注册地址", "信用代码", "法人","头像"];
const textArray = reactive(["", "", "", ""]);
const bottomlist = [{
text: '拍照',
@@ -191,9 +211,16 @@
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`
- });
+ if(imgetarget.value == 4){
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=1&size=1&height=1500&width=1500`
+ });
+ }else{
+ uni.navigateTo({
+ url: `/compontent/public/camera?url=${chooseRes.tempFilePaths[0]}&type=0&size=1`
+ });
+ }
+
},
fail: err => {
console.error('拍照失败：', err)
@@ -286,6 +313,7 @@
const ukey = ref(
`${uni.getStorageSync('openid') || ''}ygbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 900) + 100)}`
)
+ const modifyStatus = ref("")
const next = () => {
// uni.showToast({
// title: "999999999999999999",
@@ -304,11 +332,13 @@
data.healthFmPath = imgArray[1]
data.qualificationPath = imgArray[2]
data.noCrimeCertificate = imgArray[3]
+ data.headPath = imgArray[4]
if (data.endTime == '长期') {
data.endTime = swapLongTerm(data.endTime);
}
// data.endTime = swapLongTerm(data.endTime);
data.orgCode = uni.getStorageSync('changeyuangongorgCode')
+ modifyStatus.value = data.modifyStatus;
if(data.applyStatus=='2'||data.modifyStatus){
data.modifyStatus = 1;
}
@@ -317,6 +347,7 @@
console.log("BBBB", res)
if (res.result == '重复提交') {
+ data.modifyStatus = modifyStatus.value;
uni.showToast({
title: `重复提交`,
icon: 'none'
@@ -324,6 +355,7 @@
return
}
if (res.result == '未做变更') {
+ data.modifyStatus = modifyStatus.value;
uni.showToast({
title: `当前无变更，无需提交`,
icon: 'none'
@@ -362,16 +394,20 @@
onLoad(() => {
if (uni.getStorageSync('backhuancun').healthZmPath) {
let data = uni.getStorageSync('backhuancun');
+ console.log(data)
imgArray[0] = data.healthZmPath
imgArray[1] = data.healthFmPath
imgArray[2] = data.qualificationPath
imgArray[3] = data.noCrimeCertificate
+ imgArray[4] = data?.headPath
} else if (uni.getStorageSync('baddata')) {
let data = uni.getStorageSync('baddata');
+ console.log(data)
imgArray[0] = data.healthZmPath
imgArray[1] = data.healthFmPath
imgArray[2] = data.qualificationPath
imgArray[3] = data.noCrimeCertificate
+ imgArray[4] = data?.headPath
}
})
@@ -403,6 +439,7 @@
bankNegative: data.bankFmPath,
qualification: data.qualificationPath,
noCrimeCertificate: data.noCrimeCertificate,
+ headPath : data.headPath,
houseAddress: data.idCardAddress,
employeeId: data.id,
id: null,
@@ -459,12 +496,13 @@
if (!uping.value) {
return
}
- if (imgArray[0] || imgArray[1] || imgArray[2] || imgArray[3]) {
+ if (imgArray[0] || imgArray[1] || imgArray[2] || imgArray[3] || imgArray[4]) {
let data = uni.getStorageSync('backhuancun')
data.healthZmPath = imgArray[0]
data.healthFmPath = imgArray[1]
data.qualificationPath = imgArray[2]
data.noCrimeCertificate = imgArray[3]
+ data.headPath = imgArray[4]
uni.setStorageSync("backhuancun", data)
}
diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue
index c47346a..5695156 100644
--- a/pages/addstaff/information.vue
+++ b/pages/addstaff/information.vue
@@ -35,9 +35,9 @@
婚否
-
-
+
@@ -74,7 +74,7 @@
健康状况
-
+
@@ -85,7 +85,7 @@
政治面貌
-
+
@@ -113,7 +113,7 @@
户口性质
-
+
diff --git a/pages/addstaff/successpush.vue b/pages/addstaff/successpush.vue
index eafaaae..bdb220f 100644
--- a/pages/addstaff/successpush.vue
+++ b/pages/addstaff/successpush.vue
@@ -12,7 +12,8 @@
- {{ uni.getStorageSync('isstaffchange') ? '尊敬的用户，您的个人信息变更申请已成功提交，我们将尽快为您审核，请耐心等候！' : '尊敬的用户，您的员工入驻申请已提交成功，我们已收到。审核结果将及时通知您，欢迎加入护理单元大家庭！' }}
+ {{ uni.getStorageSync('nostaffmessage') ? '尊敬的用户，您的个人信息变更申请已成功提交，我们将尽快为您审核，请耐心等候！'
+ : '尊敬的用户，您的员工入驻申请已提交成功，我们已收到。审核结果将及时通知您，欢迎加入护理单元大家庭！' }}
@@ -65,7 +66,6 @@
.font-father {
width: 100%;
min-height: 100vh;
- padding: 0 30rpx;
display: flex;
align-items: center;
flex-direction: column;
@@ -118,7 +118,6 @@
left: 0;
width: 100%;
z-index: 2;
- padding: 0 70rpx;
display: flex;
flex-direction: column;
align-items: center;
diff --git a/pages/addsupplier/information.vue b/pages/addsupplier/information.vue
index 8628272..906748a 100644
--- a/pages/addsupplier/information.vue
+++ b/pages/addsupplier/information.vue
@@ -72,7 +72,7 @@
供应商性质
-
+
-->
-
+
@@ -141,7 +141,7 @@
-
+
@@ -175,7 +175,7 @@
-
+
{{item0}}
@@ -493,6 +493,12 @@
}
});
}
+ const dj = (e,k)=>{
+ uni.showToast({
+ icon:'none',
+ title:"平台搭建，敬请期待！"
+ })
+ }
const jgxx = (e,k)=>{
if(k==1&&e.platformBuildComplete == "N"){
uni.showToast({
@@ -987,7 +993,7 @@
bottom: 0;
right: 0;
width: 70rpx;
- height: 40rpx;
+ height: 42rpx;
background-color: #E1EFFC;
border-radius: 20rpx;
border: #CAE0F9 1rpx solid;
@@ -998,10 +1004,11 @@
width: 30rpx;
height: 30rpx;
border-radius: 50%;
- margin-left: 5rpx;
+ margin-left: 30rpx;
background-color: #0385FA;
}
}
+
.small-icon {
width: 100rpx;
diff --git a/pages/supplierindex/material.vue b/pages/supplierindex/material.vue
index b739da1..0869e1d 100644
--- a/pages/supplierindex/material.vue
+++ b/pages/supplierindex/material.vue
@@ -25,7 +25,7 @@
编辑
-
+
品牌型号
规格型号
@@ -52,6 +52,9 @@
src="https://www.focusnu.com/media/directive/index/none.png" mode="widthFix" lazy-load="false" />
暂无物料信息
+
+ +
+
@@ -116,13 +119,51 @@