Merge pull request 'fix : 文件权限处理' (#275) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/275
This commit is contained in:
2024-06-02 14:23:39 +00:00
2 changed files with 23 additions and 13 deletions

View File

@@ -9,13 +9,13 @@
:loading="loading"
/>
<summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading"/>
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
<ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
<ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
<ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
</template>
</steps>
<opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
@@ -36,6 +36,7 @@ const loading = ref(false)
const processStore = useProcessStore()
const activeName = ref('first')
const commonForm = ref({})
const fileListShow = ref('READ')
const commonProvessViewer = ref(true)
const getAllInfo = async (state) => {
@@ -43,17 +44,17 @@ const getAllInfo = async (state) => {
try {
commonProvessViewer.value = false
loading.value = true
const {data, code,msg} = await getMapProjectStateInfo(route.query.projectId, state)
if(code===1000){
const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
if (code === 1000) {
loading.value = false
}else {
} else {
ElNotification({
title: '提示',
message: msg,
type: 'error'
type: 'error'
})
}
if(data===undefined)return;
if (data === undefined) return;
commonForm.value = data
processStore.setDesign(data)
processStore.runningList.value = data.runningList;
@@ -63,6 +64,9 @@ const getAllInfo = async (state) => {
processStore.passList.value = data.passList;
nextTick(() => {
commonProvessViewer.value = true
if (data.formPermMap["fileList"]) {
fileListShow.value = data.formPermMap["fileList"].perm
}
})
loading.close()
} catch {

View File

@@ -8,12 +8,14 @@
v-show="showActive == '00'"
:loading="loading"
/>
<summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"/>
<ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
<summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
<ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
<ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
<ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
</template>
</steps>
@@ -31,6 +33,7 @@ import Opinion from "@/components/DetailComponent/Opinion.vue";
const route = useRoute()
const activeName = ref('first')
const fileListShow = ref('READ')
const loading = ref(false)
const active = ref(route.query.state)
const processStore = useProcessStore()
@@ -63,6 +66,9 @@ const getAllInfo = async (state) => {
processStore.passList.value = data.passList;
nextTick(() => {
commonProvessViewer.value = true
if (data.formPermMap["fileList"]) {
fileListShow.value = data.formPermMap["fileList"].perm
}
})
loading.close()
} catch {