|
@@ -161,6 +161,14 @@
|
|
|
</el-row>
|
|
|
<el-divider content-position="left"><i class="el-icon-document"></i> 报告信息</el-divider>
|
|
|
<el-row :gutter="0">
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="报告名称" prop="reportName"
|
|
|
+ :rules="[
|
|
|
+ {required: true, message:'报告名称不能为空', trigger:'blur'},
|
|
|
+ ]">
|
|
|
+ <el-input v-model="inputForm.reportName" placeholder="请填写报告名称" clearable></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="被服务单位" prop="servedUnitName"
|
|
|
:rules="[
|
|
@@ -423,63 +431,6 @@
|
|
|
<el-input type="textarea" v-model="inputForm.improperTakeCause" placeholder="请填写非正常取号原因"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <!--<el-col :span="12">
|
|
|
- <el-form-item label="报告编号" prop="reportReviewNo"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input :disabled="true" v-model="inputForm.reportReviewNo" placeholder="自动生成">
|
|
|
- <!– <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>–>
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>-->
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="共印份数(大写)" prop="allPrintNum"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input v-model="inputForm.allPrintNum" placeholder="请输入本报告共印份数">
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="发出份数(大写)" prop="issueNum"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input v-model="inputForm.issueNum" placeholder="请输入发出份数">
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="存档份数(大写)" prop="placeOnFileNum"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input v-model="inputForm.placeOnFileNum" placeholder="请输入存档份数">
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="打印人签名" prop="printedBy"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input v-model="inputForm.printedBy" placeholder="请输入打印人签名">
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="校对人签名" prop="checkAutograph"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input v-model="inputForm.checkAutograph" placeholder="请输入校对人签名">
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="计算机文号" prop="computerNo"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input v-model="inputForm.computerNo" placeholder="请输入计算机文号">
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
|
|
@@ -487,14 +438,6 @@
|
|
|
<!-- 附件-->
|
|
|
<UpLoadComponent ref="enclosure"></UpLoadComponent>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane label="签章文件" name="archiveFile">
|
|
|
- <!-- 签章文件-->
|
|
|
- <UpLoadComponent ref="archiveFile"></UpLoadComponent>
|
|
|
- </el-tab-pane>
|
|
|
- <el-tab-pane label="已签章附件" name="signatureFile">
|
|
|
- <!-- 附件-->
|
|
|
- <UpLoadComponent ref="signatureFile"></UpLoadComponent>
|
|
|
- </el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -514,7 +457,7 @@
|
|
|
import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
|
|
|
import UserSelectAll from '@/components/userSelect'
|
|
|
import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
|
|
|
- import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
|
|
|
+ import ReportNumberApplyService from '@/api/cw/reportManagement/ReportNumberApplyService'
|
|
|
import projectReportService from '@/api/cw/reportManagement/ProjectReportService'
|
|
|
import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
|
|
|
import CommonApi from '@/api/cw/common/CommonApi'
|
|
@@ -541,7 +484,7 @@
|
|
|
loading: false,
|
|
|
reviewBys: [],
|
|
|
inputForm: {
|
|
|
- cwFileInfoList2: [],
|
|
|
+ cwFileInfoList3: [],
|
|
|
sealType: '',
|
|
|
reviewBy: '', // 下一个节点审核人
|
|
|
reportNumber: '',
|
|
@@ -549,6 +492,7 @@
|
|
|
businessType: '',
|
|
|
auditBusinessType: '',
|
|
|
reportDate: '',
|
|
|
+ reportName: '',
|
|
|
servedUnitName: '', // 被服务单位
|
|
|
registerAddress: '',
|
|
|
securityBusiness: '',
|
|
@@ -564,6 +508,7 @@
|
|
|
projectMasterName: '',
|
|
|
cwProjectInfoList: [],
|
|
|
status: '',
|
|
|
+ applyStatus: '',
|
|
|
realCreate: '',
|
|
|
userName: '',
|
|
|
detailFor1010: [],
|
|
@@ -620,13 +565,13 @@
|
|
|
}
|
|
|
},
|
|
|
ReportCancellApplyService: null,
|
|
|
- ReportReviewService: null,
|
|
|
+ ReportNumberApplyService: null,
|
|
|
enterpriseSearchService: null,
|
|
|
commonApi: null,
|
|
|
created () {
|
|
|
this.enterpriseSearchService = new EnterpriseSearchService()
|
|
|
this.reportCancellApplyService = new ReportCancellApplyService()
|
|
|
- this.reportReviewService = new ReportReviewService()
|
|
|
+ this.ReportNumberApplyService = new ReportNumberApplyService()
|
|
|
this.commonApi = new CommonApi()
|
|
|
},
|
|
|
computed: {
|
|
@@ -655,8 +600,6 @@
|
|
|
'loading': {
|
|
|
handler (newVal) {
|
|
|
this.$emit('changeLoading', newVal)
|
|
|
- this.$refs.signatureFile.changeLoading(newVal)
|
|
|
- this.$refs.archiveFile.changeLoading(newVal)
|
|
|
this.$refs.enclosure.changeLoading(newVal)
|
|
|
}
|
|
|
}
|
|
@@ -679,7 +622,7 @@
|
|
|
console.log('method', method)
|
|
|
this.activeName = 'enclosure'
|
|
|
this.reportCancellApplyService = new ReportCancellApplyService()
|
|
|
- this.reportReviewService = new ReportReviewService()
|
|
|
+ this.ReportNumberApplyService = new ReportNumberApplyService()
|
|
|
this.method = method
|
|
|
this.inputForm = {
|
|
|
reviewBy: '', // 下一个节点审核人
|
|
@@ -689,6 +632,7 @@
|
|
|
businessType: '',
|
|
|
auditBusinessType: '',
|
|
|
reportDate: '',
|
|
|
+ reportName: '',
|
|
|
servedUnitName: '', // 被服务单位
|
|
|
registerAddress: '',
|
|
|
securityBusiness: '',
|
|
@@ -704,6 +648,7 @@
|
|
|
projectMasterName: '',
|
|
|
cwProjectInfoList: [],
|
|
|
status: '',
|
|
|
+ applyStatus: '',
|
|
|
realCreate: '',
|
|
|
userName: '',
|
|
|
detailFor1010: [],
|
|
@@ -736,7 +681,7 @@
|
|
|
remark3: '',
|
|
|
opinionType: '',
|
|
|
cwFileInfoList: [],
|
|
|
- cwFileInfoList2: [],
|
|
|
+ cwFileInfoList3: [],
|
|
|
servedUnitId: '',
|
|
|
reviewStatus: '',
|
|
|
taskName: '',
|
|
@@ -751,14 +696,12 @@
|
|
|
this.inputForm.id = id
|
|
|
this.loading = false
|
|
|
this.$refs.enclosure.clearUpload()
|
|
|
- this.$refs.archiveFile.clearUpload()
|
|
|
- this.$refs.signatureFile.clearUpload()
|
|
|
this.reviewBys = []
|
|
|
this.$nextTick(() => {
|
|
|
// this.$refs.inputForm.resetFields()
|
|
|
|
|
|
this.loading = true
|
|
|
- projectReportService.queryById(this.inputForm.id).then((data) => {
|
|
|
+ projectReportService.queryById2(this.inputForm.id).then((data) => {
|
|
|
// this.$refs.uploadComponent.clearUpload()
|
|
|
this.inputForm = this.recover(this.inputForm, data)
|
|
|
this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
|
|
@@ -769,15 +712,10 @@
|
|
|
this.reimbursementTypeFlag = true
|
|
|
}
|
|
|
if (this.commonJS.isEmpty(data.details)) {
|
|
|
- this.reportReviewService.list('1').then((data) => { this.detailDivide(data) })
|
|
|
+ this.ReportNumberApplyService.list('1').then((data) => { this.detailDivide(data) })
|
|
|
} else {
|
|
|
this.detailDivide(data.details)
|
|
|
}
|
|
|
- if (this.commonJS.isNotEmpty(data.procInsId3)) {
|
|
|
- this.reportReviewService.getProcessStatus(data.procInsId3).then((data) => {
|
|
|
- this.inputForm.taskName = data
|
|
|
- })
|
|
|
- }
|
|
|
if (data.reviewBys) {
|
|
|
data.reviewBys.forEach(re => {
|
|
|
let va = {
|
|
@@ -795,9 +733,7 @@
|
|
|
if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
|
|
|
this.inputForm.signatureType = '1'
|
|
|
}
|
|
|
- this.$refs.enclosure.newUpload(this.method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
|
|
|
- this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
|
|
|
- this.$refs.signatureFile.newUpload('view', data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
|
|
|
+ this.$refs.enclosure.newUpload(this.method, data.cwFileInfoList3, 'cwWorkContract', null, null, null, null, false)
|
|
|
this.loading = false
|
|
|
})
|
|
|
})
|
|
@@ -849,8 +785,8 @@
|
|
|
startForm (callback) {
|
|
|
this.loading = true
|
|
|
if (this.commonJS.isNotEmpty(this.inputForm.id)) {
|
|
|
- projectReportService.queryById(this.inputForm.id).then((data) => {
|
|
|
- if (this.commonJS.isNotEmpty(data.reviewStatus) && data.reviewStatus !== '0' && data.reviewStatus !== '1' && data.reviewStatus !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”,就弹出提示
|
|
|
+ projectReportService.queryById2(this.inputForm.id).then((data) => {
|
|
|
+ if (this.commonJS.isNotEmpty(data.applyStatus) && data.applyStatus !== '0' && data.applyStatus !== '1' && data.applyStatus !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”,就弹出提示
|
|
|
this.loading = false
|
|
|
this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
|
throw new Error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
@@ -864,8 +800,8 @@
|
|
|
},
|
|
|
async agreeForm (callback) {
|
|
|
this.loading = true
|
|
|
- await projectReportService.queryById(this.inputForm.id).then((data) => {
|
|
|
- if (data.reviewStatus !== '2') { // 审核状态不是“待审核”,就弹出提示
|
|
|
+ await projectReportService.queryById2(this.inputForm.id).then((data) => {
|
|
|
+ if (data.applyStatus !== '2') { // 审核状态不是“待审核”,就弹出提示
|
|
|
this.loading = false
|
|
|
this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
|
throw new Error()
|
|
@@ -876,8 +812,8 @@
|
|
|
},
|
|
|
reapplyForm (callback) {
|
|
|
this.loading = true
|
|
|
- projectReportService.queryById(this.inputForm.id).then((data) => {
|
|
|
- if (data.reviewStatus !== '4') { // 审核状态不是“驳回”,就弹出提示
|
|
|
+ projectReportService.queryById2(this.inputForm.id).then((data) => {
|
|
|
+ if (data.applyStatus !== '4') { // 审核状态不是“驳回”,就弹出提示
|
|
|
this.loading = false
|
|
|
this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
|
throw new Error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
@@ -907,9 +843,9 @@
|
|
|
this.loading = false
|
|
|
throw new Error()
|
|
|
} else {
|
|
|
- this.reportReviewService.save(this.inputForm).then((data) => {
|
|
|
- this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
|
|
|
- projectReportService.saveForm(this.inputForm).then((da) => {
|
|
|
+ this.ReportNumberApplyService.save(this.inputForm).then((data) => {
|
|
|
+ this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
|
|
|
+ projectReportService.saveForm2(this.inputForm).then((da) => {
|
|
|
callback(data.businessTable, data.businessId, this.inputForm)
|
|
|
this.loading = false
|
|
|
}).catch(() => {
|
|
@@ -927,10 +863,10 @@
|
|
|
this.inputForm.assignee = this.inputForm.reviewBy
|
|
|
} else if (status === 'agree') {
|
|
|
// 审核同意
|
|
|
- this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
|
|
|
+ this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
|
|
|
this.inputForm.agreeDate = this.moment(new Date()).format('YYYY-MM-DD')
|
|
|
this.inputForm.agreeUserId = this.$store.state.user.id
|
|
|
- // this.inputForm.status = '5'
|
|
|
+ this.inputForm.reviewStatus = '5'
|
|
|
} else if (status === 'reapply') {
|
|
|
this.inputForm.reviewStatus = '2'
|
|
|
this.inputForm.assignee = this.inputForm.reviewBy
|
|
@@ -947,10 +883,10 @@
|
|
|
this.inputForm.detailFor1020.forEach(item => { this.inputForm.details.push(item) })
|
|
|
this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
|
|
|
if (status === 'agree') {
|
|
|
- this.reportReviewService.save(this.inputForm).then((data) => {
|
|
|
- this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
|
|
|
+ this.ReportNumberApplyService.save(this.inputForm).then((data) => {
|
|
|
+ this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
|
|
|
console.log('this.inputForm', this.inputForm)
|
|
|
- projectReportService.saveForm(this.inputForm).then((da) => {
|
|
|
+ projectReportService.saveForm2(this.inputForm).then((da) => {
|
|
|
callback(data.businessTable, data.businessId, this.inputForm)
|
|
|
this.loading = false
|
|
|
}).catch(() => {
|
|
@@ -967,10 +903,10 @@
|
|
|
this.loading = false
|
|
|
throw new Error()
|
|
|
} else {
|
|
|
- this.reportReviewService.save(this.inputForm).then((data) => {
|
|
|
- this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
|
|
|
+ this.ReportNumberApplyService.save(this.inputForm).then((data) => {
|
|
|
+ this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
|
|
|
console.log('this.inputForm', this.inputForm)
|
|
|
- projectReportService.saveForm(this.inputForm).then((da) => {
|
|
|
+ projectReportService.saveForm2(this.inputForm).then((da) => {
|
|
|
callback(data.businessTable, data.businessId, this.inputForm)
|
|
|
this.loading = false
|
|
|
}).catch(() => {
|
|
@@ -989,47 +925,37 @@
|
|
|
},
|
|
|
async updateStatusById (type, callback) {
|
|
|
this.loading = true
|
|
|
+ console.log('type', type)
|
|
|
if (type === 'reject' || type === 'reback') {
|
|
|
- await projectReportService.queryById(this.inputForm.id).then((data) => {
|
|
|
- if (data.reviewStatus !== '2') { // status的值不等于“审核中”就弹出提示
|
|
|
+ await projectReportService.queryById2(this.inputForm.id).then((data) => {
|
|
|
+ if (data.applyStatus !== '2') { // status的值不等于“审核中”就弹出提示
|
|
|
this.loading = false
|
|
|
this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
|
throw new Error()
|
|
|
} else {
|
|
|
if (type === 'reject') {
|
|
|
- this.reportReviewService.queryByReportId(this.inputForm.id).then((review) => {
|
|
|
+ this.ReportNumberApplyService.queryByReportId(this.inputForm.id).then((review) => {
|
|
|
console.log('review', review)
|
|
|
- this.commonApi.getTaskNameByProcInsId(review.procInsId).then((data) => {
|
|
|
- if (data === '质控审核') { // 二级复核 进入下面操作,不是二级复核 直接驳回
|
|
|
- this.reportReviewService.getHaveReportNo(this.inputForm.id).then((haveReportNo) => { // 根据报告id查询是否已经生成报告文号
|
|
|
- console.log(haveReportNo)
|
|
|
- if (haveReportNo === '1' || haveReportNo === 1) { // 返回值为 ’1‘,已生成报告文号,直接驳回
|
|
|
- this.rejectOn(callback)
|
|
|
- }
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.rejectOn(callback)
|
|
|
- }
|
|
|
- })
|
|
|
+ this.rejectOn(callback)
|
|
|
})
|
|
|
}
|
|
|
if (type === 'reback') {
|
|
|
// 撤回
|
|
|
let param = {reviewStatus: '3', id: this.inputForm.id}
|
|
|
- this.reportReviewService.updateReviewStatysByReportId(param)
|
|
|
+ this.ReportNumberApplyService.updateReviewStatysByReportId(param)
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
} else if (type === 'hold') {
|
|
|
- projectReportService.queryById(this.inputForm.id).then((data) => {
|
|
|
- if (data.reviewStatus !== '4') { // status的值不等于“驳回”就弹出提示
|
|
|
+ projectReportService.queryById2(this.inputForm.id).then((data) => {
|
|
|
+ if (data.applyStatus !== '4') { // status的值不等于“驳回”就弹出提示
|
|
|
this.loading = false
|
|
|
this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
|
throw new Error()
|
|
|
} else {
|
|
|
// 终止
|
|
|
let param = {reviewStatus: '1', id: this.inputForm.id}
|
|
|
- this.reportReviewService.updateReviewStatysByReportId(param).then(() => {
|
|
|
+ this.ReportNumberApplyService.updateReviewStatysByReportId(param).then(() => {
|
|
|
callback()
|
|
|
this.loading = false
|
|
|
})
|
|
@@ -1041,21 +967,17 @@
|
|
|
rejectOn (callback) {
|
|
|
// 驳回
|
|
|
let param
|
|
|
- this.inputForm.reviewStatus = '4'
|
|
|
+ this.inputForm.applyStatus = '4'
|
|
|
// 列表处理
|
|
|
this.inputForm.details = []
|
|
|
this.inputForm.detailFor1010.forEach(item => { this.inputForm.details.push(item) })
|
|
|
this.inputForm.detailFor1020.forEach(item => { this.inputForm.details.push(item) })
|
|
|
this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
|
|
|
- param = {reviewStatus: this.inputForm.reviewStatus,
|
|
|
- id: this.inputForm.id,
|
|
|
- needUpdate2: this.inputForm.needUpdate2,
|
|
|
- needUpdate3: this.inputForm.needUpdate3,
|
|
|
- remark2: this.inputForm.remark2,
|
|
|
- remark3: this.inputForm.remark3,
|
|
|
- details: this.inputForm.details
|
|
|
+ param = {
|
|
|
+ applyStatus: this.inputForm.applyStatus,
|
|
|
+ id: this.inputForm.id
|
|
|
}
|
|
|
- this.reportReviewService.updateReviewStatysByReportId(param).then(() => {
|
|
|
+ this.ReportNumberApplyService.updateReviewStatysByReportId(param).then(() => {
|
|
|
this.loading = false
|
|
|
callback()
|
|
|
})
|
|
@@ -1094,8 +1016,6 @@
|
|
|
// this.$refs.uploadComponent.clearUpload()
|
|
|
// this.$refs.inputForm.resetFields()
|
|
|
this.$refs.enclosure.clearUpload()
|
|
|
- this.$refs.archiveFile.clearUpload()
|
|
|
- this.$refs.signatureFile.clearUpload()
|
|
|
},
|
|
|
tabHandleClick (event) {
|
|
|
// console.log(event)
|