Merge remote-tracking branch 'origin/dev' into dev

src/views/xgf/flow/components/sendUtil.vue

@@ -44,6 +44,7 @@ export default {
       this.heirloom = JSON.stringify(e)
     },
     beforeClose() {
+      this.visible = false
     },
     sendMessage(row) {
       if (!this.value || this.value === '') {

src/views/xgf/flowApply/components/apply.vue

@@ -301,10 +301,12 @@ export default {
     },
     handleClose() {
       this.visible = false
+      this.form = {}
       this.$emit('refresh', '')
     },
     closeWindow() {
       this.visible = false
+      this.form = {}
     }
   }
 }

src/views/xgf/flowApply/components/userInfo.vue

@@ -154,6 +154,7 @@
               <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
               <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
               <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+              <el-table-column prop="TRAINING_HOURS" label="培训学时" align="center"/>
               <el-table-column label="培训有效期" align="center">
                 <template slot-scope="{row}">
                   <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>

src/views/xgf/flowList/components/list.vue

@@ -141,7 +141,6 @@ export default {
         '/trainingbatch/userList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
-          STATUS: '2',
           EMPLOY_FLAG: '1',
           VALID_FLAG: '1'
         }

src/views/xgf/flow_audit/index.vue

@@ -7,7 +7,7 @@ flowTrain/batchList<template>
             <el-input v-model="XGF_NAME" placeholder="相关方名称"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="委托时间">
             <el-date-picker
               v-model="dates"