diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue
index 4ebac4971fb0d2f56e405e60f1bdc494db33f468..9448cbc32b6c539a1514abfef39eb46ec634a9cd 100644
--- a/src/views/par/examperiod/ExamPeriod.vue
+++ b/src/views/par/examperiod/ExamPeriod.vue
@@ -50,6 +50,7 @@
         <a @click="modelMethod('edit',record)" v-action:update>编辑</a>
       </span>
       <span slot="kpzqlx" slot-scope="text">{{ kpzqlxEcho(text) }}</span>
+      <span slot="kpzqzt" slot-scope="text">{{ kpzqztEcho(text) }}</span>
     </s-table>
     <!-- 弹出框 -->
     <a-modal
@@ -103,6 +104,21 @@
               </a-select>
             </a-form-model-item>
           </a-col>
+          <a-col :span="20" :offset="1">
+            <a-form-model-item
+              :labelCol="{span:4}"
+              :wrapperCol="{span:20}"
+              label="考评周期状态"
+              prop="kpzqzt"
+            >
+              <a-switch
+                :disabled="operate=='detile'?'disabled':false"
+                checked-children="有效"
+                un-checked-children="无效"
+                :checked="checked"
+                @change="checkChange" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="20" :offset="1" style="padding-top:5px;">
             <a-form-model-item :labelCol="{span:4}" :wrapperCol="{span:20}" label="备注" prop="bz">
               <!-- <a-input v-model="selectInfo.bz" :disabled="operate=='detile'?'disabled':false" /> -->
