From 49e9ad534e59f145100becbbbe533ff61a0993fb Mon Sep 17 00:00:00 2001
From: zzq <zhuzz@neuray.cn>
Date: Mon, 7 Sep 2020 14:43:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/router.config.js                     |  4 ++--
 src/views/par/parworkinfo/ParWorkInfoDetail.vue | 13 +------------
 src/views/par/parworkinfo/SignModal.vue         | 11 ++---------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/config/router.config.js b/src/config/router.config.js
index 6e73ccf..2c8f01c 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -115,7 +115,7 @@ export const asyncRouterMap = [
             name: 'parWorkInfoUnit',
             component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoUnit.vue'),
             meta: {
-              title: '工作派发(个人)'
+              title: '工作派发(部门)'
             }
           },
           {
@@ -123,7 +123,7 @@ export const asyncRouterMap = [
             name: 'parWorkInfoDept',
             component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoDept.vue'),
             meta: {
-              title: '工作派发(部门)'
+              title: '工作派发(个人)'
             }
           },
           {
diff --git a/src/views/par/parworkinfo/ParWorkInfoDetail.vue b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
index 57e8e29..1082422 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDetail.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
@@ -103,18 +103,7 @@
         <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-tooltip>
-                <template slot="title">{{text}}</template>
-                {{text}}
-              </a-tooltip>-->
-                <a-row>
-                  <a-popover>
-                    <a-col :span="12" :offset="6" slot="content">{{ text }}</a-col>
-                    {{ text }}
-                  </a-popover>
-                </a-row>
-              </template>
+              {{ text }}
             </a-table>
           </a-spin>
         </a-col>
diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue
index 40cdd68..adaf65f 100644
--- a/src/views/par/parworkinfo/SignModal.vue
+++ b/src/views/par/parworkinfo/SignModal.vue
@@ -37,14 +37,7 @@
         <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>
+              {{ text }}
             </a-table>
           </a-spin>
         </a-col>
@@ -69,7 +62,7 @@ export default {
       confirmLoading: false, // Loading
       selectInfo: {},
       rules: {
-        bz: [{ required: true, message: '请输入备注', trigger: 'blur' }]
+        bz: [{ required: true, message: '请输入打卡内容', trigger: 'blur' }]
       },
       workClockList: [],
       columns: [
-- 
Gitee


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

---
 src/views/par/parworkinfo/SignModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue
index adaf65f..d7b9f30 100644
--- a/src/views/par/parworkinfo/SignModal.vue
+++ b/src/views/par/parworkinfo/SignModal.vue
@@ -36,9 +36,7 @@
         <a-divider>打卡记录</a-divider>
         <a-col :span="22" :offset="1">
           <a-spin :spinning="tableLoading">
-            <a-table bordered :columns="columns" :data-source="workClockList">
-              {{ text }}
-            </a-table>
+            <a-table bordered :columns="columns" :data-source="workClockList">{{ text }}</a-table>
           </a-spin>
         </a-col>
       </a-row>
@@ -60,6 +58,7 @@ export default {
       form: this.$form.createForm(this),
       modelVisible: false, // 弹出框显示
       confirmLoading: false, // Loading
+      tableLoading: false,
       selectInfo: {},
       rules: {
         bz: [{ required: true, message: '请输入打卡内容', trigger: 'blur' }]
@@ -86,6 +85,7 @@ export default {
   methods: {
     open (record) {
       const vm = this
+      this.tableLoading = true
       this.selectInfo = {}
       this.modelVisible = true
       this.selectInfo.dksj = moment()
-- 
Gitee