-
@@ -248,6 +161,7 @@ import {ElNotification} from "element-plus";
import {approvePlan} from "@/api/project-demand/summary";
import SelectPreProcess from "@/components/SelectPreProcess.vue";
+
const emit = defineEmits(['update:value'])
const tagsViewStore = useTagsView()
const cacheStore = useCacheStore()
@@ -308,9 +222,9 @@ const handleRejectPlan = async () => {
return
}
const params = {
- auditOpinion:_value.value,
- projectId:parseInt(route.query.projectId),
- state:false
+ auditOpinion: _value.value,
+ projectId: parseInt(route.query.projectId),
+ state: false
}
console.log('params', params)
const res = await approvePlan(params)
@@ -326,9 +240,9 @@ const handleRejectPlan = async () => {
}
const handleAgreePlan = async () => {
const params = {
- auditOpinion:_value.value,
- projectId:parseInt(route.query.projectId),
- state:true
+ auditOpinion: _value.value,
+ projectId: parseInt(route.query.projectId),
+ state: true
}
console.log('params', params)
const res = await approvePlan(params)
@@ -400,17 +314,33 @@ watch(() => props.loading, (newVal) => {
}, {deep: true})
watchEffect(() => {
- props.formData.singleFile=[props.formData.singleFile]
+ props.formData.singleFile = [props.formData.singleFile]
return Object.keys(props.formData).length && (localFormData.value = props.formData)
})
getFundOptions()
-
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index 0565a62..b7890ab 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -76,11 +76,11 @@ const tableConfig = reactive({
label: '专项资金名称',
align: 'center'
},
- {
- prop: 'approveName',
- label: '审批人',
- align: 'center'
- },
+ // {
+ // prop: 'approveName',
+ // label: '审批人',
+ // align: 'center'
+ // },
{
prop: 'fundAmount',
label: '资金金额(元)',
@@ -100,17 +100,27 @@ const tableConfig = reactive({
{
prop: 'projectNumber',
label: '项目数量',
- align: 'center'
+ align: 'center',
+ width: 100,
},
{
- prop: 'taskNode',
- label: '当前节点',
- align: 'center'
+ prop: 'approveName',
+ label: '当前审批节点',
+ align: 'center',
+ width: 150,
+ currentRender: ({row, index}) => {
+ if(row.state=='1'){
+ return
{row.approveName}
+ }else {
+ return
{row.taskNode}
+ }
+ }
},
{
prop: 'state',
label: '状态',
align: 'center',
+ width: 150,
showOverflowTooltip: false,
currentRender: ({row, index}) => {
if (row.state == undefined||row.state == 0) {
@@ -125,6 +135,7 @@ const tableConfig = reactive({
label: '操作',
align: 'center',
fixed:'right',
+ width: 150,
showOverflowTooltip: false,
currentRender: ({row, index}) => {
let btn = []
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index b78ed11..0828e5b 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -1,6 +1,6 @@
- 打印
+ 打印