Home Explore Help
Register Sign In
wutt
/
manHourHousekeeper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

icon

ggooalice 2 years ago
parent
0ce2ab5ccf
commit
225f97d8e8
10 changed files with 113 additions and 12 deletions
Split View Show Diff Stats
  1. 3 0
      fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue
  2. 51 5
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/demo_index.html
  3. 11 3
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.css
  4. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.js
  5. 14 0
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.json
  6. BIN
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.ttf
  7. BIN
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.woff
  8. BIN
      fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.woff2
  9. 1 1
      fhKeeper/formulahousekeeper/timesheet/src/routes.js
  10. 32 2
      fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue

+ 3 - 0
fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue
View File 

@@ -210,6 +210,7 @@
 
                 <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item>
 
                 <el-form-item><el-checkbox v-model="dialogData.notAllowedNoAttendance">是否开启考勤为0不可填报</el-checkbox></el-form-item>
 
                 <el-form-item><el-checkbox v-model="dialogData.stageHasEvtime">是否开启预估工时</el-checkbox></el-form-item>
 
+                <el-form-item><el-checkbox v-model="dialogData.pushReportData">是否开通【推送工时数据】</el-checkbox></el-form-item>
 
                 <el-form-item><el-checkbox v-model="dialogData.financeAudit">财务导入是否需要审核</el-checkbox></el-form-item>
 
                 <el-form-item><el-checkbox v-model="dialogData.includeWeekends">批量填报是否包含周末</el-checkbox></el-form-item>
 
                 <el-form-item><el-checkbox v-model="dialogData.multiWorktime">一个项目下可填报多个时间段工时</el-checkbox></el-form-item>
 
@@ -375,6 +376,7 @@
 
                             this.$set(this.dialogData,'reportAutoApprove',res.data.reportAutoApprove ? true : false)
 
                             this.$set(this.dialogData,'notAllowedNoAttendance',res.data.notAllowedNoAttendance ? true : false)
 
                             this.$set(this.dialogData,'stageHasEvtime',res.data.stageHasEvtime ? true : false)
 
+                            this.$set(this.dialogData,'pushReportData',res.data.pushReportData ? true : false)
 
                             this.$set(this.dialogData,'financeAudit',res.data.financeAudit ? true : false)
 
                             this.$set(this.dialogData,'includeWeekends',res.data.includeWeekends ? true : false)
 
                             this.$set(this.dialogData,'multiWorktime',res.data.multiWorktime ? true : false)
 
@@ -654,6 +656,7 @@
 
                     reportAutoApprove: this.dialogData.reportAutoApprove ? 1 : 0,
 
                     notAllowedNoAttendance: this.dialogData.notAllowedNoAttendance ? 1 : 0,
 
                     stageHasEvtime: this.dialogData.stageHasEvtime ? 1 : 0,
 
+                    pushReportData: this.dialogData.pushReportData ? 1 : 0,
 
                     includeWeekends: this.dialogData.includeWeekends ? 1 : 0,
 
                     multiWorktime: this.dialogData.multiWorktime ? 1 : 0,
 
                     reportAuditType: this.dialogData.reportAuditType

+ 51 - 5
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/demo_index.html
View File 

@@ -3,8 +3,8 @@
 
 <head>
 
   <meta charset="utf-8"/>
 
   <title>iconfont Demo</title>
 
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
 
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
 
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
 
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
 
   <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
 
   <link rel="stylesheet" href="demo.css">
 
   <link rel="stylesheet" href="iconfont.css">
 
@@ -54,6 +54,18 @@
 
       <div class="content unicode" style="display: block;">
 
           <ul class="icon_lists dib-box">
 
           
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe675;</span>
 
+                <div class="name">合同7</div>
 
+                <div class="code-name">&amp;#xe675;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6ca;</span>
 
+                <div class="name">sync</div>
 
+                <div class="code-name">&amp;#xe6ca;</div>
 
+              </li>
 
+          
             <li class="dib">
 
               <span class="icon iconfont">&#xe700;</span>
 
                 <div class="name">流程</div>
 
@@ -474,9 +486,9 @@
 
 <pre><code class="language-css"
 
 >@font-face {
 
   font-family: 'iconfont';
 
-  src: url('iconfont.woff2?t=1656062511171') format('woff2'),
 
-       url('iconfont.woff?t=1656062511171') format('woff'),
 
-       url('iconfont.ttf?t=1656062511171') format('truetype');
 
+  src: url('iconfont.woff2?t=1671700473139') format('woff2'),
 
+       url('iconfont.woff?t=1671700473139') format('woff'),
 
+       url('iconfont.ttf?t=1671700473139') format('truetype');
 
 }
 
 </code></pre>
 
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
 
@@ -502,6 +514,24 @@
 
       <div class="content font-class">
 
         <ul class="icon_lists dib-box">
 
           
+          <li class="dib">
 
+            <span class="icon iconfont firerock-iconhetong7"></span>
 
