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

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

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/286
This commit is contained in:
odjbin
2024-06-05 14:10:57 +00:00
parent 7df8fbd46a 0685143b3a
commit 11a1f044f5
24 changed files with 561 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,3 +26,15 @@ export const getAllocationDetailList = (params) => {
params:params
});
};
export const getResearchUser = () => {
return request({
url: '/admin/mosr/user/research',
method: "get"
});
};
export const getProjectOption = () => {
return request({
url: '/workflow/mosr/project/implementation/in/implementation/option',
method: "get"
});
};

97
src/components/DetailComponent/ApprovalDetail.vue
View File

@@ -1,27 +1,37 @@
<template>
<div v-loading="loading">
<div v-loading="loading">
<fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
<el-form :model="formData" label-width="auto" >
<el-form :model="formData" label-width="auto">
<file-component :title="getTagName(type)+'附件'" :tag="getTagName(type)"
v-model:value="formData.fileList" :processViewer="processViewer"
:file-list-show="fileListShow"/>
</el-form>
<div v-if="data.taskId">
<baseTitle title="审核意见"></baseTitle>
<el-form-item prop="_value">
<el-input
v-model="_value"
:rows="3"
type="textarea"
placeholder="请输入审核意见"
/>
</el-form-item>
</div>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="processViewer" :id-name="type"/>
</div>
<baseTitle title="审批记录"></baseTitle>
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="processViewer" :id-name="type"/>
</div>
</div>
</div>
</template>
<script setup lang="jsx">
import { computed, markRaw, reactive, ref, watchEffect } from 'vue';
import OperationRender from '@/views/workflow/common/OperationRender.vue'
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
import { ElLoading } from 'element-plus';
import {ElLoading} from 'element-plus';
import {downloadFile} from "@/api/project-demand";
const props = defineProps({
@@ -53,12 +63,16 @@ const props = defineProps({
loading: {
type: Boolean,
default: false
},
value: {
type: String,
default: ''
}
})
const form = ref()
const schema = computed(()=>{
const schema = computed(() => {
let arr
if(props.type == 'approval') {
if (props.type == 'approval') {
arr = [
{
label: '前置流程',
@@ -73,24 +87,24 @@ const schema = computed(()=>{
colProps: {
span: 24
},
component: ()=>(
<div>
{
props.formData.singleFile?.originalFileName?
<span
style={{color: '#409EFF', cursor: 'pointer'}}
onClick={()=>handleDownload(props.formData.singleFile)}
>
component: () => (
<div>
{
props.formData.singleFile?.originalFileName ?
<span
style={{color: '#409EFF', cursor: 'pointer'}}
onClick={() => handleDownload(props.formData.singleFile)}
>
{props.formData.singleFile?.originalFileName}
</span> :
<span>{'--'}</span>
}
</div>
<span>{'--'}</span>
}
</div>
)
},
]
} else if(props.type == 'execute') {
} else if (props.type == 'execute') {
arr = [
{
label: '前置流程',
@@ -105,13 +119,13 @@ const schema = computed(()=>{
colProps: {
span: 24
},
component: ()=>(
component: () => (
<div>
{
props.formData.singleFile?.originalFileName?
props.formData.singleFile?.originalFileName ?
<span
style={{color: '#409EFF', cursor: 'pointer'}}
onClick={()=>handleDownload(props.formData.singleFile)}
onClick={() => handleDownload(props.formData.singleFile)}
>
{props.formData.singleFile?.originalFileName}
</span> :
@@ -122,7 +136,7 @@ const schema = computed(()=>{
)
},
]
} else if(props.type == 'archivist'){
} else if (props.type == 'archivist') {
arr = [
{
label: '项目归档附件',
@@ -130,13 +144,13 @@ const schema = computed(()=>{
colProps: {
span: 24
},
component: ()=>(
component: () => (
<div>
{
props.formData.singleFile?.originalFileName?
props.formData.singleFile?.originalFileName ?
<span
style={{color: '#409EFF', cursor: 'pointer'}}
onClick={()=>handleDownload(props.formData.singleFile)}
onClick={() => handleDownload(props.formData.singleFile)}
>
{props.formData.singleFile?.originalFileName}
</span> :
@@ -147,7 +161,7 @@ const schema = computed(()=>{
)
},
]
} else if(props.type == 'phase'){
} else if (props.type == 'phase') {
arr = [
{
label: '阶段变更附件',
@@ -155,13 +169,13 @@ const schema = computed(()=>{
colProps: {
span: 24
},
component: ()=>(
component: () => (
<div>
{
props.formData.singleFile?.originalFileName?
props.formData.singleFile?.originalFileName ?
<span
style={{color: '#409EFF', cursor: 'pointer'}}
onClick={()=>handleDownload(props.formData.singleFile)}
onClick={() => handleDownload(props.formData.singleFile)}
>
{props.formData.singleFile?.originalFileName}
</span> :
@@ -175,6 +189,17 @@ const schema = computed(()=>{
}
return arr
})
const emit = defineEmits(['update:value'])
const _value = computed({
get() {
return props.value;
},
set(val) {
emit("update:value", val);
}
})
const getTagName = (type) => {
switch (type) {
case 'approval':
@@ -198,7 +223,7 @@ const handleDownload = (row) => {
loading.close()
})
}
watchEffect(()=>{
watchEffect(() => {
Object.keys(props.formData).length && (form.value.setValues(props.formData))
})

29
src/components/DetailComponent/CollectionDetail.vue
View File

@@ -42,6 +42,19 @@
v-model:value="formData.fileList" :processViewer="processViewer"
:file-list-show="fileListShow"/>
</el-col>
<el-col :span="24">
<div v-if="data.taskId">
<baseTitle title="审核意见"></baseTitle>
<el-form-item prop="_value">
<el-input
v-model="_value"
:rows="3"
type="textarea"
placeholder="请输入审核意见"
/>
</el-form-item>
</div>
</el-col>
</el-row>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
@@ -60,6 +73,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
import {downloadFile} from "@/api/project-demand";
const emit = defineEmits(['update:value'])
const props = defineProps({
formData: {
type: Array,
@@ -88,8 +102,23 @@ const props = defineProps({
type: {
type: String,
default: ''
},
value: {
type: String,
default: ''
}
})
const _value = computed({
get() {
return props.value;
},
set(val) {
emit("update:value", val);
}
})
const handleDownload = (row) => {
downloadFile(row.fileId).then(res => {
const blob = new Blob([res])

10
src/components/DetailComponent/ExpenseDetail.vue
View File

@@ -1,7 +1,7 @@
<template>
<div v-loading="loading">
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" :data="detailList" style="width: 100%">
<fvTable ref="tableIns" :tableConfig="tableConfig" :data="detailList.formData">
<template #empty>
<el-empty description="暂无数据"/>
</template>
@@ -108,8 +108,14 @@ const search = (val) => {
tableConfig.params = {...val}
tableIns.value.refresh()
}
watch(() => props.loading, (val) => {
props.loading=val
})
</script>
<style scoped>
:deep(.el-table--fit ){
width: 100%;
height: 400px!important;
}
</style>

40
src/components/DetailComponent/Opinion.vue
View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="审核意见"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
<!-- <baseTitle title="审核意见"></baseTitle>-->
<!-- <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>-->
<div class="oper-page-btn">
<el-button type="danger" @click="handleReject">驳回</el-button>
<el-button color="#DED0B2" @click="handleAgree">同意</el-button>
@@ -23,6 +23,10 @@ const props = defineProps({
formData: {
type: Object,
default: {}
},
value: {
type: String,
default: ''
}
})
@@ -44,6 +48,14 @@ const schema = computed(() => {
}
]
})
const _value = computed({
get() {
return props.value;
},
set(val) {
emit("update:value", val);
}
})
const back = () => {
switch (route.name) {
case 'Initiation/detail':
@@ -91,17 +103,25 @@ const back = () => {
}
break;
case 'Share/detail':
router.push({name: 'Expense/share'})
if (route.query.source === 'home') {
router.push('/home')
} else {
router.push({name: 'Expense/share'})
}
break;
case 'Phase/detail':
router.push({name: 'Implementation'})
if (route.query.source === 'home') {
router.push('/home')
} else {
router.push({name: 'Implementation'})
}
break;
}
}
// 驳回
const handleReject = async () => {
const values = form.value.getValues()
if (!values.auditOpinion) {
// const values = form.value.getValues()
if (!_value.value) {
ElNotification({
title: '提示',
message: '请填写审核意见',
@@ -111,8 +131,10 @@ const handleReject = async () => {
}
const params = {
taskId: props.taskId,
...values
// ...values
auditOpinion: _value.value
}
console.log('params', params)
const res = await rejectTask(params)
ElNotification({
title: '提示',
@@ -124,11 +146,11 @@ const handleReject = async () => {
}
const handleAgree = async () => {
const values = form.value.getValues()
// const values = form.value.getValues()
const params = {
taskId: props.taskId,
formData: props.formData,
...values
auditOpinion: _value.value
}
const res = await agreeTask(params)
ElNotification({

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

@@ -136,6 +136,19 @@
v-model:value="localFormData.fileList" :processViewer="processViewer"
:file-list-show="fileListShow"/>
</el-col>
<el-col :span="24">
<div v-if="data.taskId">
<baseTitle title="审核意见"></baseTitle>
<el-form-item prop="_value">
<el-input
v-model="_value"
:rows="3"
type="textarea"
placeholder="请输入审核意见"
/>
</el-form-item>
</div>
</el-col>
</el-row>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
@@ -159,6 +172,7 @@ import {useCacheStore} from '@/stores/cache.js'
import {getSubCompOpt} from "@/api/user/user";
import FileComponent from "./FileComponent.vue";
const emit = defineEmits(['update:value'])
const tagsViewStore = useTagsView()
const cacheStore = useCacheStore()
const props = defineProps({
@@ -181,6 +195,10 @@ const props = defineProps({
loading: {
type: Boolean,
default: false
},
value: {
type: String,
default: ''
}
})
const localFormData = ref({})
@@ -191,6 +209,14 @@ const dictName = ref({})
const rules = reactive({
auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
})
const _value = computed({
get() {
return props.value;
},
set(val) {
emit("update:value", val);
}
})
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''

79
src/components/SearchFilesByTag.vue
View File

@@ -1,42 +1,46 @@
<template>
<el-form :model="attachment" inline>
<el-form-item label="名称" prop="fileName">
<el-input v-model="attachment.fileName" placeholder="请输入附件名称查询" clearable filterable style="width: 300px"/>
</el-form-item>
<el-form-item label="标签" prop="tag" v-if="type==='40'">
<el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
<el-option
v-for="item in tagsOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
<el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
</el-form-item>
</el-form>
<el-card style="width: 100%">
<fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
:data="fileList" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-card>
<div v-loading="_value">
<el-form :model="attachment" inline>
<el-form-item label="名称" prop="fileName">
<el-input v-model="attachment.fileName" placeholder="请输入附件名称查询" clearable filterable style="width: 300px"/>
</el-form-item>
<el-form-item label="标签" prop="tag" v-if="type==='40'">
<el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
<el-option
v-for="item in tagsOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
<el-button @click="handleReset">重置</el-button>
<el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
</el-form-item>
</el-form>
<el-card style="width: 100%">
<fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
:data="fileList" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-card>
</div>
</template>
<script setup lang="jsx">
import {downloadFile} from "@/api/project-demand";
import {ElNotification} from "element-plus";
import {getTags} from "@/api/project-manage";
import {computed} from "vue";
const route = useRoute()
const router = useRouter()
const attachment = reactive({})
const emit = defineEmits(['search'])
const emit = defineEmits(['search','update:modelValue'])
const props = defineProps({
fileList: {
type: Array,
@@ -46,7 +50,11 @@ const props = defineProps({
type: String,
default: '00'
},
uploadState:{
uploadState: {
type: Boolean,
default: true
},
loading: {
type: Boolean,
default: true
}
@@ -91,6 +99,14 @@ const tableConfig = reactive({
]
})
const showTable = ref(true)
const _value = computed({
get() {
return props.loading || ""
},
set(value) {
emit('update:modelValue', value)
}
})
const getTagsOption = () => {
if (!route.query.id) return
getTags(route.query.id).then(res => {
@@ -108,6 +124,11 @@ const getTagsOption = () => {
const handleSearch = () => {
emit('search', attachment)
}
const handleReset=()=>{
attachment.fileName=''
attachment.tag=''
emit('search', {})
}
const handleUpload = () => {
emit('upload')
}

42
src/utils/date.js Normal file
View File

@@ -0,0 +1,42 @@
export const dateFormat = (time = new Date().getTime(),flag) => { //YYYY年MM月DD日 星期d
const _time = time.toString().length > 10 ? time : time * 1000
const weekList = ["日","一", "二", "三", "四", "五", "六" ];
const date = new Date(_time);
const Y = date.getFullYear();
const M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
const Mm = (date.getMonth() + 1 < 10 ? (date.getMonth() + 1) : date.getMonth() + 1);
const D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
const h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
const m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
const s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
let weekDay = new Date().getDay();
const week= weekList[weekDay]
// const strDate = `${Y}/${M}/${D} ${h}:${m}:${s}`
if(flag){
return `${Mm}月`;
}else {
return `${Y}年${M}月${D}日 星期${week}`;
}
}
export const getNowFormatDate = (flag) => {
let date = new Date(),
year = date.getFullYear(), //获取完整的年份(4位)
month = date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
strDate = date.getDate() // 获取当前日(1-31)
if (month < 10) month = `0${month}` // 如果月份是个位数，在前面补0
if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数，在前面补0
if(flag){
return `${year}-${month}-${strDate}`
}else {
return `${year}-${month}`
}
}
export default {
dateFormat,
getNowFormatDate
}

271
src/views/expense-management/share/add.vue
View File

@@ -20,96 +20,107 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-table :data="formData.tableData" style="width: 100%">
<el-table-column prop="projectId" label="项目名称" width="230">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.projectId?'1':rules.projectId">
<el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable>
<el-option
v-for="item in nameOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="researchPersonnel" label="研发人员" width="230">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.researchPersonnel?'1':rules.researchPersonnel">
<el-select v-model="scope.row.researchPersonnel" placeholder="请选择研发人员" clearable>
<el-option
v-for="item in researchOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="wagesPayable" label="应发工资" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.wagesPayable?'1':rules.wagesPayable">
<el-input-number v-model="scope.row.wagesPayable" placeholder="请输入应发工资" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="performance" label="绩效" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.performance?'1':rules.performance">
<el-input-number v-model="scope.row.performance" placeholder="请输入绩效" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="reserveFund" label="公积金" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.reserveFund?'1':rules.reserveFund">
<el-input-number v-model="scope.row.reserveFund" placeholder="请输入公积金" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="socialSecurity" label="社保" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.socialSecurity?'1':rules.socialSecurity">
<el-input-number v-model="scope.row.socialSecurity" placeholder="请输入社保" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="annuity" label="年金" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.annuity?'1':rules.annuity">
<el-input-number v-model="scope.row.annuity" placeholder="请输入年金" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="workday" label="工作日(天)" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.workday?'1':rules.workday">
<el-input-number v-model="scope.row.workday" placeholder="请输入工作日" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="researchDuration" label="研发时长(天)" width="175">
<template #default="scope">
<el-form-item prop="time" :rules="scope.row.researchDuration?'1':rules.researchDuration">
<el-input-number v-model="scope.row.researchDuration" placeholder="请输入研发时长" :controls="false"/>
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column prop="time" label="时间">-->
<!-- <template #default="scope">-->
<!-- <el-input v-model="scope.row.time" placeholder="请输入时间" clearable>-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="subtotal" label="小计">-->
<!-- <template #default="scope">-->
<!-- <el-input v-model="scope.row.subtotal" placeholder="请输入小计" clearable>-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="oper" label="操作">
<template #default="scope">
<el-button type="primary" @click="handleCopy(scope.row)" link style="font-size: 18px">复制</el-button>
<el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 18px">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
</el-form>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="projectId" label="项目名称" width="180">
<template #default="scope">
<el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable>
<el-option
v-for="item in nameOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="researchPersonnel" label="研发人员" width="180">
<template #default="scope">
<el-select v-model="scope.row.researchPersonnel" placeholder="请选择研发人员" clearable>
<el-option
v-for="item in researchOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="wagesPayable" label="应发工资">
<template #default="scope">
<el-input v-model="scope.row.wagesPayable" placeholder="请输入应发工资" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="performance" label="绩效">
<template #default="scope">
<el-input v-model="scope.row.performance" placeholder="请输入绩效" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="reserveFund" label="公积金">
<template #default="scope">
<el-input v-model="scope.row.reserveFund" placeholder="请输入公积金" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="socialSecurity" label="社保">
<template #default="scope">
<el-input v-model="scope.row.socialSecurity" placeholder="请输入社保" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="annuity" label="年金">
<template #default="scope">
<el-input v-model="scope.row.annuity" placeholder="请输入年金" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="workday" label="工作日(天)">
<template #default="scope">
<el-input v-model="scope.row.workday" placeholder="请输入工作日" clearable>
</el-input>
</template>
</el-table-column>
<el-table-column prop="researchDuration" label="研发时长(天)">
<template #default="scope">
<el-input v-model="scope.row.researchDuration" placeholder="请输入研发时长" clearable>
</el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="time" label="时间">-->
<!-- <template #default="scope">-->
<!-- <el-input v-model="scope.row.time" placeholder="请输入时间" clearable>-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="subtotal" label="小计">-->
<!-- <template #default="scope">-->
<!-- <el-input v-model="scope.row.subtotal" placeholder="请输入小计" clearable>-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="oper" label="操作">
<template #default="scope">
<el-button type="primary" @click="handleCopy(scope.row)" link style="font-size: 18px">复制</el-button>
<el-button type="primary" @click="handleDelete(scope.$index)" link style="font-size: 18px">删除</el-button>
</template>
</el-table-column>
</el-table>
<div style="width:100%;text-align: center;padding: 10px">
<el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
</div>
@@ -127,13 +138,22 @@
<script setup lang="jsx">
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {addAllocation, getAllocationDetail,getAllocationProcess} from "@/api/expense-manage";
import {addAllocation, getAllocationDetail, getAllocationProcess, getResearchUser,getProjectOption} from "@/api/expense-manage";
import {useProcessStore} from '@/stores/processStore.js';
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
const rules = reactive({
shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}],
apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}]
apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}],
projectId: [{required: true, message: '请选择项目名称', trigger: 'blur'}],
researchPersonnel: [{required: true, message: '请选择研发人员', trigger: 'blur'}],
wagesPayable: [{required: true, message: '请输入应发工资', trigger: 'blur'}],
performance: [{required: true, message: '请输入绩效', trigger: 'blur'}],
reserveFund: [{required: true, message: '请输入公积金', trigger: 'blur'}],
socialSecurity: [{required: true, message: '请输入社保', trigger: 'blur'}],
annuity: [{required: true, message: '请输入年金', trigger: 'blur'}],
workday: [{required: true, message: '请输入工作日', trigger: 'blur'}],
researchDuration: [{required: true, message: '请输入研发时长', trigger: 'blur'}],
})
const processStore = useProcessStore()
const processInstanceData = ref()
@@ -142,35 +162,34 @@ const loading = ref(false)
const route = useRoute()
const router = useRouter()
const tagsViewStore = useTagsView()
const formData = ref({})
let formData = reactive({
tableData: [
{
projectId:'',
projectName: '',
researchPersonnel:'',
wagesPayable:'',
performance:'',
reserveFund:'',
socialSecurity:'',
annuity:'',
workday:'',
researchDuration:''
}
]
})
const form = ref()
const nameOptions = ref([
{
label: "某项目",
value: '42'
}
])
const researchOptions = ref([
{
label: "某人员",
value: '1'
}
])
const tableData = ref([
{
projectId: '',
projectName: '',
researchPersonnel: '',
wagesPayable: '',
performance: '',
reserveFund: '',
socialSecurity: '',
annuity: '',
workday: '',
researchDuration: '',
// subtotal: '',
}
])
const nameOptions = ref([])
const researchOptions = ref([])
const getResearchOptions = async () => {
const res = await getResearchUser()
researchOptions.value = res.data
}
const getProjectOptions = async () => {
const res = await getProjectOption()
nameOptions.value = res.data
}
const handleAdd = () => {
let row = {
projectId: '',
@@ -185,21 +204,21 @@ const handleAdd = () => {
researchDuration: '',
// subtotal: '',
}
tableData.value.push(row)
formData.tableData.push(row)
}
const handleCopy = (row) => {
tableData.value.push(row)
formData.tableData.push(row)
}
const handleDelete = (index) => {
tableData.value.splice(index, 1)
formData.tableData.splice(index, 1)
}
const handleSubmit = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
let params = {
...formData.value,
usrAllocations: tableData.value,
...formData,
usrAllocations: formData.tableData,
deploymentId: processInstanceData.value.deploymentId,
}
const {code, msg} = await addAllocation(params)
@@ -224,13 +243,15 @@ const getDetailInfo = async () => {
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
formData.value = res.data.formData
formData = res.data.formData
loading.value = false
}
})
}
const init = async () => {
processDiagramViewer.value = false
await getResearchOptions()
await getProjectOptions()
getAllocationProcess().then(res => {
if (res.code === 1000) {
let data = res.data
@@ -244,7 +265,7 @@ const init = async () => {
nextTick(() => {
processDiagramViewer.value = true
})
}else {
} else {
ElNotification({
title: '提示',
message: res.msg,

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

@@ -26,15 +26,26 @@
<!-- </fvTable>-->
</el-tab-pane>
</el-tabs>
<div v-if="shareData.taskId">
<baseTitle title="审核意见"></baseTitle>
<el-form-item prop="auditOpinion">
<el-input
v-model="auditOpinion"
:rows="3"
type="textarea"
placeholder="请输入审核意见"
/>
</el-form-item>
</div>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
<div class="process">
<operation-render v-if="shareProcessViewer" :operation-list="shareData.operationList"
:state="data.state"/>
<process-diagram-viewer v-if="shareProcessViewer" id-name="fundProcess"/>
:state="shareData.state"/>
<process-diagram-viewer v-if="shareProcessViewer" id-name="shareProcess"/>
</div>
</div>
<opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"></opinion>
<opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId" v-model:value="auditOpinion"></opinion>
</template>
<script setup lang="jsx">
@@ -49,6 +60,7 @@ const route = useRoute()
const shareData = ref({})
const detailList = ref([])
const formData = ref({})
const auditOpinion = ref('')
const shareProcessViewer = ref(true)
const loading = ref(false)
const activeName = ref('first')
@@ -59,14 +71,15 @@ const getDetail = async () => {
if (code === 1000) {
shareData.value = data
formData.value = data.formData
loading.value = false
} else {
ElNotification({
title: '提示',
message: msg,
type: 'error'
type: 'error'
})
loading.value = false
}
loading.value = false
}
const getDetailList = async () => {
let params = {
@@ -94,7 +107,7 @@ const getDetailList = async () => {
}
}
getDetail()
getDetailList()
// getDetailList()
</script>
<style scoped lang="scss">
:deep(.el-tabs__nav-scroll) {

2
src/views/expense-management/share/index.vue
View File

@@ -163,7 +163,7 @@ const handleEdit = (row) => {
router.push({
name: 'Share/edit',
query: {
id:row.id
id:row.allocationId
}
})
}

17
src/views/home/index.vue
View File

@@ -193,6 +193,23 @@ const handleView = (row) => {
source: 'home'
}
})
}else if (row.targetState == '80' && row.targetId) {
router.push({
name: 'Share/detail',
query: {
id: row.targetId,
state: row.state,
source: 'home'
}
})
}else if (row.targetState == '90' && row.targetId) {
router.push({
name: 'Phase/detail',
query: {
projectId: row.targetId,
source: 'home'
}
})
}
}
</script>

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

@@ -23,9 +23,9 @@
<el-config-provider>
<el-date-picker
v-model="formData.deadline"
type="datetime"
type="date"
placeholder="截止时间"
value-format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD"
/>
</el-config-provider>
</el-form-item>
@@ -317,7 +317,6 @@ const handleResubmit = () => {
const getDetailInfo = async () => {
getFormInfo(route.query.id).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
formData.value = res.data
showTinymce.value = false
showTable.value = false
@@ -326,7 +325,11 @@ const getDetailInfo = async () => {
showTable.value = true
})
} else {
ElMessage.error(res.msg)
ElNotification({
title: '提示',
message: res.msg,
type: 'error'
})
}
})
}
@@ -341,13 +344,21 @@ const handleDelete = (row) => {
type: 'warning'
}).then(() => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
ElMessage.success("删除成功");
formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
}
});
}).catch(() => {
ElMessage.warning("用户取消删除! ");
ElNotification({
title: '提示',
message: '用户取消删除! ',
type: 'warning'
})
})
}

5
src/views/project-demand/requirement/detail.vue
View File

@@ -2,8 +2,8 @@
<baseTitle title="需求征集详情"></baseTitle>
<collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
:fileListShow="fileListShow"
:processViewer="processViewer" :loading="loading"/>
<opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"></opinion>
:processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>
<opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId" v-model:value="auditOpinion"></opinion>
</template>
<script setup lang="jsx">
@@ -25,6 +25,7 @@ const specialFundOption = ref([])
const processInstanceData = ref({})
const fileListShow = ref("READ")
const showTable = ref(false)
const auditOpinion = ref('')
const processViewer = ref(false)
const processTree = ref()
const collectData = ref([])

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

@@ -238,7 +238,7 @@
<!-- </div>-->
</div>
<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-else @click="handleResubmit">重新发布</el-button>
</div>

37
src/views/project-demand/summary/detail.vue
View File

@@ -1,19 +1,26 @@
<template>
<steps :active="route.query.id==='-1'?0:1" @setDetail="setDetail" @stepChange="stepChange" :reportType="route.query.id==='-1'?'direct':''">
<steps :active="route.query.id==='-1'?0:1" @setDetail="setDetail" @stepChange="stepChange"
:reportType="route.query.id==='-1'?'direct':''">
<template #content>
<collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
<summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
<ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
<ApprovalDetail type="execute" v-show="showActive == '40'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
<ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
</template>
</steps>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"></opinion>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"
v-model:value="auditOpinion"></opinion>
</template>
<script setup lang="jsx">
@@ -30,14 +37,15 @@ const loading = ref(false)
const fileListShow = ref('READ')
const processStore = useProcessStore()
const active = ref(route.query.state)
const auditOpinion = ref('')
const showActive = ref()
const getInfo = async (state) => {
fileListShow.value='READ'
fileListShow.value = 'READ'
const projectId = route.query.projectId
summaryProcessViewer.value = false
loading.value = true
const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
if(code===1000){
const {code, data, msg} = await getMapProjectStateInfo(projectId, state)
if (code === 1000) {
summaryData.value = data;
loading.value = false
processStore.setDesign(data)
@@ -52,14 +60,14 @@ const getInfo = async (state) => {
fileListShow.value = data.formPermMap["fileList"].perm
}
})
}else {
} else {
ElNotification({
title: '提示',
message: msg,
type: 'error'
type: 'error'
})
if(msg==='查询结果为空'){
summaryData.value=[]
if (msg === '查询结果为空') {
summaryData.value = []
}
loading.value = false
}
@@ -71,6 +79,7 @@ const setDetail = (active) => {
}
const stepChange = (data) => {
auditOpinion.value = ''
showActive.value = data.active
getInfo(data.active)
}

126
src/views/project-management/filing/attachment.vue
View File

@@ -1,24 +1,8 @@
<template>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="需求征集" name="00">
<search-files-by-tag @search="searchRequirement" @upload="upload"
:otherFileList="otherFileList" :uploadState="uploadState"/>
</el-tab-pane>
<el-tab-pane label="需求上报" name="10">
<search-files-by-tag @search="searchReport" @upload="upload"
:otherFileList="otherFileList" :uploadState="uploadState"/>
</el-tab-pane>
<el-tab-pane label="项目立项" name="20">
<search-files-by-tag @search="searchInitiation" @upload="upload"
:otherFileList="otherFileList" :uploadState="uploadState"/>
</el-tab-pane>
<el-tab-pane label="项目实施" name="40">
<search-files-by-tag type="40" @search="searchImplementation" @upload="upload" ref="implementation"
:otherFileList="otherFileList" :uploadState="uploadState"/>
</el-tab-pane>
<el-tab-pane label="项目归档" name="50">
<search-files-by-tag @search="searchFiling" @upload="upload"
:otherFileList="otherFileList" :uploadState="uploadState"/>
<el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
<search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
:fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/>
</el-tab-pane>
</el-tabs>
</template>
@@ -31,78 +15,52 @@ const route = useRoute()
const router = useRouter()
const activeName = ref('50')
const attachment = ref({})
const implementation = ref()
const loading = ref(false)
const uploadState = ref(true)
const otherFileList = ref([])
const fileList = ref([])
const projectId = ref(route.query.id)
const requirementId = ref(route.query.requirementId)
const handleClick = (tab) => {
switchSearch(tab.props.name)
}
const switchSearch = (index) => {
switch (index) {
case '00':
searchRequirement({})
break
case '10':
searchReport({})
break
case '20':
searchInitiation({})
break
case '40':
searchImplementation({})
break
case '50':
searchFiling({})
break
const paneList=ref([
{
label:'需求征集',
name:'00'
},
{
label:'需求上报',
name:'10'
},
{
label:'项目立项',
name:'20'
},
{
label:'项目实施',
name:'40'
},
{
label:'项目归档',
name:'50'
}
])
const handleClick = (tab) => {
activeName.value=tab.props.name
loading.value=true
search({})
}
const searchRequirement = async (param) => {
param.targetState = '00'
const search = async (param) => {
param.targetState = activeName.value
param.targetId = projectId.value
searchFileList(param).then(res => {
loading.value=false
changeFileList(res)
})
}
const searchReport = async (param) => {
param.targetState = '10'
param.targetId = projectId.value
searchFileList(param).then(res => {
changeFileList(res)
})
}
const searchInitiation = async (param) => {
param.targetState = '20'
param.targetId = projectId.value
searchFileList(param).then(res => {
changeFileList(res)
})
}
const searchImplementation = async (param) => {
param.targetState = '40'
param.targetId = projectId.value
console.log('param',param)
searchFileList(param).then(res => {
changeFileList(res)
})
}
const searchFiling = async (param) => {
param.targetState = '50'
param.targetId = projectId.value
searchFileList(param).then(res => {
changeFileList(res)
})
}
const changeFileList = (res) => {
if (res.code === 1000) {
otherFileList.value = res.data.fileList
fileList.value = res.data.fileList
uploadState.value = res.data.upload
} else {
ElNotification({
@@ -113,14 +71,6 @@ const changeFileList = (res) => {
}
}
onMounted(() => {
if (activeName.value === '50') {
searchFiling({})
}
})
const upload = () => {
if (activeName.value === '40') {
router.push({
@@ -140,6 +90,12 @@ const upload = () => {
})
}
}
onMounted(() => {
if (activeName.value === '50') {
search({})
}
})
</script>
<style scoped lang="scss">

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

@@ -97,7 +97,7 @@ const getTagsOption = () => {
const handleSearch = () => {
let params = {
targetId: route.query.id,
targetState: "30"
targetState: "40"
}
if (attachment.tag) {
tagsOption.value.forEach(item => {

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

@@ -1,8 +1,8 @@
<template>
<baseTitle title="阶段变更详情"></baseTitle>
<ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
:processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
<opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"></opinion>
: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>
</template>
<script setup lang="jsx">
@@ -15,6 +15,7 @@ const summaryData = ref({})
const summaryProcessViewer = ref(true)
const processStore = useProcessStore()
const loading = ref(false)
const auditOpinion = ref('')
const fileListShow = ref('READ')
const getInfo = async () => {
fileListShow.value = 'READ'

3
src/views/project-management/implementation/upload.vue
View File

@@ -139,8 +139,7 @@ const handleSubmit = async (instance) => {
let params = {
fileList: fileList.value,
projectId: route.query.id,
tag: formData.value.tagName,
targetState: "30"
targetState: "40"
}
let res = await uploadFileList(params)
ElNotification({

2
src/views/workflow/process/ProcessSetting.vue
View File

@@ -46,7 +46,7 @@ const processKeyChange = () => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
type: 'error'
})
}
})

1
src/views/workflow/process/ProcessTree.vue
View File

@@ -19,7 +19,6 @@ import {useProcessStore} from '@/stores/processStore.js'
const processStore = useProcessStore()
const emit = defineEmits()
const props = defineProps({
mode: {
type: String,

39
src/views/workflow/process/common/AvatarEllipsis.vue
View File

@@ -5,16 +5,23 @@
<slot name="pre"></slot>
<div style="display: flex;flex-wrap: wrap;">
<div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
<div class="circle-user">
<Tooltip :content="user.name" placement="bottom-start" width="45">
</Tooltip>
</div>
<div v-if="user.icon"
class="el-timeline-item__node" :style="{
<div class="user">
<div class="circle-user">
<Tooltip :content="user.name" placement="bottom-start" width="45">
</Tooltip>
</div>
<div v-if="user.icon && mode === 'preview'"
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 v-if="user.icon" size="15" :class="user.class">
<component :is="user.icon"/>
</el-icon>
</div>
</div>
<div class="arrow" v-if="(index+1)%3!==0&&userInfo.length!==1&&(index+1)!==userInfo.length">
<el-icon size="20">
<Right/>
</el-icon>
</div>
</div>
@@ -23,7 +30,7 @@
</template>
<script setup>
import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
import {Loading, Close, CircleCheckFilled, MoreFilled, Right} from '@element-plus/icons-vue'
import {defineProps} from "vue";
const props = defineProps({
@@ -107,11 +114,17 @@ init()
.avatar_name {
display: flex;
flex-direction: column;
align-items: center;
margin-right: 1px;
/*width: 45px;*/
position: relative;
margin-bottom: 5px;
.user {
display: flex;
flex-direction: column;
align-items: center;
margin-right: 1px;
/*width: 45px;*/
position: relative;
}
}
.el-timeline-item__node {

4
src/views/workflow/process/nodes/Node.vue
View File

@@ -23,7 +23,7 @@
</template>
<template v-else-if="showAvatar">
<span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo" :mode="mode"/>
</template>
<template v-else>
<span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
@@ -250,7 +250,7 @@ const init = () => {
.node-body-content {
cursor: pointer;
padding: 18px;
padding: 18px 8px;
color: #656363;
font-size: 14px;