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

src/api/initiateAssessment.js

@@ -0,0 +1,10 @@
+
+import request from '@/utils/request'
+//  发起考核
+export function apiInitiateAssessmentInfo (query) {
+  return request({
+    url: '/lz_management/flowStart/save',
+    method: 'POST',
+    data: query
+  })
+}

src/api/workbench.js

@@ -70,12 +70,3 @@ 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

@@ -122,7 +122,7 @@
               :data="popupData.tableList"
               @selection-change="handleSelectionChange"
               tooltip-effect="dark"
-              :row-key="getRowKeys"
+              :row-key="handleGetRowKeys"
             >
               <el-table-column
                 type="selection"
@@ -190,7 +190,8 @@
 </template>
 <script>
 import PopupRight from '@/components/PopupRight'
-import { getWorkList, sendAssessmentInfo } from '@/api/workbench'
+import { getWorkList } from '@/api/workbench'
+import { apiInitiateAssessmentInfo } from '@/api/initiateAssessment'
 export default {
   data () {
     return {
@@ -211,7 +212,6 @@ export default {
         rangDate: [{ required: true, message: '请选择时间周期', trigger: 'change' }],
         assessmentList: [{ type: 'array', required: true, message: '请选择参与考评组', trigger: 'change' }],
         'mergeType.name': [{ required: true, message: '请填写新建考核名称', trigger: 'blur' }]
-
       },
       popupData: {
         tableList: [],
@@ -261,15 +261,13 @@ export default {
         }
       })
     },
-    getRowKeys (row) {
+    handleGetRowKeys (row) {
       return row.id
     },
     handleGroupDelete (index, rows) {
-      console.log('删除----', rows)
       rows.splice(index, 1)
     },
     handleSubmit () {
-      console.log('提交')
       this.$refs['formData'].validate((val) => {
         this.dialogSendVisible = val
       })
@@ -282,6 +280,7 @@ export default {
       let para = {
         cycleType: this.formData.cycleTimeType,
         groupIds: groupIdList.join(),
+        // groupIds: 24, // 目前可用
         name: this.formData.mergeType.name
       }
       if (this.formData.cycleTimeType === 0) {
@@ -290,7 +289,7 @@ export default {
         para['startTime'] = this.$format(this.formData.rangDate[0], 'yyyy-MM-dd hh:mm:ss')
         para['endTime'] = this.$format(this.formData.rangDate[1], 'yyyy-MM-dd hh:mm:ss')
       }
-      sendAssessmentInfo(para).then(res => {
+      apiInitiateAssessmentInfo(para).then(res => {
         this.dialogSendVisible = false
         // this.$router.push({ name: 'assessment' })
         this.$message({
@@ -300,14 +299,12 @@ export default {
       })
     },
     handlePopupSearchChange (val) {
-      console.log('搜索' + val)
       // 去搜搜
       this.handleGainAssessmentGroupList()
     },
     handleSelectionChange (val) {
       //  选择发生变化
       this.popupData.selectedList = val
-      console.log('选择发生变化  ', val)
     },
     handlePopupCreat () {
       this.showChooseList = false