+            <div class="name">
 
+              合同7
 
+            </div>
 
+            <div class="code-name">.firerock-iconhetong7
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont firerock-iconsync"></span>
 
+            <div class="name">
 
+              sync
 
+            </div>
 
+            <div class="code-name">.firerock-iconsync
 
+            </div>
 
+          </li>
 
+          
           <li class="dib">
 
             <span class="icon iconfont firerock-iconliucheng1"></span>
 
             <div class="name">
 
@@ -1132,6 +1162,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-iconhetong7"></use>
 
+                </svg>
 
+                <div class="name">合同7</div>
 
+                <div class="code-name">#firerock-iconhetong7</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#firerock-iconsync"></use>
 
+                </svg>
 
+                <div class="name">sync</div>
 
+                <div class="code-name">#firerock-iconsync</div>
 
+            </li>
 
+          
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
                   <use xlink:href="#firerock-iconliucheng1"></use>

+ 11 - 3
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.css
View File 

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

File diff suppressed because it is too large
+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.js


+ 14 - 0
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.json
View File 

@@ -5,6 +5,20 @@
 
   "css_prefix_text": "firerock-icon",
 
   "description": "",
 
   "glyphs": [
 
+    {
 
+      "icon_id": "774469",
 
+      "name": "合同7",
 
+      "font_class": "hetong7",
 
+      "unicode": "e675",
 
+      "unicode_decimal": 58997
 
+    },
 
+    {
 
+      "icon_id": "5832808",
 
+      "name": "sync",
 
+      "font_class": "sync",
 
+      "unicode": "e6ca",
 
+      "unicode_decimal": 59082
 
+    },
 
     {
 
       "icon_id": "6970024",
 
       "name": "流程",

BIN
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.ttf
View File


BIN
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.woff
View File


BIN
fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.woff2
View File


+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/routes.js
View File 

@@ -290,7 +290,7 @@ export const allRouters = [//组织架构
 
         path: '/',
 
         component: Home,
 
         name: '合同管理',
 
-        iconCls: 'iconfont firerock-iconxiangmu',
 
+        iconCls: 'iconfont firerock-iconhetong7',
 
         leaf: true,
 
         children: [
 
             { path: '/contract', component: contract, name: '合同管理' },

+ 32 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue
View File 

@@ -121,6 +121,7 @@
 
               v-model="contractForm.startDate"
 
               value-format="yyyy-MM-dd"
 
               type="date"
 
+              :picker-options="{disabledDate: disabledStart}"
 
               :placeholder="$t('optiondate')">
 
             </el-date-picker>
 
             <span style="float:right;">{{$t('scheduleendtime')}}
 
@@ -129,6 +130,7 @@
 
               v-model="contractForm.endDate"
 
               value-format="yyyy-MM-dd"
 
               type="date"
 
+              :picker-options="{disabledDate: disabledEnd}"
 
               :placeholder="$t('optiondate')">
 
             </el-date-picker>
 
             </span>
 
@@ -254,7 +256,7 @@
 
       </div>
 
       <el-dialog :title="typeTitle == this.$t('add') ? $t('xin-zeng-he-tong-lei-xing') : $t('bian-ji-he-tong-lei-xing')" :visible.sync="typeItemDialog" v-if="typeItemDialog" append-to-body width="400px">
 
         <div style="height: 12vh;overflow-y: auto;overflow-x: hidden;">
 
-          <el-input v-model="typeItemForm.typeName"></el-input>
 
+          <el-input v-model="typeItemForm.typeName" :maxlength="200"></el-input>
 
         </div>
 
         <div slot="footer" class="dialog-footer;">
 
           <el-button type="primary" @click="typeItemDialog = false">{{$t('btn.cancel')}}</el-button>
 
@@ -379,7 +381,28 @@ export default {
 
                   }
 
                 
             },
 
-
 
+    disabledStart(date){
 
+      if(this.contractForm.endDate){
 
+        if(date > new Date(this.contractForm.endDate)){
 
+          return true
 
+        }else{
 
+          return false
 
+        }
 
+      }else{
 
+        return false
 
+      }
 
+    },
 
+    disabledEnd(date){
 
+      if(this.contractForm.startDate){
 
+        if(date < new Date(this.contractForm.startDate)){
 
+          return true
 
+        }else{
 
+          return false
 
+        }
 
+      }else{
 
+        return false
 
+      }
 
+    },
 
     searchFilter(){
 
       this.page = 1
 
       this.getContractList()
 
@@ -479,6 +502,13 @@ export default {
 
       this.typeDialog = true
 
     },
 
     typeItemAdd(){
 
+      if(this.typeList.length == 20){
 
+        this.$message({
 
+          message: '合同类型最多只能创建20个',
 
+          type: 'error'
 
+        })
 
+        return
 
+      }
 
       this.typeTitle = this.$t('add')
 
       this.typeItemForm = {typeName: ''}
 
       this.typeItemDialog = true