4月18修改ui

src/App.vue

@@ -394,7 +394,7 @@
         .littleBlock{   //添加对话框 label和input框
             display: flex;
             width: 70%;
-            margin-top: 20px;
+            margin: 10px;
             .dialogLabel{      //label
               max-width: 60px;
               min-width: 65px;
@@ -408,6 +408,9 @@
             }
             
           }
+          .el-dialog__footer{
+            padding-top: 0;
+          }
         .footer{
           width: 100%;
           display: flex;
@@ -537,7 +540,7 @@
           right: 30px;
           bottom: 0;
       }
-      .AllDialogBtn{
+      .AllDialogBtn{          //对话框按钮
         width: 120px;
         font-size: 16px !important;
       }

src/views/activityManage/makerActvityDetails.vue

@@ -109,8 +109,9 @@
                 <div>
                   <p>活动指导老师</p>
                 </div>
-                <el-button type="primary" v-if="tableData.state==0" @click="addTeacher" size="mini">添加教师</el-button>
-                <el-button type="info" v-show="tableData.state==1 || tableData.state==2" disabled  size='small'>添加教师</el-button>
+                <el-button type="primary"  @click="addTeacher" size="mini">添加教师</el-button>
+                <!-- <el-button type="primary" v-if="tableData.state==0" @click="addTeacher" size="mini">添加教师</el-button> -->
+                <!-- <el-button type="info" v-show="tableData.state==1 || tableData.state==2" disabled  size='small'>添加教师</el-button> -->
               </div>
               <hr>
               <el-table
@@ -231,9 +232,9 @@
                       </div>
                     </div>
                     <div slot="footer" class="footer">
-                      <el-button v-if="isAddTeacher" type="primary" @click="commit" class="diaBtn"  size="small">确认提交</el-button>
-                      <el-button v-if="!isAddTeacher" type="primary" @click="change" class="diaBtn"  size="small">确认修改</el-button>
-                      <el-button @click="handleClose" class="diaBtn" size="small">取消</el-button>
+                      <el-button v-if="isAddTeacher" type="primary" @click="commit" class="AllDialogBtn"  >确认提交</el-button>
+                      <el-button v-if="!isAddTeacher" type="primary" @click="change" class="AllDialogBtn"  >确认修改</el-button>
+                      <el-button @click="handleClose" class="AllDialogBtn" >取消</el-button>
                     </div>
               </el-dialog>
             <!--修改成员dialog对话框结束 -->
@@ -246,8 +247,8 @@
                     <div class="addDialogLogo">LOGO</div>
                     <div class="deleteContent">是否修改“{{ tableData.title}}”项目活动？</div>
                     <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="save" class="AllDialogBtn" size="small">确认提交</el-button>
-                        <el-button @click="dialogVisible1=false;" class="AllDialogBtn" style="background:#cccccc" size="small">取消</el-button>
+                        <el-button type="primary" @click="save" class="AllDialogBtn" >确认提交</el-button>
+                        <el-button @click="dialogVisible1=false;" class="AllDialogBtn" style="background:#cccccc" >取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 删除文件对话框结束 -->
@@ -259,8 +260,8 @@
                     <div class="addDialogLogo">LOGO</div>
                     <div class="deleteContent" >是否删除“{{DelFileData.fileName}}”文件？</div>
                     <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="DelFileYes" class="AllDialogBtn" size="small">确认删除</el-button>
-                        <el-button @click="DelFileDialog=false;" class="AllDialogBtn" style="background:#cccccc" size="small">取消</el-button>
+                        <el-button type="primary" @click="DelFileYes" class="AllDialogBtn" >确认删除</el-button>
+                        <el-button @click="DelFileDialog=false;" class="AllDialogBtn" style="background:#cccccc" >取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 删除文件对话框结束 -->
@@ -273,8 +274,8 @@
                     <div class="addDialogLogo">LOGO</div>
                     <div class="deleteContent">是否审核“{{ tableData.title}}”项目活动？</div>
                     <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="process" class="AllDialogBtn" size="small">确认审核</el-button>
-                        <el-button @click="processDialog=false;" class="AllDialogBtn" style="background:#cccccc" size="small">取消</el-button>
+                        <el-button type="primary" @click="process" class="AllDialogBtn" >确认审核</el-button>
+                        <el-button @click="processDialog=false;" class="AllDialogBtn" style="background:#cccccc" >取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 审核对话框结束 -->
@@ -287,8 +288,8 @@
                     <!-- <div class="addDialogLogo">LOGO</div> -->
                     <div class="deleteContent">是否删除“{{ delTeacherTable.Name}}”指导老师？</div>
                     <span slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="DelTeacherYes" class="AllDialogBtn" size="small">确认删除</el-button>
-                        <el-button @click="DelTeacherDialog=false;" class="AllDialogBtn" size="small">取消</el-button>
+                        <el-button type="primary" @click="DelTeacherYes" class="AllDialogBtn" >确认删除</el-button>
+                        <el-button @click="DelTeacherDialog=false;" class="AllDialogBtn" >取消</el-button>
                     </span>
                   </el-dialog>
                   <!-- 删除老师对话框结束 -->
@@ -704,6 +705,7 @@ export default {
   .dialog-footer{
     display: flex;
     justify-content: center;
+    
   }
 }
 .BtnStyle{

src/views/fundManage/makerfundApply.vue

@@ -63,7 +63,7 @@
             </div>
             <div style="width: 100%;display: flex;">
                 <div class="howMoney">
-                    <div class="inpInterval twoStyle">已支付</div>
+                    <div class="inpInterval">已支付</div>
                     <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                 </div>
                 <div class="howMoney">
@@ -123,7 +123,7 @@
 
                 <div style="width: 100%;display: flex;">
                     <div class="howMoney">
-                        <div class="inpInterval twoStyle">已支付</div>
+                        <div class="inpInterval">已支付</div>
                         <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                     </div>
                     <div class="howMoney">
@@ -994,8 +994,9 @@ export default {
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',param)
                 .then(res=>{
-                    console.log(res.data);
+                    // console.log(res.data);
                     this.projectFilter=res.data[1]
+                    console.log(this.projectFilter);
                 },err=>{
                     console.log(err);
                 })

src/views/fundManage/makerfundDetails.vue

@@ -47,7 +47,7 @@
         <div class="howMoneyFlex">
             <div style="width: 100%;display: flex;">
                 <div class="howMoney">
-                    <div class="inpInterval">直接经费</div>
+                    <div class="inpInterval ">直接经费</div>
                     <el-select v-model="item.directFundData" @change="directFundDataSelectChange()" placeholder="请选择">
                         <el-option
                         v-for="item in item.directFundSelects"
@@ -58,7 +58,7 @@
                     </el-select>
                 </div>
                 <div class="howMoney">
-                    <div class="inpInterval">预算</div>
+                    <div class="inpInterval twoStyle">预算</div>
                     <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                 </div>
             </div>
@@ -69,11 +69,11 @@
                     <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                 </div>
                 <div class="howMoney">
-                    <div class="inpInterval ">本次申请</div>
+                    <div class="inpInterval twoStyle">本次申请</div>
                     <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                 </div>
                 <div class="howMoney">
-                    <div class="inpInterval ">余额</div>
+                    <div class="inpInterval twoStyle">余额</div>
                     <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                 </div>
             </div>
@@ -117,7 +117,7 @@
                         </el-select>
                     </div>
                     <div class="howMoney">
-                        <div class="inpInterval ">预算</div>
+                        <div class="inpInterval twoStyle">预算</div>
                         <el-input v-model="item.budget" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                     </div>
                 </div>
@@ -128,11 +128,11 @@
                         <el-input v-model="item.usedFund" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                     </div>
                     <div class="howMoney">
-                        <div class="inpInterval ">本次申请</div>
+                        <div class="inpInterval twoStyle">本次申请</div>
                         <el-input v-model="item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                     </div>
                     <div class="howMoney">
-                        <div class="inpInterval ">余额</div>
+                        <div class="inpInterval twoStyle">余额</div>
                         <el-input disabled :value="item.budget - item.usedFund -item.apply" type="number" class="inputNumber howMoneyInp" placeholder="金额"></el-input>
                     </div>
                 </div>

src/views/projectApply/projectApplicationApply3.vue

@@ -646,7 +646,7 @@ import { VueEditor } from "vue2-editor";
             box-sizing: border-box;
             padding: 0 5%;
             flex-shrink: 0;
-            width: 40%;
+            width: 45%;
             display: flex;
             justify-content: flex-end;
             .littleBlockInp{

src/views/projectApply/projectApplicationDetails.vue

@@ -222,10 +222,10 @@
               </div>
             </div> -->
             <div slot="footer" class="footer">
-              <el-button v-show="isAddMember" type="primary" @click="commit" class="diaBtn" >确认提交</el-button>
-              <el-button v-show="!isAddMember" type="primary" @click="commit2" class="diaBtn" >确认修改</el-button>
+              <el-button v-show="isAddMember" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
+              <el-button v-show="!isAddMember" type="primary" @click="commit2" class="AllDialogBtn" >确认修改</el-button>
 
-              <el-button @click="init" class="diaBtn">取消</el-button>
+              <el-button @click="init" class="AllDialogBtn">取消</el-button>
             </div>
       </el-dialog>
       <!--添加成员dialog对话框结束 -->
@@ -329,6 +329,11 @@
             this.dialogImageUrl=val.url
         },
         addMember(){       //添加成员按钮，显示对话框
+            for(let key in this.addTabMember){
+                if (key!='score') {
+                  this.addTabMember[key]=''
+                }
+            }
             this.addMemberDialog=true;
             this.isAddMember=1;
         },

src/views/projectManage/ProjectManagement3_1.vue

@@ -170,7 +170,9 @@
     <!-- 多行文本框区域结束 -->
     <div class="baseBtn">
             <div class="blockWidth">
-              <el-button type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
+              <el-button v-show="state==0" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
+              <el-button v-show="state==1" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
+              <el-button v-show="state==2" disabled style="background: #ccc !important;border: 0;" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
             </div>
           </div>
 
@@ -202,9 +204,9 @@
                 </div>
               </div>
               <div slot="footer" class="footer">
-                <el-button v-show="isAddMember" type="primary" @click="commit" class="diaBtn" size="small">确认提交</el-button>
-                <el-button v-show="!isAddMember"  type="primary" @click="change" class="diaBtn" size="small">确认修改</el-button>
-                <el-button @click="handleClose" class="diaBtn" size="small">取消</el-button>
+                <el-button v-show="isAddMember" type="primary" @click="commit" class="AllDialogBtn" >确认提交</el-button>
+                <el-button v-show="!isAddMember"  type="primary" @click="change" class="AllDialogBtn" >确认修改</el-button>
+                <el-button @click="handleClose" class="AllDialogBtn">取消</el-button>
               </div>
         </el-dialog>
       <!--添加成员dialog对话框结束 -->
@@ -218,8 +220,8 @@
           <div class="addDialogLogo">LOGO</div>
           <div class="deleteContent">确定修改?</div>
           <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitAll" class="btn5">确认提交</el-button>
-            <el-button @click="handleClose" size="small">取消</el-button>
+            <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>
+            <el-button @click="handleClose"  class="AllDialogBtn">取消</el-button>
           </span>
         </el-dialog>
       <!-- 提交对话框结束 -->
@@ -254,6 +256,7 @@
           return {
             updateActivity:false,
             isAddMember:1,
+            state:0,
             customToolbar: [
               ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
@@ -308,6 +311,7 @@
                   this.selects.department=data.classid;
                   this.tableData=JSON.parse(data.course_teacher)
                   this.textareaS=JSON.parse(data.chapters)
+                  this.state=data.state
                 }).catch(err=>{
                   this.$message.error(err.message)
                 })