From 7ef2454c7df85c9a8fd493552398d4ac07c460d4 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期一, 23 六月 2025 09:43:56 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 laboratory/src/views/projectList/addProject.vue |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/laboratory/src/views/projectList/addProject.vue b/laboratory/src/views/projectList/addProject.vue
index bf6b2f7..acebfbf 100644
--- a/laboratory/src/views/projectList/addProject.vue
+++ b/laboratory/src/views/projectList/addProject.vue
@@ -23,7 +23,7 @@
                         <div :class="item == 1 || item == 2 ? 'member-name-box' : 'member-name-box-2'">
                             <el-tooltip v-for="i in memberList(item)" :key="i.userId" class="member-name" effect="dark"
                                 :content="i.nickName" placement="top">
-                                <span>{{ i.nickName }}</span>
+                                <span style="overflow: hidden;width: 60px; display: block;padding: 0 7px;">{{ i.nickName }}</span>
                             </el-tooltip>
                         </div>
                         <div class="member-edit" v-if="memberList(item).length != 0" @click="editUserList">修改</div>
@@ -44,7 +44,7 @@
     name: 'AddProject',
     data() {
         return {
-            form: {},
+            form: this.getDefaultForm(),
             rules: {
                 teamName: [{ required: true, message: '请输入项目组名称', trigger: 'blur' }],
                 personCharge: [{ required: true, message: '请输入项目组描述', trigger: 'blur' }]
@@ -58,6 +58,19 @@
         }
     },
     methods: {
+        getDefaultForm() {
+            return {
+                teamName: '',
+                personCharge: ''
+            }
+        },
+        resetForm() {
+            this.form = this.getDefaultForm();
+            this.selectMemberData = [];
+            if (this.$refs.form) {
+                this.$refs.form.resetFields();
+            }
+        },
         submitForm() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
@@ -65,20 +78,16 @@
                         this.$message.error('请选择项目组成员')
                         return
                     }
-                    const ROLE_NAME_TO_TYPE = {
-                        '审批人': 2,
-                        '工艺工程师': 3,
-                        '实验员': 4,
-                        '化验师': 5
-                    };
+                   
                     const data = {
                         teamName: this.form.teamName,
                         personCharge: this.form.personCharge,
                         staffs: this.selectMemberData.map(member => ({
                             userId: member.userId,
-                            roleType: ROLE_NAME_TO_TYPE[member.roleName]
+                            roleType: member.roleType
                         }))
                     }
+                    console.log('data data data',data)
                     addProject(data).then(res => {
                         if (res.code == 200) {
                             this.$message.success('添加成功')
@@ -90,6 +99,9 @@
         },
         addMember() {
             this.$refs.selectMember.open()
+            this.$nextTick(() => {
+                this.$refs.selectMember.setSelection(this.selectMemberData);
+            });
         },
         memberList(i) {
             switch (i) {
@@ -113,6 +125,7 @@
                     return
                 }
             }
+            console.log('data data data',data)
             this.selectMemberData = data;
             this.$refs.selectMember.close();
         },
@@ -122,6 +135,9 @@
                 this.$refs.selectMember.setSelection(this.selectMemberData);
             });
         }
+    },
+    mounted() {
+        this.resetForm();
     }
 }
 </script>

--
Gitblit v1.7.1