From ddf07c2b8488b14513ba1d7d2c2f3cc75e339b10 Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Tue, 1 Sep 2020 17:30:35 +0800
Subject: [PATCH 1/2] =?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       | 109 +++++++-----
 src/views/par/parworkinfo/ParWorkInfoDept.vue | 155 ++++++++++--------
 src/views/par/parworkinfo/ParWorkInfoUnit.vue | 154 +++++++++--------
 src/views/par/parworkinfo/ParWorkInfoUser.vue | 149 +++++++++--------
 4 files changed, 323 insertions(+), 244 deletions(-)

diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue
index bbaaafd..9eef56d 100644
--- a/src/views/par/examperiod/ExamPeriod.vue
+++ b/src/views/par/examperiod/ExamPeriod.vue
@@ -1,13 +1,13 @@
 <template>
   <a-card style="margin-top:-2px" :bordered="false">
     <div class>
-      <a-form>
+      <a-form-model>
         <!--查询条件 start-->
         <a-row class="form-row">
           <a-col :span="6" :offset="1">
-            <a-form-item label="考评周期名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="考评周期名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input style="width:210px" v-model="queryParam.kpzqmc" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <!--查询条件 end-->
@@ -31,7 +31,7 @@
           </a-col>
         </a-row>
         <!--操作按钮 end -->
-      </a-form>
+      </a-form-model>
     </div>
     <s-table
       class="text-overflow"
@@ -59,26 +59,34 @@
       :destroyOnClose="true"
       :confirmLoading="confirmLoading"
       centered
+      :footer="operate=='detile'?null:undefind"
     >
-      <a-form :form="form">
+      <a-form-model
+        ref="ruleForm"
+        :model="selectInfo"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
         <a-row class="form-row">
           <a-col :span="10" :offset="1">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期名称">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期名称" prop="kpzqmc">
               <a-input v-model="selectInfo.kpzqmc" :disabled="operate=='detile'?'disabled':false" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="20" :offset="1" style="padding-top:5px;">
-            <a-form-item :labelCol="{span:4}" :wrapperCol="{span:20}" label="备注">
+            <a-form-model-item :labelCol="{span:4}" :wrapperCol="{span:20}" label="备注" prop="bz">
               <!-- <a-input v-model="selectInfo.bz" :disabled="operate=='detile'?'disabled':false" /> -->
               <a-textarea
                 v-model="selectInfo.bz"
                 placeholder="请输入备注"
                 :auto-size="{ minRows: 3, maxRows: 5 }"
+                :disabled="operate=='detile'?'disabled':false"
               />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form-model>
     </a-modal>
   </a-card>
 </template>
@@ -135,9 +143,15 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
+      rules: {
+        kpzqmc: [{ required: true, message: '考评周期名称不能为空', trigger: 'blur' }],
+        bz: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
+      },
       modelVisible: false, // 弹出框显示
       operate: 'query', // 当前操作
-      selectInfo: {}, // 选中的数据
+      selectInfo: {
+        kpzqmc: ''
+      }, // 选中的数据
       confirmLoading: false, // Loading
       url: '/par/examperiod', // ajax请求地址
       loading: false
@@ -192,40 +206,47 @@ export default {
     },
     // 确认
     handleOk () {
-      this.confirmLoading = true
-      if (this.operate === 'detile') {
-        // 详情
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-      }
-      if (this.operate === 'add') {
-        // 新增
-        this.actionParam = {
-          url: '/par/examperiod/insert',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '新增成功'
-        }
-      }
-      if (this.operate === 'edit') {
-        // 修改
-        this.actionParam = {
-          url: '/par/examperiod/update',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '修改成功'
+      const vm = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          vm.confirmLoading = true
+          if (vm.operate === 'detile') {
+            // 详情
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+          }
+          if (vm.operate === 'add') {
+            // 新增
+            vm.actionParam = {
+              url: '/par/examperiod/insert',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '新增成功'
+            }
+          }
+          if (vm.operate === 'edit') {
+            // 修改
+            vm.actionParam = {
+              url: '/par/examperiod/update',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '修改成功'
+            }
+          }
+          // 调用请求
+          return method(vm.actionParam).then(res => {
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+            // 刷新列表
+            vm.$refs.stable.refresh(true)
+          })
+        } else {
+          return false
         }
-      }
-      // 调用请求
-      return method(this.actionParam).then(res => {
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-        // 刷新列表
-        this.$refs.stable.refresh(true)
       })
     },
     exportExcel () {
diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue
index c37def3..965d291 100644
--- a/src/views/par/parworkinfo/ParWorkInfoDept.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue
@@ -102,8 +102,8 @@
           >编辑</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.pfzt==='1'" />
-          <a @click="sign(record)" v-if="record.zxr===userInfo.id&&record.pfzt==='1'">打卡</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>
@@ -122,10 +122,15 @@
         :confirmLoading="confirmLoading"
         centered
       >
-        <a-form :form="form">
+        <a-form-model
+          ref="ruleForm"
+          :model="selectInfo"
+          :rules="rules"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol">
           <a-row class="form-row" type="flex">
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行人">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行人" prop="zxr">
                 <a-tree-select
                   v-model="selectInfo.zxr"
                   style="width:100%"
@@ -140,10 +145,10 @@
                     :title="staff.name"
                   ></a-tree-select-node>
                 </a-tree-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别" prop="gzlb">
                 <a-select
                   v-model="selectInfo.gzlb"
                   style="width: 100%;"
@@ -155,17 +160,17 @@
                   <a-select-option value="3">个人工作备忘</a-select-option>
                 </a-select>
                 <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" v-if="qdShow" style="padding-top:5px;">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
                 <a-select v-model="selectInfo.qdlx" style="width: 100%;" placeholder="请选择清单类型">
                   <a-select-option value="1">问题类型</a-select-option>
                   <a-select-option value="2">任务类型</a-select-option>
                   <a-select-option value="3">工作类型</a-select-option>
                 </a-select>
                 <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <!-- <a-col :span="10" :offset="1">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
@@ -173,10 +178,11 @@
             </a-form-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="gznr"
               >
                 <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-textarea
@@ -184,12 +190,12 @@
                   placeholder="请输入工作内容"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="20" :offset="1" style="padding-top:5px;">
               <a-row>
                 <a-col :span="12">
-                  <a-form-item
+                  <a-form-model-item
                     :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
                     :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
                     label="周期性工作"
@@ -202,10 +208,10 @@
                       <a-radio value="1">是</a-radio>
                       <a-radio value="2">否</a-radio>
                     </a-radio-group>
-                  </a-form-item>
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="12" v-if="zqShow">
-                  <a-form-item
+                  <a-form-model-item
                     :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
                     :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
                     label="周期"
@@ -223,21 +229,21 @@
                       <a-select-option value="5">日</a-select-option>
                       <a-select-option value="6">自定义</a-select-option>
                     </a-select>
-                  </a-form-item>
+                  </a-form-model-item>
                 </a-col>
               </a-row>
             </a-col>
             <a-col :span="20" :offset="1" style="padding-top:5px;" v-if="zdyzqShow">
-              <a-form-item
+              <a-form-model-item
                 :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
                 :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
                 label="自定义周期"
               >
                 <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-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"
@@ -245,10 +251,10 @@
                   style="width:100%;"
                   @change="startChange"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-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"
@@ -256,11 +262,11 @@
                   style="width:100%;"
                   @change="endChange"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="3" style="color:red;padding-left:3px;padding-top:6px;">不选视为永久有效</a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
                 <!-- <a-input v-model="selectInfo.zrdw" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-tree-select
                   v-model="selectInfo.zrdwList"
@@ -271,14 +277,13 @@
                   multiple
                   :tree-data="orgTree"
                 ></a-tree-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
                 <!-- <a-input v-model="selectInfo.zrr" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-tree-select
                   v-model="selectInfo.zrrList"
-                  show-search
                   style="width: 100%"
                   :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                   placeholder="请选择责任人"
@@ -292,10 +297,10 @@
                     :title="staff.name"
                   ></a-tree-select-node>
                 </a-tree-select>
-              </a-form-item>
+              </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="质量要求"
@@ -306,11 +311,10 @@
                   placeholder="请输入质量要求"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
           </a-row>
-        </a-form>
-      </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>
@@ -464,7 +468,12 @@ export default {
       staffList: [],
       currentRole: 'unitRole',
       qdShow: false,
-      fileList: []
+      fileList: [],
+      rules: {
+        zxr: [{ required: true, message: '请选择执行人', trigger: 'change' }],
+        gzlb: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
+        gznr: [{ required: true, message: '工作内容不能为空', trigger: 'blur' }]
+      }
     }
   },
   created () {
@@ -482,6 +491,7 @@ export default {
     }).then(resDept => {
       console.log('人员部门查询', resDept)
       const deptId = resDept.result.id
+      vm.userInfo.deptCode = deptId
       // 获取当前部门下人员
       query('/par/parworkinfo' + '/getStaffInfoByOrgId', 'GET', {
         id: deptId
@@ -717,7 +727,9 @@ export default {
       console.log('点击操作', action, selectInfo)
       this.operate = action // 记录当前操作
       this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
-      this.selectInfo.sfszqxgz = '2'
+      if (action === 'add') {
+        this.selectInfo.sfszqxgz = '2'
+      }
       const dateFormat = 'YYYY-MM-DD'
       if (this.selectInfo.kssj) {
         this.selectInfo.kssj = moment(this.selectInfo.kssj, dateFormat)
@@ -736,8 +748,8 @@ export default {
         } else {
           this.zqShow = false
         }
-        const zdyzq = this.selectInfo.zdyzq ? this.selectInfo.zdyzq : ''
-        if (zdyzq === '6') {
+        const zq = this.selectInfo.zq ? this.selectInfo.zq : ''
+        if (zq === '6') {
           this.zdyzqShow = true
         } else {
           this.zdyzqShow = false
@@ -785,41 +797,48 @@ export default {
     },
     // 确认
     handleOk () {
-      this.confirmLoading = true
-      this.selectInfo.zxrlb = '2'
-      if (this.operate === 'detile') {
-        // 详情
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-      }
-      if (this.operate === 'add') {
-        // 新增
-        this.actionParam = {
-          url: '/par/parworkinfo/insert',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '新增成功'
-        }
-      }
-      if (this.operate === 'edit') {
-        // 修改
-        this.actionParam = {
-          url: '/par/parworkinfo/update',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '修改成功'
+      const vm = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          vm.confirmLoading = true
+          vm.selectInfo.zxrlb = '2'
+          if (vm.operate === 'detile') {
+            // 详情
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+          }
+          if (vm.operate === 'add') {
+            // 新增
+            vm.actionParam = {
+              url: '/par/parworkinfo/insert',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '新增成功'
+            }
+          }
+          if (vm.operate === 'edit') {
+            // 修改
+            vm.actionParam = {
+              url: '/par/parworkinfo/update',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '修改成功'
+            }
+          }
+          // 调用请求
+          return method(vm.actionParam).then(res => {
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+            // 刷新列表
+            vm.$refs.stable.refresh(true)
+          })
+        } else {
+          return false
         }
-      }
-      // 调用请求
-      return method(this.actionParam).then(res => {
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-        // 刷新列表
-        this.$refs.stable.refresh(true)
       })
     }
   }
diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
index 46f48d3..475b096 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -115,10 +115,16 @@
         :confirmLoading="confirmLoading"
         centered
       >
-        <a-form :form="form">
+        <a-form-model
+          ref="ruleForm"
+          :model="selectInfo"
+          :rules="rules"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol"
+        >
           <a-row class="form-row" type="flex">
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行单位">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行单位" prop="zxr">
                 <a-tree-select
                   v-model="selectInfo.zxr"
                   style="width: 100%"
@@ -127,10 +133,10 @@
                   allow-clear
                   :tree-data="orgTree"
                 ></a-tree-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别" prop="gzlb">
                 <a-select
                   v-model="selectInfo.gzlb"
                   style="width: 100%;"
@@ -142,10 +148,10 @@
                   <a-select-option value="3">个人工作备忘</a-select-option>
                 </a-select>
                 <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;" v-show="qdShow">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
                 <a-select
                   v-model="selectInfo.qdlx"
                   @change="qdlxChange"
@@ -157,7 +163,7 @@
                   <a-select-option value="3">工作类型</a-select-option>
                 </a-select>
                 <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <!-- <a-col :span="10" :offset="1">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
@@ -165,10 +171,11 @@
             </a-form-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="gznr"
               >
                 <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-textarea
@@ -176,12 +183,12 @@
                   placeholder="请输入工作内容"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="20" :offset="1" style="padding-top:5px;">
               <a-row>
                 <a-col :span="12">
-                  <a-form-item
+                  <a-form-model-item
                     :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
                     :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
                     label="周期性工作"
@@ -194,10 +201,10 @@
                       <a-radio value="1">是</a-radio>
                       <a-radio value="2">否</a-radio>
                     </a-radio-group>
-                  </a-form-item>
+                  </a-form-model-item>
                 </a-col>
                 <a-col :span="12" v-show="zqShow">
-                  <a-form-item
+                  <a-form-model-item
                     :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
                     :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
                     label="周期"
@@ -215,21 +222,21 @@
                       <a-select-option value="5">日</a-select-option>
                       <a-select-option value="6">自定义</a-select-option>
                     </a-select>
-                  </a-form-item>
+                  </a-form-model-item>
                 </a-col>
               </a-row>
             </a-col>
             <a-col :span="20" :offset="1" style="padding-top:5px;" v-show="zdyzqShow">
-              <a-form-item
+              <a-form-model-item
                 :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
                 :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
                 label="自定义周期"
               >
                 <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-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"
@@ -237,10 +244,10 @@
                   style="width:100%;"
                   @change="startChange"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-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"
@@ -248,11 +255,11 @@
                   style="width:100%;"
                   @change="endChange"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="3" style="color:red;padding-left:3px;padding-top:6px;">不选视为永久有效</a-col>
             <a-col :span="10" :offset="1" style="padding-top:5px;">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
                 <!-- <a-input v-model="selectInfo.zrdw" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-tree-select
                   v-model="selectInfo.zrdwList"
@@ -263,14 +270,13 @@
                   multiple
                   :tree-data="orgTree"
                 ></a-tree-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             <a-col :span="10">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
                 <!-- <a-input v-model="selectInfo.zrr" :disabled="operate==='detile'?'disabled':false" /> -->
                 <a-tree-select
                   v-model="selectInfo.zrrList"
-                  show-search
                   style="width: 100%"
                   :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                   placeholder="请选择责任人"
@@ -284,10 +290,10 @@
                     :title="staff.name"
                   ></a-tree-select-node>
                 </a-tree-select>
-              </a-form-item>
+              </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="质量要求"
@@ -298,10 +304,10 @@
                   placeholder="请输入质量要求"
                   :auto-size="{ minRows: 3, maxRows: 5 }"
                 />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
           </a-row>
-        </a-form>
+        </a-form-model>
       </a-modal>
       <sign-modal ref="signModalRef"></sign-modal>
       <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
@@ -454,7 +460,12 @@ export default {
       staffList: [],
       currentRole: 'unitRole',
       qdShow: false,
-      fileList: []
+      fileList: [],
+      rules: {
+        zxr: [{ required: true, message: '请选择执行单位', trigger: 'change' }],
+        gzlb: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
+        gznr: [{ required: true, message: '工作内容不能为空', trigger: 'blur' }]
+      }
     }
   },
   created () {
@@ -467,9 +478,9 @@ export default {
       vm.orgTree = vm.genernateTree(res.result.data)
     })
     // 获取所有人员
-    query('/admin/pmUser' + '/query', 'GET').then(res => {
+    query('/admin/pmUser' + '/findStaffAll', 'GET').then(res => {
       console.log('人员查询', res)
-      vm.staffList = res.result.data
+      vm.staffList = res.result
     })
     console.log('当前登录用户', this.userInfo)
   },
@@ -701,7 +712,9 @@ export default {
       console.log('点击操作', action, selectInfo)
       this.operate = action // 记录当前操作
       this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
-      this.selectInfo.sfszqxgz = '2'
+      if (action === 'add') {
+        this.selectInfo.sfszqxgz = '2'
+      }
       const dateFormat = 'YYYY-MM-DD'
       if (this.selectInfo.kssj) {
         this.selectInfo.kssj = moment(this.selectInfo.kssj, dateFormat)
@@ -720,8 +733,8 @@ export default {
         } else {
           this.zqShow = false
         }
-        const zdyzq = this.selectInfo.zdyzq ? this.selectInfo.zdyzq : ''
-        if (zdyzq === '6') {
+        const zq = this.selectInfo.zq ? this.selectInfo.zq : ''
+        if (zq === '6') {
           this.zdyzqShow = true
         } else {
           this.zdyzqShow = false
@@ -769,41 +782,48 @@ export default {
     },
     // 确认
     handleOk () {
-      this.confirmLoading = true
-      this.selectInfo.zxrlb = '1'
-      if (this.operate === 'detile') {
-        // 详情
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-      }
-      if (this.operate === 'add') {
-        // 新增
-        this.actionParam = {
-          url: '/par/parworkinfo/insert',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '新增成功'
-        }
-      }
-      if (this.operate === 'edit') {
-        // 修改
-        this.actionParam = {
-          url: '/par/parworkinfo/update',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '修改成功'
+      const vm = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          vm.confirmLoading = true
+          vm.selectInfo.zxrlb = '1'
+          if (vm.operate === 'detile') {
+            // 详情
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+          }
+          if (vm.operate === 'add') {
+            // 新增
+            vm.actionParam = {
+              url: '/par/parworkinfo/insert',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '新增成功'
+            }
+          }
+          if (vm.operate === 'edit') {
+            // 修改
+            vm.actionParam = {
+              url: '/par/parworkinfo/update',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '修改成功'
+            }
+          }
+          // 调用请求
+          return method(vm.actionParam).then(res => {
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+            // 刷新列表
+            vm.$refs.stable.refresh(true)
+          })
+        } else {
+          return false
         }
-      }
-      // 调用请求
-      return method(this.actionParam).then(res => {
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-        // 刷新列表
-        this.$refs.stable.refresh(true)
       })
     }
   }
diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue
index cb138ed..ce02163 100644
--- a/src/views/par/parworkinfo/ParWorkInfoUser.vue
+++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue
@@ -78,10 +78,16 @@
       :confirmLoading="confirmLoading"
       centered
     >
-      <a-form :form="form">
+      <a-form-model
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
         <a-row class="form-row" type="flex">
           <a-col :span="10" :offset="1" style="padding-top:5px;">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别" prop="gzlb">
               <a-select
                 v-model="selectInfo.gzlb"
                 style="width: 100%;"
@@ -93,17 +99,17 @@
                 <a-select-option value="3">个人工作备忘</a-select-option>
               </a-select>
               <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="10" v-if="qdShow">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
               <a-select v-model="selectInfo.qdlx" style="width: 100%;" placeholder="请选择清单类型">
                 <a-select-option value="1">问题类型</a-select-option>
                 <a-select-option value="2">任务类型</a-select-option>
                 <a-select-option value="3">工作类型</a-select-option>
               </a-select>
               <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <!-- <a-col :span="10" :offset="1">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
@@ -111,10 +117,11 @@
             </a-form-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="gznr"
             >
               <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
               <a-textarea
@@ -122,12 +129,12 @@
                 placeholder="请输入工作内容"
                 :auto-size="{ minRows: 3, maxRows: 5 }"
               />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="20" :offset="1" style="padding-top:5px;">
             <a-row>
               <a-col :span="12">
-                <a-form-item
+                <a-form-model-item
                   :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
                   :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
                   label="周期性工作"
@@ -140,10 +147,10 @@
                     <a-radio value="1">是</a-radio>
                     <a-radio value="2">否</a-radio>
                   </a-radio-group>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :span="12" v-if="zqShow">
-                <a-form-item
+                <a-form-model-item
                   :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
                   :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
                   label="周期"
@@ -161,21 +168,21 @@
                     <a-select-option value="5">日</a-select-option>
                     <a-select-option value="6">自定义</a-select-option>
                   </a-select>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
             </a-row>
           </a-col>
           <a-col :span="20" :offset="1" style="padding-top:5px;" v-if="zdyzqShow">
-            <a-form-item
+            <a-form-model-item
               :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
               :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
               label="自定义周期"
             >
               <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="10" :offset="1" style="padding-top:5px;">
-            <a-form-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"
@@ -183,10 +190,10 @@
                 style="width:100%;"
                 @change="startChange"
               />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="10">
-            <a-form-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"
@@ -194,10 +201,10 @@
                 style="width:100%;"
                 @change="endChange"
               />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="10" :offset="1" style="padding-top:5px;">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
               <!-- <a-input v-model="selectInfo.zrdw" :disabled="operate==='detile'?'disabled':false" /> -->
               <a-tree-select
                 v-model="selectInfo.zrdwList"
@@ -208,14 +215,13 @@
                 multiple
                 :tree-data="orgTree"
               ></a-tree-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="10">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
               <!-- <a-input v-model="selectInfo.zrr" :disabled="operate==='detile'?'disabled':false" /> -->
               <a-tree-select
                 v-model="selectInfo.zrrList"
-                show-search
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                 placeholder="请选择责任人"
@@ -229,10 +235,10 @@
                   :title="staff.name"
                 ></a-tree-select-node>
               </a-tree-select>
-            </a-form-item>
+            </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="质量要求"
@@ -243,10 +249,10 @@
                 placeholder="请输入质量要求"
                 :auto-size="{ minRows: 3, maxRows: 5 }"
               />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form-model>
     </a-modal>
     <sign-modal ref="signModalRef"></sign-modal>
     <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
@@ -400,7 +406,11 @@ export default {
       staffList: [],
       currentRole: 'unitRole',
       qdShow: false,
-      currDate: moment(new Date())
+      currDate: moment(new Date()),
+      rules: {
+        gzlb: [{ required: true, message: '请选择工作类别', trigger: 'change' }],
+        gznr: [{ required: true, message: '工作内容不能为空', trigger: 'blur' }]
+      }
     }
   },
   created () {
@@ -558,7 +568,9 @@ export default {
       console.log('点击操作', action, selectInfo)
       this.operate = action // 记录当前操作
       this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
-      this.selectInfo.sfszqxgz = '2'
+      if (action === 'add') {
+        this.selectInfo.sfszqxgz = '2'
+      }
       const dateFormat = 'YYYY-MM-DD'
       if (selectInfo.kssj) {
         this.selectInfo.kssj = moment(this.selectInfo.kssj, dateFormat)
@@ -577,8 +589,8 @@ export default {
         } else {
           this.zqShow = false
         }
-        const zdyzq = this.selectInfo.zdyzq ? this.selectInfo.zdyzq : ''
-        if (zdyzq === '6') {
+        const zq = this.selectInfo.zq ? this.selectInfo.zq : ''
+        if (zq === '6') {
           this.zdyzqShow = true
         } else {
           this.zdyzqShow = false
@@ -626,43 +638,50 @@ export default {
     },
     // 确认
     handleOk () {
-      this.confirmLoading = true
-      this.selectInfo.zxrlb = '2'
-      this.selectInfo.zxr = this.userInfo.id
-      this.selectInfo.pfzt = '1'
-      if (this.operate === 'detile') {
-        // 详情
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-      }
-      if (this.operate === 'add') {
-        // 新增
-        this.actionParam = {
-          url: '/par/parworkinfo/insert',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '新增成功'
-        }
-      }
-      if (this.operate === 'edit') {
-        // 修改
-        this.actionParam = {
-          url: '/par/parworkinfo/update',
-          action: 'POST',
-          parameter: {},
-          data: this.selectInfo,
-          message: '修改成功'
+      const vm = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          vm.confirmLoading = true
+          vm.selectInfo.zxrlb = '2'
+          vm.selectInfo.zxr = vm.userInfo.id
+          vm.selectInfo.pfzt = '1'
+          if (vm.operate === 'detile') {
+            // 详情
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+          }
+          if (vm.operate === 'add') {
+            // 新增
+            vm.actionParam = {
+              url: '/par/parworkinfo/insert',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '新增成功'
+            }
+          }
+          if (vm.operate === 'edit') {
+            // 修改
+            vm.actionParam = {
+              url: '/par/parworkinfo/update',
+              action: 'POST',
+              parameter: {},
+              data: vm.selectInfo,
+              message: '修改成功'
+            }
+          }
+          // 调用请求
+          return method(vm.actionParam).then(res => {
+            vm.confirmLoading = false
+            // 关闭编辑框
+            vm.modelVisible = false
+            // 刷新列表
+            vm.$refs.stable.refresh(true)
+          })
+        } else {
+          return false
         }
-      }
-      // 调用请求
-      return method(this.actionParam).then(res => {
-        this.confirmLoading = false
-        // 关闭编辑框
-        this.modelVisible = false
-        // 刷新列表
-        this.$refs.stable.refresh(true)
       })
     }
   }
-- 
Gitee


From 11c2ced7d2405eaff1fd4b994c2ebe86529a6cb5 Mon Sep 17 00:00:00 2001
From: tianhao <2524518601@qq.com>
Date: Wed, 2 Sep 2020 09:09:20 +0800
Subject: [PATCH 2/2] =?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/statisticalreport/StatisticalReport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/statisticalreport/StatisticalReport.vue b/src/views/statisticalreport/StatisticalReport.vue
index 94ba743..d1b21ad 100644
--- a/src/views/statisticalreport/StatisticalReport.vue
+++ b/src/views/statisticalreport/StatisticalReport.vue
@@ -200,7 +200,7 @@ export default {
       //   console.log("内容结果", res);
       // });
       const vm = this
-      query('/par/statisticalreport/content', 'GET').then(res => {
+      query('/par/statisticalreport/content', 'GET', vm.queryParam).then(res => {
         console.log('内容结果', res)
         vm.contentList = res.result
         this.confirmLoading = false
-- 
Gitee