#

src/views/makerActvity.vue

@@ -105,6 +105,8 @@
           prop="status"
           label="状态"
           min-width="7%">
+
+          
         </el-table-column>
         <el-table-column
           prop="date"
@@ -133,7 +135,7 @@
 <!-- 表格结束 -->
 
 <!-- 完结对话框开始 -->
-    <el-dialog
+    <!-- <el-dialog
       title="提示"
       :visible.sync="endDialog"
       width="600px"
@@ -152,19 +154,18 @@
         <el-button type="primary" @click="init" class="btn5" size="mini">确认提交</el-button>
         <el-button @click="init" class="btn5" style="background:#cccccc" size="mini">取消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
     <!-- 完结对话框结束 -->
 
 <!-- 审核对话框开始 -->
-    <div class="dialog">
 
       <!-- 审核对话框 -->
-      <el-dialog
+      <!-- <el-dialog
         title="活动审核"
         :visible.sync="auditDialog"
         width="600px"
         :modal="false"
-        :close-on-click-modal="false"
+        :close-on-click-modal="true"
         :before-close="init">
       
         <div class="diaTit" style="margin-top: 0;">
@@ -196,66 +197,115 @@
             <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
             <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
           </div>
-      </el-dialog>
+      </el-dialog> --> 
+
 
-      <!-- 驳回对话框 -->
+      <!-- 活动审核对话框开始 -->
       <el-dialog
-        title="驳回提交"
-        :visible.sync="rejectDialog"
-        width="600px"
-        :modal="false"
-        :close-on-click-modal="false"
-        :before-close="init">
-        <div class="diaTit">
-            <div>
-              <div class="spans">项目名称:</div><div>人工智能分链机器</div>
+          title="活动审核"
+          :visible.sync="auditDialog"
+          :modal="false"
+          class="dialogWidth"
+          :close-on-click-modal="true"
+          :before-close="init">
+        
+          <div class="diaTit">
+              <div class="spans">项目名称</div>
+              <div class="spanCon">:人工智能分链机器</div>
+              <div class="spans" style="margin-left: 30px;">项目负责人</div>
+              <div class="spanCon">:徐晓霞</div>
+          </div>
+
+            <div class="diaTit1">
+              <div class="spans1">所在部门</div>
+              <div>
+                <el-input v-model="input" placeholder="信通学院"></el-input>
+              </div>
             </div>
-            <div style="margin-left:40px">
-              <div class="spans">项目负责人</div><div>徐晓霞</div>
+
+            <div class="diaTit1">
+              <div class="spans1">预算总经费</div>
+              <div>
+                <el-input v-model="input" placeholder="6000"></el-input>
+              </div>
             </div>
-          </div>
 
-          <div class="diaInpBlock">
-            <div class="diaLabel">所在部门</div>
-            <div>
-              <el-input v-model="input"  placeholder="信通学院"></el-input>
+            <div class="diaTit1">
+              <div class="spans1">联系电话</div>
+              <div>
+                <el-input v-model="input" placeholder="13854449525"></el-input>
+              </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
+              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
             </div>
+      </el-dialog>
+      <!-- 活动审核对话框结束 -->
+
+      <!-- 驳回提交对话框开始 -->
+      <el-dialog
+          title="驳回提交"
+          :visible.sync="rejectDialog"
+          :modal="false"
+          class="dialogWidth"
+          width="700px"
+          :close-on-click-modal="true"
+          :before-close="init">
+        
+          <div class="diaTit">
+              <div class="spans">项目名称</div>
+              <div class="spanCon">:人工智能分链机器</div>
+              <div class="spans" style="margin-left: 30px;">项目负责人</div>
+              <div class="spanCon">:徐晓霞</div>
           </div>
 
-          <div class="diaInpBlock">
-            <div class="diaLabel">预算总经费</div>
-            <div class="diaTit2">
-              <el-input v-model="input"  placeholder="6000"></el-input>
+            <div class="diaTit1">
+              <div class="spans1">所在部门</div>
+              <div>
+                <el-input v-model="input" placeholder="信通学院"></el-input>
+              </div>
             </div>
-          </div>
 
-          <div class="diaInpBlock">
-            <div class="diaLabel">联系电话</div>
-            <div>
-              <el-input v-model="input" placeholder="13854449525"></el-input>
+            <div class="diaTit1">
+              <div class="spans1">预算总经费</div>
+              <div>
+                <el-input v-model="input" placeholder="6000"></el-input>
+              </div>
             </div>
-          </div>
 
-          <div class="diaInpBlock">
-            <div class="diaLabel">撤回意见</div>
-            <div>
-              <el-input
-                type="textarea"
-                :rows="4"
-                resize="none"
-                placeholder="请输入内容"
-                style="width: 300px;"
-                v-model="textarea">
-              </el-input>
+            <div class="diaTit1">
+              <div class="spans1">联系电话</div>
+              <div>
+                <el-input v-model="input" placeholder="13854449525"></el-input>
+              </div>
+            </div>
+
+            <div class="diaTit1">
+              <div class="spans1" style="position: relative;top:-23px">撤回意见</div>
+              <div>
+                <el-input
+                  type="textarea"
+                  :rows="4"
+                  resize="none"
+                  placeholder="请输入内容"
+                  v-model="textarea">
+                </el-input>
+              </div>
+            </div>
+
+
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="commit2" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
+              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
             </div>
-          </div>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="commit2" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-            <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
-          </div>
       </el-dialog>
-    </div>
-<!-- 审核对话框开始 -->
+      <!-- 驳回提交对话框结束 -->
+
+
+
+
+
 
   </div>
 </template>
@@ -264,6 +314,7 @@
     export default {
       data() {
         return {
+          status:1,
           textarea:'',
           input:'',
           endDialog:false,  //完结对话框
@@ -284,7 +335,7 @@
             useBudget:'10000',
             date:'2022年-11月-12日',
             tel:'16625153432',
-            status:'已审核',
+            status:'已报销',
             dept:'中德制造'
           },
           ],
@@ -301,11 +352,13 @@
         // 活动审核对话框确定
         commit(){
           this.auditDialog=false;
+          this.status--
         },
 
         // 驳回对话框确定
         commit2(){
           this.rejectDialog=false;
+          this.status++
         },
 
         end(){//完结按钮
@@ -334,7 +387,12 @@
         },
         // 审核按钮
         audi(){
-          this.auditDialog=true;
+          if(this.status){
+            this.auditDialog=true;
+            return
+          }else{
+            this.rejectDialog=true;
+          }
           // this.rejectDialog=true;
         }
       }
@@ -344,165 +402,261 @@
 <style lang="less">
 .makerActvity{
 
-  .el-dialog{
-      border-radius:5px;
-      overflow: hidden;
-    }
 
-  .projectApplicationfundAddDialog{  //完结对话框的
 
-    .el-dialog__header{
-    background: #32455b;
-    }
-    .el-dialog__title{
-      color:rgb(246, 247, 246);
-    }
+  .dialogWidth{
+      .el-input__inner{
+        width: 300px;
+      }
+      .el-textarea__inner{
+        width: 480px;
+      }
+      .el-dialog{
+          width: 600px;
+          border-radius: 5px;
+          overflow: hidden;
+        }
+        .el-dialog__body{
+          padding:30px 35px ;
+        }
+        
+        .el-dialog__header{
+          background: #32455b;
+        }
+        .el-dialog__title{
+          color: #fff;
+          position: relative;
+          top: -5px;
+          font-size: 18px;
+        }
 
-    .deleteContent{
-      width: 100%;
-      text-align: left;
-      font-size: 20px;
-      color: #000;
-      box-sizing: border-box;
-      padding: 0 20px;
-    }
-    .deleteContent1{
-      width: 100%;
-      text-align: left;
-      font-size: 18px;
-      font-weight: bold;
-      color: #000;
-      margin-top: 30px;
-    }
-    .download{
-      margin: 20px 15px;
-      width: 100%;
-      text-align: left;
-      font-size: 14px;
-      font-weight: bold;
-      color: #5391fd;
-    }
-    .addMoneyBtn{
-      width: 150px;
-      height: 40px;
-      border: #000 1px dashed;
-      border-radius: 5px;
-      margin: 15px 10px 30px;
-      display: flex;
-      justify-content: center;
-      line-height: 40px;
-          .jia{
-              border-radius: 50%;
-              border: 1.5px #ccc solid;
-              font-size: 25px;
-              line-height: 26px;
-              font-weight: 10;
-              margin-top: 6px;
-              margin-right: 5px;
-              height: 27px;
-              width: 27px;
-              color: #ccc;
+        .diaTit{     //项目名称、负责人
+            width: 100%;
+            display: flex;
+            .spans{
+              width: 84px;
+              font-size: 16px;
+              margin-right: 10px;
+              display: inline-block;
+              text-align: justify;
+              color: #000;
+              font-size: 16px;
+              text-justify:distribute-all-lines;
+              text-align-last: justify;
+              transform: translate(0,22%);
+              margin-bottom: 10px;
+            }
+            
+        }
+        .spanCon{
+              font-size: 16px;
+              margin-top: 5px;
+              color: #a0a0a0;
+            }
+        .spans1{      //label
+              min-width: 84px;
+              font-size: 16px;
+              color: #000;
+              margin-right: 10px;
+              display: inline-block;
+              text-align: justify;
+              text-justify:distribute-all-lines;
+              text-align-last: justify;
+              transform: translate(0,22%);
+            }
+          
+          .diaTit1{   //label和input框
+            display: flex;
+            width: 80%;
+            margin-top: 20px;
+            
           }
-    }
-    .addDialogLogo{
-      width: 60px;
-      height: 30px;
-      line-height: 30px;
-      background: #f2f2f2;
-      position: absolute;
-      left: 10px;
-      top: 10px;
-      text-align: center;
-    }
-    
-    .addDialogMid{
-      box-sizing: border-box;
-      padding:0 60px 0 10px;
-      .addDialogTit{
-        display: flex;
-        div{
-          width: 80px;
-          line-height: 40px;
-          text-align: left;
+          
+        .dialog-footer{
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            .diaBtn{
+              width: 180px;
+              height: 35px;
+              line-height: 5px;
+              font-size: 16px;
+            }
         }
-      }
-    .addDialogTit1{
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 15px;
-    }
-    .addDialogTit2{
-      margin-top: 10px;
-      font-size: 18px;
-      color: #000;
-      text-indent: 2em;
-    }
-    .addDialogCon{
-      margin-top: 20px;
-    }
   }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//   .el-dialog{
+//       border-radius:5px;
+//       overflow: hidden;
+//     }
+
+//   .projectApplicationfundAddDialog{  //完结对话框的
+
+//     .el-dialog__header{
+//     background: #32455b;
+//     }
+//     .el-dialog__title{
+//       color:rgb(246, 247, 246);
+//     }
+
+//     .deleteContent{
+//       width: 100%;
+//       text-align: left;
+//       font-size: 20px;
+//       color: #000;
+//       box-sizing: border-box;
+//       padding: 0 20px;
+//     }
+//     .deleteContent1{
+//       width: 100%;
+//       text-align: left;
+//       font-size: 18px;
+//       font-weight: bold;
+//       color: #000;
+//       margin-top: 30px;
+//     }
+//     .download{
+//       margin: 20px 15px;
+//       width: 100%;
+//       text-align: left;
+//       font-size: 14px;
+//       font-weight: bold;
+//       color: #5391fd;
+//     }
+//     .addMoneyBtn{
+//       width: 150px;
+//       height: 40px;
+//       border: #000 1px dashed;
+//       border-radius: 5px;
+//       margin: 15px 10px 30px;
+//       display: flex;
+//       justify-content: center;
+//       line-height: 40px;
+//           .jia{
+//               border-radius: 50%;
+//               border: 1.5px #ccc solid;
+//               font-size: 25px;
+//               line-height: 26px;
+//               font-weight: 10;
+//               margin-top: 6px;
+//               margin-right: 5px;
+//               height: 27px;
+//               width: 27px;
+//               color: #ccc;
+//           }
+//     }
+//     .addDialogLogo{
+//       width: 60px;
+//       height: 30px;
+//       line-height: 30px;
+//       background: #f2f2f2;
+//       position: absolute;
+//       left: 10px;
+//       top: 10px;
+//       text-align: center;
+//     }
+    
+//     .addDialogMid{
+//       box-sizing: border-box;
+//       padding:0 60px 0 10px;
+//       .addDialogTit{
+//         display: flex;
+//         div{
+//           width: 80px;
+//           line-height: 40px;
+//           text-align: left;
+//         }
+//       }
+//     .addDialogTit1{
+//       display: flex;
+//       justify-content: space-between;
+//       margin-bottom: 15px;
+//     }
+//     .addDialogTit2{
+//       margin-top: 10px;
+//       font-size: 18px;
+//       color: #000;
+//       text-indent: 2em;
+//     }
+//     .addDialogCon{
+//       margin-top: 20px;
+//     }
+//   }
   
-}
-.dialog-footer{    //对话框按钮
-    display: flex;
-    justify-content: center;
-    .btn5{
-      height: 40px;
-      background: #0e72e6;
-      width: 200px;
-      font-size: 16px;
-    }
-    .diaBtn{
-      width: 200px;
-      height: 40px;
-      font-size: 16px;
-    }
-  }
+// }
+// .dialog-footer{    //对话框按钮
+//     display: flex;
+//     justify-content: center;
+//     .btn5{
+//       height: 40px;
+//       background: #0e72e6;
+//       width: 200px;
+//       font-size: 16px;
+//     }
+//     .diaBtn{
+//       width: 200px;
+//       height: 40px;
+//       font-size: 16px;
+//     }
+//   }
 
-    .el-dialog__header{
-      background: #32455b;
+//     .el-dialog__header{
+//       background: #32455b;
 
-    }
-    .el-dialog__title{
-      color: #fff;
-      font-size: 18px;
-      position: relative;
-      top: -3px;
-    }
+//     }
+//     .el-dialog__title{
+//       color: #fff;
+//       font-size: 18px;
+//       position: relative;
+//       top: -3px;
+//     }
   
-    .diaTit{
-      width: 100%;
-      display: flex;
-      font-size: 16px;
-      justify-content: flex-start;
-    }
-    .diaInpBlock{
-      display: flex;
-      margin-top: 20px;
-      font-size: 16px;
-      .el-input__inner {
-        width: 300px;
-      }
-    }
-    .spans{
-      color: #000;
-      box-sizing: border-box;
-      padding-right: 10px;
-    }
-    .diaLabel{
-      color: #000;
-      min-width: 100px;
-      margin-right: 5px;
-      display: inline-block;
-      text-align: justify;
-      // font-weight: bold;
-      text-justify:distribute-all-lines;
-      text-align-last: justify;
-      transform: translate(0,22%);
-      padding-right: 15px;
-    }
-}
-.msgData{    //对话框人物名称颜色
-  color: rgb(173, 173, 173);
+//     .diaTit{
+//       width: 100%;
+//       display: flex;
+//       font-size: 16px;
+//       justify-content: flex-start;
+//     }
+//     .diaInpBlock{
+//       display: flex;
+//       margin-top: 20px;
+//       font-size: 16px;
+//       .el-input__inner {
+//         width: 300px;
+//       }
+//     }
+//     .spans{
+//       color: #000;
+//       box-sizing: border-box;
+//       padding-right: 10px;
+//     }
+//     .diaLabel{
+//       color: #000;
+//       min-width: 100px;
+//       margin-right: 5px;
+//       display: inline-block;
+//       text-align: justify;
+//       // font-weight: bold;
+//       text-justify:distribute-all-lines;
+//       text-align-last: justify;
+//       transform: translate(0,22%);
+//       padding-right: 15px;
+//     }
+// }
+// .msgData{    //对话框人物名称颜色
+//   color: rgb(173, 173, 173);
 }
 </style>

src/views/makerfund.vue

@@ -134,7 +134,7 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="330"
+          width="340"
           align="center"
           label="操作"
           >

src/views/projectApplication2.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="projectApplication2 core_dialogue">
+    <div class="projectApplication2">
 
         <div class="pA1Header">
           <div style="width: 600px;display: flex;">

src/views/projectApplicationDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="projectApplication1 core_dialogue">
+  <div class="projectApplication1">
     <div class="pA1Header">
       <!-- 详情页 -->
       <div style="width: 800px;display: flex;">