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-05-19 00:16:40 +08:00
parent fccce985b6
commit c96cbf8415
7 changed files with 269 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/components/NameCircle.vue Normal file
View File

@@ -0,0 +1,125 @@
<template>
<div>
<slot name="pre"></slot>
<div class="user-audit">
<div class="circle-user">
<Tooltip :content="user.name" placement="bottom-start" width="45"/>
<div v-if="user.icon"
class="el-timeline-item__node" :style="{
backgroundColor: user.color
}">
<el-icon v-if="user.icon" size="15" :class="user.class">
<component :is="user.icon"/>
</el-icon>
</div>
</div>{{user.operationTime}}
<div class="username" v-if="user.auditOpinion">
<Tooltip :content="user.auditOpinion" placement="bottom-start" width="90"/>
</div>
</div>
</div>
</template>
<script setup>
import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
import {defineProps} from "vue";
const props = defineProps({
row: {
type: Number,
default: 1
},
hoverTip: {
type: Boolean,
default: false
},
user: {
type: Object,
default: {}
},
mode: {
type: String,
default: 'design'
}
})
const init = () => {
// for (let user of props.userInfo) {
initUser(props.user)
// }
}
const initUser = (user) => {
let state = user.state
//创建节点
if (state === 'CREATE') {
user["icon"] = CircleCheckFilled
user["color"] = "#0bbd87"
}
//审批通过
if (state === 'AGREE' || state === 'AUTO_PASS') {
user["icon"] = CircleCheckFilled
user["color"] = "#0bbd87"
}
//审批处理中
if (state === 'RUNNING') {
user["icon"] = Loading
user["color"] = "#f78f5f"
user["class"] = 'is-loading'
}
//拒绝后评论
if (state === 'REFUSE') {
user["icon"] = Close
user["color"] = "#f56c6c"
}
if (state === 'PASS') {
user["icon"] = MoreFilled
user["color"] = "#c0c4cc"
}
return user;
}
init()
</script>
<style scoped lang="scss">
.user-audit {
display: flex;
flex-direction: column;
align-items: center;
.circle-user {
width: 50px;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 50%;
border: 1px solid #ACACAC;
position: relative;
.el-timeline-item__node {
position: absolute;
bottom: 0;
right: 1px;
}
}
.username {
//width: 90px;
margin-top: 10px;
background: #f5f5f5;
padding: 5px;
.el-tooltip__trigger {
width: 90px;
text-align: center;
//padding-top: 2px;
//text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden
}
}
}
</style>

1
src/components/Tooltip.vue
View File

@@ -35,6 +35,5 @@ const isShowTooltip = () => {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
padding-top: 3px;
}
</style>

30
src/views/project-demand/collection/add.vue
View File

