odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复页面排版及项目管理的公司查询

Browse Source
This commit is contained in:
odjbin
2024-08-01 22:16:30 +08:00
parent ff668b1887
commit 2f42a7464a
22 changed files with 291 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/project-management/filing/index.vue
View File

@@ -12,6 +12,7 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import {toThousands} from '@/utils/changePrice.js'
import {switchAttachmentState} from "@/api/project-manage/attachment";
import {ElMessageBox} from "element-plus";
import { getSubCompOpt } from '@/api/user/user.js';
const router = useRouter()
const shortcuts = [
@@ -43,7 +44,19 @@ const shortcuts = [
},
},
]
const searchConfig = reactive([
const searchConfig = ref([
{
label: '征集公司',
prop: 'affiliatedCompanyId',
component: 'el-tree-select',
props: {
placeholder: '请输入征集公司查询',
clearable: true,
data: [],
filterable: true,
checkStrictly: true
}
},
{
label: '项目名称',
prop: 'projectName',
@@ -346,4 +359,10 @@ const handleOpenUpload=(row,flag)=>{
})
})
}
const init = async () => {
const res = await getSubCompOpt()
searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
}
init()
</script>

2
src/views/project-management/implementation/detail.vue
View File

@@ -49,7 +49,7 @@
</template>
</steps>
<div style="width: 100%;height: 30px"></div>
<opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
<opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId" :taskUserOptionList="detailData.taskUserOptionList"
v-model:value="auditOpinion"/>
</template>

20
src/views/project-management/implementation/index.vue
View File

@@ -10,6 +10,7 @@
<script setup lang="jsx">
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import {toThousands} from '@/utils/changePrice.js'
import { getSubCompOpt } from '@/api/user/user.js';
const router = useRouter()
const shortcuts = [
@@ -41,7 +42,19 @@ const shortcuts = [
},
},
]
const searchConfig = reactive([
const searchConfig = ref([
{
label: '征集公司',
prop: 'affiliatedCompanyId',
component: 'el-tree-select',
props: {
placeholder: '请输入征集公司查询',
clearable: true,
data: [],
filterable: true,
checkStrictly: true
}
},
{
label: '项目名称',
prop: 'projectName',
@@ -400,5 +413,10 @@ const handlePhaseChangeEdit = (row) => {
}
})
}
const init = async () => {
const res = await getSubCompOpt()
searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
}
init()
</script>

2
src/views/project-management/implementation/phaseDetail.vue
View File

@@ -5,7 +5,7 @@
<div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div>
<ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow" v-model:value="auditOpinion"/>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId" v-model:value="auditOpinion"></opinion>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId" :taskUserOptionList="summaryData.taskUserOptionList" v-model:value="auditOpinion"></opinion>
</template>
<script setup lang="jsx">

20
src/views/project-management/initiation/index.vue
View File

@@ -10,6 +10,7 @@
<script setup lang="jsx">
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import {toThousands} from '@/utils/changePrice.js'
import { getSubCompOpt } from '@/api/user/user.js';
const router = useRouter()
const shortcuts = [
{
@@ -40,7 +41,19 @@ const shortcuts = [
},
},
]
const searchConfig = reactive([
const searchConfig = ref([
{
label: '征集公司',
prop: 'affiliatedCompanyId',
component: 'el-tree-select',
props: {
placeholder: '请输入征集公司查询',
clearable: true,
data: [],
filterable: true,
checkStrictly: true
}
},
{
label: '项目名称',
prop: 'projectName',
@@ -314,5 +327,10 @@ const handleApply = (row) => {
}
})
}
const init = async () => {
const res = await getSubCompOpt()
searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
}
init()
</script>

47
src/views/project-management/mobledetail/OpinionMoblie.vue
View File

@@ -1,8 +1,16 @@
<template>
<!-- <baseTitle title="审核意见"></baseTitle>-->
<!-- <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>-->
<div class="oper-page-btn">
<el-button type="danger" @click="handleReject">驳回</el-button>
<div class="oper-page-btn" style="display: flex">
<el-select v-if="taskUserOptionList?.length>0" v-model="backNode" placeholder="请选择退回节点" clearable style="width: 150px;margin-right: 10px">
<el-option
v-for="item in taskUserOptionList"
:key="item.nodeId"
:label="item.nodeName + (item.userInfo ? ':' + item.userInfo.name : '')"
:value="item.nodeId">
</el-option>
</el-select>
<el-button type="danger" @click="rollbackHandler">驳回</el-button>
<el-button color="#DED0B2" @click="handleAgree">同意</el-button>
</div>
</template>
@@ -27,9 +35,15 @@ const props = defineProps({
value: {
type: String,
default: ''
},
//退回节点选择框数据
taskUserOptionList: {
type: Array,
default: []
}
})
const backNode = ref('')
const form = ref()
const schema = computed(() => {
return [
@@ -146,6 +160,35 @@ const handleReject = async () => {
// back()
}
//回退节点
const rollbackHandler = async () => {
// const values = form.value.getValues()
if (!_value.value) {
ElNotification({
title: '提示',
message: '请填写审核意见',
type: 'warning'
})
return
}
const params = {
taskId: props.taskId,
// ...values
auditOpinion: _value.value,
rollBackId: backNode.value
}
// console.log('params', params)
const res = await rejectTask(params)
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
back()
}
}
const handleAgree = async () => {
// const values = form.value.getValues()
const params = {

2
src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
View File

@@ -85,7 +85,7 @@
</div>
</div>
</el-form>
<opinion-moblie v-if="fundData.taskId" :formData="formData" :taskId="fundData.taskId"
<opinion-moblie v-if="fundData.taskId" :formData="formData" :taskId="fundData.taskId" :taskUserOptionList="fundData.taskUserOptionList"
v-model:value="formData.auditOpinion"></opinion-moblie>
<file-preview ref="filePreviewRef" :fullscreen="true" v-if="filePreviewShow" :fileName="filePreviewParam.fileName" :fileUrl="filePreviewParam.fileUrl"
:fileType="filePreviewParam.fileType"/>

2
src/views/project-management/mobledetail/index.vue
View File

@@ -46,7 +46,7 @@
<!-- :formData="detailData.formData"/>-->
</template>
</StepsMoblie>
<opinion-moblie v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
<opinion-moblie v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId" :taskUserOptionList="detailData.taskUserOptionList"
v-model:value="auditOpinion"/>
</div>
</template>

1
src/views/project-management/phaseDetailMoblie/index.vue
View File

@@ -7,6 +7,7 @@
<ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow" v-model:value="auditOpinion"/>
<opinion-moblie v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"
:taskUserOptionList="summaryData.taskUserOptionList"
v-model:value="auditOpinion"/>
</div>
</template>