@@ -148,7 +149,7 @@ const pageInfo = reactive({
const rules = reactive({
requestName: [{required: true, message: '请选择前置流程', trigger: 'blur'}],
})
-const tagsViewStore = useTagsView()
+// const tagsViewStore = useTagsView()
const processStore = useProcessStore()
const otherFileList = ref([])
const localFormData = ref({
@@ -212,7 +213,7 @@ const getPreProcessList = () => {
})
total.value = searchArray.length
currentList.value = searchArray
- preProcessList.value = currentList.value.slice(0, 10)
+ preProcessList.value = currentList.value.slice(0, 5)
})
}
const choosePreProcess = () => {
@@ -360,20 +361,21 @@ const handleSubmit = async () => {
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
- tagsViewStore.delVisitedViews(router.currentRoute.value.path)
- if (props.step === '20') {
- await router.push({
- name: 'Initiation'
- })
- } else if (props.step === '40') {
- await router.push({
- name: 'Implementation'
- })
- } else if (props.step === '50') {
- await router.push({
- name: 'Filing'
- })
- }
+ // tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+ location.reload()
+ // if (props.step === '20') {
+ // await router.push({
+ // name: 'Initiation'
+ // })
+ // } else if (props.step === '40') {
+ // await router.push({
+ // name: 'Implementation'
+ // })
+ // } else if (props.step === '50') {
+ // await router.push({
+ // name: 'Filing'
+ // })
+ // }
}
}
const init = async () => {
@@ -426,4 +428,10 @@ onMounted(async () => {
display: flex;
justify-content: flex-end;
}
+:deep(.el-upload-list) {
+ width: auto;
+}
+:deep(.el-overlay-dialog ){
+ left: 0!important;
+}
diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue
new file mode 100644
index 0000000..3578ed3
--- /dev/null
+++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue
@@ -0,0 +1,135 @@
+
+
+
+
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
new file mode 100644
index 0000000..4257601
--- /dev/null
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -0,0 +1,242 @@
+
+
+
+
diff --git a/src/views/project-management/mobledetail/index.vue b/src/views/project-management/mobledetail/index.vue
index d24040b..74b09c4 100644
--- a/src/views/project-management/mobledetail/index.vue
+++ b/src/views/project-management/mobledetail/index.vue
@@ -36,7 +36,7 @@
:processViewer="commonProvessViewer"
:fileListShow="fileListShow"
v-model:value="auditOpinion"/>
-
@@ -56,9 +55,10 @@ import {ElLoading, ElNotification} from "element-plus";
import ApprovalDetail from './ApprovalDetailMoblie.vue';
import CollectionDetail from './CollectionDetailMoblie.vue';
import SummaryDetail from './SummaryDetailMoblie.vue';
-import Opinion from './OpinionMoblie.vue';
import StepsMoblie from './StepsMoblie.vue';
-import ProjectApply from './ProjectApplyMoblie.vue';
+import {getMapProjectStateInfo} from "./api";
+import OpinionMoblie from "./OpinionMoblie.vue";
+import ProjectApplyMoblie from "./ProjectApplyMoblie.vue";
const route = useRoute()
@@ -70,7 +70,6 @@ const fileListShow = ref('READ')
const mode = ref('')
const currentStep = ref()
const auditOpinion = ref('')
-// const step = ref(route.query.step)
route.query.step == '10' && (currentStep.value = 1)
route.query.step == '20' && (currentStep.value = 2)
route.query.step == '40' && (currentStep.value = 3)
@@ -167,4 +166,4 @@ const stepChange = (data) => {
//}
}
}
-
\ No newline at end of file
+
diff --git a/src/views/special-fund/detail.vue b/src/views/special-fund/detail.vue
index a6760a2..1d08334 100644
--- a/src/views/special-fund/detail.vue
+++ b/src/views/special-fund/detail.vue
@@ -19,11 +19,6 @@ const getDetail = async () => {
loading.value = true
fundProcessViewer.value = false
const {code, data, msg} = await getFundDetailProcess(specialFundId)
- ElNotification({
- title: '提示',
- message: msg,
- type: code === 1000 ? 'success' : 'error'
- })
if (code === 1000) {
fundData.value = data
loading.value = false
@@ -39,6 +34,11 @@ const getDetail = async () => {
showTable.value = true
})
}else {
+ ElNotification({
+ title: '提示',
+ message: msg,
+ type: 'error'
+ })
loading.value = false
}
}
From 36c5b04dbc92a71c36aaad41734e6c86c1270447 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 24 Jun 2024 13:39:30 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
=?UTF-8?q?=E6=91=8A/=E8=B5=84=E9=87=91=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AllocationSummaryDetailMobile.vue | 105 ++++++++
.../mobledetail/ExpenseDetailMobile.vue | 247 ++++++++++++++++++
.../mobledetail/ShareDetailMobile.vue | 7 +-
3 files changed, 357 insertions(+), 2 deletions(-)
create mode 100644 src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
create mode 100644 src/views/project-management/mobledetail/ExpenseDetailMobile.vue
diff --git a/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
new file mode 100644
index 0000000..6cdb330
--- /dev/null
+++ b/src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
diff --git a/src/views/project-management/mobledetail/ExpenseDetailMobile.vue b/src/views/project-management/mobledetail/ExpenseDetailMobile.vue
new file mode 100644
index 0000000..1ba2212
--- /dev/null
+++ b/src/views/project-management/mobledetail/ExpenseDetailMobile.vue
@@ -0,0 +1,247 @@
+
+
+
+
diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue
index 3578ed3..d58d183 100644
--- a/src/views/project-management/mobledetail/ShareDetailMobile.vue
+++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue
@@ -1,4 +1,5 @@
+
@@ -15,10 +16,10 @@
-
+
-
+
@@ -62,6 +63,8 @@ import {ElNotification} from "element-plus";
import {useProcessStore} from '@/stores/processStore.js';
import {getAllocationDetail} from "@/api/expense-manage";
import OpinionMoblie from "./OpinionMoblie.vue";
+import AllocationSummaryDetailMobile from "./AllocationSummaryDetailMobile.vue";
+import ExpenseDetailMobile from "./ExpenseDetailMobile.vue";
const changeDiagram = ref(false)
const processStore = useProcessStore()
From 9d0490a2536b076b18cb5fa7bdb8efb4d5d713db Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 25 Jun 2024 11:55:48 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
=?UTF-8?q?=E6=91=8A=E7=BC=96=E8=BE=91=E4=BC=A0=E5=8F=82=E5=92=8C=E5=8F=B0?=
=?UTF-8?q?=E8=B4=A6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/expense-management/share/add.vue | 42 ++++++++++++-------
.../implementation/account.vue | 23 +++++++---
2 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 47f618c..6a8dad3 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -160,17 +160,17 @@ import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
const userList = ref([])
const changeDiagram = ref(false)
const rules = reactive({
- shareName: [{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'}],
+ shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
+ apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
+ projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
+ // researchPersonnel: [{required: true, message: '请选择研发人员', trigger: ['blur', 'change']}],
+ wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
+ performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
+ reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
+ socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
+ annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
+ workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
+ researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
})
const processStore = useProcessStore()
const opentionData = ref()
@@ -293,7 +293,7 @@ const handleSubmit = (instance) => {
usrAllocations: formData.value.tableData,
deploymentId: processInstanceData.value.deploymentId,
}
- console.log('params', params, formData.value.tableData)
+ // console.log('params', params, formData.value.tableData)
const {code, msg} = await addAllocation(params)
ElNotification({
title: '提示',
@@ -318,21 +318,35 @@ const handleResubmit = (instance) => {
type: 'error'
})
}
+ let newUsrAllocationsObj={}
+ let newUsrAllocationsObjArray=[]
formData.value.tableData.forEach(item => {
item.allocationId = formData.value.allocationId
item.projectName = getProjectName(item.projectId)
if (item.performance == 0) {
item.performance = null
}
+ newUsrAllocationsObj={
+ projectId: item.projectId,
+ projectName:item.projectName,
+ researchPersonnel: item.researchPersonnel,
+ wagesPayable: item.wagesPayable,
+ performance: item.performance,
+ reserveFund: item.reserveFund,
+ socialSecurity: item.socialSecurity,
+ annuity: item.annuity,
+ workday: item.workday,
+ researchDuration: item.researchDuration,
+ }
+ newUsrAllocationsObjArray.push(newUsrAllocationsObj)
})
let params = {
allocationId: formData.value.allocationId,
shareName: formData.value.shareName,
apportionmentMonth: formData.value.apportionmentMonth,
- usrAllocations: formData.value.tableData,
+ usrAllocations: newUsrAllocationsObjArray,
deploymentId: processInstanceData.value.deploymentId,
}
- console.log('params', params)
const {code, msg} = await editAllocation(params)
ElNotification({
title: '提示',
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 070031f..a279d04 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -2,8 +2,7 @@
- 导出
-
+
@@ -89,7 +88,8 @@ const formDataArray = ref([
prop: 'projectCompletionRate',
colProps: {
span: 6
- }
+ },
+ component: ()=>{tableData.value.projectCompletionRate}%
},
{
label: '已完成工作量',
@@ -99,7 +99,6 @@ const formDataArray = ref([
}
}
])
-
const tableData = ref({})
const schema = computed(() => {
if (JSON.stringify(tableData.value) !== '{}') {
@@ -111,7 +110,8 @@ const schema = computed(() => {
const baseForm = ref()
const tableIns = ref()
const btns = ref([
- {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''}
+ {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''},
+ {name: '导出', key: 'export', color: '#DED0B2', auth: ''}
])
const searchConfig = reactive([
{
@@ -173,6 +173,10 @@ const searchConfig = reactive([
])
const tableConfig = reactive({
columns: [
+ {
+ type: 'selection',
+ prop: 'selection'
+ },
{
prop: 'name',
type: 'index',
@@ -234,6 +238,11 @@ const tableConfig = reactive({
if (route.query.state !== '4') {
btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''})
}
+const exportIds=ref([])
+const selectionChange=(data)=>{
+ console.log('data',data)
+ console.log(' data.forEach(item=>item.id)', data.forEach(item=>item.id))
+}
const handleUpdateTable = () => {
router.push({
name: 'Implementation/update',
@@ -259,6 +268,9 @@ const headBtnClick = (key) => {
case 'update':
handleUpdateTable()
break;
+ case 'export':
+ exportExcelHandler()
+ break;
}
}
const handleUploadFee = () => {
@@ -271,6 +283,7 @@ const handleUploadFee = () => {
}
const exportExcelHandler = () => {
+ console.log('exportIds.value',exportIds.value)
let data = {
projectId: 113
}
From afa0a528985eb04ac4ff56a03382b8250ccaf245 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 25 Jun 2024 16:21:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E5=88=86=E6=91=8A=E5=A4=8D=E5=88=B6/=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E4=B8=80=E8=A1=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DetailComponent/ExpenseDetail.vue | 8 ++
src/views/expense-management/share/add.vue | 76 ++++++++++++-------
2 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index 7984fed..02f0e87 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -49,6 +49,7 @@