@@ -64,7 +64,7 @@ import {useProcessStore} from '@/stores/processStore.js';
import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile,downloadFile} from "@/api/project-demand/index.js";
import FileUpload from "@/components/FileUpload.vue";
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
import {ElMessage, ElMessageBox} from "element-plus";
import {ElMessage, ElMessageBox,ElNotification} from "element-plus";
import {useRoute, useRouter} from 'vue-router'
import {getSubCompOpt} from '@/api/user/user.js'
import {useTagsView} from '@/stores/tagsview.js'
@@ -186,17 +186,25 @@ const init = async () => {
const res = await getSubCompOpt()
companyOption.value = res.data
getWorkflowInfo().then(res => {
let data = res.data
processInstanceData.value = data
processStore.setDesign(data)
processStore.runningList.value = data.runningList;
processStore.endList.value = data.endList;
processStore.noTakeList.value = data.noTakeList;
processStore.refuseList.value = data.refuseList;
processStore.passList.value = data.passList;
nextTick(() => {
processDiagramViewer.value = true
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if(res.code === 1000){
let data = res.data
processInstanceData.value = data
processStore.setDesign(data)
processStore.runningList.value = data.runningList;
processStore.endList.value = data.endList;
processStore.noTakeList.value = data.noTakeList;
processStore.refuseList.value = data.refuseList;
processStore.passList.value = data.passList;
nextTick(() => {
processDiagramViewer.value = true
})
}else {
}
})
}
const submitParam=(item)=>{

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

@@ -1,4 +1,5 @@
<template>
<baseTitle title="需求上报"></baseTitle>
<fvForm :schema="schame" @getInstance="getInstance"></fvForm>
<div class="oper-page-btn">
<el-button type="primary" @click="staging">存为草稿</el-button>
@@ -8,24 +9,38 @@
<script setup lang="jsx">
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import { markRaw } from 'vue';
import {markRaw} from 'vue';
import FileUpload from './components/FileUpload.vue';
import {requirementReported} from "./api";
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
const router = useRouter()
const tagsViewStore = useTagsView()
const localData = reactive({
form: null
})
const schame = computed(()=>{
let arr = [
return [
{
label: '名称',
prop: 'name',
prop: 'projectName',
component: 'el-input',
props: {},
colProps: {
span: 12
}
},
{
label: '专项资金',
prop: 'projectType',
component: markRaw(fvSelect),
props: {},
colProps: {
span: 12
}
},
{
label: '开始时间',
prop: 'startTime',
@@ -37,7 +52,7 @@ const schame = computed(()=>{
},
{
label: '所属公司',
prop: 'company',
prop: 'companyName',
component: 'el-input',
props: {},
colProps: {
@@ -64,7 +79,7 @@ const schame = computed(()=>{
},
{
label: '出资类型',
prop: 'monenyType',
prop: 'investmentType',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -73,7 +88,7 @@ const schame = computed(()=>{
},
{
label: '项目影响',
prop: 'projectEffect',
prop: 'projectImpact',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -82,7 +97,7 @@ const schame = computed(()=>{
},
{
label: '所属业务板块',
prop: 'ywbank',
prop: 'businessSegment',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -91,7 +106,7 @@ const schame = computed(()=>{
},
{
label: '预期成果形式',
prop: 'yuqichengg',
prop: 'resultForm',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -100,7 +115,7 @@ const schame = computed(()=>{
},
{
label: '预期技术标准制定',
prop: 'yuqizhidingbiaozhu',
prop: 'technicalStandard',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -109,7 +124,7 @@ const schame = computed(()=>{
},
{
label: '产学研联合',
prop: 'chanxue',
prop: 'industryUniversityResearch',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -118,7 +133,7 @@ const schame = computed(()=>{
},
{
label: '开展政府申报',
prop: 'zhengfushenbao',
prop: 'governmentDeclaration',
component: markRaw(fvSelect),
props: {},
colProps: {
@@ -127,16 +142,80 @@ const schame = computed(()=>{
},
{
label: '知识产权状况',
prop: 'zhishichanquan',
prop: 'intellectualProperty',
component: markRaw(fvSelect),
props: {},
colProps: {
span: 12
}
},
{
label: '发明专利',
prop: 'inventionPatent',
component: 'el-input',
props: {},
colProps: {
span: 6
}
},
{
label: '实用性新型专利',
prop: 'newPatent',
component: 'el-input',
props: {},
colProps: {
span: 6
}
},
{
label: '软件著作权',
prop: 'softwareCopyright',
component: 'el-input',
props: {},
colProps: {
span: 6
}
},
{
label: '著作权',
prop: 'copyright',
component: 'el-input',
props: {},
colProps: {
span: 6
}
},
{
label: '其他',
prop: 'other',
component: 'el-input',
props: {},
colProps: {
span: 6
}
}, {
label: '经济概算',
prop: 'economicEstimate',
component: 'el-input',
props: {},
colProps: {
span: 6
}
},{
label: '申请公司总部科技创新专项资金',
prop: 'specialFundAmount',
component: 'el-input',
props: {},
colProps: {
span: 6
}
},
{
label: '现有业务描述',
prop: 'yewudes',
prop: 'serviceDescription',
component: 'el-input',
props: {
type: 'textarea'
@@ -147,7 +226,7 @@ const schame = computed(()=>{
},
{
label: '研发项目关键内容描述',
prop: 'contentnesss',
prop: 'contentDescription',
component: 'el-input',
props: {
type: 'textarea'
@@ -169,14 +248,30 @@ const schame = computed(()=>{
}
}
]
return arr
})
const getInstance = (e) => {
localData.form = e
}
const handleSubmit = async () => {}
const handleSubmit = async () => {
// let params={
// localData.form.getValues(),
// files:[]
// }
let res = await requirementReported(localData.form.getValues())
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
await router.push({
name: 'Summary'
})
}
}
const staging = async () => {}
</script>
</script>

10
src/views/project-demand/summary/api/index.js
View File

@@ -9,4 +9,12 @@ export const fileUp = (url, data) => {
'Content-Type': 'multipart/form-data'
}
})
}
}
export const requirementReported = (data) => {
return request({
url: '/workflow/mosr/requirement/reported',
method: "post",
data: data
});
};

2
src/views/project-demand/summary/index.vue
View File

@@ -128,7 +128,7 @@ const tableConfig = reactive({
}
}
],
api: '',
api: '/workflow/mosr/requirement/collect',
params: {},
btns: [
{name: '新增上报', key: 'add', type: 'primary', auth: ''},

58
src/views/workflow/common/OperationRender.vue
View File

@@ -10,53 +10,15 @@
<el-card>
<div style="display: flex;">
<!-- <avatar-ellipsis :row="3" v-if="operation.userInfo.length > 0" :user-info="operation.userInfo"/>-->
<div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
<!-- <el-avatar size="large" :src="user.avatar"></el-avatar>-->
<!-- <div v-if="!$slots.dot && operation.userInfo.length > 1"-->
<!-- class="el-timeline-item__node" :style="{-->
<!-- backgroundColor: user.color-->
<!-- }">-->
<!-- <el-icon v-if="user.icon" :class="user.class">-->
<!-- <component :is="user.icon"/>-->
<!-- </el-icon>-->
<!-- </div>-->
<!-- <el-tooltip effect="dark" :content="user.name" placement="bottom-start">-->
<!-- <span class="username">{{ user.name }}</span>-->
<!-- </el-tooltip>-->
<avatar-ellipsis :row="3" v-if="operation.userInfo.length > 0" :user-info="operation.userInfo"/>
<template v-if="user.auditOpinion">
<div class="username">
<el-tooltip effect="dark" :content="user.auditOpinion" placement="bottom-start">
<div>{{ user.auditOpinion }}</div>
</el-tooltip>
</div>
</template>
<name-circle :user="user"/>
</div>
<div style="margin-left: 10px;">
<div style="color: #c0bebe">{{ operation.operationName }}</div>
<div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
</div>
</div>
<!-- <template v-if="operation.comment">-->
<!-- <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">-->
<!-- <div>-->
<!-- {{ operation.comment.context }}-->
<!-- </div>-->
<!-- <div style="margin-top: 10px;"-->
<!-- v-if="operation.comment.attachments && operation.comment.attachments.length > 0">-->
<!-- <template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">-->
<!-- <el-image-->
<!-- style="width: 100px; height: 100px"-->
<!-- :src="item.url"-->
<!-- :preview-src-list="[item.url]">-->
<!-- </el-image>-->
<!-- </template>-->
<!-- <div v-for="(file) in getAttachmentList(operation.comment.attachments,false)">-->
<!-- <el-link style="color: #2a99ff" :href="file.url" icon="el-icon-document">{{ file.name }}</el-link>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </template>-->
</el-card>
</el-timeline-item>
<el-timeline-item :color="timeline.color" :icon="timeline.icon" size="large">
@@ -71,6 +33,7 @@
<script setup>
import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
import AvatarEllipsis from '../process/common/AvatarEllipsis.vue'
import NameCircle from "@/components/NameCircle.vue";
const props = defineProps({
operationList: {
@@ -287,21 +250,6 @@ init()
position: relative;
margin-right: 5px;
.username {
width: 100px;
margin-top: 10px;
background: #f5f5f5;
padding: 10px;
.el-tooltip__trigger {
width: 90px;
//padding-top: 2px;
//text-align: center;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden
}
}
}
.el-timeline-item__node {