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 1/5] =?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 2/5] =?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 3/5] =?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 @@