提交修改
This commit is contained in:
quyixiao
parent
368f2e39b1
commit
fad5dfed29
@ -24,7 +24,7 @@
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" v-if="auth.approvelCommit === 1 && status !== 5 " @click="commitRecord(2)">通过</el-button>
|
||||
<el-button type="primary" v-if="auth.waitCommit===1 && status !== 5 " @click="commitRecord(3)">待提交</el-button>
|
||||
<el-button type="primary" v-if="auth.waitCommit===1 && status !== 5 " @click="commitRecord(3)">通过</el-button>
|
||||
<el-button type="primary" v-if="status === 5 && auth.reject == 1" @click="commitRecord(5)">驳回</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
@ -62,7 +62,6 @@ export default {
|
||||
this.auth = auth
|
||||
this.visible = true
|
||||
this.status = status
|
||||
|
||||
this.$nextTick(async () => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
if (this.resultCommentEditor === null) {
|
||||
@ -73,6 +72,7 @@ export default {
|
||||
this.resultCommentEditor.customConfig.debug = true
|
||||
this.resultCommentEditor.create()
|
||||
}
|
||||
this.resultCommentEditor.txt.html('<p></p>')
|
||||
const data = await getResultComment(this.recordResultId)
|
||||
if (data && data.code === 0) {
|
||||
this.resultCommitId = data.resultComment.id
|
||||
|
||||
@ -182,7 +182,7 @@ export default {
|
||||
{value: '0', label: '新建'},
|
||||
{value: '1', label: '审批中'},
|
||||
{value: '2', label: '拒绝'},
|
||||
{value: '3', label: '侍提交'},
|
||||
{value: '3', label: '审批中'},
|
||||
{value: '4', label: '审批通过'}
|
||||
],
|
||||
departmentList1: [],
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="姓名">
|
||||
<el-input v-model="dataForm.name" placeholder="员工姓名" clearable></el-input>
|
||||
</el-form-item>
|
||||
@ -71,19 +70,29 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button @click="getDataList()">查询</el-button>
|
||||
<el-button size="mini" type="primary" @click="getDataList()">查询</el-button>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="">
|
||||
<el-select v-model="dataForm.batchOpt" placeholder="批量操作" clearable filterable>
|
||||
<el-option
|
||||
v-for="item in batchOpts"
|
||||
:key="item.id"
|
||||
:label="item.opt"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button size="mini" type="primary" style="" @click="">提交</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
<div>
|
||||
<el-button type="primary" style="margin-bottom: 10px" @click="submitBt()" v-if="isHiden">批量提交</el-button>
|
||||
</div>
|
||||
|
||||
<el-tabs type="border-card" v-model="tabValue" @tab-click="tabChange">
|
||||
<el-tab-pane label="审批中" name="1,2,5"></el-tab-pane>
|
||||
<el-tab-pane label="全部" name=""></el-tab-pane>
|
||||
<el-tab-pane label="侍提交" name="3"></el-tab-pane>
|
||||
<el-tab-pane label="全部" name="1,2,3,4,5"></el-tab-pane>
|
||||
<el-tab-pane label="批量提交" name="3"></el-tab-pane>
|
||||
<el-tab-pane label="审批通过" name="4"></el-tab-pane>
|
||||
|
||||
<el-table
|
||||
@ -128,8 +137,6 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
||||
|
||||
<el-pagination
|
||||
@size-change="sizeChangeHandle"
|
||||
@current-change="currentChangeHandle"
|
||||
@ -139,12 +146,8 @@
|
||||
:total="totalPage"
|
||||
layout="total, sizes, prev, pager, next, jumper">
|
||||
</el-pagination>
|
||||
|
||||
|
||||
</el-tabs>
|
||||
|
||||
|
||||
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
||||
</div>
|
||||
@ -173,7 +176,7 @@ export default {
|
||||
} else if (status === 2) {
|
||||
return '己审批'
|
||||
} else if (status === 3) {
|
||||
return '侍提交'
|
||||
return '审批中'
|
||||
} else if (status === 4) {
|
||||
return '审批通过'
|
||||
} else if (status === 5) {
|
||||
@ -192,6 +195,13 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
batchOpts: [{
|
||||
id: 1,
|
||||
opt: '批量提交'
|
||||
}, {
|
||||
id: 2,
|
||||
opt: '批量终止'
|
||||
}],
|
||||
Datalist: [{
|
||||
Month: 1,
|
||||
title: '近一个月'
|
||||
@ -223,7 +233,7 @@ export default {
|
||||
{value: '0', label: '新建'},
|
||||
{value: '1', label: '审批中'},
|
||||
{value: '2', label: '拒绝'},
|
||||
{value: '3', label: '侍提交'},
|
||||
{value: '3', label: '审批中'},
|
||||
{value: '4', label: '审批通过'}
|
||||
],
|
||||
departmentList1: [],
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
|
||||
<div class="bottom" v-if="this.auth.commit == 1" >
|
||||
<el-button size="mini" type="primary" @click="commitApprovalYes('你确认要提交审批吗？')">提交审批</el-button>
|
||||
<el-button size="mini" type="primary" @click="commitApprovalYes('你确认要提交审批吗？',2)">提交审批</el-button>
|
||||
</div>
|
||||
|
||||
<div class="bottom" v-if=" auth.add == 1 " >
|
||||
@ -39,14 +39,25 @@
|
||||
</div>
|
||||
|
||||
<div class="bottom" v-if="this.auth.confirmCommit == 1">
|
||||
<el-button size="mini" type="primary" style="" @click="commitApprovalYes('你要确认得分吗？')">确认得分</el-button>
|
||||
<el-button size="mini" type="primary" style="" @click="commitApprovalYes('你要确认得分吗？',2)">确认得分</el-button>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="bottom" v-if="this.auth.approvel == 1">
|
||||
<el-button type="primary" size="mini" @click="commitApprovalAddOrUpdate(1)"><label >审批</label></el-button>
|
||||
</div>
|
||||
|
||||
<div class="bottom" v-if="this.auth.dissatisfied == 1" >
|
||||
<el-button type="primary" size="mini" @click="commitApprovalAddOrUpdate('你确定要申述吗？',6)"><label >申述</label></el-button>
|
||||
</div>
|
||||
|
||||
<div class="bottom" v-if="this.auth.submited == 1" >
|
||||
<el-button type="primary" size="mini" @click="commitApprovalYes('你确定要撤回吗？',7)"><label >撤回</label></el-button>
|
||||
</div>
|
||||
|
||||
<div class="bottom" v-if="this.auth.submited == 1" >
|
||||
<el-button type="primary" size="mini" @click="commitApprovalYes('你确定要催领导吗？',8)"><label >催办</label></el-button>
|
||||
</div>
|
||||
|
||||
<div class="bottom" v-show="this.auth.reject === 1">
|
||||
<el-button size="mini" type="warning" @click="commitApprovalAddOrUpdate(5)" ><label >驳回</label></el-button>
|
||||
</div>
|
||||
@ -59,9 +70,6 @@
|
||||
<p><span @click="uploadDownFile(2)" ><label :class="'label bg-info my_pointer'">下载附件（{{fileCount}}）</label></span></p>
|
||||
</div>
|
||||
|
||||
<div class="bottom" >
|
||||
<p><span @click="uploadDownFile(2)" ><label :class="'label bg-info my_pointer'">下载附件（{{fileCount}}）</label></span></p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@ -140,7 +148,7 @@ import UploadAddOrUpdate from './upload-add-or-update.vue'
|
||||
export default {
|
||||
created () {
|
||||
console.log(window.innerHeight)
|
||||
this.clientHeight = window.innerHeight - 343
|
||||
this.clientHeight = window.innerHeight - 50
|
||||
console.log(this.clientHeight)
|
||||
this.stepList.forEach(item => item.name = item.name.slice(-2))
|
||||
},
|
||||
@ -214,6 +222,7 @@ export default {
|
||||
'recordType': this.recordType
|
||||
}).then(data => {
|
||||
if (data && data.code === 0) {
|
||||
this.clientHeight = window.innerHeight - 50
|
||||
this.tableData = data.list
|
||||
this.yeJiCheckNum = data.yeJiCheckNum
|
||||
this.wenHuaJiaZhiGuanNum = data.wenHuaJiaZhiGuanNum
|
||||
@ -271,7 +280,7 @@ export default {
|
||||
}, 500)
|
||||
})
|
||||
},
|
||||
commitApprovalYes (msg = '确定要提交审批吗?') {
|
||||
commitApprovalYes (msg = '确定要提交审批吗?', status) {
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
@ -279,7 +288,7 @@ export default {
|
||||
}).then(() => {
|
||||
commitApproval({
|
||||
'recordResultId': this.recordResultId,
|
||||
'status': 2
|
||||
'status': status
|
||||
}).then(data => {
|
||||
if (data) {
|
||||
if (data.code === 0) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user