Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/staff/perform/stat/dialogshow.vue

@@ -27,7 +27,13 @@
         </el-col>
         <el-col :span="6">
           <Field label="周期类型" :span="24" prop="periodType" v-model="form.periodType" type="select"
-            :enumData="dict.periodType" placeholder="请选择周期类型" />
+            :enumData="dict.periodType" @change="periodTypeChange" placeholder="请选择周期类型" />
+        </el-col>
+        <el-col :span="6">
+          <Field v-if="form.periodType == 2" label="半年类型" :span="24" prop="halfYear" v-model="form.halfYear" type="select"
+            :enumData="dict.halfYear" placeholder="请选择半年类型" />
+          <Field v-if="form.periodType == 3" label="季度类型" :span="24" prop="quarter" v-model="form.quarter" type="select"
+            :enumData="dict.quarter" placeholder="请选择季度类型" />
         </el-col>
       </el-row>
       <!-- <el-row>
@@ -158,6 +164,10 @@ export default {
     this.staffList()
   },
   methods: {
+    periodTypeChange(){
+      this.form.quarter = ""
+      this.form.halfYear = ""
+    },
     beforeSubmit(form) {
       // 个人/部门
       const perposeStaffList = []//选中人员
@@ -247,25 +257,25 @@ export default {
         // 新增
         this.reset()
         this.form.assessmentScope = this.$parent.query.assessmentScope + ''
-      }else{
+      } else {
         // 编辑
-        this.form.year = this.form.year+''
+        this.form.year = this.form.year + ''
         const leaderMobiles = this.form.leaderMobiles.split(',')
         // 回显负责人
         const ownerList = []
-        this.form.leaders.split(',').forEach((v,i)=>{
+        this.form.leaders.split(',').forEach((v, i) => {
           ownerList.push({ ownerId: "", ownerName: v, leaderMobiles: leaderMobiles[i] || '' })
         })
         this.ownerList = ownerList
         // 回显选中人员
         const staffId = []
-        this.form.perposeStaffList &&  this.form.perposeStaffList.forEach(v=>{
+        this.form.perposeStaffList && this.form.perposeStaffList.forEach(v => {
           staffId.push(v.staffId)
         })
         this.staffId = staffId
         // 回显选中部门
         const deptId = []
-        this.form.perposeDeptList && this.form.perposeDeptList.forEach(v=>{
+        this.form.perposeDeptList && this.form.perposeDeptList.forEach(v => {
           deptId.push(v.deptId)
         })
         this.deptId = deptId
@@ -290,8 +300,8 @@ export default {
         periodType: '1',
         year: "",
         // month: null,
-        // halfYear: 1,
-        // quarter: 1,
+        halfYear: "",
+        quarter: "",
         leaders: "",
         leaderMobiles: "",
         remark: "",