From dac3f8292f0f0250f7e72a4cdd8caf7e18c9c034 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 9 Sep 2024 15:39:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=8C=E5=8F=AA=E5=AD=98=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectNumber.vue | 6 ++---- src/views/projectcenter/ProjectAdd.vue | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue index 86973067..9d6ddd69 100644 --- a/src/components/project/ProjectNumber.vue +++ b/src/components/project/ProjectNumber.vue @@ -21,14 +21,12 @@ import {computed, defineEmits, defineProps, onMounted, ref, watch} from 'vue'; import { useStore } from "vuex"; const props = defineProps({ value: String, - label: String, }) -const emit = defineEmits(['update:value','update:label']) +const emit = defineEmits(['update:value']) const store = useStore(); -const numValue = ref(props.value||null) +const numValue = computed(()=>store.state.project_number.find(item=>item.value == props.value)?.name || null) const handleChange = (value,option)=>{ emit('update:value',value || '') - emit('update:label',option?.label || '') } onMounted(() => { // console.log(store.state.project_number,'store.state.project_number') diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 0273ce63..a4067635 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -151,7 +151,7 @@
项目编号:
- +
@@ -345,7 +345,6 @@ export default { watch(()=>state.projectInfo.boeFlag,(val)=>{ if(!val){ state.projectInfo.numValue = '' - state.projectInfo.numLabel = '' } }) From 76a54aaac1f55f53e9732b7477ae428a9a9c3717 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 19 Sep 2024 17:28:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectNumber.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue index 9d6ddd69..d312696f 100644 --- a/src/components/project/ProjectNumber.vue +++ b/src/components/project/ProjectNumber.vue @@ -34,7 +34,7 @@ onMounted(() => { const options = computed(()=>store.state.project_number.map(e => { return{ value: e.value, - label: e.name + label: ' 【 ' + e.value + ' 】 ' + e.name } })) From b9dec2abeeddbc4c356a0e42fedef8c5be8d544d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 23 Sep 2024 17:02:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E4=B8=80=E7=9B=B4=E8=BD=AC?= =?UTF-8?q?=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index a4067635..ee9ec40f 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -502,6 +502,7 @@ export default { id: state.projectInfo.id, }).then((res) => { return res.data.data == 1; + }).catch((err) => { }); if (offName) { message.destroy(); @@ -519,6 +520,10 @@ export default { path: "/taskpage", query: { projectId: res.data.data }, }); + }).catch((err) => { + state.loading = false; + message.destroy(); + message.error('创建项目失败,请重新创建'); }); };