2022.8.29

fhKeeper/formulahousekeeper/timesheet/package-lock.json

@@ -2815,7 +2815,7 @@
     },
     "el-table-infinite-scroll": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/el-table-infinite-scroll/-/el-table-infinite-scroll-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/el-table-infinite-scroll/-/el-table-infinite-scroll-2.0.0.tgz",
       "integrity": "sha512-zDmsGvce4V0wx7j4CBdYi2wgMsv66SbQBp7984gk25Jc8b2nKdjBYrXpFLfMDZ0iYjTDpxkH9+5iEhCgM3+byw==",
       "requires": {
         "core-js": "^3.x",
@@ -2825,7 +2825,7 @@
       "dependencies": {
         "core-js": {
           "version": "3.22.5",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
+          "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.22.5.tgz",
           "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA=="
         }
       }
@@ -5098,7 +5098,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1616463603361&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
         }
@@ -5218,7 +5218,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.nlark.com/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "npmlog": {
@@ -5235,7 +5235,7 @@
     },
     "nprogress": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/nprogress/download/nprogress-0.2.0.tgz",
       "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
     },
     "nth-check": {
@@ -9348,7 +9348,7 @@
         },
         "path-exists": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },

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

@@ -494,7 +494,17 @@
             <el-table v-if="ins == 9" key="9" border :data="reportTimelyList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column prop="userName" label="人员" min-width="200" align="center"></el-table-column>
                 <el-table-column prop="departmentName" label="所属部门" min-width="200" align="center"></el-table-column>
-                <el-table-column prop="timelinessRate" label="填报及时率" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="timelinessRate" label="填报及时率" min-width="200" align="center">
+                  <template slot-scope="scope">
+                    <el-link v-if="scope.row.dataList != null" @click="timelyDetail(scope.row.dataList)">{{scope.row.timelinessRate}}</el-link>
+                    <span v-else>{{scope.row.timelinessRate}}</span>
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column prop="dataList" label="详情" width="100" fixed="right" align="center">
+                  <template slot-scope="scope">
+                    <el-button @click="timelyDetail(scope.row.dataList)">详情</el-button>
+                  </template>
+                </el-table-column> -->
             </el-table>
 
             <!-- 日报待审核统计 -->
@@ -683,6 +693,14 @@
              </el-table>
           </div>
         </el-dialog>
+
+        <!-- 员工填报及时率详情 -->
+        <el-dialog title="详情" :visible.sync="timelyDetailDialog" width="600px">
+          <el-table :data="timelyDetailList">
+            <el-table-column prop="date" label="日期"></el-table-column>
+            <el-table-column prop="detail" label="填报情况"></el-table-column>
+          </el-table>
+        </el-dialog>
   </section>
 </template>
 
@@ -784,7 +802,10 @@ export default {
       stateKey: 1,
 
       outputValueList: [],
-      outputValueTitle: []
+      outputValueTitle: [],
+
+      timelyDetailList: [],
+      timelyDetailDialog: false
     };
   },
   computed: {},
@@ -1434,6 +1455,18 @@ export default {
         this.getProjectStages(true)
       }
     },
+    timelyDetail(rowList){ // 员工填报及时率详情
+      // this.timelyDetailList = rowList
+      let list = []
+      for(let i in rowList){
+        list.push({
+          date: Object.keys(rowList[i])[0],
+          detail: Object.values(rowList[i])[0]
+        })
+      }
+      this.timelyDetailList = list
+      this.timelyDetailDialog = true
+    },
     //获取项目阶段的汇总工时
     getProjectStages(e) {