Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0

src/api/workbench.js

@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-
 // 获取考核组列表
 export function getWorkList (query) {
   return request({
@@ -71,3 +70,12 @@ export function saveDetailProcs (query) {
     data: query
   })
 }
+
+//  发起考核
+export function sendAssessmentInfo (query) {
+  return request({
+    url: '/lz_management/flowStart/save',
+    method: 'post',
+    data: query
+  })
+}

src/views/kpi/workbench/initiateAssessment/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="initiate-assessment commonFont">
     <el-form
-      :v-model="formData"
+      :model="formData"
       :rules="formRules"
+      ref="formData"
       label-width="150px"
       label-position="left"
       label-suffix="："
@@ -14,19 +15,20 @@
         prop="cycleTimeType"
       >
         <el-radio-group v-model="formData.cycleTimeType">
-          <el-radio :label="1">月度</el-radio>
-          <el-radio :label="2">自定义</el-radio>
+          <el-radio :label="0">月度</el-radio>
+          <el-radio :label="1">自定义</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
         label="时间周期"
         required
+        prop="rangDate"
       >
         <el-date-picker
           @change="handleChangeRangDate"
           v-model="formData.rangDate"
-          :type="formData.cycleTimeType === 1 ? 'month' : 'monthrange'"
-          :key="formData.cycleTimeType === 1 ? 'month' : 'monthrange'"
+          :type="formData.cycleTimeType === 0 ? 'month' : 'monthrange'"
+          :key="formData.cycleTimeType === 0 ? 'month' : 'monthrange'"
           value-format="yyyy-MM"
         >
         </el-date-picker>
@@ -34,7 +36,7 @@
       <el-form-item
         v-if="formData.rangDate"
         label="考核合并"
-        required
+        prop="mergeType.name"
       >
         <el-radio
           v-model="formData.mergeType.type"
@@ -42,7 +44,7 @@
         >新发起考核
           <el-input
             v-model="formData.mergeType.name"
-            :disabled="formData.cycleTimeType===1"
+            :disabled="formData.cycleTimeType===0"
             maxlength="30"
             show-word-limit
           ></el-input>
@@ -51,7 +53,10 @@
 
       <div class="choose-group">
         <div class="title">被考核对象</div>
-        <el-form-item label="参与考评组">
+        <el-form-item
+          label="参与考评组"
+          prop="assessmentList"
+        >
           <div>
             <el-button @click="handleChooseGroup">请选择</el-button>
           </div>
@@ -60,6 +65,7 @@
               v-if="formData.assessmentList.length>0"
               :data="formData.assessmentList"
               :header-cell-style="{ 'background-color': '#f5f5f5' }"
+              max-height="440px"
             >
               <el-table-column
                 label="考核组名称"
@@ -76,7 +82,7 @@
                     @click.native.prevent="
                       handleGroupDelete(scope.$index, formData.assessmentList)
                     "
-                    plain
+                    size="small"
                   >删除</el-button>
                 </template>
               </el-table-column>
@@ -164,7 +170,7 @@ export default {
       popupRightTitle: '选择考评组（月度）考核',
       showChooseList: false,
       formData: {
-        cycleTimeType: 1,
+        cycleTimeType: 0,
         rangDate: '',
         assessmentList: [], // 考核对象
         mergeType: { // 考核合并类型
@@ -173,8 +179,11 @@ export default {
         }
       },
       formRules: {
-        cycleTimeType: { required: true, message: '请选择周期类型', trigger: 'blur' },
-        rangDate: { required: true, message: '请选择时间周期', trigger: 'blur' }
+        cycleTimeType: [{ required: true, message: '请选择周期类型', trigger: 'blur' }],
+        rangDate: [{ required: true, message: '请选择时间周期', trigger: 'change' }],
+        assessmentList: [{ type: 'array', required: true, message: '请选择周期类型', trigger: 'change' }],
+        'mergeType.name': [{ required: true, message: '请选择周期类型', trigger: 'blur' }]
+
       },
       popupData: {
         tableList: [],
@@ -204,12 +213,11 @@ export default {
   methods: {
     handleChangeRangDate (chgVal) {
       let nameStr = this.$format(chgVal, 'yyyy年MM月绩效考核')
-      if (this.formData.cycleTimeType === 2) {
+      if (this.formData.cycleTimeType === 1) {
         // 自定义
         nameStr = chgVal[0] + '至' + chgVal[1] + '绩效考核'
       }
       this.formData.mergeType.name = nameStr
-      // console.log(this.formData.rangDate)
     },
     handleChooseGroup () {
       this.popupData.selectedList = []
@@ -221,6 +229,24 @@ export default {
     },
     handleSubmit () {
       console.log('提交')
+      this.$refs['formData'].validate((val) => {
+        console.log('1111111111111111')
+        const groupIdList = this.formData.assessmentList.map((item, index) => {
+          return item.id
+        })
+        let para = {
+          cycleType: this.formData.cycleTimeType,
+          groupIds: groupIdList.join(),
+          name: this.formData.mergeType.name
+        }
+        if (this.formData.cycleTimeType === 0) {
+          para['gmtCreate'] = this.formData.rangDate
+        } else {
+          para['gmtCreate'] = this.formData.rangDate[0]
+          para['endTime'] = this.formData.rangDate[1]
+        }
+        console.log('提交', groupIdList.join())
+      })
     },
     handlePopupSearchChange (val) {
       console.log('搜索' + val)
@@ -240,7 +266,16 @@ export default {
     },
     handleSubmitPopup () {
       this.showChooseList = false
-      this.formData.assessmentList = this.popupData.selectedList
+      const list = this.popupData.selectedList
+      let newList = []
+      for (let index = 0; index < 20; index++) {
+        for (let index = 0; index < list.length; index++) {
+          const element = list[index]
+          newList.push(element)
+        }
+      }
+      this.formData.assessmentList = newList
+      // this.formData.assessmentList = this.popupData.selectedList
     },
     // 获取数据
     handleGainAssessmentGroupList () {