From 513a00298d740801cabcb047ab93903ebac4743a Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Thu, 3 Sep 2020 14:59:15 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=8F=90=E4=BA=A4=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examperiod/ExamPeriod.vue       |  37 +++--
 src/views/par/parworkinfo/FinishWork.vue      | 137 ++++++++++++++++++
 src/views/par/parworkinfo/ParWorkInfoDept.vue |  24 ++-
 .../par/parworkinfo/ParWorkInfoDetail.vue     |  27 ++--
 src/views/par/parworkinfo/ParWorkInfoUnit.vue |  21 ++-
 src/views/par/parworkinfo/ParWorkInfoUser.vue |  49 +++++--
 .../par/parworkinfo/ParWorkTrackingDept.vue   |  75 ++++++++--
 src/views/par/parworkinfo/SignModal.vue       |  60 +++++---
 8 files changed, 348 insertions(+), 82 deletions(-)
 create mode 100644 src/views/par/parworkinfo/FinishWork.vue

diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue
index 9eef56d..cd5c589 100644
--- a/src/views/par/examperiod/ExamPeriod.vue
+++ b/src/views/par/examperiod/ExamPeriod.vue
@@ -6,7 +6,7 @@
         <a-row class="form-row">
           <a-col :span="6" :offset="1">
             <a-form-model-item label="考评周期名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input style="width:210px" v-model="queryParam.kpzqmc" />
+              <a-input style="width:210px" placeholder="请输入考评周期名称" v-model="queryParam.kpzqmc" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -55,12 +55,14 @@
       :title="operate=='detile'?'详情':operate=='edit'?'编辑':'新增'"
       :width="900"
       v-model="modelVisible"
-      @ok="handleOk"
       :destroyOnClose="true"
       :confirmLoading="confirmLoading"
       centered
-      :footer="operate=='detile'?null:undefind"
     >
+      <template slot="footer">
+        <a-button @click="handleCancel" v-show="operate!=='detile'">取消</a-button>
+        <a-button type="primary" :loading="loading" @click="handleOk" v-show="operate!=='detile'">确定</a-button>
+      </template>
       <a-form-model
         ref="ruleForm"
         :model="selectInfo"
@@ -70,8 +72,13 @@
       >
         <a-row class="form-row">
           <a-col :span="10" :offset="1">
-            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期名称" prop="kpzqmc">
-              <a-input v-model="selectInfo.kpzqmc" :disabled="operate=='detile'?'disabled':false" />
+            <a-form-model-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="考评周期名称"
+              prop="kpzqmc"
+            >
+              <a-input maxLength="80" placeholder="请输入考评周期名称" v-model="selectInfo.kpzqmc" :disabled="operate=='detile'?'disabled':false" />
             </a-form-model-item>
           </a-col>
           <a-col :span="20" :offset="1" style="padding-top:5px;">
@@ -82,6 +89,7 @@
                 placeholder="请输入备注"
                 :auto-size="{ minRows: 3, maxRows: 5 }"
                 :disabled="operate=='detile'?'disabled':false"
+                maxLength="600"
               />
             </a-form-model-item>
           </a-col>
