Merge branch 'dongwu-master'

src/App.vue

@@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 const store = useStore();
 const isLogin = ref(false);
 
-console.log("版本3.0.2------------");
+console.log("版本3.0.3------------");
 
 
 

src/views/projectcenter/ProjectAdd.vue

@@ -30,7 +30,7 @@
             </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
+            <NameInput :placeholder="ptojectType == 3 ? '请输入班级名称':'请输入项目名称'" v-model:value="projectInfo.name"
                        v-model:validated="projectInfo.validated" :type="1"
                        :maxlength="30" show-count :id="projectInfo.id"></NameInput>
           </div>
@@ -40,7 +40,7 @@
             <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="flex: 1; display: flex">
+          <div class="in select" style="flex: 1; display: flex; flex-wrap: wrap;">
             <div :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`" style="
                   width: 100px;
                   height: 100px;
@@ -48,6 +48,7 @@
                   cursor: pointer;
                   position: relative;
                   overflow: hidden;
+                  margin-bottom: 14px;
                 " v-for="(src, index) in projectPic" :style="{
                   display: index >= 3 ? 'none' : 'flex',
                 }" :key="index" @click="() => (projectInfo.picUrl = src.value)">
@@ -74,6 +75,7 @@
                   font-weight: 400;
                   color: #4ea6ff;
                   line-height: 36px;
+                  margin-left: 14px;
                 ">
               查看更多
               <img src="../../assets/images/projectadd/go.png" alt=""/>
@@ -185,7 +187,7 @@
         <div class="name">
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
-            <a-select :getPopupContainer="
+            <a-select :allowClear="true" :getPopupContainer="
               (triggerNode) => triggerNode.parentNode || document.body
             " placeholder="请选择模版" style="width: 100%" :options="classifyList5" @change="classificationChange5"
                       @popupScroll="templateScroll" :fieldNames="{
@@ -370,6 +372,22 @@ export default {
     };
 
     const classificationChange5 = (key, option) => {
+      if(key==undefined || option==undefined){
+        // 标识清空选择的模版
+        state.timeRange = []
+        state.projectInfo = {
+          name: "",
+          picUrl: "",
+          beginTime: "",
+          endTime: "",
+          manager: "",
+          managerId: "",
+          sourceBelongId: null,
+          level: "",
+          systemId: null
+        }
+        return
+      }
       state.projectInfo = option;
       state.projectInfo.projectTemplateId = option.id;
       state.projectInfo.id = "";
@@ -414,7 +432,7 @@ export default {
       level: "请填写项目级别",
       systemId: "请填写项目培训体系",
       boeFlag: "请选择是否BOEU实施",
-    };
+    }; 
 
     function timeChange(e) {
       if (e && e.length === 2) {