no message

src/api/workbench.js

@@ -75,7 +75,7 @@ export function saveDetailProcs (query) {
 export function sendAssessmentInfo (query) {
   return request({
     url: '/lz_management/flowStart/save',
-    method: 'post',
+    method: 'POST',
     data: query
   })
 }

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

@@ -152,12 +152,37 @@
               >新建考评组</el-button>
             </div>
           </div>
+          <el-pagination
+            :hide-on-single-page="true"
+            :current-page.sync="rqAssessmentParameter.currPage"
+            :page-size="rqAssessmentParameter.pageSize"
+            :total="rqAssessmentParameter.totalCount"
+            :page-count="rqAssessmentParameter.totalPage"
+            @current-change="handleCurrentChange"
+            layout="total, prev, pager, next, jumper"
+          ></el-pagination>
         </div>
         <div
           slot="footer-left"
           class="popup-footer-left"
         >已选择：{{popupData.selectedList.length}}个</div>
       </popup-right>
+      <el-dialog
+        title="发起考核"
+        :visible.sync="dialogSendVisible"
+        width="30%"
+      >
+        <span>确认发起{{this.formData.mergeType.name}}绩效考核？</span>
+        <span
+          slot="footer"
+          class="dialog-footer"
+        >
+          <el-button
+            type="primary"
+            @click="handleDialogSend"
+          >确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -167,6 +192,7 @@ import { getWorkList, sendAssessmentInfo } from '@/api/workbench'
 export default {
   data () {
     return {
+      dialogSendVisible: false,
       popupRightTitle: '选择考评组（月度）考核',
       showChooseList: false,
       formData: {
@@ -181,8 +207,8 @@ export default {
       formRules: {
         cycleTimeType: [{ required: true, message: '请选择周期类型', trigger: 'blur' }],
         rangDate: [{ required: true, message: '请选择时间周期', trigger: 'change' }],
-        assessmentList: [{ type: 'array', required: true, message: '请选择周期类型', trigger: 'change' }],
+        assessmentList: [{ type: 'array', required: true, message: '请选择参与考评组', trigger: 'change' }],
-        'mergeType.name': [{ required: true, message: '请选择周期类型', trigger: 'blur' }]
+        'mergeType.name': [{ required: true, message: '请填写新建考核名称', trigger: 'blur' }]
 
       },
       popupData: {
@@ -191,10 +217,10 @@ export default {
       },
       rqAssessmentParameter: {
         currPage: 1,
-        pageSize: 20,
+        pageSize: 100,
         searchName: '',
-        totalCount: undefined,
+        totalCount: 1,
-        totalPage: undefined
+        totalPage: 1
       }
     }
   },
@@ -230,22 +256,34 @@ export default {
     handleSubmit () {
       console.log('提交')
       this.$refs['formData'].validate((val) => {
+        this.dialogSendVisible = val
         console.log('1111111111111111')
+      })
+    },
+    handleDialogSend () {
+      // 发起考核
       const groupIdList = this.formData.assessmentList.map((item, index) => {
         return item.id
       })
       let para = {
         cycleType: this.formData.cycleTimeType,
-          groupIds: groupIdList.join(),
+        groupIds: '24',
+        // groupIds: groupIdList.join(),
         name: this.formData.mergeType.name
       }
       if (this.formData.cycleTimeType === 0) {
-          para['gmtCreate'] = this.formData.rangDate
+        para['startTime'] = this.$format(this.formData.rangDate, 'yyyy-MM-dd hh:mm:ss')
       } else {
-          para['gmtCreate'] = this.formData.rangDate[0]
+        para['startTime'] = this.$format(this.formData.rangDate[0], 'yyyy-MM-dd hh:mm:ss')
-          para['endTime'] = this.formData.rangDate[1]
+        para['endTime'] = this.$format(this.formData.rangDate[1], 'yyyy-MM-dd hh:mm:ss')
       }
-        console.log('提交', groupIdList.join())
+      sendAssessmentInfo(para).then(res => {
+        this.dialogSendVisible = false
+        this.$router.push({ name: 'assessment' })
+        this.$message({
+          message: '发起考核成功',
+          type: 'success'
+        })
       })
     },
     handlePopupSearchChange (val) {
@@ -267,34 +305,24 @@ export default {
     handleSubmitPopup () {
       this.showChooseList = false
       const list = this.popupData.selectedList
-      let newList = []
+      this.formData.assessmentList = this.popupData.selectedList
-      for (let index = 0; index < 20; index++) {
+    },
-        for (let index = 0; index < list.length; index++) {
+    handleCurrentChange (val) {
-          const element = list[index]
+      this.handleGainAssessmentGroupList(val)
-          newList.push(element)
-        }
-      }
-      this.formData.assessmentList = newList
-      // this.formData.assessmentList = this.popupData.selectedList
     },
     // 获取数据
-    handleGainAssessmentGroupList () {
+    handleGainAssessmentGroupList (currPage) {
+      currPage = currPage > 0 ? currPage : this.rqAssessmentParameter.currPage
       let para = {
         pageSize: this.rqAssessmentParameter.pageSize,
-        currPage: this.rqAssessmentParameter.currPage,
+        currPage: currPage,
         name: this.rqAssessmentParameter.searchName
       }
-      getWorkList({}).then(res => {
+      getWorkList(para).then(res => {
-        const currPage = res.currPage
+        this.rqAssessmentParameter.totalPage = res.totalPage
-        let newList = []
+        this.rqAssessmentParameter.totalCount = res.totalCount
-        for (let index = 0; index < 20; index++) {
+        this.currPage = res.currPage
-          for (let index = 0; index < res.list.length; index++) {
+        this.popupData.tableList = res.list
-            const element = res.list[index]
-            newList.push(element)
-          }
-        }
-        this.popupData.tableList = newList
-        console.log(res)
       })
     }
   }