diff --git a/src/app.config.ts b/src/app.config.ts index a39ee2401ca3af10b0b7e377cbfd34ecc3290410..c4076f75af25a77f048f60aefae81a0e007b5fe4 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -1,7 +1,7 @@ export default defineAppConfig({ pages: [ - "pages/index/index", "pages/list/index", + "pages/index/index", "pages/detail/index", "pages/manage/index", ], diff --git a/src/pages/manage/index.tsx b/src/pages/manage/index.tsx index 0b97fc29cd033eedb626316a10fd58474dca38a3..8c57938e995d2f9e128c13c50a0a55d8dd90e26d 100644 --- a/src/pages/manage/index.tsx +++ b/src/pages/manage/index.tsx @@ -66,10 +66,10 @@ const Manage = () => { attachmentList: fileList.join(";"), approvePass: "0", operationName: tagName, - approveSignPhoto:signUrl, + approveSignPhoto:signUrl || defaultSign, nextSignature:keepUsing?'1':'0' }; - if(actionObj.signFlag === '1' &&!signUrl){ + if(actionObj.signFlag === '1' &&!signUrl && !defaultSign){ setSignOpen(true) return } @@ -95,7 +95,6 @@ const Manage = () => { approveComment: inputStr, attachmentList: fileList.join(";"), operationName: tagName, - // approveSignPhoto:signUrl } as any; if (nodeType === 3 || nodeType === 5) { formData = { @@ -124,7 +123,7 @@ const Manage = () => { } const submit = ()=>{ - if(actionObj.signFlag === '1' &&!signUrl){ + if(actionObj.signFlag === '1' &&!signUrl && !defaultSign){ setSignOpen(true) return } @@ -132,7 +131,7 @@ const Manage = () => { thingId: actionObj.thingId, reportContents: params, }); - services.login.completeExamine({...formData,approveSignPhoto:signUrl,nextSignature:keepUsing?'1':'0'}).then((res: any) => { + services.login.completeExamine({...formData,approveSignPhoto:signUrl || defaultSign,nextSignature:keepUsing?'1':'0'}).then((res: any) => { if (res.code === 200) { Toast.success("处置成功"); Taro.reLaunch({ @@ -206,11 +205,11 @@ const Manage = () => { reportContents: params, }); - if(actionObj.signFlag === '1' &&!signUrl){ + if(actionObj.signFlag === '1' &&!signUrl && !defaultSign){ setSignOpen(true) return } - services.login.completeExamine({...formData,fixUser: userId,approveSignPhoto:signUrl,nextSignature:keepUsing?'1':'0'}).then((res: any) => { + services.login.completeExamine({...formData,fixUser: userId,approveSignPhoto:signUrl || defaultSign,nextSignature:keepUsing?'1':'0'}).then((res: any) => { if (res.code === 200) { setShowSelectUser(false) Toast.success("处置成功"); @@ -415,7 +414,10 @@ const Manage = () => { setKeepUsing(!keepUsing)}>下次同意继续使用此签名 - signRef.current?.resetDraw()}>清除签名 + { + setSignUrl('') + signRef.current?.resetDraw() + }}>清除签名