@@ -131,6 +147,7 @@ export default {
   data () {
     return {
       visible: false,
+      checked: true,
       form: this.$form.createForm(this),
       // 查询参数
       queryParam: {},
@@ -159,6 +176,11 @@ export default {
           dataIndex: 'kpzqlx',
           scopedSlots: { customRender: 'kpzqlx' }
         },
+        {
+          title: '考评周期状态',
+          dataIndex: 'kpzqzt',
+          scopedSlots: { customRender: 'kpzqzt' }
+        },
         {
           title: '备注',
           dataIndex: 'bz',
@@ -205,6 +227,16 @@ export default {
   },
   created () {},
   methods: {
+    checkChange () {
+      this.checked = !this.checked
+    },
+    kpzqztEcho (text) {
+      if (text === '1') {
+        return '有效'
+      } else if (text === '2') {
+        return '无效'
+      }
+    },
     /**
      * 搜索
      */
@@ -216,6 +248,11 @@ export default {
     modelMethod (action, selectInfo) {
       this.operate = action // 记录当前操作
       this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
+      if (this.selectInfo.kpzqzt === '1') {
+        this.checked = true
+      } else if (this.selectInfo.kpzqzt === '2') {
+        this.checked = false
+      }
       const _this = this
       if (this.operate === 'del') {
         // 删除
@@ -256,6 +293,12 @@ export default {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           vm.confirmLoading = true
+          console.log(vm.selectInfo.kpzqzt)
+          if (vm.checked) {
+            vm.selectInfo.kpzqzt = '1'
+          } else {
+            vm.selectInfo.kpzqzt = '2'
+          }
           if (vm.operate === 'detile') {
             // 详情
             vm.confirmLoading = false
diff --git a/src/views/par/parworkinfo/FinishWork.vue b/src/views/par/parworkinfo/FinishWork.vue
index b309465c28d19b4ca0feb487f9a7dac687bb32b9..cdfd2b163f094781ff842f63e211a045b0de6b63 100644
--- a/src/views/par/parworkinfo/FinishWork.vue
+++ b/src/views/par/parworkinfo/FinishWork.vue
@@ -8,20 +8,14 @@
     :confirmLoading="confirmLoading"
     centered
   >
-    <a-form-model
-      ref="ruleForm"
-      :rules="rules"
-      :model="selectInfo"
-    >
+    <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>
+          >{{ selectInfo.wcsj }}</a-form-model-item>
         </a-col>
         <a-col :span="20" :offset="1" style="padding-top:5px;">
           <a-form-model-item
@@ -103,22 +97,39 @@ export default {
     // 确认
     handleOk () {
       const vm = this
-      this.$refs.ruleForm.validate(valid => {
+      // 删除
+
+      vm.$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')
+          this.$confirm({
+            title: '警告',
+            content: `工作确认完成后将无法进行打卡，是否确认工作完成？`,
+            okText: '确认',
+            okType: 'danger',
+            cancelText: '取消',
+            onOk () {
+              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')
+              })
+            },
+            onCancel: () => {
+              this.$notification['info']({
+                message: '取消完成工作操作',
+                duration: 4
+              })
+            }
           })
         } else {
           return false
diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue
index 2e13b119d1c44d686bb5c8e2e2008a7c4a017633..fdf536f8f1adbed25daac44d058ed141d73475b3 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDept.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue
@@ -40,11 +40,7 @@
             </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-input v-model="queryParam.gznr" style="width: 100%;" placeholder="请输入工作内容" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -134,10 +130,16 @@
           :model="selectInfo"
           :rules="rules"
           :label-col="labelCol"
-          :wrapper-col="wrapperCol">
+          :wrapper-col="wrapperCol"
+        >
           <a-row class="form-row" type="flex">
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行人" prop="zxr">
+              <a-form-model-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="执行人"
+                prop="zxr"
+              >
                 <a-tree-select
                   v-model="selectInfo.zxr"
                   style="width:100%"
@@ -155,7 +157,12 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别" prop="gzlb">
+              <a-form-model-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="工作类别"
+                prop="gzlb"
+              >
                 <a-select
                   v-model="selectInfo.gzlb"
                   style="width: 100%;"
@@ -247,7 +254,10 @@
                 :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
                 label="自定义周期"
               >
-                <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
+                <a-input
+                  v-model="selectInfo.zdyzq"
+                  :disabled="operate==='detile'?'disabled':false"
+                />
               </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
@@ -299,10 +309,10 @@
                   multiple
                 >
                   <a-tree-select-node
-                    v-for="staff in staffList"
-                    :key="staff.id"
-                    :value="staff.id"
-                    :title="staff.name"
+                    v-for="staff in zrStaffList"
+                    :key="staff.ID"
+                    :value="staff.ID"
+                    :title="staff.NAME"
                   ></a-tree-select-node>
                 </a-tree-select>
               </a-form-model-item>
@@ -323,7 +333,8 @@
               </a-form-model-item>
             </a-col>
           </a-row>
-        </a-form-model></a-modal>
+        </a-form-model>
+      </a-modal>
       <sign-modal ref="signModalRef"></sign-modal>
       <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
     </a-card>
@@ -388,7 +399,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -414,11 +426,13 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -448,7 +462,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
@@ -474,12 +489,15 @@ export default {
       loading: false,
       orgTree: [],
       staffList: [],
+      zrStaffList: [],
       currentRole: 'unitRole',
       qdShow: false,
       fileList: [],
       rules: {
         zxr: [{ required: true, message: '请选择执行人', trigger: 'change' }],
-        gzlb: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
+        gzlb: [
+          { required: true, message: '请选择工作类别', trigger: 'change' }
+        ],
         gznr: [{ required: true, message: '工作内容不能为空', trigger: 'blur' }]
       }
     }
@@ -490,6 +508,9 @@ export default {
     // 获取树形组织信息
     getOrgTree({ parentTreeId: 'root' }).then(res => {
       vm.orgTree = vm.genernateTree(res.result.data)
+      for (let i = 0; i < vm.orgTree.length; i++) {
+        vm.orgTree[i].disabled = true
+      }
     })
     // 获取当前登陆人部门
     query('/par/parworkinfo' + '/getOrgInfoByStaffId', 'GET', {
@@ -504,6 +525,12 @@ export default {
         vm.staffList = res.result
       })
     })
+    // 获取所有人员
+    query('/admin/pmUser' + '/listStaffAndOrg', 'GET').then(res => {
+      console.log('人员查询', res)
+      vm.zrStaffList = res.result
+    })
+    console.log('当前登录用户', this.userInfo)
   },
   methods: {
     // 周期回显
diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
index 3740af379c6fd3d600962846e05d77b1f3c02605..47ab3151ca73a13767a92fd9ff232119f257bfc7 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -124,7 +124,12 @@
         >
           <a-row class="form-row" type="flex">
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行单位" prop="zxr">
+              <a-form-model-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="执行单位"
+                prop="zxr"
+              >
                 <a-tree-select
                   v-model="selectInfo.zxr"
                   style="width: 100%"
@@ -136,7 +141,12 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别" prop="gzlb">
+              <a-form-model-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="工作类别"
+                prop="gzlb"
+              >
                 <a-select
                   v-model="selectInfo.gzlb"
                   style="width: 100%;"
@@ -233,7 +243,10 @@
                 :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
                 label="自定义周期"
               >
-                <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
+                <a-input
+                  v-model="selectInfo.zdyzq"
+                  :disabled="operate==='detile'?'disabled':false"
+                />
               </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
@@ -286,9 +299,9 @@
                 >
                   <a-tree-select-node
                     v-for="staff in staffList"
-                    :key="staff.id"
-                    :value="staff.id"
-                    :title="staff.name"
+                    :key="staff.ID"
+                    :value="staff.ID"
+                    :title="staff.NAME"
                   ></a-tree-select-node>
                 </a-tree-select>
               </a-form-model-item>
@@ -400,7 +413,8 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
@@ -435,7 +449,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
@@ -466,7 +481,9 @@ export default {
       fileList: [],
       rules: {
         zxr: [{ required: true, message: '请选择执行单位', trigger: 'change' }],
-        gzlb: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
+        gzlb: [
+          { required: true, message: '请选择工作类别', trigger: 'change' }
+        ],
         gznr: [{ required: true, message: '工作内容不能为空', trigger: 'blur' }]
       }
     }
@@ -477,9 +494,14 @@ export default {
     // 获取树形组织信息
     getOrgTree({ parentTreeId: 'root' }).then(res => {
       vm.orgTree = vm.genernateTree(res.result.data)
+      for (let i = 0; i < vm.orgTree.length; i++) {
+        vm.orgTree[i].disabled = true
+      }
+      console.log('组织机构查询', vm.orgTree)
     })
     // 获取所有人员
-    query('/admin/pmUser' + '/findStaffAll', 'GET').then(res => {
+    query('/admin/pmUser' + '/listStaffAndOrg', 'GET').then(res => {
+      console.log('人员查询', res)
       vm.staffList = res.result
     })
   },
diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue
index a19c3e60155ccf6a108113ccd5e8c1e35fcd14af..0972c2769d1bf61eb3a57e7ffb71bc776a1ed49e 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUser.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue
@@ -242,9 +242,9 @@
               >
                 <a-tree-select-node
                   v-for="staff in staffList"
-                  :key="staff.id"
-                  :value="staff.id"
-                  :title="staff.name"
+                  :key="staff.ID"
+                  :value="staff.ID"
+                  :title="staff.NAME"
                 ></a-tree-select-node>
               </a-tree-select>
             </a-form-model-item>
@@ -319,7 +319,8 @@ export default {
       columns: [
         {
           title: '执行人/单位',
-          dataIndex: 'zxrstr'
+          dataIndex: 'zxrstr',
+          ellipsis: true
         },
         {
           title: '工作类别',
@@ -333,7 +334,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -359,11 +361,13 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -393,7 +397,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
@@ -434,10 +439,14 @@ export default {
     // 获取树形组织信息
     getOrgTree({ parentTreeId: 'root' }).then(res => {
       vm.orgTree = vm.genernateTree(res.result.data)
+      for (let i = 0; i < vm.orgTree.length; i++) {
+        vm.orgTree[i].disabled = true
+      }
     })
     // 获取所有人员
-    query('/admin/pmUser' + '/query', 'GET').then(res => {
-      vm.staffList = res.result.data
+    query('/admin/pmUser' + '/listStaffAndOrg', 'GET').then(res => {
+      console.log('人员查询', res)
+      vm.staffList = res.result
     })
   },
   methods: {
diff --git a/src/views/par/parworkinfo/ParWorkTrackingDept.vue b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
index 7cf6cc8583729b0111050aa1d24d0f47e17234af..72bab27c0951ef1559c6d663941dadd53d4ea614 100644
--- a/src/views/par/parworkinfo/ParWorkTrackingDept.vue
+++ b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
@@ -382,7 +382,8 @@ export default {
       columns: [
         {
           title: '执行人/单位',
-          dataIndex: 'zxrstr'
+          dataIndex: 'zxrstr',
+          ellipsis: true
         },
         {
           title: '工作类别',
@@ -396,7 +397,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -422,11 +424,13 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -456,7 +460,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',