From 0d7c3033973dd765b477dba90cd321f45cf30674 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 00:38:21 +0800 Subject: [PATCH 01/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/auth/index.vue | 1 - src/views/expense-management/share/add.vue | 6 ++++-- src/views/project-demand/requirement/add.vue | 15 ++++++++++----- src/views/project-demand/summary/add.vue | 7 ++++--- .../project-management/implementation/check.vue | 6 ++++-- .../project-management/implementation/upload.vue | 3 ++- .../implementation/uploadFee.vue | 3 ++- src/views/project-management/initiation/apply.vue | 3 ++- src/views/special-fund/add.vue | 3 ++- 9 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/views/auth/index.vue b/src/views/auth/index.vue index dda3c87..7adfb49 100644 --- a/src/views/auth/index.vue +++ b/src/views/auth/index.vue @@ -95,7 +95,6 @@ - diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 28dbf61..2730e08 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -279,11 +279,12 @@ const handleSubmit = (instance) => { if (!instance) return instance.validate(async (valid) => { if (!valid) { - return ElNotification({ + ElNotification({ title: '提示', message: '请完善数据,再提交!', type: 'error' }) + return; } let researchPersonnelId = '' formData.value.tableData.forEach(item => { @@ -326,11 +327,12 @@ const handleResubmit = (instance) => { if (!instance) return instance.validate(async (valid) => { if (!valid) { - return ElNotification({ + ElNotification({ title: '提示', message: '请完善数据,再提交!', type: 'error' }) + return; } let newUsrAllocationsObj = {} let newUsrAllocationsObjArray = [] diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index cdb13c4..11ff89f 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -1,7 +1,7 @@ - - diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue deleted file mode 100644 index 588f6d6..0000000 --- a/src/views/project-management/implementation/check.vue +++ /dev/null @@ -1,239 +0,0 @@ - - - - - diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index f71e6d6..4d8e78d 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -10,7 +10,7 @@
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue deleted file mode 100644 index c39704d..0000000 --- a/src/views/project-management/initiation/apply.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - - - diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue index 5ce838e..993eb5e 100644 --- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue +++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue @@ -16,7 +16,7 @@ From 9a789db8a71c973b36c04af988b0d0965c53aa15 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 21:31:05 +0800 Subject: [PATCH 09/19] =?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=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AttachmentUpload.vue | 25 ++++++++++------------ src/views/expense-management/share/add.vue | 19 +++++++++++----- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 3a317b4..70bb806 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -223,21 +223,20 @@ const isSingleFile = ref(false) const allFileList = ref([]) const deleteFileVal = ref({}) const singleFileList = ref([]) -if (props.formData.fileList !== null && props.formData.fileList?.length > 0) { - allFileList.value = props.formData.fileList -} - +// if (props.formData.fileList !== null && props.formData.fileList?.length > 0) { +// allFileList.value = props.formData.fileList +// } watch(() => props.showSingleTable, (newVal) => { props.showSingleTable = newVal }, {deep: true}) -// watch(() => props.formData.fileList, (newVal) => { -// console.log('newVal-fileList', newVal) -// if (props.preview) { -// // newVal?.forEach(item => { -// // allFileList.value.push(item) -// // }) -// } -// }, {deep: true}) +watch(() => props.formData.fileList, (newVal) => { + console.log('newVal-fileList', newVal) + if (props.preview) { + newVal?.forEach(item => { + allFileList.value.push(item) + }) + } +}, {immediate: true}) // watch(() => props.otherFileList, (newVal) => { // props.otherFileList=newVal // if (props.preview) { @@ -280,8 +279,6 @@ const handleDelete = (row, type) => { singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1); isSingleFile.value = false } else { - console.log('allFileList.value',allFileList.value,row) - console.log('allFileList.value.findIndex((item) => item.id === row.fileId)',allFileList.value.findIndex((item) => item.id === row.fileId)) allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1); } } diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 1e868fe..d74d6b5 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -115,7 +115,7 @@
-
流程图
+
流程图
{ name: row.researchPersonnel, companyName: row.companyName, } - userList.value.push(userObj) + userList.value=[userObj] } - userPicker.value.showUserPicker() + nextTick(() => { + userPicker.value.showUserPicker() + }) } const selected = (select) => { + console.log('select',select) if (!select || select.length === 0) { return } @@ -228,7 +231,7 @@ const selected = (select) => { item.researchPersonnel = select[0].name } }) - userList.value=select + // userList.value=select } const getResearchOptions = async () => { const res = await getResearchUser() @@ -353,13 +356,18 @@ const handleResubmit = (instance) => { item.performance = null } newUsrAllocationsObj = { + allocationId: formData.value.allocationId, + id: item.id, projectId: item.projectId, projectName: item.projectName, + researchPersonnel: item.researchPersonnel, researchPersonnelId: item.researchPersonnelId, wagesPayable: item.wagesPayable, performance: item.performance, reserveFund: item.reserveFund, socialSecurity: item.socialSecurity, + time: item.time, + subtotal: item.subtotal, annuity: item.annuity, workday: item.workday, researchDuration: item.researchDuration, @@ -378,9 +386,10 @@ const handleResubmit = (instance) => { allocationId: formData.value.allocationId, shareName: formData.value.shareName, apportionmentMonth: formData.value.apportionmentMonth, - usrAllocations: newUsrAllocationsObjArray, + usrAllocations:newUsrAllocationsObjArray, deploymentId: processInstanceData.value.deploymentId, } + console.log('params', params, formData.value.tableData) const {code, msg} = await editAllocation(params) ElNotification({ title: '提示', From 361510242cabf5f24b80da53c67dc97e86510da2 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 21:38:51 +0800 Subject: [PATCH 10/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E8=A1=A8=E6=A0=BC=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implementation/account.vue | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 5c24d7e..3a92081 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -1,12 +1,15 @@ From bbc883a116a8237d61bfc89f5cd6e09834136d94 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 21:52:33 +0800 Subject: [PATCH 11/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implementation/updateTable.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue index f0155eb..950611d 100644 --- a/src/views/project-management/implementation/updateTable.vue +++ b/src/views/project-management/implementation/updateTable.vue @@ -10,7 +10,7 @@ {{ tableForm.projectChargePersonName }} - + {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }} @@ -154,12 +154,14 @@ getBaseInfo() const init = async () => { const {code, msg, data} = await searchUpdateLedgerData(route.query.id) tableForm.value = data - let userObj = { - id: data.projectChargePerson, - name: data.projectChargePersonName, - companyName: data.companyName, + if(data.projectChargePersonName){ + let userObj = { + id: data.projectChargePerson, + name: data.projectChargePersonName, + companyName: data.companyName, + } + userList.value.push(userObj) } - userList.value.push(userObj) if (code !== 1000) { ElNotification({ title: '提示', From 842fa7b782ea260d365c7ca4a01f39845d4c2fd8 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 22:58:01 +0800 Subject: [PATCH 12/19] =?UTF-8?q?fix=20:=20=E4=BA=BA=E5=91=98=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=A1=86,=E4=B8=BB=E6=AC=A1=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expense-management/share/add.vue | 6 ++++-- src/views/project-management/implementation/phase.vue | 3 ++- src/views/project-management/implementation/updateTable.vue | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index d74d6b5..f0917d6 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -153,8 +153,6 @@ import { import {useProcessStore} from '@/stores/processStore.js'; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; import OperationRender from '@/views/workflow/common/OperationRender.vue' -import {ref} from "vue"; - import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; const userList = ref([]) @@ -213,6 +211,7 @@ const showPersonnelPicker = (row, index) => { id: row.researchPersonnelId, name: row.researchPersonnel, companyName: row.companyName, + accountType: row.accountType, } userList.value=[userObj] } @@ -229,6 +228,8 @@ const selected = (select) => { if (index === currentIndex.value) { item.researchPersonnelId = select[0].id item.researchPersonnel = select[0].name + item.companyName = select[0].companyName + item.accountType = select[0].accountType } }) // userList.value=select @@ -382,6 +383,7 @@ const handleResubmit = (instance) => { }) return; } + console.log('formData.value.apportionmentMonth',new Date(formData.value.apportionmentMonth)) let params = { allocationId: formData.value.allocationId, shareName: formData.value.shareName, diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index 4d8e78d..54ab532 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -163,7 +163,8 @@ const selected = (select) => { let userInfo = { id: val.id, name: val.name, - avatar: val.avatar, + companyName: val.companyName, + accountType: val.accountType, } userInfoList.push(userInfo) } diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue index 950611d..8cfdbd6 100644 --- a/src/views/project-management/implementation/updateTable.vue +++ b/src/views/project-management/implementation/updateTable.vue @@ -114,6 +114,8 @@ const selected = (select) => { for (const selectElement of select) { tableForm.value.projectChargePerson = selectElement.id tableForm.value.projectChargePersonName = selectElement.name + tableForm.value.companyName = selectElement.companyName + tableForm.value.accountType = selectElement.accountType } userList.value = select } @@ -159,6 +161,7 @@ const init = async () => { id: data.projectChargePerson, name: data.projectChargePersonName, companyName: data.companyName, + accountType: data.accountType, } userList.value.push(userObj) } From 8ae817ffb3e7f8152c281f0744d9343011a76b3c Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Thu, 4 Jul 2024 10:04:28 +0800 Subject: [PATCH 13/19] =?UTF-8?q?fix:=20=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fvcomponents/fvTable/index.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue index 0f37907..9cbaebe 100644 --- a/src/fvcomponents/fvTable/index.vue +++ b/src/fvcomponents/fvTable/index.vue @@ -227,10 +227,8 @@ const getList = async () => { } else { localData.list = data } - if (data.total) { - localData.total = data.total - emits('getTotal', localData.total) - } + localData.total = data.total + emits('getTotal', localData.total) localData.loading = false } else { ElNotification({ From 2466e1565941375490502991d9ff34e0a15631d8 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 4 Jul 2024 11:30:03 +0800 Subject: [PATCH 14/19] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8->=E5=BE=81=E9=9B=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project-demand/requirement/add.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 0c6f586..ea15fa1 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -104,7 +104,7 @@ 重新提交 返回
-
@@ -168,7 +168,7 @@ const formPermMap = ref(new Map()); const companyNameArray = ref([]) const rules = reactive({ requirementName: [{required: true, message: '请输入征集名称', trigger: 'blur'}], - companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}], + companyIds: [{required: true, message: '请选择征集公司', trigger: 'blur'}], collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}], deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}], specialFundId: [{required: true, message: '请选择专项资金名称', trigger: 'blur'}], @@ -341,7 +341,7 @@ const submitParam = (item) => { if (item.companyIds.length === 0) { ElNotification({ title: '提示', - message: '请选择所属公司', + message: '请选择征集公司', type: 'error' }) return; From 70ffe5c1ebff5dde4cf80448e2f2eaedaf88a0df Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 4 Jul 2024 12:30:38 +0800 Subject: [PATCH 15/19] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expense-management/share/add.vue | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index f0917d6..29eb247 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -320,7 +320,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: '提示', @@ -346,8 +346,6 @@ const handleResubmit = (instance) => { }) return; } - let newUsrAllocationsObj = {} - let newUsrAllocationsObjArray = [] let researchPersonnelId = '' formData.value.tableData.forEach(item => { item.allocationId = formData.value.allocationId @@ -356,24 +354,6 @@ const handleResubmit = (instance) => { if (item.performance == 0) { item.performance = null } - newUsrAllocationsObj = { - allocationId: formData.value.allocationId, - id: item.id, - projectId: item.projectId, - projectName: item.projectName, - researchPersonnel: item.researchPersonnel, - researchPersonnelId: item.researchPersonnelId, - wagesPayable: item.wagesPayable, - performance: item.performance, - reserveFund: item.reserveFund, - socialSecurity: item.socialSecurity, - time: item.time, - subtotal: item.subtotal, - annuity: item.annuity, - workday: item.workday, - researchDuration: item.researchDuration, - } - newUsrAllocationsObjArray.push(newUsrAllocationsObj) }) if (!researchPersonnelId) { ElNotification({ @@ -383,15 +363,14 @@ const handleResubmit = (instance) => { }) return; } - console.log('formData.value.apportionmentMonth',new Date(formData.value.apportionmentMonth)) let params = { allocationId: formData.value.allocationId, shareName: formData.value.shareName, apportionmentMonth: formData.value.apportionmentMonth, - usrAllocations:newUsrAllocationsObjArray, + 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 editAllocation(params) ElNotification({ title: '提示', From 05585bb980d9f65df2ae9b6b38ff290c7793a945 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 4 Jul 2024 13:08:00 +0800 Subject: [PATCH 16/19] =?UTF-8?q?fix=20:=20=E6=B5=81=E7=A8=8B=E5=9B=BE/?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=8E=E6=8C=89=E9=92=AE=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expense-management/share/add.vue | 4 ++-- src/views/project-management/implementation/updateTable.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 29eb247..75f8448 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -40,7 +40,7 @@ diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index bc7a9b7..84f417d 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -186,7 +186,7 @@ const tableConfig = reactive({ } ], api: '/admin/role', - btns: [{name: '新增', key: 'add', auth: auths.add, type: 'primary'}], + btns: [{name: '新增', key: 'add', auth: auths.add, color:"#DED0B2"}], params: {} }) diff --git a/src/views/system/subsidiary/index.vue b/src/views/system/subsidiary/index.vue index 464310b..8371dcc 100644 --- a/src/views/system/subsidiary/index.vue +++ b/src/views/system/subsidiary/index.vue @@ -10,12 +10,12 @@ - 搜索 - 重置 + 搜索 + 重置
- {{ isExpand ? '全部收起' : '全部展开' }} + {{ isExpand ? '全部收起' : '全部展开' }}
- 提交 - 返回 + 提交 + 返回
@@ -246,4 +246,4 @@ onMounted(async ()=>{ \ No newline at end of file + diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 03b4764..d12a2ab 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -167,7 +167,7 @@ const tableConfig = reactive({ api: '/admin/mosr/user', params: {}, btns: [ - {name: '新增', type: 'primary', auth: ['admin:user:add'], key: 'add'} + {name: '新增', color:"#DED0B2", auth: ['admin:user:add'], key: 'add'} ] }) diff --git a/src/views/tool/dict/index.vue b/src/views/tool/dict/index.vue index afc598b..410a0da 100644 --- a/src/views/tool/dict/index.vue +++ b/src/views/tool/dict/index.vue @@ -3,13 +3,13 @@
- 新增 + 新增 - 修改 - 删除
@@ -40,7 +40,7 @@
- 新增 + 新增
diff --git a/src/views/workflow/process/ProcessDesign.vue b/src/views/workflow/process/ProcessDesign.vue index 323388e..b2ac0b8 100644 --- a/src/views/workflow/process/ProcessDesign.vue +++ b/src/views/workflow/process/ProcessDesign.vue @@ -1,14 +1,14 @@