2022.6.24 18:38

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

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe700;</span>
+                <div class="name">流程</div>
+                <div class="code-name">&amp;#xe700;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6e1;</span>
+                <div class="name">打卡记录</div>
+                <div class="code-name">&amp;#xe6e1;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe674;</span>
                 <div class="name">关联</div>
@@ -462,9 +474,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1650935737210') format('woff2'),
-       url('iconfont.woff?t=1650935737210') format('woff'),
-       url('iconfont.ttf?t=1650935737210') format('truetype');
+  src: url('iconfont.woff2?t=1656062511171') format('woff2'),
+       url('iconfont.woff?t=1656062511171') format('woff'),
+       url('iconfont.ttf?t=1656062511171') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -490,6 +502,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont firerock-iconliucheng1"></span>
+            <div class="name">
+              流程
+            </div>
+            <div class="code-name">.firerock-iconliucheng1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont firerock-icondakajilu"></span>
+            <div class="name">
+              打卡记录
+            </div>
+            <div class="code-name">.firerock-icondakajilu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont firerock-iconguanlian"></span>
             <div class="name">
@@ -1102,6 +1132,22 @@
       <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-iconliucheng1"></use>
+                </svg>
+                <div class="name">流程</div>
+                <div class="code-name">#firerock-iconliucheng1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-icondakajilu"></use>
+                </svg>
+                <div class="name">打卡记录</div>
+                <div class="code-name">#firerock-icondakajilu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#firerock-iconguanlian"></use>

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2390497 */
-  src: url('iconfont.woff2?t=1650935737210') format('woff2'),
-       url('iconfont.woff?t=1650935737210') format('woff'),
-       url('iconfont.ttf?t=1650935737210') format('truetype');
+  src: url('iconfont.woff2?t=1656062511171') format('woff2'),
+       url('iconfont.woff?t=1656062511171') format('woff'),
+       url('iconfont.ttf?t=1656062511171') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.firerock-iconliucheng1:before {
+  content: "\e700";
+}
+
+.firerock-icondakajilu:before {
+  content: "\e6e1";
+}
+
 .firerock-iconguanlian:before {
   content: "\e674";
 }

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

@@ -5,6 +5,20 @@
   "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "6970024",
+      "name": "流程",
+      "font_class": "liucheng1",
+      "unicode": "e700",
+      "unicode_decimal": 59136
+    },
+    {
+      "icon_id": "15673407",
+      "name": "打卡记录",
+      "font_class": "dakajilu",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
+    },
     {
       "icon_id": "5651484",
       "name": "关联",

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -291,9 +291,11 @@
                 </div>
             </el-col>
         </el-row>
-        <span style="margin-left:10px;color:#666;">工作事项</span>
-        <el-switch style="margin-left: 40px" v-model="timeType.workContentState" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-        <span style="margin-left:10px;color:#999;">是否为必填项</span>
+        <div class="yanjiu">
+            <span style="margin-left:10px;color:#666;">{{user.companyId==781?'具体内容与结果':'工作事项'}}</span>
+            <el-switch :style="user.companyId==781?'margin-left:66px;':'margin-left:108px;'" v-model="timeType.workContentState" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
+            <span style="margin-left:10px;color:#999;">是否为必填项</span>
+        </div>
         <!-- 是否开启导入审核 -->
         <div class="yanjiu">
             <p style="margin-left:10px;color:#666;">是否开启导入审核</p>
@@ -478,9 +480,10 @@
                 let st = this.restTime.startTime
                 let et = this.restTime.endTime
                 if(st == null || et == null){ return }
+                console.log(st,et);
                 if(st.split(':')[0] > et.split(':')[0]){
                     e ? this.restTime.startTime = this.restTime.endTime : this.restTime.endTime = this.restTime.startTime
-                }else if(st.split(':')[0] = et.split(':')[0]){
+                }else if(st.split(':')[0] == et.split(':')[0]){
                     if(st.split(':')[1] > et.split(':')[1]){
                         e ? this.restTime.startTime = this.restTime.endTime : this.restTime.endTime = this.restTime.startTime
                     }

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

@@ -115,6 +115,10 @@
                                     <!-- <span :style="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5?'color:red':''">{{item1.reportTime}}h</span> -->
                                     <span >{{item1.reportTime}}</span>h
                                 </span>
+                                <span class="approvalProcessBox">
+                                    <i class="iconfont firerock-iconliucheng1"></i>
+                                    <span class="approvalProcessClick" @click="getApprovalProcess(item1)">审批流程</span>
+                                </span>
                             </span>
                             <div class="checkbtn" style="padding-right:20px;">
                                 <el-button v-if="item1.state >= 2 && user.id == item1.id" type="primary" size="small" @click="isSubstitude=false; fillInReport(index1,0)">编辑日报</el-button>
@@ -1267,6 +1271,14 @@
             </span>
         </el-dialog>
         
+        <!-- 审核流程展示 -->
+        <el-dialog title="审核流程" v-if="approvalProcessDialog" :visible.sync="approvalProcessDialog" customClass="customWidth" width="400px">
+            <div style="padding:20px 40px 20px 0">
+                <el-timeline :reverse="false">
+                    <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">{{item.msg}}</el-timeline-item>
+                </el-timeline>
+            </div>
+        </el-dialog>
     </section>
 </template>
 
@@ -1464,7 +1476,10 @@
                 expandDate: [],
 
                 notifySelList:[],
-                departmentList: []
+                departmentList: [],
+
+                approvalProcessDialog: false,
+                approvalProcessData: []
             };
         },
         watch: {
@@ -1497,6 +1512,27 @@
             
         },
         methods: {
+            getApprovalProcess(item){
+                this.http.post('/report-log/get',{
+                    creatorId: item.id,
+                    createDate: sessionStorage.msg
+                },res => {
+                    if(res.code == 'ok'){
+                        this.approvalProcessDialog = true
+                        this.approvalProcessData = res.data
+                    }else{
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        })
+                    }
+                },err => {
+                    this.$message({
+                        message: err,
+                        type: 'error'
+                    })
+                })
+            },
 
             filterNode(value, data) {
                 // console.log(value, data, '搜索')
@@ -5224,6 +5260,30 @@
         float: left;
         height: 42px;
     }
+    .approvalProcessBox{
+        margin-left: 30px;
+        font-size: 14px;
+        line-height: 16px;
+        cursor: pointer;
+    }
+    .approvalProcessBox i {
+        margin-right: 0;
+        height: 16px;
+        width: 16px;
+        display: inline-block;
+        transform: scale(1.2);
+        position: relative;
+        top: 0.5px;
+        color: #409eff;
+    }
+    .approvalProcessBox .approvalProcessClick{
+        cursor: pointer;
+        color: #409eff;
+        font-size: 14px;
+    }
+    .approvalProcessBox:hover .approvalProcessClick{
+        color: #3485fb;
+    }
 </style>
 
 <style lang="scss" scoped>