|
|
@@ -467,6 +467,150 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-divider content-position="left"><i class="el-icon-document"></i>一级复核</el-divider>
|
|
|
+ <el-row :gutter="15" >
|
|
|
+ <vxe-table
|
|
|
+ border
|
|
|
+ show-overflow
|
|
|
+ ref="details"
|
|
|
+ class="vxe-table-element"
|
|
|
+ :data="inputForm.detailFor1010"
|
|
|
+ style="margin-left: 5em"
|
|
|
+ @cell-click=""
|
|
|
+ @edit-closed=""
|
|
|
+ highlight-current-row
|
|
|
+ :key="tableKeyClient"
|
|
|
+ :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
|
|
|
+ >
|
|
|
+ <vxe-table-column field="typeName" title="复核的主要内容" :edit-render="{}">
|
|
|
+ <template v-slot:edit="scope">
|
|
|
+ <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
|
|
|
+ </template>
|
|
|
+ </vxe-table-column>
|
|
|
+ <vxe-table-column width="450px" field="reviewComments" title="复核结果（是/否/不适用）" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
|
|
|
+ <template v-slot:edit="scope">
|
|
|
+ <vxe-select :disabled="method === 'view'" v-model="scope.row.reviewComments" transfer>
|
|
|
+ <vxe-option
|
|
|
+ v-for="item in $dictUtils.getDictList('yes_no_notApplicable')"
|
|
|
+ :key="item.value"
|
|
|
+ :value="item.value"
|
|
|
+ :label="item.label">
|
|
|
+ </vxe-option>
|
|
|
+ </vxe-select>
|
|
|
+ </template>
|
|
|
+ </vxe-table-column>
|
|
|
+ </vxe-table>
|
|
|
+ <el-col style="margin-top: 15px">
|
|
|
+ <el-form-item label="关注或修改的事项" prop="needUpdate1"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input size="medium" type="textarea" v-model="inputForm.needUpdate1" placeholder="请填写需提请关注或修改的事项"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col>
|
|
|
+ <el-form-item label="备注" prop="remark1"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input size="medium" type="textarea" v-model="inputForm.remark1" placeholder="请填写一级复核备注"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-divider content-position="left"><i class="el-icon-document"></i>二级复核</el-divider>
|
|
|
+ <el-row :gutter="15" >
|
|
|
+ <vxe-table
|
|
|
+ border
|
|
|
+ show-overflow
|
|
|
+ ref="details"
|
|
|
+ class="vxe-table-element"
|
|
|
+ :data="inputForm.detailFor1020"
|
|
|
+ style="margin-left: 5em"
|
|
|
+ @cell-click=""
|
|
|
+ @edit-closed=""
|
|
|
+ highlight-current-row
|
|
|
+ :key="tableKeyClient2"
|
|
|
+ :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
|
|
|
+ >
|
|
|
+ <vxe-table-column field="typeName" title="复核的主要内容" :edit-render="{}">
|
|
|
+ <template v-slot:edit="scope">
|
|
|
+ <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
|
|
|
+ </template>
|
|
|
+ </vxe-table-column>
|
|
|
+ <vxe-table-column width="450px" field="reviewComments" title="复核结果（是/否/不适用）" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
|
|
|
+ <template v-slot:edit="scope">
|
|
|
+ <vxe-select :disabled="method === 'view'" v-model="scope.row.reviewComments" transfer>
|
|
|
+ <vxe-option
|
|
|
+ v-for="item in $dictUtils.getDictList('yes_no_notApplicable')"
|
|
|
+ :key="item.value"
|
|
|
+ :value="item.value"
|
|
|
+ :label="item.label">
|
|
|
+ </vxe-option>
|
|
|
+ </vxe-select>
|
|
|
+ </template>
|
|
|
+ </vxe-table-column>
|
|
|
+ </vxe-table>
|
|
|
+ <el-col style="margin-top: 15px">
|
|
|
+ <el-form-item label="关注或修改的事项" prop="needUpdate2"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input size="medium" type="textarea" v-model="inputForm.needUpdate2" placeholder="请填写二级复核需提请关注或修改的事项"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col>
|
|
|
+ <el-form-item label="备注" prop="remark2"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input size="medium" type="textarea" v-model="inputForm.remark2" placeholder="请填写二级复核备注"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-divider content-position="left"><i class="el-icon-document"></i>三级复核</el-divider>
|
|
|
+ <el-row :gutter="15" >
|
|
|
+ <vxe-table
|
|
|
+ border
|
|
|
+ show-overflow
|
|
|
+ ref="details"
|
|
|
+ class="vxe-table-element"
|
|
|
+ :data="inputForm.detailFor1030"
|
|
|
+ style="margin-left: 5em"
|
|
|
+ @cell-click=""
|
|
|
+ @edit-closed=""
|
|
|
+ highlight-current-row
|
|
|
+ :key="tableKeyClient3"
|
|
|
+ :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
|
|
|
+ >
|
|
|
+ <vxe-table-column field="typeName" title="复核的主要内容" :edit-render="{}">
|
|
|
+ <template v-slot:edit="scope">
|
|
|
+ <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
|
|
|
+ </template>
|
|
|
+ </vxe-table-column>
|
|
|
+ <vxe-table-column width="450px" field="reviewComments" title="复核结果（是/否/不适用）" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
|
|
|
+ <template v-slot:edit="scope">
|
|
|
+ <vxe-select :disabled="method === 'view'" v-model="scope.row.reviewComments" transfer>
|
|
|
+ <vxe-option
|
|
|
+ v-for="item in $dictUtils.getDictList('yes_no_notApplicable')"
|
|
|
+ :key="item.value"
|
|
|
+ :value="item.value"
|
|
|
+ :label="item.label">
|
|
|
+ </vxe-option>
|
|
|
+ </vxe-select>
|
|
|
+ </template>
|
|
|
+ </vxe-table-column>
|
|
|
+ </vxe-table>
|
|
|
+ <el-col style="margin-top: 15px">
|
|
|
+ <el-form-item label="关注或修改的事项" prop="needUpdate3"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input size="medium" type="textarea" v-model="inputForm.needUpdate3" placeholder="请填写三级复核需提请关注或修改的事项"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col>
|
|
|
+ <el-form-item label="备注" prop="remark3"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input size="medium" type="textarea" v-model="inputForm.remark3" placeholder="三级复核备注"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
<el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
|
|
|
<!--<el-tab-pane label="报告信息列表" name="newRow">
|
|
|
@@ -683,7 +827,7 @@
|
|
|
import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
|
|
|
import SelectUserTree from '@/views/modules/utils/treeUserSelect'
|
|
|
import SelectTree from '@/components/treeSelect/treeSelect.vue'
|
|
|
- import UserSelect from '@/components/userSelect'
|
|
|
+ import UserSelect from '../workClientInfo/clientUserSelect'
|
|
|
import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
|
|
|
import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
|
|
|
// import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
|
|
|
@@ -713,6 +857,25 @@
|
|
|
method: '',
|
|
|
loading: false,
|
|
|
inputForm: {
|
|
|
+ reviewBy: '', // 下一个节点审核人
|
|
|
+ detailFor1010: [],
|
|
|
+ detailFor1020: [],
|
|
|
+ detailFor1030: [],
|
|
|
+ details: [],
|
|
|
+ reportNewLineId: '',
|
|
|
+ allPrintNum: '',
|
|
|
+ issueNum: '',
|
|
|
+ placeOnFileNum: '',
|
|
|
+ printedBy: '',
|
|
|
+ checkAutograph: '',
|
|
|
+ computerNo: '',
|
|
|
+ reportTitleType: '',
|
|
|
+ needUpdate1: '',
|
|
|
+ needUpdate2: '',
|
|
|
+ needUpdate3: '',
|
|
|
+ remark1: '',
|
|
|
+ remark2: '',
|
|
|
+ remark3: '',
|
|
|
projectMasterId: '',
|
|
|
reviewStatus: '',
|
|
|
taskName: '',
|
|
|
@@ -760,6 +923,8 @@
|
|
|
tableKey: '',
|
|
|
tableKeyClient: '1',
|
|
|
tableKeyContact: '2',
|
|
|
+ tableKeyClient2: '1',
|
|
|
+ tableKeyClient3: '1',
|
|
|
visible: false
|
|
|
}
|
|
|
},
|
|
|
@@ -843,16 +1008,43 @@
|
|
|
this.projectReportService = new ProjectReportService()
|
|
|
this.method = method
|
|
|
this.inputForm = {
|
|
|
+ reviewBy: '', // 下一个节点审核人
|
|
|
+ detailFor1010: [],
|
|
|
+ detailFor1020: [],
|
|
|
+ detailFor1030: [],
|
|
|
+ details: [],
|
|
|
+ reportNewLineId: '',
|
|
|
+ allPrintNum: '',
|
|
|
+ issueNum: '',
|
|
|
+ placeOnFileNum: '',
|
|
|
+ printedBy: '',
|
|
|
+ checkAutograph: '',
|
|
|
+ computerNo: '',
|
|
|
+ reportTitleType: '',
|
|
|
+ needUpdate1: '',
|
|
|
+ needUpdate2: '',
|
|
|
+ needUpdate3: '',
|
|
|
+ remark1: '',
|
|
|
+ remark2: '',
|
|
|
+ remark3: '',
|
|
|
projectMasterId: '',
|
|
|
- auditBusinessType: '',
|
|
|
- opinionType: '',
|
|
|
- reportNo: '',
|
|
|
- reportReviewNo: '',
|
|
|
+ reviewStatus: '',
|
|
|
+ taskName: '',
|
|
|
+ sealType: '',
|
|
|
reportNumber: '',
|
|
|
reportType: '',
|
|
|
+ businessType: '',
|
|
|
+ auditBusinessType: '',
|
|
|
reportDate: '',
|
|
|
servedUnitName: '', // 被服务单位
|
|
|
+ registerAddress: '',
|
|
|
+ securityBusiness: '',
|
|
|
+ businessLocation: '',
|
|
|
auditFees: '',
|
|
|
+ userName: '',
|
|
|
+ opinionType: '',
|
|
|
+ reportNo: '',
|
|
|
+ reportReviewNo: '',
|
|
|
projectId: '',
|
|
|
id: '',
|
|
|
createDate: '',
|
|
|
@@ -860,8 +1052,7 @@
|
|
|
id: '',
|
|
|
name: JSON.parse(localStorage.getItem('user')).name
|
|
|
},
|
|
|
- reviewStatus: '',
|
|
|
- taskName: '',
|
|
|
+ remarks: '',
|
|
|
documentNo: '',
|
|
|
projectName: '',
|
|
|
projectNumber: '',
|
|
|
@@ -876,8 +1067,7 @@
|
|
|
signatureFileList: [],
|
|
|
servedUnitId: '',
|
|
|
status: '',
|
|
|
- realCreate: '',
|
|
|
- cwWorkClientContactDTOList: []
|
|
|
+ realCreate: ''
|
|
|
}
|
|
|
this.inputForm.id = id
|
|
|
this.loading = false
|
|
|
@@ -928,6 +1118,11 @@
|
|
|
if (this.formReadOnly) {
|
|
|
method = 'view'
|
|
|
}
|
|
|
+ if (this.commonJS.isEmpty(data.details)) {
|
|
|
+ this.reportReviewService.list('1').then(({data}) => { this.detailDivide(data) })
|
|
|
+ } else {
|
|
|
+ this.detailDivide(data.details)
|
|
|
+ }
|
|
|
this.$refs.enclosure.newUpload(method, data.cwFileInfoList2, 'cwWorkContract', null, null, null, null, false)
|
|
|
// this.$refs.archiveFile.newUpload(method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
|
|
|
this.$refs.signatureFile.newUpload(method, data.signatureFileList, 'cwWorkContract', null, null, null, null, false)
|
|
|
@@ -944,6 +1139,25 @@
|
|
|
// })
|
|
|
})
|
|
|
},
|
|
|
+ detailDivide (details) {
|
|
|
+ this.inputForm.detailFor1010 = []
|
|
|
+ this.inputForm.detailFor1020 = []
|
|
|
+ this.inputForm.detailFor1030 = []
|
|
|
+ details.forEach(item => {
|
|
|
+ if (item.sort.toString().startsWith('1010')) {
|
|
|
+ this.inputForm.detailFor1010.push(item)
|
|
|
+ this.tableKeyClient = Math.random()
|
|
|
+ }
|
|
|
+ if (item.sort.toString().startsWith('1020')) {
|
|
|
+ this.inputForm.detailFor1020.push(item)
|
|
|
+ this.tableKeyClient2 = Math.random()
|
|
|
+ }
|
|
|
+ if (item.sort.toString().startsWith('1030')) {
|
|
|
+ this.inputForm.detailFor1030.push(item)
|
|
|
+ this.tableKeyClient3 = Math.random()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
openContractForm () {
|
|
|
if (!this.commonJS.isEmpty(this.inputForm.contractId)) {
|
|
|
// this.$refs.projectInfoForm.init(this.inputForm.contractId)
|
|
|
@@ -984,6 +1198,11 @@
|
|
|
this.inputForm.signatureFileList = data
|
|
|
})
|
|
|
}
|
|
|
+ // 列表处理
|
|
|
+ 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) })
|
|
|
this.reportReviewService.save(this.inputForm)
|
|
|
this.projectReportService.saveForm(this.inputForm).then(({data}) => {
|
|
|
// callback(data.businessTable, data.businessId, this.inputForm)
|
lizhenhao