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

src/views/classMessage/classMessage/components/list.vue

@@ -63,7 +63,11 @@
       <el-table-column prop="CLASS_NAME" width="300px" label="班级名称" />
       <el-table-column prop="TRAINING_TYPE_NAME" width="200px" label="培训类型" />
       <el-table-column prop="OPENING_TIME" label="开班时间" />
-      <el-table-column prop="PLACE_NAME" width="200px" label="培训地点" />
+      <el-table-column prop="PLACE" width="200px" label="培训地点">
+        <template slot-scope="{row}">
+          {{ row.PLACE_NAME ? row.PLACE_NAME : row.PLACE }}
+        </template>
+      </el-table-column>
       <el-table-column prop="CLASS_SIZE" label="班级容量" />
       <el-table-column prop="TRAINEES_NUM" label="培训人员数量" />
       <el-table-column prop="CLASS_STATUS" label="班级状态">

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

@@ -60,11 +60,12 @@
       <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
       <el-table-column prop="STUDY_STATUS_NAME" label="培训状态" align="center"/>
       <el-table-column prop="CHECK_STATUS_NAME" label="审核状态" align="center"/>
-      <el-table-column label="操作" align="center" width="350">
+      <el-table-column label="操作" align="center" width="450">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
+          <el-button v-if="row.CHECK_STATUS == '2'" type="success" size="mini" @click="sendMessage(row)">重新推送</el-button>
           <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
@@ -127,6 +128,31 @@ export default {
         page: 1,
         limit: 10
       },
+      form: {
+        STATUS: null,
+        APPOINT_CORP_ID: '',
+        APPOINT_CORP_NAME: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: null,
+        APPOINT_USER_NAME: '',
+        APPOINT_ANNEX: null,
+        OPINION: '',
+        STEP: false,
+        LIMIT_END_TIME: '',
+        user: '',
+        XGF_USER_ID:'',
+        FLOWS_STEP:'1',
+        FLOWS_TYPE:'2',
+        repeatPush: '1',
+        tm: new Date().getTime(),
+        list: [],
+        isShow: true,
+        info: {},
+        TYPE: null,
+        BACK_NAME: '',
+        BACK_STEP: ''
+      },
       total: 0,
       varList: [],
       KEYWORDS: '',
@@ -168,6 +194,72 @@ export default {
       }
       this.getList()
     },
+    // 推送人员
+    sendMessage(item){
+      this.form.STATUS = 1
+      this.form.STEP = false
+      this.form.TYPE = 2
+      this.form.BACK_STEP = -1
+      this.form.XGF_USER_ID = item.XGF_USER_ID
+      this.form.repeatPush = '1'
+      this.form.FLOWS_STEP = '1'
+      this.form.FLOWS_TYPE = '2'
+      if (this.form.TYPE !== '2') {
+        this.loading = true
+        requestFN('/xgf/user/approveMax', this.form)
+          .then((data) => {
+            if (data.code === '0') {
+              this.$message.success('推送成功')
+              this.visible = false
+              this.$emit('refresh', '')
+              this.handleClose()
+            } else {
+              this.$message.error(data.errorMessage)
+            }
+
+            this.loading = false
+          })
+          .catch((e) => {
+            console.log(e)
+          })
+      } else {
+        const formData = new FormData()
+        this.form.chengNuoFlag = '1'
+        Object.keys(this.form).map(key => {
+          formData.append(key, this.form[key])
+        })
+        if (this.form.APPOINT_ANNEX) {
+          for (let i = 0; i < this.form.APPOINT_ANNEX.length; i++) {
+            formData.append('weiTuoShu', this.form.APPOINT_ANNEX[i].raw)
+          }
+        }
+        this.loading = true
+        upload('/xgf/user/approveMax', formData)
+          .then((data) => {
+            this.$message.success('推送成功')
+            this.visible = false
+            this.$emit('refresh', '')
+            this.handleClose()
+            this.loading = false
+          })
+          .catch((e) => {
+            console.log(e)
+          })
+      }
+    },
+    handleClose() {
+      this.form = {
+        STATUS: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: '',
+        APPOINT_USER_NAME: '',
+        OPINION: '',
+        user: '',
+        list: [],
+        tm: new Date().getTime()
+      }
+    },
     goKeyReset() {
       this.KEYWORDS = ''
       this.STATUS = ''

src/views/xgf/flow_audit/userInfo.vue

@@ -275,6 +275,7 @@
                           style="object-fit: cover; width: 40px; height: 40px"/>
                         <el-image
                           v-if="item.FILEPATH_BACK"
+                          :src="config.fileUrl + item.FILEPATH_BACK"
                           :preview-src-list="[config.fileUrl + item.FILEPATH_BACK]"
                           z-index="8000"
                           style="object-fit: cover; width: 40px; height: 40px"/>