From 38e9c1d1e5d2b819c8edcc17a9fdb28585b2a181 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 15:39:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE,?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=81=E9=9B=86=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/index.scss | 2 +-
src/views/project-demand/requirement/add.vue | 8 ++++++-
src/views/project-demand/summary/index.vue | 6 ++---
.../implementation/account.vue | 8 +++----
.../implementation/updateTable.vue | 22 +++++++++++--------
5 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index b664b8f..93b3576 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,7 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
}
.approval-record {
- padding-top: 10px;
+ //padding-top: 10px;
padding-bottom: 30px;
position: relative;
.approval-title {
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 6eade9d..828a747 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -367,7 +367,13 @@ const submitParam = (item) => {
const handleSubmit = async (instance) => {
if (!instance) return
instance.validate(async (valid) => {
- if (!valid) return
+ if (!valid) {
+ return ElNotification({
+ title: '提示',
+ message: '请完善数据,再提交!',
+ type: 'error'
+ })
+ }
const {msg, code} = await addRequirement(submitParam(formData.value))
ElNotification({
title: '提示',
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 3c70964..b3ef500 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -283,9 +283,9 @@ const headBtnClick = (key) => {
const search = (val) => {
let obj = {...val}
- if (obj.time) {
- obj.startTime = obj.time[0]
- obj.endTime = obj.time[1]
+ if (obj.dateValue) {
+ obj.startTime = obj.dateValue[0]
+ obj.endTime = obj.dateValue[1]
delete obj.dateValue
}
tableConfig.params = obj
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 71fa18e..7d4ae3b 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -173,10 +173,10 @@ const searchConfig = reactive([
])
const tableConfig = reactive({
columns: [
- {
- type: 'selection',
- prop: 'selection'
- },
+ // {
+ // type: 'selection',
+ // prop: 'selection'
+ // },
{
prop: 'name',
type: 'index',
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index d8a138d..e072c59 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -9,9 +9,9 @@
- {{tableForm.projectChargePerson?tableForm.projectChargePerson: currentPerson.name }}
+ {{tableForm.projectChargePersonName}}
- {{ tableForm.projectChargePerson||currentPerson.name ? '更改' : '请选择研发人员' }}
+ {{ tableForm.projectChargePersonName ? '更改' : '请选择研发人员' }}
@@ -55,7 +55,7 @@
-
+
@@ -88,23 +88,30 @@ const tagsViewStore = useTagsView()
const baseForm = ref()
const route = useRoute()
const router = useRouter()
-const currentPerson = ref({})
const tableForm = ref({
projectName: '',
completeWork: '',
endTime: '',
projectBudgetDescription: '',
projectChargePerson: '',
+ projectChargePersonName:'',
projectCompletionRate: '',
projectDevelopmentWay: '',
projectId: '',
- startTime: '',
+ startTime: ''
})
const userPicker = ref()
+
+const showPersonnelPicker = () => {
+ userPicker.value.showUserPicker()
+}
const selected = (select) => {
+ if (!select || select.length === 0) {
+ return
+ }
for (const selectElement of select) {
- currentPerson.value = selectElement
tableForm.value.projectChargePerson = selectElement.id
+ tableForm.value.projectChargePersonName = selectElement.name
}
}
const disabledDate = (time) => {
@@ -113,9 +120,6 @@ const disabledDate = (time) => {
const handleBack = () => {
history.back()
}
-const showPersonnelPicker = () => {
- userPicker.value.showUserPicker()
-}
const handleSubmit = async () => {
let params = {
...tableForm.value,