From 876fadb9e0d9f4e00af3b444ed38080a4bb13fa5 Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Tue, 8 Sep 2020 11:02:36 +0800
Subject: [PATCH] =?UTF-8?q?bug=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/FinishWork.vue      |  3 ++-
 src/views/par/parworkinfo/ParWorkInfoDept.vue | 19 ++++++++++---------
 .../par/parworkinfo/ParWorkInfoDetail.vue     |  7 ++++---
 src/views/par/parworkinfo/ParWorkInfoUnit.vue | 19 ++++++++++---------
 src/views/par/parworkinfo/ParWorkInfoUser.vue | 19 ++++++++++---------
 .../par/parworkinfo/ParWorkTrackingDept.vue   | 18 +++++++++---------
 src/views/par/parworkinfo/SignModal.vue       |  5 +++--
 7 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/views/par/parworkinfo/FinishWork.vue b/src/views/par/parworkinfo/FinishWork.vue
index cdfd2b1..4a5b2e3 100644
--- a/src/views/par/parworkinfo/FinishWork.vue
+++ b/src/views/par/parworkinfo/FinishWork.vue
@@ -7,6 +7,7 @@
     :destroyOnClose="true"
     :confirmLoading="confirmLoading"
     centered
+    :maskClosable="false"
   >
     <a-form-model ref="ruleForm" :rules="rules" :model="selectInfo">
       <a-row class="form-row" type="flex">
@@ -14,7 +15,7 @@
           <a-form-model-item
             :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
             :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
-            label="完成时间"
+            label="完成日期"
           >{{ selectInfo.wcsj }}</a-form-model-item>
         </a-col>
         <a-col :span="20" :offset="1" style="padding-top:5px;">
diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue
index 97d0fad..2a6e4bc 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDept.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue
@@ -124,6 +124,7 @@
         :destroyOnClose="true"
         :confirmLoading="confirmLoading"
         centered
+        :maskClosable="false"
       >
         <a-form-model
           ref="ruleForm"
@@ -261,22 +262,22 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始日期">
                 <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-date-picker
                   v-model="selectInfo.kssj"
-                  placeholder="请选择开始时间"
+                  placeholder="请选择开始日期"
                   style="width:100%;"
                   @change="startChange"
                 />
               </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止日期">
                 <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-date-picker
                   v-model="selectInfo.jzsj"
-                  placeholder="请选择截止时间"
+                  placeholder="请选择截止日期"
                   style="width:100%;"
                   @change="endChange"
                 />
@@ -404,15 +405,15 @@ export default {
           ellipsis: true
         },
         {
-          title: '开始时间',
+          title: '开始日期',
           dataIndex: 'kssj'
         },
         {
-          title: '截止时间',
+          title: '截止日期',
           dataIndex: 'jzsj'
         },
         {
-          title: '完成时间',
+          title: '完成日期',
           dataIndex: 'wcsj'
         },
         {
@@ -697,11 +698,11 @@ export default {
         }
       })
     },
-    // 开始时间变化
+    // 开始日期变化
     startChange (date, str) {
       this.selectInfo.kssjstr = str
     },
-    // 截止时间变化
+    // 截止日期变化
     endChange (date, str) {
       this.selectInfo.jzsjstr = str
     },
diff --git a/src/views/par/parworkinfo/ParWorkInfoDetail.vue b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
index 1082422..4fe3226 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDetail.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
@@ -7,6 +7,7 @@
     :confirmLoading="confirmLoading"
     centered
     :footer="null"
+    :maskClosable="false"
   >
     <a-form :form="form">
       <a-row class="form-row" type="flex">
@@ -72,14 +73,14 @@
           <a-form-item
             :labelCol="labelCol"
             :wrapperCol="wrapperCol"
-            label="开始时间"
+            label="开始日期"
           >{{ selectInfo.kssj }}</a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item
             :labelCol="labelCol"
             :wrapperCol="wrapperCol"
-            label="截止时间"
+            label="截止日期"
           >{{ selectInfo.jzsj }}</a-form-item>
         </a-col>
         <a-col :span="10" :offset="1" style="padding-top:5px;">
