Q-ABAB 1 anno fa
parent
commit
bca5423e51

+ 2 - 2
src/config/config.js

@@ -23,8 +23,8 @@ const store = new Vuex.Store({
         // api: 'https://pbl.cocorobo.cn/api/pbl/',
         // socket: "https://poll.cocorobo.cn",
         // socket: "http://localhost:1473",
-        // api: 'http://10.3.16.226:7003/api',
-        api: 'http://127.0.0.1:7003/api',
+        api: 'http://10.3.16.226:7003/api',
+        // api: 'http://127.0.0.1:7003/api',
         // api: 'http://10.3.13.84:7003/api',
 
     },

+ 1 - 20
src/views/home.vue

@@ -1,7 +1,6 @@
 <template>
   <!-- 左边导航栏 -->
     <el-container class="homePage">
-
       <el-container class="homeBody">
         <el-aside width="12%" class="aside core_dialogue">
               <el-col :span="12">
@@ -19,20 +18,7 @@
                         </div>
                       </template>
                       <div class="submenu" v-for="(item2,ind2) in item['group']" :key="ind2">
-                        <el-submenu v-if="item2['group']" :index="ind+'-'+ind2">
-                          <template slot="title" >
-                            <div class="subTitle" @click="goto(item2.goto)" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
-                              <!-- <i :class="item2.icon" style="margin-right: 15px;width: 15px;" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''"></i> -->
-                              {{ item2.label }}
-                            </div>
-                          </template>
-                          <el-menu-item-group>
-                            <el-menu-item  v-for="(item3,ind3) in item2['group']" :key="ind3" :index='ind+"-"+ind2+"-"+ind3' @click="goto(item3.goto)">
-                              <div class="subTitle" :style="$route.path.indexOf(item3.goto)!=-1?'color:#40aaff':''">{{ item3.label }}</div>
-                            </el-menu-item>
-                          </el-menu-item-group>
-                        </el-submenu>
-                        <el-menu-item :index="ind2.toString()" v-else @click="goto(item2.goto)">
+                        <el-menu-item :index="ind2.toString()" @click="goto(item2.goto)">
                           <template slot="title">
                             <div class="subTitle" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
                               <i :class="item2.icon" style="margin-right: 15px;width: 15px;"></i>
@@ -51,19 +37,14 @@
                       </template>
                     </el-menu-item>
                   </div>
-
                 </el-menu>
               </el-col>
         </el-aside>
-
         <el-main class="main  core_dialogue">
           <router-view></router-view>
         </el-main>
       </el-container>
-
     </el-container>
-    
-    
 </template>
 
 <script>

+ 0 - 7
src/views/projectApply/projectApplication.vue

@@ -3,7 +3,6 @@
   <div class="projectApplication" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">项目立项管理</div>
-      <!-- <el-button  style="font-size: 16px;" @click="apply">项目立项申请</el-button> -->
     </div>
     <hr>
 
@@ -48,12 +47,6 @@
             </el-option>
           </el-select>
         </div>
-        <!-- <div class="selectInp">
-          <div class="ProjectManagementQuery">
-            <el-input v-model="selectText" @change="getData" placeholder="请输入项目名称"></el-input>
-            <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
-          </div>
-        </div> -->
         <div class="selectsBlock">
           <div class="selectLabel">负责人</div>
           <el-select v-model="selectInp.person" @change="getData" placeholder="请选择">

+ 3 - 2
src/views/projectManage/components/FundDetailList.vue

@@ -60,8 +60,9 @@
          <template #default="scope">
           <div>
             {{ scope.row.state==0?'未审核':""}}
-            {{ scope.row.state==1?'未报销':""}}
-            {{ scope.row.state==2?'已报销':""}}
+            {{ scope.row.state==1?'待审核':""}}
+            {{ scope.row.state==2?'已审核':""}}
+            {{ scope.row.state==3?'已报销':""}}
           </div>
          </template>
         </el-table-column>

BIN
sso.war