2022.4.6

fhKeeper/formulahousekeeper/timesheet/package-lock.json

@@ -8110,6 +8110,14 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
+    "v-distpicker": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/v-distpicker/-/v-distpicker-1.2.12.tgz",
+      "integrity": "sha512-hREPQ1gg0nDwySofg0WAnmVnbtJHeelSqSQU/hyPwokjBNr2tFVOu++JXNZMVhG9Gt4IitgfdiNz+UYnB3H6bw==",
+      "requires": {
+        "vue": "^2.6.10"
+      }
+    },
     "v-viewer": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.6.4.tgz",

fhKeeper/formulahousekeeper/timesheet/package.json

@@ -21,6 +21,7 @@
     "jquery": "^3.4.1",
     "nprogress": "^0.2.0",
     "tinymce": "^5.7.1",
+    "v-distpicker": "^1.2.12",
     "v-viewer": "^1.6.4",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.0",

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -17,6 +17,8 @@ import store from './vuex/store'
 import http from './http'
 import port from './port'
 import $ from 'jquery'
+import VDistPicker from 'v-distpicker'
+Vue.component('v-distpicker',VDistPicker)
 
 import './day.js' // 加载 dayjs 初始化配置
 
@@ -149,9 +151,14 @@ router.beforeEach((to, from, next) => {
                     // }
 
                     // 更据当前登录的权限来显示模块
-                    console.log(user.moduleList)
+                    console.log("user",user)
                     console.log(filterRouter)
                     var arr = []
+                    for(var p in filterRouter){
+                        if(filterRouter[p].name == "出差管理"){
+                            arr.push(filterRouter[p])
+                        }
+                    }
                     for(var i in user.moduleList) {
                         for(var s in filterRouter) {
                             if(user.moduleList[i].children.length > 0) {

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -65,6 +65,9 @@ import tasks from './views/task/list';
 import leave from './views/leave/list';
 import customData from './views/project/custom_data';
 
+// 出差
+import awayOffice from './views/awayOffice/awayOffice';
+
 // 研究中心
 // import research from './views/research/list';
 
@@ -265,6 +268,16 @@ export const allRouters = [//组织架构
             { path: '/leave', component: leave, name: '请假管理' }
         ]
     },
+    {
+        path: '/',
+        component: Home,
+        name: '出差管理',
+        iconCls: 'iconfont firerock-iconwj-qjd',
+        leaf: true,
+        children: [
+            { path: '/awayOffice', component: awayOffice, name: '出差管理' }
+        ]
+    },
     {
         path: '/',
         component: Home,

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -5,7 +5,7 @@
             <el-card class="box-card daily" shadow="never">
                 <div style="position: relative;margin-top: -20px;margin-bottom: 20px">
                 <!-- <div class="jjk" style="display:inline-block;position:fixed;top:70px;background:#fff;left:250px;"> -->
-                <div class="jjk" style="display:inline-block;position:absolute;top:10px;background:#fff;left:0px;">
+                <div class="jjk" style="display:inline-block;position:absolute;top:15px;background:#fff;left:0px;">
                         <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM"
                          style="width:190px;"
                          @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
@@ -19,13 +19,15 @@
                          <el-button style="margin-left:10px;" icon="iconfont firerock-icongongshitongji" size="mini"  @click="showWorkTime"></el-button>
                     </div> -->
                         <span v-for="(item,index) in allDate" :id="'day'+index" :class="index==choseDay?'chooseDate date_item':'date_item'" 
-                        @click="choseDate(index, item)" :key="index" >
+                        @click="choseDate(index, item)" :key="index" style="padding:0 6px;">
                         <div :style="'display:inline-block;'+(item.state == null?'padding:0px 6px;':'')" >
-                            <div><span>{{item.showDate}}</span>
+                            <div style="text-align:center;position:relative;"><span>{{item.showDate}}</span>
+                            <br>
                             <span style="font-size:10px;text-align:center;color:#999;">{{item.weekDay}}</span>
+                        <i v-if="item.state != null" class="iconfont firerock-icondot" :class="statusStyle[item.state]" style="position:absolute;top:-1px;right:-18px"></i>
+
                             </div>
                         </div>
-                        <i v-if="item.state != null" class="iconfont firerock-icondot" :class="statusStyle[item.state]"></i>
                         </span>
                 </div>
                 </div>