@@ -110,9 +118,9 @@ export default {
       inDetail: false,
 
       // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
+      loadData: (parameter) => {
         return query('/par/examperiod' + '/queryPage', 'GET', parameter).then(
-          res => {
+          (res) => {
             return res.result
           }
         )
@@ -144,7 +152,9 @@ export default {
         sm: { span: 16 }
       },
       rules: {
-        kpzqmc: [{ required: true, message: '考评周期名称不能为空', trigger: 'blur' }],
+        kpzqmc: [
+          { required: true, message: '考评周期名称不能为空', trigger: 'blur' }
+        ],
         bz: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
       },
       modelVisible: false, // 弹出框显示
@@ -189,7 +199,7 @@ export default {
               message: '删除成功'
             }
             // 调用请求
-            method(_this.actionParam).then(res => {
+            method(_this.actionParam).then((res) => {
               _this.$refs.stable.refresh(true) // 刷新列表
             })
           },
@@ -207,7 +217,7 @@ export default {
     // 确认
     handleOk () {
       const vm = this
-      this.$refs.ruleForm.validate(valid => {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           vm.confirmLoading = true
           if (vm.operate === 'detile') {
@@ -237,7 +247,7 @@ export default {
             }
           }
           // 调用请求
-          return method(vm.actionParam).then(res => {
+          return method(vm.actionParam).then((res) => {
             vm.confirmLoading = false
             // 关闭编辑框
             vm.modelVisible = false
@@ -249,6 +259,9 @@ export default {
         }
       })
     },
+    handleCancel () {
+      this.modelVisible = false
+    },
     exportExcel () {
       this.loading = true
       this.actionParam = {
@@ -258,7 +271,7 @@ export default {
         action: 'GET',
         data: {}
       }
-      return this.downloadFile(this.actionParam).then(res => {
+      return this.downloadFile(this.actionParam).then((res) => {
         download(res)
         this.loading = false
       })
diff --git a/src/views/par/parworkinfo/FinishWork.vue b/src/views/par/parworkinfo/FinishWork.vue
new file mode 100644
index 0000000..b309465
--- /dev/null
+++ b/src/views/par/parworkinfo/FinishWork.vue
@@ -0,0 +1,137 @@
+<template>
+  <a-modal
+    title="完成工作"
+    :width="900"
+    v-model="modelVisible"
+    @ok="handleOk"
+    :destroyOnClose="true"
+    :confirmLoading="confirmLoading"
+    centered
+  >
+    <a-form-model
+      ref="ruleForm"
+      :rules="rules"
+      :model="selectInfo"
+    >
+      <a-row class="form-row" type="flex">
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-form-model-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="完成时间"
+          >
+            {{ selectInfo.wcsj }}
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-form-model-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="备注"
+            prop="bz"
+          >
+            <!-- <a-input v-model="selectInfo.gznr" :disabled="operate=='detile'?'disabled':false" /> -->
+            <a-textarea
+              v-model="selectInfo.bz"
+              placeholder="请输入备注"
+              :auto-size="{ minRows: 8, maxRows: 8 }"
+              :maxLength="600"
+            />
+          </a-form-model-item>
+        </a-col>
+        <a-col :span="20" :offset="1" style="padding-top:5px;" v-if="yqShow">
+          <a-form-model-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="延期原因"
+            prop="yqyy"
+          >
+            <a-textarea
+              v-model="selectInfo.yqyy"
+              placeholder="请输入延期原因"
+              :auto-size="{ minRows: 8, maxRows: 8 }"
+              :maxLength="600"
+            />
+          </a-form-model-item>
+        </a-col>
+      </a-row>
+    </a-form-model>
+  </a-modal>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import moment from 'moment'
+import { method } from '@/api/admin'
+
+export default {
+  components: {},
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data () {
+    return {
+      form: this.$form.createForm(this),
+      modelVisible: false, // 弹出框显示
+      confirmLoading: false, // Loading
+      selectInfo: {},
+      now: {},
+      rules: {
+        bz: [{ required: true, message: '请输入备注', trigger: 'blur' }],
+        yqyy: [{ required: true, message: '请输入延期原因', trigger: 'blur' }]
+      },
+      yqShow: false,
+      dkinfo: {}
+    }
+  },
+  created () {},
+  methods: {
+    open (record) {
+      this.selectInfo = {}
+      this.modelVisible = true
+      this.selectInfo.wcsj = moment()
+        .locale('zh-cn')
+        .format('YYYY-MM-DD HH:mm:ss')
+      this.selectInfo.workinfoid = record.id
+      const now = new Date()
+      const current = new Date(record.jzsj)
+      if (now > current) {
+        this.yqShow = true
+      } else {
+        this.yqShow = false
+      }
+    },
+    // 确认
+    handleOk () {
+      const vm = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          vm.confirmLoading = true
+          vm.actionParam = {
+            url: '/par/parworkinfo/updateParAndInsertWorkClock',
+            action: 'POST',
+            parameter: vm.selectInfo,
+            data: {},
+            message: '提交完成工作成功'
+          }
+          // 调用请求
+          method(vm.actionParam).then(res => {
+            vm.confirmLoading = false
+            // 关闭弹窗
+            vm.modelVisible = false
+            vm.$emit('result')
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue
index 965d291..091b98f 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDept.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue
@@ -38,6 +38,15 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :span="6" :offset="1">
+              <a-form-item label="工作内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
+                  v-model="queryParam.gznr"
+                  style="width: 100%;"
+                  placeholder="请输入工作内容"
+                />
+              </a-form-item>
+            </a-col>
           </a-row>
           <!--查询条件 end-->
           <!--操作按钮 start -->
@@ -102,8 +111,6 @@
           >编辑</a>
           <a-divider type="vertical" v-if="record.pfzt==='0'&&record.crtUser===userInfo.id" />
           <a @click="hangOut(record)" v-if="record.pfzt==='0'&&record.crtUser===userInfo.id">派发</a>
-          <a-divider type="vertical" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'" />
-          <a @click="sign(record)" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'">打卡</a>
         </span>
         <span slot="gzlb" slot-scope="text">{{ gzlbEcho(text) }}</span>
         <span slot="gzzt" slot-scope="text">{{ gzztEcho(text) }}</span>
@@ -189,6 +196,7 @@
                   v-model="selectInfo.gznr"
                   placeholder="请输入工作内容"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
+                  maxLength="666"
                 />
               </a-form-model-item>
             </a-col>
@@ -310,6 +318,7 @@
                   v-model="selectInfo.zlyq"
                   placeholder="请输入质量要求"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
+                  maxLength="666"
                 />
               </a-form-model-item>
             </a-col>
@@ -390,10 +399,10 @@ export default {
           title: '截止时间',
           dataIndex: 'jzsj'
         },
-        // {
-        //   title: "完成时间",
-        //   dataIndex: "wcsj"
-        // },
+        {
+          title: '完成时间',
+          dataIndex: 'wcsj'
+        },
         {
           title: '工作状态',
           dataIndex: 'gzzt',
@@ -737,6 +746,9 @@ export default {
       if (this.selectInfo.jzsj) {
         this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
       }
+      if (this.selectInfo.wcsj) {
+        this.selectInfo.wcsj = moment(this.selectInfo.wcsj, dateFormat)
+      }
       console.log('日期处理', this.selectInfo)
       if (action === 'edit') {
         const sfszqxgz = this.selectInfo.sfszqxgz
diff --git a/src/views/par/parworkinfo/ParWorkInfoDetail.vue b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
index d4e4a84..c0f81d9 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDetail.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
@@ -101,20 +101,22 @@
         </a-col>
         <a-divider>打卡记录</a-divider>
         <a-col :span="22" :offset="1">
-          <a-table bordered :columns="columns" :data-source="workClockList">
-            <template slot="bz" slot-scope="text">
-              <!-- <a-tooltip>
+          <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>
-          </a-table>
+                <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>
@@ -134,6 +136,7 @@ export default {
       form: this.$form.createForm(this),
       modelVisible: false, // 弹出框显示
       confirmLoading: false, // Loading
+      tableLoading: false,
       selectInfo: {},
       labelCol: {
         xs: { span: 24 },
@@ -190,6 +193,7 @@ export default {
         this.qdShow = false
       }
       this.modelVisible = true
+      this.tableLoading = true
       // let actionParam = {
       //   // 请求参数
       //   url: "/par/parworkclock/list",
@@ -206,6 +210,7 @@ export default {
       query('/par/parworkclock/list', 'GET', record).then(res => {
         console.log('打卡记录集合', res)
         vm.workClockList = res.result.data
+        vm.tableLoading = false
       })
     },
     // 工作类别回显
diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
index 475b096..7e59dae 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -182,6 +182,7 @@
                   v-model="selectInfo.gznr"
                   placeholder="请输入工作内容"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
+                  maxLength="666"
                 />
               </a-form-model-item>
             </a-col>
@@ -303,6 +304,7 @@
                   v-model="selectInfo.zlyq"
                   placeholder="请输入质量要求"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
+                  maxLength="666"
                 />
               </a-form-model-item>
             </a-col>
@@ -372,7 +374,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -382,10 +385,10 @@ export default {
           title: '截止时间',
           dataIndex: 'jzsj'
         },
-        // {
-        //   title: "完成时间",
-        //   dataIndex: "wcsj"
-        // },
+        {
+          title: '完成时间',
+          dataIndex: 'wcsj'
+        },
         {
           title: '工作状态',
           dataIndex: 'gzzt',
@@ -402,7 +405,8 @@ export default {
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -650,7 +654,7 @@ export default {
         },
         onCancel: () => {
           vm.$notification['info']({
-            message: '取消删除操作',
+            message: '取消派发操作',
             duration: 4
           })
         }
@@ -722,6 +726,9 @@ export default {
       if (this.selectInfo.jzsj) {
         this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
       }
+      if (this.selectInfo.wcsj) {
+        this.selectInfo.wcsj = moment(this.selectInfo.wcsj, dateFormat)
+      }
       console.log('日期处理', this.selectInfo)
       if (action === 'edit') {
         const sfszqxgz = this.selectInfo.sfszqxgz
diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue
index ce02163..2527208 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUser.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue
@@ -19,6 +19,15 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :span="6" :offset="1">
+            <a-form-item label="工作内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input
+                v-model="queryParam.gznr"
+                style="width: 100%;"
+                placeholder="请输入工作内容"
+              />
+            </a-form-item>
+          </a-col>
         </a-row>
         <!--查询条件 end-->
         <!--操作按钮 start -->
@@ -54,12 +63,14 @@
     >
       <span slot="action" slot-scope="text, record">
         <a @click="detail(record)">详情</a>
-        <a-divider type="vertical" v-if="record.crtUser===userInfo.id" />
-        <a @click="modelMethod('del',record)" v-action:delete v-if="record.crtUser===userInfo.id">删除</a>
-        <a-divider type="vertical" v-if="record.crtUser===userInfo.id" />
-        <a @click="modelMethod('edit',record)" v-action:update v-if="record.crtUser===userInfo.id">编辑</a>
-        <a-divider type="vertical" />
-        <a @click="sign(record)">打卡</a>
+        <a-divider type="vertical" v-if="record.crtUser===userInfo.id&&record.gzzt === '0'" />
+        <a @click="modelMethod('del',record)" v-action:delete v-if="record.crtUser===userInfo.id&&record.gzzt === '0'">删除</a>
+        <a-divider type="vertical" v-if="record.crtUser===userInfo.id&&record.gzzt === '0'" />
+        <a @click="modelMethod('edit',record)" v-action:update v-if="record.crtUser===userInfo.id&&record.gzzt === '0'">编辑</a>
+        <a-divider type="vertical" v-if="record.gzzt === '0'"/>
+        <a @click="sign(record)" v-if="record.gzzt === '0'">打卡</a>
+        <a-divider type="vertical" v-if="record.gzzt === '0'"/>
+        <a @click="finishWork(record)" v-if="record.gzzt === '0'">完成工作</a>
       </span>
       <span slot="gzlb" slot-scope="text">{{ gzlbEcho(text) }}</span>
       <span slot="gzzt" slot-scope="text">{{ gzztEcho(text) }}</span>
@@ -80,7 +91,7 @@
     >
       <a-form-model
         ref="ruleForm"
-        :model="form"
+        :model="selectInfo"
         :rules="rules"
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
@@ -128,6 +139,7 @@
                 v-model="selectInfo.gznr"
                 placeholder="请输入工作内容"
                 :auto-size="{ minRows: 3, maxRows: 5 }"
+                maxLength="666"
               />
             </a-form-model-item>
           </a-col>
@@ -248,13 +260,15 @@
                 v-model="selectInfo.zlyq"
                 placeholder="请输入质量要求"
                 :auto-size="{ minRows: 3, maxRows: 5 }"
+                maxLength="666"
               />
             </a-form-model-item>
           </a-col>
         </a-row>
       </a-form-model>
     </a-modal>
-    <sign-modal ref="signModalRef"></sign-modal>
+    <sign-modal ref="signModalRef" @result="search"></sign-modal>
+    <finish-work ref="finishWorkRef" @result="search"></finish-work>
     <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
   </a-card>
 </template>
@@ -263,6 +277,7 @@ import { STable } from '@/components'
 import { query, method, getOrgTree } from '@/api/admin'
 import { mapGetters } from 'vuex'
 
+import finishWork from './FinishWork'
 import SignModal from './SignModal'
 import moment from 'moment'
 import ParWorkInfoDetail from './ParWorkInfoDetail'
@@ -272,7 +287,8 @@ export default {
     STable,
     getOrgTree,
     SignModal,
-    ParWorkInfoDetail
+    ParWorkInfoDetail,
+    finishWork
   },
   computed: {
     ...mapGetters(['userInfo'])
@@ -328,10 +344,10 @@ export default {
           title: '截止时间',
           dataIndex: 'jzsj'
         },
-        // {
-        //   title: "完成时间",
-        //   dataIndex: "wcsj"
-        // },
+        {
+          title: '完成时间',
+          dataIndex: 'wcsj'
+        },
         {
           title: '工作状态',
           dataIndex: 'gzzt',
@@ -578,6 +594,9 @@ export default {
       if (this.selectInfo.jzsj) {
         this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
       }
+      if (this.selectInfo.wcsj) {
+        this.selectInfo.wcsj = moment(this.selectInfo.wcsj, dateFormat)
+      }
       console.log('日期处理', selectInfo)
       if (action === 'edit') {
         const sfszqxgz = this.selectInfo.sfszqxgz
@@ -683,6 +702,10 @@ export default {
           return false
         }
       })
+    },
+    // 完成工作
+    finishWork (record) {
+      this.$refs.finishWorkRef.open(record)
     }
   }
 }
diff --git a/src/views/par/parworkinfo/ParWorkTrackingDept.vue b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
index 713d7e0..10d9292 100644
--- a/src/views/par/parworkinfo/ParWorkTrackingDept.vue
+++ b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
@@ -38,6 +38,15 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :span="6" :offset="1">
+              <a-form-item label="工作内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input
+                  v-model="queryParam.gznr"
+                  style="width: 100%;"
+                  placeholder="请输入工作内容"
+                />
+              </a-form-item>
+            </a-col>
           </a-row>
           <!--查询条件 end-->
           <!--操作按钮 start -->
@@ -102,8 +111,10 @@
           >编辑</a> -->
           <!-- <a-divider type="vertical" v-if="record.pfzt==='0'&&record.crtUser===userInfo.id" />
           <a @click="hangOut(record)" v-if="record.pfzt==='0'&&record.crtUser===userInfo.id">派发</a> -->
-          <a-divider type="vertical" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'" />
-          <a @click="sign(record)" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'">打卡</a>
+          <a-divider type="vertical" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'&&record.gzzt === '0'"/>
+          <a @click="sign(record)" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'&&record.gzzt === '0'">打卡</a>
+          <a-divider type="vertical" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'&&record.gzzt === '0'" />
+          <a @click="finishWork(record)" v-if="(record.zxr===userInfo.id || record.zxr===userInfo.deptCode)&&record.pfzt==='1'&&record.gzzt === '0'">完成工作</a>
         </span>
         <span slot="gzlb" slot-scope="text">{{ gzlbEcho(text) }}</span>
         <span slot="gzzt" slot-scope="text">{{ gzztEcho(text) }}</span>
@@ -189,6 +200,7 @@
                   v-model="selectInfo.gznr"
                   placeholder="请输入工作内容"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
+                  maxLength="666"
                 />
               </a-form-model-item>
             </a-col>
@@ -310,12 +322,15 @@
                   v-model="selectInfo.zlyq"
                   placeholder="请输入质量要求"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
+                  maxLength="666"
                 />
               </a-form-model-item>
             </a-col>
           </a-row>
-        </a-form-model></a-modal>
-      <sign-modal ref="signModalRef"></sign-modal>
+        </a-form-model>
+      </a-modal>
+      <sign-modal ref="signModalRef" @result="search"></sign-modal>
+      <finish-work ref="finishWorkRef" @result="search"></finish-work>
       <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
     </a-card>
   </a-spin>
@@ -326,6 +341,7 @@ import { query, method, getOrgTree, download } from '@/api/admin'
 import { mapGetters } from 'vuex'
 
 import SignModal from './SignModal'
+import finishWork from './FinishWork'
 import moment from 'moment'
 import ParWorkInfoDetail from './ParWorkInfoDetail'
 
@@ -334,7 +350,8 @@ export default {
     STable,
     getOrgTree,
     SignModal,
-    ParWorkInfoDetail
+    ParWorkInfoDetail,
+    finishWork
   },
   computed: {
     ...mapGetters(['userInfo'])
@@ -390,10 +407,10 @@ export default {
           title: '截止时间',
           dataIndex: 'jzsj'
         },
-        // {
-        //   title: "完成时间",
-        //   dataIndex: "wcsj"
-        // },
+        {
+          title: '完成时间',
+          dataIndex: 'wcsj'
+        },
         {
           title: '工作状态',
           dataIndex: 'gzzt',
@@ -636,9 +653,12 @@ export default {
     },
     // 打卡
     sign (record) {
-      console.log('打卡', record)
       this.$refs.signModalRef.open(record)
     },
+    // 完成工作
+    finishWork (record) {
+      this.$refs.finishWorkRef.open(record)
+    },
     // 派发
     hangOut (record) {
       const vm = this
@@ -737,6 +757,9 @@ export default {
       if (this.selectInfo.jzsj) {
         this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
       }
+      if (this.selectInfo.wcsj) {
+        this.selectInfo.wcsj = moment(this.selectInfo.wcsj, dateFormat)
+      }
       console.log('日期处理', this.selectInfo)
       if (action === 'edit') {
         const sfszqxgz = this.selectInfo.sfszqxgz
@@ -841,6 +864,38 @@ export default {
         }
       })
     }
+    // finishWork (record) { // 完成工作
+    //   const vm = this
+    //   this.$confirm({
+    //     title: '提示',
+    //     content: `确认要提交完成吗?`,
+    //     okText: '确认',
+    //     okType: 'warn',
+    //     cancelText: '取消',
+    //     onOk () {
+    //       record.wcsj = moment().locale('zh-cn').format('YYYY-MM-DD HH:mm:ss')
+    //       record.gzzt = '1'
+    //       vm.actionParam = {
+    //         // 请求参数
+    //         url: vm.url + '/update',
+    //         action: 'POST',
+    //         parameter: record,
+    //         data: record,
+    //         message: '完成工作成功'
+    //       }
+    //       // 调用请求
+    //       method(vm.actionParam).then(res => {
+    //         vm.$refs.stable.refresh(true) // 刷新列表
+    //       })
+    //     },
+    //     onCancel: () => {
+    //       vm.$notification['info']({
+    //         message: '取消完成工作操作',
+    //         duration: 4
+    //       })
+    //     }
+    //   })
+    // }
   }
 }
 </script>
diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue
index 0eb5b65..f3ca2c8 100644
--- a/src/views/par/parworkinfo/SignModal.vue
+++ b/src/views/par/parworkinfo/SignModal.vue
@@ -8,20 +8,25 @@
     :confirmLoading="confirmLoading"
     centered
   >
-    <a-form :form="form">
+    <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-item
+          <a-form-model-item
             :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
             :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
             label="打卡时间"
-          >{{ selectInfo.dksj }}</a-form-item>
+          >{{ selectInfo.dksj }}</a-form-model-item>
         </a-col>
         <a-col :span="20" :offset="1" style="padding-top:5px;">
-          <a-form-item
+          <a-form-model-item
             :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
             :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
             label="备注"
+            prop="bz"
           >
             <!-- <a-input v-model="selectInfo.gznr" :disabled="operate=='detile'?'disabled':false" /> -->
             <a-textarea
@@ -30,10 +35,10 @@
               :auto-size="{ minRows: 8, maxRows: 8 }"
               :maxLength="600"
             />
-          </a-form-item>
+          </a-form-model-item>
         </a-col>
       </a-row>
-    </a-form>
+    </a-form-model>
   </a-modal>
 </template>
 <script>
@@ -51,14 +56,16 @@ export default {
       form: this.$form.createForm(this),
       modelVisible: false, // 弹出框显示
       confirmLoading: false, // Loading
-      selectInfo: {}
+      selectInfo: {},
+      rules: {
+        bz: [{ required: true, message: '请输入备注', trigger: 'blur' }]
+      }
     }
   },
   created () {},
   methods: {
     open (record) {
-      console.log('打卡', record)
-      // this.selectInfo = record;
+      this.selectInfo = {}
       this.modelVisible = true
       this.selectInfo.dksj = moment()
         .locale('zh-cn')
@@ -69,20 +76,27 @@ export default {
     // 确认
     handleOk () {
       const vm = this
-      this.confirmLoading = true
-      vm.actionParam = {
-        // 请求参数
-        url: '/par/parworkclock/insert',
-        action: 'POST',
-        parameter: {},
-        data: vm.selectInfo,
-        message: '打卡成功'
-      }
-      // 调用请求
-      method(vm.actionParam).then(res => {
-        vm.confirmLoading = false
-        // 关闭弹窗
-        vm.modelVisible = false
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          vm.confirmLoading = true
+          vm.actionParam = {
+            // 请求参数
+            url: '/par/parworkclock/insert',
+            action: 'POST',
+            parameter: {},
+            data: vm.selectInfo,
+            message: '打卡成功'
+          }
+          // 调用请求
+          method(vm.actionParam).then(res => {
+            vm.confirmLoading = false
+            // 关闭弹窗
+            vm.modelVisible = false
+            vm.$emit('result')
+          })
+        } else {
+          return false
+        }
       })
     }
   }
-- 
Gitee