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

Merge pull request 'master' (#294) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/294
This commit is contained in:
odjbin
2024-06-06 14:21:42 +00:00
parent 40c09c58d4 d9d3a7f02a
commit ac00d68350
8 changed files with 252 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/expense-manage/index.js
View File

@@ -38,15 +38,7 @@ export const getProjectOption = () => {
method: "get" method: "get"
}); });
}; };
export const getAllocationCollect = (allocationId) => {
return request({
url: '/workflow/mosr/cost/allocation/collect',
method: "post",
params:{
allocationId:allocationId
}
});
};
export const editAllocation = (data) => { export const editAllocation = (data) => {
return request({ return request({
url: '/workflow/mosr/cost/allocation/edit', url: '/workflow/mosr/cost/allocation/edit',

2
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -110,7 +110,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
v-if="localFormData.isSpecialFund!==null||localFormData.isSpecialFund"> v-if="localFormData.specialFundAmount">
<span>{{ localFormData.specialFundAmount }}</span> <span>{{ localFormData.specialFundAmount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>

11
src/fvcomponents/fvTable/index.vue
View File

@@ -203,10 +203,15 @@ const getList = async () => {
localData.loading = true localData.loading = true
try { try {
const {code, data, msg} = await requestList(api, queryParmas) const {code, data, msg} = await requestList(api, queryParmas)
if (code === 1000) { if (code === 1000) {
localData.list = data.rows if(data.rows){
localData.total = data.total localData.list = data.rows
}else {
localData.list = data
}
if(data.total){
localData.total = data.total
}
localData.loading = false localData.loading = false
} else { } else {
ElNotification({ ElNotification({

32
src/views/expense-management/share/detail.vue
View File

@@ -18,7 +18,7 @@
<expense-detail/> <expense-detail/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分摊汇总" name="second" v-loading="loading"> <el-tab-pane label="分摊汇总" name="second" v-loading="loading">
<fvTable v-if="showTable" ref="tableRef" :tableConfig="tableConfig" :data="collectList"> <fvTable v-if="showTable" ref="tableRef" :tableConfig="tableConfig">
<template #empty> <template #empty>
<el-empty description="暂无数据"/> <el-empty description="暂无数据"/>
</template> </template>
@@ -52,7 +52,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue' import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
import {ElNotification} from "element-plus"; import {ElNotification} from "element-plus";
import {useProcessStore} from '@/stores/processStore.js'; import {useProcessStore} from '@/stores/processStore.js';
import {getAllocationDetail,getAllocationCollect} from "@/api/expense-manage"; import {getAllocationDetail} from "@/api/expense-manage";
const processStore = useProcessStore() const processStore = useProcessStore()
const route = useRoute() const route = useRoute()
@@ -62,7 +62,6 @@ const auditOpinion = ref('')
const shareProcessViewer = ref(true) const shareProcessViewer = ref(true)
const showTable = ref(true) const showTable = ref(true)
const loading = ref(false) const loading = ref(false)
const collectList = ref([])
const activeName = ref('first') const activeName = ref('first')
const tableConfig = reactive({ const tableConfig = reactive({
columns: [ columns: [
@@ -112,7 +111,11 @@ const tableConfig = reactive({
label: '摘要', label: '摘要',
align: 'center' align: 'center'
} }
] ],
api:'/workflow/mosr/cost/allocation/collect',
params:{
allocationId:route.query.id
}
}) })
const getDetail = async () => { const getDetail = async () => {
const id = route.query.id const id = route.query.id
@@ -139,30 +142,9 @@ const getDetail = async () => {
} }
} }
const getDetailCollect = async () => {
loading.value = true
showTable.value = false
const {code, data, msg} = await getAllocationCollect(route.query.id)
if (code === 1000) {
collectList.value = data
nextTick(() => {
loading.value = false
showTable.value = true
})
}else {
ElNotification({
title: '提示',
message: msg,
type: 'error'
})
}
}
const handleClick = (tab) => { const handleClick = (tab) => {
console.log('tab',tab.index)
if (tab.index==0) { if (tab.index==0) {
getDetail() getDetail()
}else {
getDetailCollect()
} }
} }
getDetail() getDetail()

122
src/views/project-demand/requirement/add.vue
View File

@@ -2,33 +2,33 @@
<div v-loading="loading" class="add-block"> <div v-loading="loading" class="add-block">
<baseTitle title="需求征集信息录入"></baseTitle> <baseTitle title="需求征集信息录入"></baseTitle>
<el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules"> <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
<el-form-item label="名称" prop="requirementName"> <el-form-item label="名称" prop="requirementName">
<el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input> <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属公司" prop="companyIds"> <el-form-item label="所属公司" prop="companyIds">
<el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;" <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
filterable clearable :check-strictly="true" multiple/> filterable clearable :check-strictly="true" multiple/>
</el-form-item> </el-form-item>
<el-form-item label="征集类型" prop="collectType"> <el-form-item label="征集类型" prop="collectType">
<el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable> <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
<el-option <el-option
v-for="item in typeOption" v-for="item in typeOption"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="截止时间" prop="deadline"> <el-form-item label="截止时间" prop="deadline">
<el-config-provider> <el-config-provider>
<el-date-picker <el-date-picker
v-model="formData.deadline" v-model="formData.deadline"
type="date" type="date"
placeholder="截止时间" placeholder="截止时间"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> />
</el-config-provider> </el-config-provider>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="是否专项资金" prop="isSpecialFund"> <el-form-item label="是否专项资金" prop="isSpecialFund">
@@ -53,8 +53,13 @@
</el-row> </el-row>
</el-form> </el-form>
<baseTitle title="征集说明"></baseTitle> <baseTitle title="征集说明"></baseTitle>
<Tinymce v-if="showTinymce" image-url="/notice/file" file-url="/notice/file" <el-input
v-model:value="formData.collectExplain" /> v-model="formData.collectExplain"
style="width:100%"
:rows="5"
type="textarea"
placeholder="请输入征集说明"
/>
<baseTitle title="申请文件"></baseTitle> <baseTitle title="申请文件"></baseTitle>
<file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/> <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
<fvTable style="width: 100%;max-height: 300px;" v-if="showTable" <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
@@ -67,13 +72,11 @@
<div class="approval-record"> <div class="approval-record">
<baseTitle title="流程"></baseTitle> <baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/> <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
<!-- <div class="process" id="approvalRecord">-->
<!-- <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
<!-- </div>-->
</div> </div>
<div class="oper-page-btn"> <div class="oper-page-btn">
<el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button> <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button> <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div> </div>
</div> </div>
</template> </template>
@@ -91,7 +94,7 @@ import {
} from "@/api/project-demand/index.js"; } from "@/api/project-demand/index.js";
import FileUpload from "@/components/FileUpload.vue"; import FileUpload from "@/components/FileUpload.vue";
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
import {ElMessage, ElMessageBox, ElNotification} from "element-plus"; import {ElMessageBox, ElNotification} from "element-plus";
import {useRoute, useRouter} from 'vue-router' import {useRoute, useRouter} from 'vue-router'
import {getSubCompOpt} from '@/api/user/user.js' import {getSubCompOpt} from '@/api/user/user.js'
import {useTagsView} from '@/stores/tagsview.js' import {useTagsView} from '@/stores/tagsview.js'
@@ -110,7 +113,7 @@ const formData = ref({
deadline: '', deadline: '',
collectExplain: '', collectExplain: '',
fileList: [], fileList: [],
isSpecialFund:false isSpecialFund: false
}) })
const showTinymce = ref(true) const showTinymce = ref(true)
const routerName = ref(router.currentRoute.value.name) const routerName = ref(router.currentRoute.value.name)
@@ -172,10 +175,12 @@ const tableConfig = reactive({
return ( return (
<div> <div>
<el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button> <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
<popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
perm={['mosr:requirement:del']}
onDelete={() => handleDelete(row)}/>
</div> </div>
) )
} }
// <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
} }
] ]
}) })
@@ -183,7 +188,7 @@ const tableConfig = reactive({
const checkFormPrem = (formKey) => { const checkFormPrem = (formKey) => {
if (formPermMap.value.hasOwnProperty(formKey)) { if (formPermMap.value.hasOwnProperty(formKey)) {
let formItem = formPermMap.value[formKey]; let formItem = formPermMap.value[formKey];
return formItem.perm === 'EDIT' return formItem.perm === 'EDIT'
} else { } else {
return true; return true;
} }
@@ -203,9 +208,10 @@ const compositeParam = (item) => {
let tag = '' let tag = ''
if (!formData.value.collectType && routerName.value === 'Requirement/add') { if (!formData.value.collectType && routerName.value === 'Requirement/add') {
tag = '需求征集' tag = '需求征集'
}else if(!formData.value.collectType &&routerName.value === 'Requirement/edit'){ } else if (!formData.value.collectType && routerName.value === 'Requirement/edit') {
tag = '需求征集' tag = '需求征集'
}if (formData.value.collectType) { }
if (formData.value.collectType) {
tag = formData.value.collectType tag = formData.value.collectType
} }
return { return {
@@ -250,7 +256,7 @@ const init = async () => {
nextTick(() => { nextTick(() => {
processDiagramViewer.value = true processDiagramViewer.value = true
}) })
}else { } else {
ElNotification({ ElNotification({
title: '提示', title: '提示',
message: res.msg, message: res.msg,
@@ -277,15 +283,15 @@ const submitParam = (item) => {
requirementName: item.requirementName, requirementName: item.requirementName,
fileList: files, fileList: files,
deploymentId: processInstanceData.value.deploymentId, deploymentId: processInstanceData.value.deploymentId,
isSpecialFund:item.isSpecialFund, isSpecialFund: item.isSpecialFund,
specialFund:item.specialFund specialFund: item.specialFund
} }
} }
const handleSubmit = async (instance) => { const handleSubmit = async (instance) => {
if (!instance) return if (!instance) return
instance.validate(async (valid) => { instance.validate(async (valid) => {
if (!valid) return if (!valid) return
const {msg,code} = await addRequirement(submitParam(formData.value)) const {msg, code} = await addRequirement(submitParam(formData.value))
ElNotification({ ElNotification({
title: '提示', title: '提示',
message: msg, message: msg,
@@ -338,28 +344,16 @@ const handleBack = () => {
history.back() history.back()
} }
const handleDelete = (row) => { const handleDelete = (row) => {
ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', { deleteFile(row.fileId).then(res => {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
}
});
}).catch(() => {
ElNotification({ ElNotification({
title: '提示', title: '提示',
message: '用户取消删除! ', message: res.msg,
type: 'warning' type: res.code === 1000 ? 'success' : 'error'
}) })
}) if (res.code === 1000) {
formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
}
});
} }
onMounted(async () => { onMounted(async () => {
@@ -376,9 +370,11 @@ onMounted(async () => {
:deep(.el-empty__description) { :deep(.el-empty__description) {
margin-top: 0; margin-top: 0;
} }
:deep(.el-table--fit ){
height: 300px!important; :deep(.el-table--fit ) {
height: 300px !important;
} }
.add-block { .add-block {
//display: flex; //display: flex;
//justify-content: space-between; //justify-content: space-between;

57
src/views/project-demand/summary/add.vue
View File

@@ -8,25 +8,25 @@
<el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input> <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5" v-if="!route.query.id">
<el-form-item label="是否专项资金" prop="isSpecialFund"> <el-form-item label="是否专项资金" prop="isSpecialFund" >
<el-radio-group v-model="formData.isSpecialFund"> <el-radio-group v-model="formData.isSpecialFund">
<el-radio :label="true">是</el-radio> <el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio> <el-radio :label="false">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="formData.isSpecialFund?(!route.query.id?6:12):6">
<el-form-item label="专项资金" prop="specialFund" v-if="formData.isSpecialFund"> <el-form-item label="专项资金" prop="specialFund" v-if="formData.isSpecialFund">
<!-- <span>{{ getSpecialFundName(formData.specialFund) }}</span>--> <span v-if="route.query.id">{{ getSpecialFundName(formData.specialFund) }}</span>
<el-select v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable> <el-select v-else v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable>
<el-option <el-option
v-for="item in specialFundOption" v-for="item in specialFundOption"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -180,37 +180,37 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发明专利(项)" prop="inventionPatent"> <el-form-item label="发明专利(项)" prop="inventionPatent">
<el-input v-model="formData.inventionPatent" clearable></el-input> <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="实用性新型专利(项)" prop="newPatent"> <el-form-item label="实用性新型专利(项)" prop="newPatent">
<el-input v-model="formData.newPatent" clearable></el-input> <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="软件著作权(项)" prop="softwareCopyright"> <el-form-item label="软件著作权(项)" prop="softwareCopyright">
<el-input v-model="formData.softwareCopyright" clearable></el-input> <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="著作权(项)" prop="copyright"> <el-form-item label="著作权(项)" prop="copyright">
<el-input v-model="formData.copyright" clearable></el-input> <el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="其他(项)" prop="other"> <el-form-item label="其他(项)" prop="other">
<el-input v-model="formData.other" clearable></el-input> <el-input-number v-model="formData.other" placeholder="请输入其他" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="经济概算(元)" prop="economicEstimate"> <el-form-item label="经济概算(元)" prop="economicEstimate">
<el-input v-model="formData.economicEstimate" clearable></el-input> <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" v-if="formData.isSpecialFund"> <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" v-if="formData.isSpecialFund">
<el-input v-model="formData.specialFundAmount" clearable></el-input> <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@@ -229,16 +229,12 @@
@getAttachment="getAttachment" @getAttachment="getAttachment"
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData" @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Summary/edit'"/> :preview="name === 'Summary/edit'"/>
<!-- <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
<div class="approval-record"> <div class="approval-record">
<baseTitle title="流程"></baseTitle> <baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/> <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
<!-- <div class="process" id="approvalRecord">-->
<!-- <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
<!-- </div>-->
</div> </div>
<div class="oper-page-btn"> <div class="oper-page-btn">
<!-- <el-button type="info" @click="staging">存为草稿</el-button>--> <!-- <el-button type="info" @click="staging">存为草稿</el-button>-->
<el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button> <el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
<el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button> <el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
</div> </div>
@@ -274,6 +270,7 @@ const showTable = ref(true)
const otherFileList = ref([]) const otherFileList = ref([])
const file = ref({}) const file = ref({})
const formData = ref({ const formData = ref({
isSpecialFund: false,
industryUniversityResearch: '0', industryUniversityResearch: '0',
governmentDeclaration: '0', governmentDeclaration: '0',
}) })
@@ -417,7 +414,7 @@ const handleSubmit = debounce(async (instance) => {
// } // }
let params = { let params = {
...formData.value, ...formData.value,
isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false, isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false,
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
fileList: otherFiles, fileList: otherFiles,
singleFile: singleFile, singleFile: singleFile,
@@ -472,7 +469,7 @@ const handleResubmit = debounce(() => {
//todo requirementId //todo requirementId
let params = { let params = {
...formData.value, ...formData.value,
isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false, isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false,
deploymentId: deploymentId.value, deploymentId: deploymentId.value,
fileList: otherFiles, fileList: otherFiles,
singleFile: singleFile, singleFile: singleFile,
@@ -560,5 +557,13 @@ const staging = async () => {
.detail-block { .detail-block {
overflow: hidden; overflow: hidden;
padding-bottom: 30px; padding-bottom: 30px;
:deep(.el-input-number) {
width: 100%;
.el-input__inner {
text-align: left;
}
}
} }
</style> </style>

301
src/views/workflow/process/common/UserPicker.vue
View File

@@ -1,69 +1,67 @@
<template> <template>
<el-dialog custom-class="custom-dialog" class="border" :border="false" closeFree width="600px" <el-dialog custom-class="custom-dialog" class="border" :border="false" closeFree width="1000px" style="height: 676px"
:title="title" :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="true" :title="title" :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="true"
:destroy-on-close="true"> :destroy-on-close="true">
<div> <div class="picker">
<div class="picker"> <div class="candidate" v-loading="loading">
<div class="candidate" v-loading="loading"> <el-input v-model="filterText" @change="getList(1)"
<el-input v-model="filterText" @change="getList(1)" clearable placeholder="输入部门/昵称进行搜索">
clearable placeholder="输入部门/昵称进行搜索"> <template #append>
<template #append> <el-button @click="getList(1)">搜索</el-button>
<el-button @click="getList(1)">搜索</el-button> </template>
</template> </el-input>
</el-input> <!-- 人员选择 -->
<!-- 人员选择 --> <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>
<el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/> <el-scrollbar style="height:90%;">
<el-scrollbar style="height:340px"> <div class="tree">
<div class="tree"> <el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value"
<el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value" :default-expanded-keys="expandedKeys" lazy accordion
:default-expanded-keys="expandedKeys" lazy accordion @node-click="handleChange" @node-expand="handleChange">
@node-click="handleChange" @node-expand="handleChange" <template #default="{ node, data }">
> <div class="tree-node">
<template #default="{ node, data }"> <div v-if="data.type === 0" style="display: flex;align-items: center;padding: 3px 0">
<div class="tree-node"> <el-icon>
<div v-if="data.type === 0" style="display: flex;align-items: center;padding: 3px 0"> <UserFilled/>
<el-icon> </el-icon>
<UserFilled/> {{ node.label }}-{{ data.companyName }}
</el-icon>
{{ node.label }}
</div>
<div v-else-if="data.type ===1">
<el-icon>
<UserFilled/>
</el-icon>
{{ node.label }}
</div>
<div v-else>
<el-icon>
<FolderOpened/>
</el-icon>
{{ node.label }}
</div>
</div> </div>
</template> <div v-else-if="data.type ===1">
</el-tree> <el-icon>
</div> <UserFilled/>
</el-scrollbar> </el-icon>
</div> {{ node.label }}
<div class="selected"> </div>
<div class="count"> <div v-else>
<span>已选 {{ selectList.length }} 项</span> <el-icon>
<span @click="clearSelected">清空</span> <FolderOpened/>
</el-icon>
{{ node.label }}
</div>
</div>
</template>
</el-tree>
</div> </div>
<div class="org-items" style="height: 350px;"> </el-scrollbar>
<el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/> </div>
<div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-item"> <div class="selected">
<!-- <el-avatar :src="selectItem.avatar" style="margin-right: 5px;"></el-avatar>--> <div class="count">
{{ selectItem.name }} <span>已选 {{ selectList.length }} 项</span>
<i class="el-icon-close" @click="noSelected(selectItem)"></i> <span @click="clearSelected">清空</span>
</div> </div>
<div class="org-items">
<el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/>
<div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-item">
{{ selectItem.name }}-{{ selectItem.companyName }}
<el-icon @click="noSelected(selectItem)" size="20" style="margin-left: 10px;cursor: pointer;">
<CircleClose/>
</el-icon>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div slot="footer"> <div class="footer">
<el-button size="mini" @click="visible = false">取 消</el-button> <el-button size="mini" @click="visible = false">取 消</el-button>
<el-button size="mini" type="primary" @click="selectConfirm">确 定</el-button> <el-button size="mini" color="#DED0B2" @click="selectConfirm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
@@ -109,14 +107,11 @@ const defaultProps = {
value: "value", value: "value",
label: "name", label: "name",
children: "children", children: "children",
// isLeaf:(data, node) => isLeaf: (data) => {
// { if (data.type === 0) {
// console.log('data, node',data, node) return true
// if (node.level === 2) { }
// return true }
// }
// }
}; };
const emit = defineEmits(); const emit = defineEmits();
@@ -200,7 +195,6 @@ const showUserPicker = () => {
getList(); getList();
}; };
const handleChange = (item, data) => { const handleChange = (item, data) => {
console.log('item', item, data)
selectItem = item; selectItem = item;
if (isSearch.value && item.type !== 0) { if (isSearch.value && item.type !== 0) {
filterText.value = "" filterText.value = ""
@@ -283,116 +277,109 @@ defineExpose({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
$containWidth: 264px; $containWidth: 480px;
:deep(.tree) { :deep(.tree) {
.el-tree { .el-tree-node__content {
.el-tree-node { height: 34px;
.el-tree-node__children {
.el-tree-node { .tree-node {
.el-tree-node__content { font-size: 18px;
//height: 45px !important;
.tree-node {
}
}
}
}
} }
} }
.el-tree-node { //.el-tree-node {
.is-leaf + .el-checkbox .el-checkbox__inner { // .is-leaf + .el-checkbox .el-checkbox__inner {
display: inline-block; // display: inline-block;
} // }
//
.el-checkbox .el-checkbox__inner { // .el-checkbox .el-checkbox__inner {
display: none; // display: none;
} // }
} //}
.tree-node {
div {
.el-avatar {
width: 40px;
height: 40px;
margin-right: 5px;
}
}
}
} }
.footer {
.el-dialog__body { float: right;
padding: 10px 20px;
} }
.picker { .picker {
height: 402px; height: 560px;
position: relative; position: relative;
text-align: left; text-align: left;
.candidate { .candidate {
left: 0;
top: 0;
}
}
.candidate, .selected {
position: absolute;
display: inline-block;
width: $containWidth;
height: 400px;
border: 1px solid #e8e8e8;
}
.selected {
border-left: none;
right: 0;
top: 0;
.count {
width: calc(var($containWidth) - 20px);
padding: 10px;
display: inline-block;
border-bottom: 1px solid #e8e8e8;
margin-bottom: 5px;
& > span:nth-child(2) {
float: right;
color: #c75450;
cursor: pointer;
}
}
}
.org-items {
overflow-y: auto;
height: 350px;
.el-icon-close {
position: absolute; position: absolute;
right: 5px; display: inline-block;
cursor: pointer; width: $containWidth;
font-size: larger; height: 98%;
} border: 1px solid #e8e8e8;
.org-item { :deep(.el-input) {
margin: 0 5px; height: 40px;
border-radius: 5px;
position: relative;
padding: 7px 5px;
display: flex;
align-items: center;
cursor: pointer; .el-input__inner, .el-input-group__append {
font-size: 16px;
&:hover { }
background: #f1f1f1;
}
> span {
margin-left: 5px;
} }
} }
.selected {
right: 0;
top: 0;
position: absolute;
display: inline-block;
width: 450px;
height: 98%;
border: 1px solid #e8e8e8;
.count {
width: 100%;
padding: 10px;
display: inline-block;
border-bottom: 1px solid #e8e8e8;
margin-bottom: 5px;
font-size: 16px;
> span:nth-child(2) {
float: right;
color: #c75450;
cursor: pointer;
margin-left: 10px;
}
}
.org-items {
overflow-y: auto;
height: 90%;
.el-icon-close {
position: absolute;
right: 5px;
cursor: pointer;
font-size: larger;
}
.org-item {
margin: 0 5px;
border-radius: 5px;
position: relative;
padding: 7px 5px;
display: flex;
align-items: center;
font-size: 16px;
&:hover {
background: #f1f1f1;
}
> span {
margin-left: 5px;
}
}
}
}
} }
.el-scrollbar .el-scrollbar__wrap { .el-scrollbar .el-scrollbar__wrap {

2
src/views/workflow/process/config/ApprovalNodeConfig.vue
View File

@@ -8,7 +8,7 @@
<el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round> <el-button size="mini" icon="Plus" type="primary" @click="showSysRolePicker" round>
选择人员 选择人员
</el-button> </el-button>
<user-picker title="请选择系统角色" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/> <user-picker title="请选择人员" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
<!-- <ellipsis :row="3" :user-info="assignedUser"/>--> <!-- <ellipsis :row="3" :user-info="assignedUser"/>-->
<role-items v-model="assignedUser"/> <role-items v-model="assignedUser"/>
</div> </div>