调整bug

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,8 +4,8 @@ var path = require('path')
 // var ip = '192.168.2.36'
 
  
-// var ip = '47.100.37.243'
-var ip = '192.168.2.105'
+var ip = '47.100.37.243'
+// var ip = '192.168.2.105'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -1136,20 +1136,27 @@ export default {
             sums[index] = '合计';
             return;
           }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' 元';
+          if(index === 1) {
+            const values = data.map(item => Number(item[column.property]));
+            if (!values.every(value => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr);
+                if (!isNaN(value)) {
+                  return prev + curr;
+                } else {
+                  return prev;
+                }
+              }, 0);
+              var zhi = +sums[index] + 0
+              var sl = zhi.toFixed(2)
+              sl += ' 元';
+            } else {
+              sums[index] = 'N/A';
+            }
           } else {
             sums[index] = 'N/A';
           }
+          
         });
 
         console.log(sums, 123)

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -43,7 +43,7 @@
                     <el-link type="primary" :underline="false" @click="handleAdd(-1,null)">新增项目</el-link>
                 </el-form-item>
                 <el-form-item style="float:right;" v-if="user.company.packageProject==1">
-                    <router-link to="/projectGantt" >
+                    <router-link to="/projectGantt">
                         <el-link type="primary" :underline="false" >甘特图</el-link>
                     </router-link>
                 </el-form-item>
@@ -66,23 +66,23 @@
                      </div> -->
                      <el-popover placement="top" width="400" trigger="hover" v-if="scope.row.projectName.length > 15">
                          <div>
-                             <el-link type="primary" v-if="user.company.packageProject==1" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
+                             <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
                              <span v-if="user.company.packageProject==0" >{{scope.row.projectName}}</span>
                          </div>
                          <div slot="reference" class="kans">
-                            <el-link type="primary" v-if="user.company.packageProject==1" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
+                            <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
                             <span v-if="user.company.packageProject==0" >{{scope.row.projectName}}</span>
                          </div>
                      </el-popover>
                      <div v-else>
-                         <el-link type="primary" v-if="user.company.packageProject==1" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
+                         <el-link type="primary" v-if="user.company.packageProject==1" :underline="false" :href="'#/projectInside/'+scope.row.id">{{scope.row.projectName}}</el-link>
                             <span v-if="user.company.packageProject==0" >{{scope.row.projectName}}</span>
                      </div>
                 </template>
             </el-table-column>
             <el-table-column prop="inchargerName" label="负责人" sortable width="150">
                 <template slot-scope="scope">
-                    <el-link type="primary" @click="showUser(scope.row.inchargerId)">{{scope.row.inchargerName}}</el-link>
+                    <el-link type="primary" :underline="false" @click="showUser(scope.row.inchargerId)">{{scope.row.inchargerName}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column prop="participator" label="参与者" width="300" sortable v-if="user.company.packageProject==0">
@@ -93,18 +93,18 @@
                     <div v-if="scope.row.participator.length > 5">
                         <el-popover placement="top" width="500" trigger="hover" v-if="scope.row.participator.length > 0">
                             <span v-for="par in scope.row.participator" :key="par.id">
-                                <el-link style="margin-right:10px;" type="primary" @click="showUser(par.id)">{{par.name}}</el-link>
+                                <el-link style="margin-right:10px;" :underline="false" type="primary" @click="showUser(par.id)">{{par.name}}</el-link>
                             </span>
                             <div slot="reference" class="addss">
                                 <span v-for="par in scope.row.participator" :key="par.id">
-                                    <el-link style="margin-right:10px;" type="primary" @click="showUser(par.id)">{{par.name}}</el-link>
+                                    <el-link style="margin-right:10px;" :underline="false" type="primary" @click="showUser(par.id)">{{par.name}}</el-link>
                                 </span>
                             </div>
                         </el-popover>
                     </div>
                     <div v-else>
                         <span v-for="par in scope.row.participator" :key="par.id" >
-                            <el-link style="margin-right:10px;" type="primary" @click="showUser(par.id)">{{par.name}}</el-link>
+                            <el-link style="margin-right:10px;" type="primary" :underline="false" @click="showUser(par.id)">{{par.name}}</el-link>
                         </span>
                     </div>
                     
@@ -467,6 +467,13 @@
 	white-space:nowrap;
 	text-overflow: ellipsis;
 }
+a {
+  text-decoration: none;
+}
+ 
+.router-link-active {
+  text-decoration: none;
+}
 </style>
 <script>
     import util from "../../common/js/util";