|
|
@@ -350,7 +350,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' && inStyle != '3' ">
|
|
|
- <el-select v-model="selectDept" filterable disabled
|
|
|
+ <el-select v-model="selectDept" filterable
|
|
|
placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
|
|
|
<el-option v-for="item in allorgunitOptions" :key="item.Id" :label="item.Fullname"
|
|
|
:value="item.Id">
|
|
|
@@ -650,6 +650,9 @@
|
|
|
},
|
|
|
changeOrgUnit (val) {
|
|
|
let auditstepcode = 'PROF_RECE'
|
|
|
+ if (!val) {
|
|
|
+ return
|
|
|
+ }
|
|
|
api.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
|
|
|
this.userOptions = res.data.item
|
|
|
}).catch(err => {
|
|
|
@@ -850,6 +853,7 @@
|
|
|
} else {
|
|
|
return
|
|
|
}
|
|
|
+ console.log(auditstepcode, 'auditstepcode')
|
|
|
// let deplist = []
|
|
|
// deplist = this.companyid.split(",")
|
|
|
// let deptid = deplist[deplist.length - 1]
|
|
|
@@ -970,6 +974,7 @@
|
|
|
getFirAuditerByDept () {
|
|
|
console.log(this.authUser.Profile)
|
|
|
let deptid = this.authUser.Profile.DepartmentId
|
|
|
+ console.log(deptid, 'deptid')
|
|
|
this.userOptions = []
|
|
|
let auditstepcode = 'FIRST_TRIAL' // 初审人
|
|
|
api.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
|
|
|
@@ -1001,6 +1006,7 @@
|
|
|
this.auditOrgChange()
|
|
|
this.btnstatus = val
|
|
|
this.getFirAuditerByDept()
|
|
|
+ console.log(this.selectDept, 'selectDept')
|
|
|
this.changeOrgUnit(this.selectDept)
|
|
|
this.dialogSecUnitSeparateVisible = true
|
|
|
},
|
|
|
@@ -1008,7 +1014,10 @@
|
|
|
secUnitSeparateAuditMakeSure () {
|
|
|
console.log('二级单位分办审批结果确认')
|
|
|
this.shenheForm.SuccessStatus = 1
|
|
|
- this.secUnitSeparateAuditParamsCheck()
|
|
|
+ var res = this.secUnitSeparateAuditParamsCheck()
|
|
|
+ if (!res) {
|
|
|
+ return
|
|
|
+ }
|
|
|
this.loading = true
|
|
|
let params = {
|
|
|
FirstAudit: this.auditer,
|
|
|
@@ -1039,6 +1048,7 @@
|
|
|
},
|
|
|
// 二级单位分办审批参数检查 ⬇
|
|
|
secUnitSeparateAuditParamsCheck () {
|
|
|
+ console.log(this.shenheForm.SuccessStatus, '状态1')
|
|
|
if (this.shenheForm.SuccessStatus === 1) {
|
|
|
if (this.auditer === '') {
|
|
|
this.$message({
|
|
|
@@ -1094,6 +1104,7 @@
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
+ return true
|
|
|
},
|
|
|
commonAuditClick () {
|
|
|
console.log('审批公共会话框')
|