From 7bc85d54436f4f80095a3b59c0f7cb4e9e1b505b Mon Sep 17 00:00:00 2001
From: zzq <zhuzz@neuray.cn>
Date: Fri, 4 Sep 2020 15:41:17 +0800
Subject: [PATCH 1/3] =?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/views/par/parworkinfo/FinishWork.vue      | 57 +++++++++++--------
 src/views/par/parworkinfo/ParWorkInfoDept.vue | 55 ++++++++++++------
 src/views/par/parworkinfo/ParWorkInfoUnit.vue | 35 +++++++++---
 src/views/par/parworkinfo/ParWorkInfoUser.vue | 16 ++++--
 4 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/src/views/par/parworkinfo/FinishWork.vue b/src/views/par/parworkinfo/FinishWork.vue
index b309465..cdfd2b1 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 6174889..d815e84 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>
@@ -389,7 +400,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -475,12 +487,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' }]
       }
     }
@@ -493,6 +508,9 @@ export default {
       console.log('1111111111122222222222222')
       console.log('组织机构查询', 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', {
@@ -510,6 +528,11 @@ export default {
         console.log('人员选择集合', vm.staffList)
       })
     })
+    // 获取所有人员
+    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 f116d48..801e3f9 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>
@@ -467,7 +480,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' }]
       }
     }
@@ -480,9 +495,13 @@ export default {
       console.log('1111111111122222222222222')
       console.log('组织机构查询', 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 a14ab33..cc19f57 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>
@@ -334,7 +334,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -437,11 +438,14 @@ export default {
       console.log('1111111111122222222222222')
       console.log('组织机构查询', 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 => {
+    query('/admin/pmUser' + '/listStaffAndOrg', 'GET').then(res => {
       console.log('人员查询', res)
-      vm.staffList = res.result.data
+      vm.staffList = res.result
     })
     console.log('当前登录用户', this.userInfo)
   },
-- 
Gitee


From 54d3be598907401451ddf2e3b13e17454b38a263 Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Fri, 4 Sep 2020 15:41:56 +0800
Subject: [PATCH 2/3] =?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/ParWorkInfoDept.vue     | 12 ++++++++----
 src/views/par/parworkinfo/ParWorkInfoUnit.vue     |  6 ++++--
 src/views/par/parworkinfo/ParWorkInfoUser.vue     | 15 ++++++++++-----
 src/views/par/parworkinfo/ParWorkTrackingDept.vue | 15 ++++++++++-----
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue
index 6174889..cb73c1f 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDept.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue
@@ -389,7 +389,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -415,11 +416,13 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -449,7 +452,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
index f116d48..758529a 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -401,7 +401,8 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
@@ -436,7 +437,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue
index a14ab33..d08629f 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUser.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue
@@ -320,7 +320,8 @@ export default {
       columns: [
         {
           title: '执行人/单位',
-          dataIndex: 'zxrstr'
+          dataIndex: 'zxrstr',
+          ellipsis: true
         },
         {
           title: '工作类别',
@@ -334,7 +335,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -360,11 +362,13 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -394,7 +398,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
diff --git a/src/views/par/parworkinfo/ParWorkTrackingDept.vue b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
index d987053..82e36a2 100644
--- a/src/views/par/parworkinfo/ParWorkTrackingDept.vue
+++ b/src/views/par/parworkinfo/ParWorkTrackingDept.vue
@@ -383,7 +383,8 @@ export default {
       columns: [
         {
           title: '执行人/单位',
-          dataIndex: 'zxrstr'
+          dataIndex: 'zxrstr',
+          ellipsis: true
         },
         {
           title: '工作类别',
@@ -397,7 +398,8 @@ export default {
         },
         {
           title: '工作内容',
-          dataIndex: 'gznr'
+          dataIndex: 'gznr',
+          ellipsis: true
         },
         {
           title: '开始时间',
@@ -423,11 +425,13 @@ export default {
         },
         {
           title: '责任单位',
-          dataIndex: 'zrdw'
+          dataIndex: 'zrdw',
+          ellipsis: true
         },
         {
           title: '质量要求',
-          dataIndex: 'zlyq'
+          dataIndex: 'zlyq',
+          ellipsis: true
         },
         // {
         //   title: "备注",
@@ -457,7 +461,8 @@ export default {
         },
         {
           title: '责任人',
-          dataIndex: 'zrr'
+          dataIndex: 'zrr',
+          ellipsis: true
         },
         {
           title: '操作',
-- 
Gitee


From 5ae1832b5f38789b4201e933ea520ea8a52385aa Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Fri, 4 Sep 2020 16:15:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examperiod/ExamPeriod.vue | 43 +++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue
index 4ebac49..9448cbc 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
-- 
Gitee