Commit 8cfd85b3 authored by 沈翠玲's avatar 沈翠玲

修改bug

parent f75347e7
...@@ -285,15 +285,19 @@ ...@@ -285,15 +285,19 @@
<el-button <el-button
type="primary" type="primary"
@click="submitForm('fail')" @click="submitForm('fail')"
v-if="currentDetail.flowStatus === 'pending'" v-if="
v-permission="'stages_apply_btn'" currentDetail.flowStatus === 'pending' &&
(authButtonListGet.includes('stages_apply_btn') || authButtonListGet.includes('stages_tenant_apply_btn'))
"
>不通过</el-button >不通过</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="submitForm('pass')" @click="submitForm('pass')"
v-if="currentDetail.flowStatus === 'pending'" v-if="
v-permission="'stages_apply_btn'" currentDetail.flowStatus === 'pending' &&
(authButtonListGet.includes('stages_apply_btn') || authButtonListGet.includes('stages_tenant_apply_btn'))
"
>通过</el-button >通过</el-button
> >
</div> </div>
......
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
@click="submitForm('fail')" @click="submitForm('fail')"
v-if=" v-if="
currentDetail.flowStatus === 'pending' && currentDetail.flowStatus === 'pending' &&
authButtonListGet.includes('reduction_apply_btn') (authButtonListGet.includes('reduction_apply_btn') || authButtonListGet.includes('reduction_tenant_apply_btn'))
" "
>不通过</el-button >不通过</el-button
> >
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
@click="submitForm('pass')" @click="submitForm('pass')"
v-if=" v-if="
currentDetail.flowStatus === 'pending' && currentDetail.flowStatus === 'pending' &&
authButtonListGet.includes('reduction_apply_btn') (authButtonListGet.includes('reduction_apply_btn') || authButtonListGet.includes('reduction_tenant_apply_btn'))
" "
>通过</el-button >通过</el-button
> >
...@@ -555,16 +555,24 @@ ...@@ -555,16 +555,24 @@
const params = { const params = {
...currentDetail.value, ...currentDetail.value,
askForStatus: 'Pending', askForStatus: 'Pending',
repairTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
repairUser: {
username: userStore.userInfo?.username,
id: userStore.userInfo?.id,
},
flowStatus: type, flowStatus: type,
...form, ...form,
images: images.length > 0 ? images : null, images: images.length > 0 ? images : null,
reduceRecords: list, reduceRecords: list,
}; };
if (authButtonListGet.includes('reduction_tenant_apply_btn')) {
params['tenantTime'] = dayjs().format('YYYY-MM-DD HH:mm:ss')
params['tenantUser'] = {
username: userStore.userInfo?.username,
id: userStore.userInfo?.id,
}
} else {
param['repairTime'] = dayjs().format('YYYY-MM-DD HH:mm:ss')
param['repairUser'] = {
username: userStore.userInfo?.username,
id: userStore.userInfo?.id,
}
}
auditReduce(params).then((res) => { auditReduce(params).then((res) => {
if (res.success) { if (res.success) {
ElMessage.success({ ElMessage.success({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment