yuanyiming 2 tahun lalu
induk
melakukan
4cf6d6fcac
3 mengubah file dengan 147 tambahan dan 116 penghapusan
  1. 3 8
      src/App.vue
  2. 61 33
      src/views/ProjectManagementFund2.vue
  3. 83 75
      src/views/projectApplication.vue

+ 3 - 8
src/App.vue

@@ -137,11 +137,6 @@
       }
     }
 
-
- 
-
- 
-
   .fontSize{   //所有表格字体大小
     margin-top: 15px;
     font-size: 16px !important;
@@ -370,7 +365,7 @@
       }
     }
 
-    .selectInp{// 搜索框 项目管理、成果展示 一级页面
+    .selectInp{// 一级页面搜索框 项目管理、成果展示 
       display: flex;
       justify-content: space-between;
       margin-top: 20px;
@@ -410,7 +405,7 @@
     }
 
 
-    .twoSelectInp{   //搜索框    创业公司登记、消息提示
+    .twoSelectInp{   //一级页面搜索框 创业公司登记、消息提示
       width: 100%;
       display: flex;
       justify-content: space-between;
@@ -431,7 +426,7 @@
 
         }
       }
-
+    
 
 
 

+ 61 - 33
src/views/ProjectManagementFund2.vue

@@ -112,9 +112,9 @@
         <div style="display: flex;align-items: center;flex-wrap: wrap;">
           <div class="deleteContent1">
             <div class="dagSpan">项目名称</div>
-              <el-select v-model="value" style="width: 70%;" placeholder="请选择">
+              <el-select v-model="values.projectName" style="width: 70%;" placeholder="请选择">
                 <el-option
-                  v-for="item in options"
+                  v-for="item in projectNameOptions"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -123,9 +123,9 @@
           </div>
           <div class="deleteContent1">
               <div class="dagSpan">项目类型</div>
-              <el-select v-model="value"  placeholder="请选择">
+              <el-select v-model="values.projectType"  placeholder="请选择">
                 <el-option
-                  v-for="item in options"
+                  v-for="item in projectTypeOptions"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -142,12 +142,12 @@
         <div class="dagInpS">
           <div class="dagInpS1">
             <div class="dagSpan">直接经费</div>
-            <el-select v-model="value"
+            <el-select v-model="values.fund"
             :popper-append-to-body="false" 
             popper-class="select-popper"
             placeholder="请选择">
                 <el-option
-                  v-for="item in options"
+                  v-for="item in fundOptions"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -156,15 +156,15 @@
           </div>
           <div class="dagInpS1">
             <div class="dagSpan">预算</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.budget1" placeholder="请输入内容"></el-input>
           </div>
           <div class="dagInpS1">
             <div class="dagSpan">已支付</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.Paid1" placeholder="请输入内容"></el-input>
           </div>
           <div class="dagInpS1">
             <div class="dagSpan">余额</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.balance1" placeholder="请输入内容"></el-input>
           </div>
         </div>
         <div class="dagInpS2">
@@ -174,7 +174,7 @@
                 :rows="3"
                 resize="none"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="datas.reason1">
               </el-input>
         </div>
         <!-- 支出类别(单位:元)第一部分结束-->
@@ -183,19 +183,19 @@
  <div class="dagInpS">
           <div class="dagInpS1">
             <div class="dagSpan" style="width: 70px;">其他</div>
-            <el-input v-model="input" style="width: 200px;" placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.rests" style="width: 200px;" placeholder="请输入内容"></el-input>
           </div>
           <div class="dagInpS1">
             <div class="dagSpan">预算</div>
-            <el-input v-model="input"  placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.budget2"  placeholder="请输入内容"></el-input>
           </div>
           <div class="dagInpS1">
             <div class="dagSpan">已支付</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.Paid2" placeholder="请输入内容"></el-input>
           </div>
           <div class="dagInpS1">
             <div class="dagSpan">余额</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
+            <el-input v-model="datas.balance2" placeholder="请输入内容"></el-input>
           </div>
         </div>
         <div class="dagInpS2">
@@ -205,7 +205,7 @@
                 :rows="3"
                 resize="none"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="datas.reason2">
               </el-input>
         </div>
         <!-- 支出类别(单位:元)第二部分结束-->
@@ -227,12 +227,41 @@
         data() {
           return {
             fundDetail:false,
-            options: [ 
-              {
-                value: '选项5',
-                label: '北京烤鸭'
-              }],
-  
+              projectNameOptions:[
+                {
+                  value: '1',
+                  label: '北京烤鸭'
+                },
+                {
+                  value: '2',
+                  label: '胡辣汤'
+                },
+              ],
+              projectTypeOptions:[
+                  {
+                    value: '1',
+                    label: '军事'
+                  },
+                  {
+                    value: '2',
+                    label: '饮食'
+                  },
+              ],
+              fundOptions:[
+                  {
+                    value: '1',
+                    label: '10000'
+                  },
+                  {
+                    value: '饮食',
+                    label: '100000000'
+                  },
+              ],
+              values:{
+                projectName:'',
+                projectType:'',
+                fund:''
+              },
               tableData:[{
                 projectName:'陆地游泳辅助器',
                 projectPerson:'王多鱼',
@@ -255,18 +284,17 @@
 
               }
               ],
-            tableData2:[{
-              sort:'人工智能设备购买',
-              Fund:'20000.00',
-              projectName:'项目协作费用',
-              remark:'',
-              state:'已使用'
-              },
-            ],
-            textarea:'',
-            input:'',
-            value: '',
-  
+              datas:{
+                budget1:'',   //预算
+                budget2:'',
+                Paid1:'',     //已支付
+                Paid2:'',
+                balance1:'',   //余额
+                balance2:'',
+                reason1:'',
+                reason2:'',
+                rests:"",
+              }
           }
         },
         methods:{

+ 83 - 75
src/views/projectApplication.vue

@@ -153,7 +153,9 @@
         title="立项撤回提交"
         :visible.sync="dialogVisible1"
         :modal="false"
-        :close-on-click-modal="false"
+        width="700px"
+        :close-on-click-modal="true"
+        class="dialogWidth"
         :before-close="init">
         <div class="diaTit">
               <div class="spans">项目名称:</div>
@@ -191,7 +193,6 @@
                 :rows="4"
                 resize="none"
                 placeholder="请输入内容"
-                style="width: 500px;"
                 v-model="textarea">
               </el-input>
             </div>
@@ -208,16 +209,13 @@
           title="立项审核"
           :visible.sync="dialogVisible"
           :modal="false"
-          :close-on-click-modal="false"
+          class="dialogWidth"
+          :close-on-click-modal="true"
           :before-close="init">
         
           <div class="diaTit">
-            <!-- <div style="width: 50%;display: flex;"> -->
               <div class="spans">项目名称</div>
               <div class="spanCon">:人工智能分链机器</div>
-            <!-- </div> -->
-             
-              
               <div class="spans" style="margin-left: 30px;">项目负责人</div>
               <div class="spanCon">:徐晓霞</div>
           </div>
@@ -381,78 +379,88 @@
 
 <style lang="less">
 .projectApplication{
-  .el-dialog{
-    width: 700px;
-    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;
-  }
 
-  .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;
+  .dialogWidth{
+      .el-input__inner{
+        width: 300px;
       }
-  .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: 70%;
-      margin-top: 20px;
-      
-    }
-    
-  .dialog-footer{
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      .diaBtn{
-        width: 180px;
-        height: 35px;
-        line-height: 5px;
-        font-size: 16px;
+      .el-textarea__inner{
+        width: 400px;
       }
+      .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;
+        }
+
+        .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;
+            
+          }
+          
+        .dialog-footer{
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            .diaBtn{
+              width: 180px;
+              height: 35px;
+              line-height: 5px;
+              font-size: 16px;
+            }
+        }
   }
+  
 }
 
 </style>