This commit is contained in:
parent
319419fbda
commit
914fb04175
|
|
@ -278,6 +278,13 @@
|
||||||
mode="aspectFit"
|
mode="aspectFit"
|
||||||
class="sign-image"
|
class="sign-image"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<!-- <up-image
|
||||||
|
v-if="form.signaturePath"
|
||||||
|
:src="form.signaturePath"
|
||||||
|
mode="aspectFit"
|
||||||
|
class="sign-image"
|
||||||
|
/> -->
|
||||||
<view v-else class="sign-empty-box"></view>
|
<view v-else class="sign-empty-box"></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="sign-buttons">
|
<view class="sign-buttons">
|
||||||
|
|
@ -916,7 +923,9 @@ const handleGetWorkerInfo = async () => {
|
||||||
|
|
||||||
if (photoRes !== 'is null') {
|
if (photoRes !== 'is null') {
|
||||||
const { signaturePhoto, facePhoto } = photoRes
|
const { signaturePhoto, facePhoto } = photoRes
|
||||||
form.value.signaturePath = import.meta.env.VITE_API_FILE_ASE_URL + signaturePhoto
|
form.value.signaturePath = signaturePhoto.startsWith('http')
|
||||||
|
? signaturePhoto
|
||||||
|
: import.meta.env.VITE_API_FILE_ASE_URL + signaturePhoto
|
||||||
form.value.signatureUrl = signaturePhoto
|
form.value.signatureUrl = signaturePhoto
|
||||||
form.value.faceUrl = facePhoto
|
form.value.faceUrl = facePhoto
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -499,7 +499,7 @@ const handleSignProtocol = async (signaturePath, type) => {
|
||||||
if (result.res === 1) {
|
if (result.res === 1) {
|
||||||
console.log(result, 'result签订协议成功')
|
console.log(result, 'result签订协议成功')
|
||||||
// 通知父页面更新附件签订状态
|
// 通知父页面更新附件签订状态
|
||||||
emitSigned(result.resMsg, type, params.startDate, params.endDate)
|
emitSigned(result.resMsg, type, params.startDate, params.endDate, result.obj)
|
||||||
uni.$u.toast('签订协议成功')
|
uni.$u.toast('签订协议成功')
|
||||||
// 延迟返回,确保事件已发送
|
// 延迟返回,确保事件已发送
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|
|
||||||
|
|
@ -217,8 +217,9 @@ onLoad((options) => {
|
||||||
personnelInfo.value = JSON.parse(decodeURIComponent(options.personnelInfo))
|
personnelInfo.value = JSON.parse(decodeURIComponent(options.personnelInfo))
|
||||||
// 设置当前人脸照片
|
// 设置当前人脸照片
|
||||||
if (personnelInfo.value.facePhoto) {
|
if (personnelInfo.value.facePhoto) {
|
||||||
currentFacePhoto.value =
|
currentFacePhoto.value = personnelInfo.value.facePhoto.startsWith('http')
|
||||||
import.meta.env.VITE_API_FILE_ASE_URL + personnelInfo.value.facePhoto
|
? personnelInfo.value.facePhoto
|
||||||
|
: import.meta.env.VITE_API_FILE_ASE_URL + personnelInfo.value.facePhoto
|
||||||
|
|
||||||
console.log(currentFacePhoto.value, 'currentFacePhoto.value')
|
console.log(currentFacePhoto.value, 'currentFacePhoto.value')
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,12 @@
|
||||||
{{ isViewDetail ? '审核详情' : '施工人员入场审核' }}
|
{{ isViewDetail ? '审核详情' : '施工人员入场审核' }}
|
||||||
</view>
|
</view>
|
||||||
<scroll-view class="detail-body" scroll-y>
|
<scroll-view class="detail-body" scroll-y>
|
||||||
<view v-if="isViewDetail">
|
<view
|
||||||
|
v-if="
|
||||||
|
isViewDetail ||
|
||||||
|
(activeTab == 0 && list.filter((item) => item.isChecked).length <= 1)
|
||||||
|
"
|
||||||
|
>
|
||||||
<view class="detail-row">
|
<view class="detail-row">
|
||||||
<text class="label">姓 名:</text>
|
<text class="label">姓 名:</text>
|
||||||
<text class="value">{{ detail.name || '-' }}</text>
|
<text class="value">{{ detail.name || '-' }}</text>
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ export const createHttpClient = ({ baseURL, clientTag, tokenSelector }) => {
|
||||||
if (options.isUploadFile) {
|
if (options.isUploadFile) {
|
||||||
if (token) {
|
if (token) {
|
||||||
options.header.Authorization = token
|
options.header.Authorization = token
|
||||||
|
options.header.Token = token
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue