合并

src/App.vue

@@ -302,7 +302,6 @@
 
         .el-dialog__body{
           display: flex;
-          // justify-content: center;
           align-items: center;
           flex-direction: column;
         }
@@ -322,7 +321,8 @@
             width: 70%;
             margin-top: 20px;
             .dialogLabel{      //label
-              min-width: 70px;
+              max-width: 60px;
+              min-width: 65px;
               font-size: 16px;
               margin-right: 10px;
               display: inline-block;

src/views/makerActvityApply.vue

@@ -162,27 +162,27 @@
             class="AddMember"
             :before-close="handleClose">
 
-              <div class="diaTit1">
-                <div class="spans1">姓名</div>
+              <div class="littleBlock">
+                <div class="dialogLabel">姓名</div>
                 <div>
                   <el-input v-model="Member.Name"></el-input>
                 </div>
               </div>
 
-              <div class="diaTit1">
-                <div class="spans1">班级</div>
+              <div class="littleBlock">
+                <div class="dialogLabel">班级</div>
                 <div>
                   <el-input v-model="Member.class"></el-input>
                 </div>
               </div>
 
-              <div class="diaTit1">
-                <div class="spans1">电话</div>
+              <div class="littleBlock">
+                <div class="dialogLabel">电话</div>
                 <div>
                   <el-input v-model="Member.takeCharge"></el-input>
                 </div>
               </div>
-              <div slot="footer" class="dialog-footer">
+              <div slot="footer" class="footer">
                 <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
                 <el-button @click="handleClose" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
               </div>
@@ -254,86 +254,12 @@
       width: 100%;
       position: relative;
 
-      .el-dialog{
-        width: 700px;
-        border-radius: 5px;
-        overflow: hidden;
-      }
-      .el-dialog__body{
-        padding:30px 25%;
-      }
-      
-      .el-dialog__header{
-        background: #32455b;
-        text-align: center;
-      }
-      .el-dialog__title{
-        color: #fff;
-        position: relative;
-        top: -5px;
-        font-size: 18px;
-      }
-
+     
 
 
 
-    }
 
-  
-    .footer{
-        width: 100%;
-        height: 60px;
-        margin-top: 30px;
-        .backBtn{
-            background: #169bd5;
-            height: 40px;
-            width: 100px;
-            float: right;
-            width: 100px;
-            margin-left: 10px;
-            font-size: 16px;
-        }
     }
 
 
-   
-
-
-
-  
-
-  .AddMember{    //添加成员里的input框，防止与select里的input冲突
-      .el-input__inner{
-          width: 300px;
-      }
-    }
-
-
-  .diaTit1{   //添加对话框 label和input框
-      display: flex;
-      width: 70%;
-      margin-top: 20px;
-      .spans1{      //label
-        min-width: 40px;
-        font-size: 16px;
-        margin-right: 10px;
-        display: inline-block;
-        text-align: justify;
-        text-justify:distribute-all-lines;
-        text-align-last: justify;
-        transform: translate(0,22%);
-      }
-    }
-
-    .dialog-footer{
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      .diaBtn{
-        width: 180px;
-        height: 35px;
-        line-height: 5px;
-        font-size: 16px;
-      }
-  }
   </style>

src/views/makerActvityDetails.vue

@@ -238,7 +238,7 @@
 export default {
   data() {
     return {
-      addMemberDialog:true,
+      addMemberDialog:false,
             options: [{
               value: '选项1',
               label: '中德学院'

src/views/projectApplicationApply.vue

@@ -173,22 +173,22 @@
           class="AddMember"
           :before-close="handleClose">
 
-            <div class="diaTit1">
-              <div class="spans1">姓名</div>
+            <div class="littleBlock">
+              <div class="dialogLabel">姓名</div>
               <div>
                 <el-input v-model="Member.name"></el-input>
               </div>
             </div>
 
-            <div class="diaTit1">
-              <div class="spans1">班级</div>
+            <div class="littleBlock">
+              <div class="dialogLabel">班级</div>
               <div>
                 <el-input v-model="Member.Class"></el-input>
               </div>
             </div>
 
-            <div class="diaTit1">
-              <div class="spans1">电话</div>
+            <div class="littleBlock">
+              <div class="dialogLabel">电话</div>
               <div>
                 <el-input v-model="Member.phone"></el-input>
               </div>
@@ -217,7 +217,7 @@
               Class:'21通信',
               phone:'1234567898'
           },
-          addMemberDialog:true,
+          addMemberDialog:false,
 
           tableData:[{
               Name:'徐晓慧',

src/views/projectApplicationDetails.vue

@@ -21,43 +21,56 @@
     </div>
     <!-- 跳转导航结束 -->
 
-    <!-- 项目基本内容开始 -->
-    <div class="selects">
-      <div class="inp1" style="width: 77%;">
-          <span class="inpText">项目名称</span>
-          <el-input v-model="input"  style="width: 100%;" placeholder="请输入内容"></el-input>
-      </div>
-      <div class="inp1">
-          <span class="inpText">项目负责人</span>
-          <el-input v-model="input"  placeholder="请输入内容"></el-input>
-      </div>
-      <div class="inp1">
-          <span class="inpText">项目开始时间</span>
-          <el-input v-model="input"  placeholder="请输入内容"></el-input>
-      </div>
-      <div class="inp1">
-          <span class="inpText">所在部门</span>
-          <el-select v-model="value" style="width: 100%;" placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-       
-      </div>
-      <div class="inp1">
-          <span class="inpText">预算总经费</span>
-          <el-input v-model="input"  placeholder="请输入内容"></el-input>
-      </div>
-      <div class="inp1">
-          <span class="inpText">联系电话</span>
-          <el-input v-model="input"  placeholder="请输入内容"></el-input>
-      </div>
-    </div>
-    <!-- 项目基本内容结束 -->
+     <!-- 活动申请填写信息区域开始 -->
+     <div class="select">
+              <div class="selectTop">
+                <div class="label">项目名称</div>
+                <el-input v-model="input" placeholder="请输入内容"></el-input>
+              </div>
+              <div class="selectMid">
+                <div class="selectLeft">
+                 
+                    <div class="inpBlock">
+                        <div class="label">负责人</div>
+                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div class="inpBlock">
+                        <div class="label">所在部门</div>
+                        <el-select v-model="input" style="width: 100%;" placeholder="请选择">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                    </div>
+                    <div class="inpBlock">
+                        <div class="label">联系电话</div>
+                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                </div>
 
+                <div class="selectRight">
+                  <div class="inpBlock">
+                        <div class="label">项目开始时间</div>
+                        <el-date-picker
+                          v-model="input"
+                          type="date"
+                          style="width: 100%;"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </div>
+                    <div class="inpBlock">
+                        <div class="label">预算总经费</div>
+                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    
+                </div>
+              </div>
+              
+        </div>
+        <!-- 活动申请填写信息区域结束 -->
 
       <!-- 项目成员开始 -->
       <div class="tabTit">
@@ -147,6 +160,7 @@
           value: '中德学院',
           textarea:'',
          input:'',
+        
           tableData:[{
             Name:'徐晓慧',
             class:'22电子通信G5',