图标修改

fhKeeper/formulahousekeeper/timesheet/src/assets/myfont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe70e;</span>
+                <div class="name">文件-请假单</div>
+                <div class="code-name">&amp;#xe70e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xec4e;</span>
                 <div class="name">待办事项</div>
@@ -426,9 +432,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1637975267232') format('woff2'),
-       url('iconfont.woff?t=1637975267232') format('woff'),
-       url('iconfont.ttf?t=1637975267232') format('truetype');
+  src: url('iconfont.woff2?t=1639190324165') format('woff2'),
+       url('iconfont.woff?t=1639190324165') format('woff'),
+       url('iconfont.ttf?t=1639190324165') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -454,6 +460,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont firerock-iconwj-qjd"></span>
+            <div class="name">
+              文件-请假单
+            </div>
+            <div class="code-name">.firerock-iconwj-qjd
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont firerock-icondaibanshixiang"></span>
             <div class="name">
@@ -1012,6 +1027,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-iconwj-qjd"></use>
+                </svg>
+                <div class="name">文件-请假单</div>
+                <div class="code-name">#firerock-iconwj-qjd</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#firerock-icondaibanshixiang"></use>

fhKeeper/formulahousekeeper/timesheet/src/assets/myfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2390497 */
-  src: url('iconfont.woff2?t=1637975267232') format('woff2'),
-       url('iconfont.woff?t=1637975267232') format('woff'),
-       url('iconfont.ttf?t=1637975267232') format('truetype');
+  src: url('iconfont.woff2?t=1639190324165') format('woff2'),
+       url('iconfont.woff?t=1639190324165') format('woff'),
+       url('iconfont.ttf?t=1639190324165') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.firerock-iconwj-qjd:before {
+  content: "\e70e";
+}
+
 .firerock-icondaibanshixiang:before {
   content: "\ec4e";
 }

fhKeeper/formulahousekeeper/timesheet/src/assets/myfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "6517457",
+      "name": "文件-请假单",
+      "font_class": "wj-qjd",
+      "unicode": "e70e",
+      "unicode_decimal": 59150
+    },
     {
       "icon_id": "5961300",
       "name": "待办事项",

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -230,7 +230,7 @@ export const allRouters = [//组织架构
         path: '/',
         component: Home,
         name: '请假管理',
-        iconCls: 'iconfont firerock-iconkehuguanli',
+        iconCls: 'iconfont firerock-iconwj-qjd',
         leaf: true,
         children: [
             { path: '/leave', component: leave, name: '请假管理' }

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

@@ -40,8 +40,13 @@
             <el-form-item >
                 <el-link type="primary" :underline="false" @click="assignToProject" style="margin-left:5px;">查看项目成本分配</el-link>
             </el-form-item>
+
             <el-form-item style="float:right;">
-                <el-link type="primary" :underline="false" @click="exportData">导出数据</el-link>
+                <el-link type="primary" :underline="false" @click="exportData">导出项目成本数据</el-link>
+            </el-form-item>
+            
+            <el-form-item style="float:right;margin-right:30px;" v-if="hasNoProjectUsers">
+                <el-link type="primary" :underline="false" @click="showNoProjectUsers">查看无项目数据</el-link>
             </el-form-item>
         </el-form>
         <div id="container" style="height:300px"></div>
@@ -102,6 +107,29 @@
                     </el-upload>
             </div>
         </el-dialog>
+
+        <!--无项目人员列表-->
+        <el-dialog title="无项目人员列表" v-if="showNPDialog" :visible.sync="showNPDialog" :close-on-click-modal="false" customClass="customWidth" width="1200px">
+            <el-table :data="npUserList" highlight-current-row v-loading="listLoading" 
+            show-summary=true
+            ref="table"
+            :height="400" style="width: 100%;">
+            <el-table-column prop="name" label="姓名" sortable width="150"></el-table-column>
+            <el-table-column prop="monthCost" label="工资"  width="150"></el-table-column>
+            <el-table-column prop="bonus" label="奖金" ></el-table-column>
+            <el-table-column prop="allowance" label="津贴" ></el-table-column>
+            <el-table-column prop="insuranceOld" label="养老保险" ></el-table-column>
+            <el-table-column prop="insuranceMedical" label="医疗保险" ></el-table-column>
+            <el-table-column prop="insuranceLosejob" label="失业保险" ></el-table-column>
+            <el-table-column prop="houseFund" label="住房公积金" ></el-table-column>
+            <el-table-column prop="others" label="其他" ></el-table-column>
+            <el-table-column prop="totalCost" label="总成本" ></el-table-column>
+        </el-table>
+            <div slot="footer" class="dialog-footer">
+                <div style="float:left;color:#ff9900;">*以上人员当月尚无投入的项目，请提醒他们填写日报。</div>
+                <el-button type="primary" @click="showNPDialog = false" >关闭</el-button>
+            </div>
+        </el-dialog>
     </section>
 </template>
 <style scoped>
@@ -121,6 +149,9 @@
     export default {
         data() {
             return {
+                showNPDialog: false,
+                npUserList:[],
+                hasNoProjectUsers: false,
                 isUploading:false,
                 importDialog: false,
                 importParam:{syncUserCost:true, syncHistoryReport:true},
@@ -139,28 +170,46 @@
             };
         },
         methods: {
-
+            showNoProjectUsers() {
+                this.showNPDialog = true;
+                this.http.post('/finance/getNoProjectUsers', {yearMonth: this.date},
+                res => {
+                    if (res.code == "ok") {
+                        this.npUserList = res.data;
+                    }});
+            },
             assignToProject(){
                 var _this = this;
                 this.http.post('/finance/getTimeCost', {yearMonth: this.date},
                 res => {
                     if (res.code == "ok") {
                         var xList = [], yList = [], list = res.data.costList, 
+                        
                         totalMoneyCost = res.data.totalMoneyCost;
+                        var nopCost = 0;
+                        if (res.data.noProjectItem.project != null) {
+                            this.hasNoProjectUsers = true;
+                            nopCost = res.data.noProjectItem.cost;
+                        } else {
+                            this.hasNoProjectUsers = false;
+                        }
+                        
                         for(var i in list) {
                             xList.push(list[i].project);
-                                yList.push({
-                                    "value": list[i].cost,
-                                    "id": list[i].id,
-                                    "time": list[i].workingTime
-                                });
+                            
+                            yList.push({
+                                "value": list[i].cost,
+                                "id": list[i].id,
+                                "time": list[i].workingTime
+                            });
                         }
 
                         var myChart = echarts.init(document.getElementById("container"));
                         _this.myChart = myChart;
                         var option = {
                             title: {
-                                text: '项目成本统计 总计' + totalMoneyCost + '元',
+                                text: '项目成本总计 ' + totalMoneyCost + '元'
+                                    +(this.hasNoProjectUsers?"，无项目人员成本总计 " + nopCost+"元, 共: "+(totalMoneyCost+nopCost)+"元":""),
                                 left:'left',
                             },
                             // 工具箱
@@ -207,7 +256,7 @@
                                 data: yList,
                             }]
                         };
-                        myChart.setOption(option);
+                        option && myChart.setOption(option);
                         // myChart.getZr().on('click', params => {
                         //     const pointInPixel = [params.offsetX, params.offsetY];
                         //     if (myChart.containPixel('grid', pointInPixel)) {
@@ -288,6 +337,7 @@
             changeMonth() {
                 //改变月份
                 this.getList();
+                this.assignToProject();
             },
             // 批量导入人员
             importFinance(item) {