|
@@ -196,7 +196,7 @@
|
|
|
<template #footer>
|
|
|
<span class="dialog-footer">
|
|
|
<el-button v-if="changeLeader" @click="engProssionFn">同 意</el-button>
|
|
|
- <el-button type="primary" @click="examineAndApprove('agree')">修改确认</el-button>
|
|
|
+ <el-button type="primary" @click="examineAndApproveSV('agree')">修改确认</el-button>
|
|
|
<el-button @click="examineAndApprove('reject')">拒 绝</el-button>
|
|
|
</span>
|
|
|
</template>
|
|
@@ -240,7 +240,8 @@
|
|
|
apiGetevaluationdeptadDeleteComplete,
|
|
|
apiGetprocessInformation,
|
|
|
apiGetobtainApprovalLeader,
|
|
|
- apiGetaddRepeatBatchLeader
|
|
|
+ apiGetaddRepeatBatchLeader,
|
|
|
+ apiGetaddApprovalLeader
|
|
|
} from '../../api/api'
|
|
|
import ExcelJS from 'exceljs'
|
|
|
import fileSave from 'file-saver'
|
|
@@ -683,18 +684,36 @@
|
|
|
id: that.keyId,
|
|
|
employeeNo: that.activeLeaderName
|
|
|
}
|
|
|
- apiGetaddRepeatBatchLeader(pars).then(val => {
|
|
|
- if (val && val.data) {
|
|
|
- that.leaderVisible = false
|
|
|
- setTimeout(() => {
|
|
|
- that.submitIsdoAction('leader')
|
|
|
- }, 300)
|
|
|
- }
|
|
|
- })
|
|
|
+ if (this.rowMsg.name !== '制单人') {
|
|
|
+ apiGetaddRepeatBatchLeader(pars).then(val => {
|
|
|
+ if (val && val.data) {
|
|
|
+ that.leaderVisible = false
|
|
|
+ setTimeout(() => {
|
|
|
+ that.submitIsdoAction('leader')
|
|
|
+ }, 300)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ apiGetaddApprovalLeader(pars).then(val => {
|
|
|
+ if (val && val.data) {
|
|
|
+ that.leaderVisible = false
|
|
|
+ setTimeout(() => {
|
|
|
+ that.examineAndApprove('agree')
|
|
|
+ }, 300)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
engProssionFn() {
|
|
|
this.submitIsdoAction('agree', 'EndNoneEvent1')
|
|
|
},
|
|
|
+ examineAndApproveSV(type) {
|
|
|
+ if (this.rowMsg.name === '制单人') {
|
|
|
+ this.changeLeaderFn()
|
|
|
+ } else {
|
|
|
+ this.examineAndApprove(type)
|
|
|
+ }
|
|
|
+ },
|
|
|
examineAndApprove(type) {
|
|
|
let actionCS = ''
|
|
|
if (type === 'agree') {
|