@@ -141,7 +142,7 @@ export default {
       workClockList: [],
       columns: [
         {
-          title: '打卡时间',
+          title: '打卡日期',
           dataIndex: 'dksj',
           key: 'dksj',
           width: 180
diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
index f2c5dc4..7669bee 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -114,6 +114,7 @@
         :destroyOnClose="true"
         :confirmLoading="confirmLoading"
         centered
+        :maskClosable="false"
       >
         <a-form-model
           ref="ruleForm"
@@ -251,22 +252,22 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始日期">
                 <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-date-picker
                   v-model="selectInfo.kssj"
-                  placeholder="请选择开始时间"
+                  placeholder="请选择开始日期"
                   style="width:100%;"
                   @change="startChange"
                 />
               </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止日期">
                 <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-date-picker
                   v-model="selectInfo.jzsj"
-                  placeholder="请选择截止时间"
+                  placeholder="请选择截止日期"
                   style="width:100%;"
                   @change="endChange"
                 />
@@ -392,15 +393,15 @@ export default {
           ellipsis: true
         },
         {
-          title: '开始时间',
+          title: '开始日期',
           dataIndex: 'kssj'
         },
         {
-          title: '截止时间',
+          title: '截止日期',
           dataIndex: 'jzsj'
         },
         {
-          title: '完成时间',
+          title: '完成日期',
           dataIndex: 'wcsj'
         },
         {
@@ -674,11 +675,11 @@ export default {
         }
       })
     },
-    // 开始时间变化
+    // 开始日期变化
     startChange (date, str) {
       this.selectInfo.kssjstr = str
     },
-    // 截止时间变化
+    // 截止日期变化
     endChange (date, str) {
       this.selectInfo.jzsjstr = str
     },
diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue
index aa14360..e488c43 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUser.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue
@@ -88,6 +88,7 @@
       :destroyOnClose="true"
       :confirmLoading="confirmLoading"
       centered
+      :maskClosable="false"
     >
       <a-form-model
         ref="ruleForm"
@@ -194,22 +195,22 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="10" :offset="1" style="padding-top:5px;">
-            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始日期">
               <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
               <a-date-picker
                 v-model="selectInfo.kssj"
-                placeholder="请选择开始时间"
+                placeholder="请选择开始日期"
                 style="width:100%;"
                 @change="startChange"
               />
             </a-form-model-item>
           </a-col>
           <a-col :span="10">
-            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止日期">
               <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
               <a-date-picker
                 v-model="selectInfo.jzsj"
-                placeholder="请选择截止时间"
+                placeholder="请选择截止日期"
                 style="width:100%;"
                 @change="endChange"
               />
@@ -339,15 +340,15 @@ export default {
           ellipsis: true
         },
         {
-          title: '开始时间',
+          title: '开始日期',
           dataIndex: 'kssj'
         },
         {
-          title: '截止时间',
+          title: '截止日期',
           dataIndex: 'jzsj'
         },
         {
-          title: '完成时间',
+          title: '完成日期',
           dataIndex: 'wcsj'
         },
         {
@@ -530,11 +531,11 @@ export default {
     // 派发
     hangOut (record) {
     },
-    // 开始时间变化
+    // 开始日期变化
     startChange (date, str) {
       this.selectInfo.kssjstr = str
     },
-    // 截止时间变化
+    // 截止日期变化
     endChange (date, str) {
       this.selectInfo.jzsjstr = str
     },
diff --git a/src/views/par/parworkinfo/ParWorkTrackingDept.vue b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
index 72bab27..49dce91 100644
--- a/src/views/par/parworkinfo/ParWorkTrackingDept.vue
+++ b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
@@ -255,22 +255,22 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始日期">
                 <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-date-picker
                   v-model="selectInfo.kssj"
-                  placeholder="请选择开始时间"
+                  placeholder="请选择开始日期"
                   style="width:100%;"
                   @change="startChange"
                 />
               </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止日期">
                 <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-date-picker
                   v-model="selectInfo.jzsj"
-                  placeholder="请选择截止时间"
+                  placeholder="请选择截止日期"
                   style="width:100%;"
                   @change="endChange"
                 />
@@ -401,15 +401,15 @@ export default {
           ellipsis: true
         },
         {
-          title: '开始时间',
+          title: '开始日期',
           dataIndex: 'kssj'
         },
         {
-          title: '截止时间',
+          title: '截止日期',
           dataIndex: 'jzsj'
         },
         {
-          title: '完成时间',
+          title: '完成日期',
           dataIndex: 'wcsj'
         },
         {
@@ -686,11 +686,11 @@ export default {
         }
       })
     },
-    // 开始时间变化
+    // 开始日期变化
     startChange (date, str) {
       this.selectInfo.kssjstr = str
     },
-    // 截止时间变化
+    // 截止日期变化
     endChange (date, str) {
       this.selectInfo.jzsjstr = str
     },
diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue
index d7b9f30..0f9f7f2 100644
--- a/src/views/par/parworkinfo/SignModal.vue
+++ b/src/views/par/parworkinfo/SignModal.vue
@@ -7,6 +7,7 @@
     :destroyOnClose="true"
     :confirmLoading="confirmLoading"
     centered
+    :maskClosable="false"
   >
     <a-form-model ref="ruleForm" :model="selectInfo" :rules="rules">
       <a-row class="form-row" type="flex">
@@ -14,7 +15,7 @@
           <a-form-model-item
             :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
             :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
-            label="打卡时间"
+            label="打卡日期"
           >{{ selectInfo.dksj }}</a-form-model-item>
         </a-col>
         <a-col :span="20" :offset="1" style="padding-top:5px;">
@@ -66,7 +67,7 @@ export default {
       workClockList: [],
       columns: [
         {
-          title: '打卡时间',
+          title: '打卡日期',
           dataIndex: 'dksj',
           key: 'dksj',
           width: 180
-- 
Gitee