bug修复
parent
b3fae3e234
commit
731986f7da
|
|
@ -38,20 +38,18 @@
|
|||
<el-table-column type="index" label="序号" width="50" align="center"/>
|
||||
<el-table-column prop="USERNAME" label="用户名" align="center"/>
|
||||
<el-table-column prop="NAME" label="姓名" align="center"/>
|
||||
<el-table-column prop="DEPARTMENT_NAME" label="部门" align="center"/>
|
||||
<el-table-column prop="EMPLOYER_NAME" label="外派公司名称" align="center"/>
|
||||
<el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
|
||||
<el-table-column label="操作" align="center" width="250">
|
||||
<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-s-claim" size="mini" @click="sendMessage([row])">提交申请</el-button>
|
||||
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证
|
||||
</el-button>
|
||||
<el-button type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
|
||||
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="page-btn-group">
|
||||
<div>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">批量推送</el-button>
|
||||
<el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量同意</el-button>
|
||||
</div>
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
|
||||
</div>
|
||||
|
|
@ -69,10 +67,10 @@ import vueQr from 'vue-qr'
|
|||
import apply from './apply'
|
||||
import user from './user.vue'
|
||||
import SendUtil from './sendUtil.vue'
|
||||
import UserInfo from "./userInfo.vue";
|
||||
import UserInfo from './userInfo.vue'
|
||||
|
||||
export default {
|
||||
components: {UserInfo, SendUtil, Pagination, apply, vueQr, user },
|
||||
components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
|
||||
directives: { waves },
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -163,27 +161,8 @@ export default {
|
|||
handleShow(row) {
|
||||
this.$refs.userInfos.init(row)
|
||||
},
|
||||
sendMessage(row) {
|
||||
this.$confirm('确定要提交人员撤回申请吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
requestFN(
|
||||
'/trainingbatch/submitApplication', { xgf_user_ids: row.map(item => item.USER_ID).join(',') }
|
||||
).then((data) => {
|
||||
this.getList()
|
||||
})
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '申请提交成功!'
|
||||
})
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '申请提交取消'
|
||||
})
|
||||
})
|
||||
approve(row) {
|
||||
this.$refs.sendUtil.init(row)
|
||||
},
|
||||
getUserInfo(row) {
|
||||
this.$refs.userInfo.init(row)
|
||||
|
|
|
|||
|
|
@ -2,22 +2,16 @@
|
|||
<div>
|
||||
<el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
|
||||
<el-form>
|
||||
<el-form-item prop="TERRITORIALITY" label="集团单位 ">
|
||||
<Treeselect
|
||||
:options="jituanDanweiTreeData"
|
||||
:normalizer="normalizer"
|
||||
v-model="corp_id"
|
||||
placeholder="请选择集团单位 "
|
||||
no-options-text="暂无数据"
|
||||
no-children-text="暂无数据"
|
||||
style="width: 100%;"
|
||||
@select="getInfo($event)"
|
||||
/>
|
||||
<el-form-item prop="TERRITORIALITY" label="是否通过 ">
|
||||
<el-select v-model="value" placeholder="请选择">
|
||||
<el-option label="是" value="1"/>
|
||||
<el-option label="否" value="0"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">关 闭</el-button>
|
||||
<el-button type="primary" @click="sendMessage()">推 送</el-button>
|
||||
<el-button type="primary" @click="sendMessage()">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
|
@ -39,81 +33,24 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
jituanDanwei: '',
|
||||
loading: false,
|
||||
jituanDanweiTreeData: [],
|
||||
normalizer(node) {
|
||||
return {
|
||||
id: node.id,
|
||||
label: node.name,
|
||||
children: node.nodes
|
||||
}
|
||||
},
|
||||
corp_id: null,
|
||||
corp_name: '',
|
||||
value: null,
|
||||
heirloom: {}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init(e) {
|
||||
this.visible = true
|
||||
this.getCorpinfo()
|
||||
this.heirloom = JSON.stringify(e)
|
||||
},
|
||||
getCorpinfo() {
|
||||
requestFN(
|
||||
'/corpinfo/getDataForEditByCorpInfoId',
|
||||
{
|
||||
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
|
||||
tm: new Date().getTime()
|
||||
}
|
||||
).then((data) => {
|
||||
this.corpinfo = data.pd
|
||||
// 河港机械 jtdw002 1e6dbbe16004402f8d2c0e52afd9a676
|
||||
// 河港港工 jtdw003 3a854eefa7894e06aaa1a2611bca80f6
|
||||
// 河港检测 jtdw004 020578a4c1f04bc692ee25145c2efbe5
|
||||
// 方宇物业 jtdw005 90966974de3c4b83aca6f8fd6432d5c2
|
||||
|
||||
if (data.pd.CORP_TYPE == 'jtdw002') {
|
||||
this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
|
||||
}
|
||||
if (data.pd.CORP_TYPE == 'jtdw003') {
|
||||
this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
|
||||
}
|
||||
if (data.pd.CORP_TYPE == 'jtdw004') {
|
||||
this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
|
||||
}
|
||||
if (data.pd.CORP_TYPE == 'jtdw005') {
|
||||
this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
|
||||
}
|
||||
this.getTreeData()
|
||||
})
|
||||
},
|
||||
getTreeData() {
|
||||
if (this.jituanDanwei) {
|
||||
requestFN(
|
||||
'/companyApi/department/listTree',
|
||||
{ CORPINFO_ID: this.jituanDanwei }
|
||||
).then((data) => {
|
||||
this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
|
||||
}).catch((e) => {
|
||||
})
|
||||
}
|
||||
},
|
||||
getInfo(e) {
|
||||
console.log(e)
|
||||
this.corp_name = e.name
|
||||
},
|
||||
beforeClose() {
|
||||
this.corp_id = null
|
||||
},
|
||||
sendMessage(row) {
|
||||
requestFN(
|
||||
'/trainingbatch/sendMessage',
|
||||
'/xgf/user/approve',
|
||||
{
|
||||
list: this.heirloom,
|
||||
corp_id: this.corp_id,
|
||||
corp_name: this.corp_name,
|
||||
STATUS: this.value,
|
||||
tm: new Date().getTime()
|
||||
}
|
||||
).then((data) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue