From f6c00424abb89170affecb324011078884fc0914 Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Mon, 7 Sep 2020 10:09:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/parworkinfo/ParWorkInfoUnit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
index 9d16fdb..f2c5dc4 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -563,7 +563,7 @@ export default {
       link.href = url
       // 获取文件名
       // download 属性定义了下载链接的地址而不是跳转路径
-      link.setAttribute('download', '工作模版.xlsx')
+      link.setAttribute('download', '工作模板.xlsx')
       document.body.appendChild(link)
       link.click()
       document.body.removeChild(link)
-- 
Gitee


From 523d0646b562b49966d01ef992bd49e9af5feba8 Mon Sep 17 00:00:00 2001
From: zzq <zhuzz@neuray.cn>
Date: Mon, 7 Sep 2020 10:25:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../par/parworkinfo/ParWorkInfoDetail.vue     |  4 +-
 src/views/par/parworkinfo/SignModal.vue       | 49 ++++++++++++++++---
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/views/par/parworkinfo/ParWorkInfoDetail.vue b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
index ab07c4d..57e8e29 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDetail.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
@@ -158,7 +158,7 @@ export default {
           width: 180
         },
         {
-          title: '备注',
+          title: '打卡内容',
           dataIndex: 'bz',
           key: 'bz',
           ellipsis: true,
@@ -204,7 +204,7 @@ export default {
       // // 调用请求
       // method(actionParam).then(res => {
       // });
-      // 获取所有人员
+      // 获取打卡记录
       query('/par/parworkinfo/listClock', 'GET', record).then(res => {
         vm.workClockList = res.result.data
         vm.tableLoading = false
diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue
index 97c5d8e..40cdd68 100644
--- a/src/views/par/parworkinfo/SignModal.vue
+++ b/src/views/par/parworkinfo/SignModal.vue
@@ -8,11 +8,7 @@
     :confirmLoading="confirmLoading"
     centered
   >
-    <a-form-model
-      ref="ruleForm"
-      :model="selectInfo"
-      :rules="rules"
-    >
+    <a-form-model ref="ruleForm" :model="selectInfo" :rules="rules">
       <a-row class="form-row" type="flex">
         <a-col :span="20" :offset="1" style="padding-top:5px;">
           <a-form-model-item
@@ -25,7 +21,7 @@
           <a-form-model-item
             :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
             :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
-            label="备注"
+            label="打卡内容"
             prop="bz"
           >
             <!-- <a-input v-model="selectInfo.gznr" :disabled="operate=='detile'?'disabled':false" /> -->
@@ -37,6 +33,21 @@
             />
           </a-form-model-item>
         </a-col>
+        <a-divider>打卡记录</a-divider>
+        <a-col :span="22" :offset="1">
+          <a-spin :spinning="tableLoading">
+            <a-table bordered :columns="columns" :data-source="workClockList">
+              <template slot="bz" slot-scope="text">
+                <a-row>
+                  <a-popover>
+                    <a-col :span="12" :offset="6" slot="content">{{ text }}</a-col>
+                    {{ text }}
+                  </a-popover>
+                </a-row>
+              </template>
+            </a-table>
+          </a-spin>
+        </a-col>
       </a-row>
     </a-form-model>
   </a-modal>
@@ -44,7 +55,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import moment from 'moment'
-import { method } from '@/api/admin'
+import { method, query } from '@/api/admin'
 
 export default {
   components: {},
@@ -59,18 +70,40 @@ export default {
       selectInfo: {},
       rules: {
         bz: [{ required: true, message: '请输入备注', trigger: 'blur' }]
-      }
+      },
+      workClockList: [],
+      columns: [
+        {
+          title: '打卡时间',
+          dataIndex: 'dksj',
+          key: 'dksj',
+          width: 180
+        },
+        {
+          title: '打卡内容',
+          dataIndex: 'bz',
+          key: 'bz',
+          ellipsis: true,
+          scopedSlots: { customRender: 'bz' }
+        }
+      ]
     }
   },
   created () {},
   methods: {
     open (record) {
+      const vm = this
       this.selectInfo = {}
       this.modelVisible = true
       this.selectInfo.dksj = moment()
         .locale('zh-cn')
         .format('YYYY-MM-DD HH:mm:ss')
       this.selectInfo.workInfoId = record.id
+      // 获取打卡记录
+      query('/par/parworkinfo/listClock', 'GET', record).then(res => {
+        vm.workClockList = res.result.data
+        vm.tableLoading = false
+      })
     },
     // 确认
     handleOk () {
-- 
Gitee