diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index d2f54906..637740b1 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -261,6 +261,25 @@ const addInspectionRectificationPlanTable = (params) => postAction('/laws.enterp
const editInspectionRectificationPlanTable = (params) => postAction('/laws.enterprise/enterpriseStandardInspectRectifyPlan/edit', params)
// 稽查流程表-通过稽查内容id查寻稽查报告
const queryByInspectContentId = (params) => getAction('/laws.enterprise/EnterpriseStandardInspectReport/queryByInspectContentId', params)
+
+/* 稽查延期申请 */
+// 生成项目id
+const getInspectExtensionProjectId = (params) => getAction('/process/esInspectDelayApplyFlow/getProjectId', params)
+// 详情信息
+const getInspectExtensionDetail = (params) => getAction('/process/esInspectDelayApplyFlow/queryDetailByProjectId', params)
+// 发起
+const startInspectExtension = (params) => postAction('/process/esInspectDelayApplyFlow/flowStart', params)
+// 审批
+const approvalInspectExtension = (params) => postAction('/process/esInspectDelayApplyFlow/flowApproval', params)
+// 转办
+const transferInspectExtension = (params) => getAction('/process/esInspectDelayApplyFlow/flowTransfer', params)
+// 保存
+const saveInspectExtension = (params) => postAction('/process/esInspectDelayApplyFlow/flowSave', params)
+// 延期申请流程表-添加
+const addInspectExtensionTable = (params) => postAction('/esinspectdelayapply/processEsInspectDelayApply/add', params)
+// 延期申请流程表-编辑
+const editInspectExtensionTable = (params) => postAction('/esinspectdelayapply/processEsInspectDelayApply/edit', params)
+
export {
getProcessNodeList,
@@ -392,5 +411,14 @@ export {
editInspectionReportTable,
addInspectionRectificationPlanTable,
editInspectionRectificationPlanTable,
- queryByInspectContentId
+ queryByInspectContentId,
+
+ getInspectExtensionProjectId,
+ getInspectExtensionDetail,
+ startInspectExtension,
+ approvalInspectExtension,
+ transferInspectExtension,
+ saveInspectExtension,
+ addInspectExtensionTable,
+ editInspectExtensionTable
}
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 2ce4a93f..1a051f94 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -195,7 +195,7 @@ export const ProcessKey = {
// 企标稽查流程
ES_INSPECTION_PROCESS: { text: 'inspect_process', value: 'inspect_process' },
// 稽查延期申请流程
- INSPECTION_EXTENSION_REQUEST_PROCESS: { text: 'inspect_plan', value: 'inspect_process' },
+ INSPECTION_EXTENSION_REQUEST_PROCESS: { text: 'inspect_delay_apply_process', value: 'inspect_delay_apply_process' },
// 企标稽查整改
ES_INSPECTION_RECTIFICATION: { text: 'inspect_plan', value: 'inspect_process' }
}
@@ -276,10 +276,10 @@ export const EsInspectionProcess = new EsEnums({
// 稽查延期申请流程
export const InspectionExtensionRequestProcess = new EsEnums({
- initiate: { text: '稽查负责人申请延期', value: '1', btn: 6 },
- directorLeaderApproval: { text: '负责人主管级领导审批', value: '2', btn: 27 },
- contactEvaluation: { text: '稽查联络人评估', value: '3', btn: 27 },
- directorSuperiorLeaderApproval: { text: '负责人主管级上一级领导审批', value: '4', btn: 27 }
+ initiate: { text: '稽查负责人申请延期', value: 'responsible_start', btn: 6 },
+ directorLeaderApproval: { text: '负责人主管级领导审批', value: 'leader_approval', btn: 27 },
+ contactEvaluation: { text: '稽查联络人评估', value: 'liaisons_assess', btn: 27 },
+ directorSuperiorLeaderApproval: { text: '负责人主管级上一级领导审批', value: 'leader_up_level', btn: 27 }
})
// 企标稽查整改
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
index a6afb9f1..653cb133 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
@@ -95,7 +95,7 @@
-
+
@@ -162,6 +162,8 @@ export default {
xs: { span: 24 },
sm: { span: 22 }
},
+ // 流程key
+ processKey: ProcessKey.ES_INSPECTION_PLAN.value,
// 当前流程信息
EsInspectionPlan,
info: {},
@@ -234,9 +236,14 @@ export default {
this.currentNode = nodeId || EsInspectionPlan.initiate.value
this.currentNodeName = taskName || EsInspectionPlan.initiate.text
this.projectId = projectId
- this.btn = EsInspectionPlan.propertyOfValue('btn', this.currentNode)
+ this.btn = EsInspectionPlan.propertyOfValue('btn', this.currentNode) || 0
+ // 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
+ if (nodeId && !EsInspectionPlan.keyOfValue(nodeId)) {
+ // 审批和同意按钮
+ this.btn = 24
+ }
// 查询人员信息
- this.getPersonInfoStructure(ProcessKey.ES_INSPECTION_PLAN.value, () => {
+ this.getPersonInfoStructure(this.processKey, () => {
this.initPersonInfoData(this.currentNode === EsInspectionPlan.initiate.value)
})
// 如果是待办进来,就获取详情数据
@@ -315,7 +322,7 @@ export default {
}
// 通过表格中的所属部门人员获取稽查征求意见对象
const userList = this.$refs.inspectionPlanTable.dataSource.map(item => item.objectOfConsultation.split(',')).flat(Infinity)
- personnelObj.opinionFillList = Array.from(new Set(userList))
+ personnelObj.opinionFillList = Array.from(new Set(userList)).filter(item => item)
}
return personnelObj
},
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
index 4095d654..2e41470a 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
@@ -63,9 +63,9 @@
-
+
-
+
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
index e0ebd75b..c73c673d 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
@@ -76,7 +76,7 @@
-
+
@@ -108,7 +108,7 @@ import ProcessDetailList from '@comp/ProcessDetailList'
import InspectionProcessTable
from '@views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable'
import UserSelectModal from '@comp/selection/UserSelectModal'
-import { EsInspectionProcess, ProcessKey } from '@/enums/commonEnums'
+import { EsInspectionPlan, EsInspectionProcess, ProcessKey } from '@/enums/commonEnums'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import {
approvalInspectProcess,
@@ -141,6 +141,8 @@ export default {
xs: { span: 24 },
sm: { span: 22 }
},
+ // 流程key
+ processKey: ProcessKey.ES_INSPECTION_PROCESS.value,
// 当前流程信息
EsInspectionProcess,
info: {},
@@ -192,9 +194,14 @@ export default {
this.currentNode = nodeId || EsInspectionProcess.initiate.value
this.currentNodeName = taskName || EsInspectionProcess.initiate.text
this.projectId = projectId
- this.btn = EsInspectionProcess.propertyOfValue('btn', this.currentNode)
+ this.btn = EsInspectionProcess.propertyOfValue('btn', this.currentNode) || 0
+ // 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
+ if (nodeId && !EsInspectionPlan.keyOfValue(nodeId)) {
+ // 审批和同意按钮
+ this.btn = 24
+ }
// 查询人员信息
- this.getPersonInfoStructure(ProcessKey.ES_INSPECTION_PROCESS.value, () => {
+ this.getPersonInfoStructure(this.processKey, () => {
this.initPersonInfoData(this.currentNode === EsInspectionProcess.initiate.value)
})
// 如果是待办进来,就获取详情数据
@@ -225,7 +232,6 @@ export default {
*/
loadPage () {
const { projectId, taskId } = this.$route.query
- this.btn = EsInspectionProcess.propertyOfValue('btn', this.currentNode)
this.loading = true
getInspectProcessDetail({
projectId,
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
index f41e3110..105a8c62 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
@@ -142,7 +142,7 @@ export default {
const url = previewPdf(file.id)
this.iframeSrc = url
} else if (fileSuffix === 'docx') {
- const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
+ const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.fileName}`
// word文件仍使用KKFile进行预览
const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
this.iframeSrc = url
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
index 777ab727..00d68c1b 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
@@ -211,6 +211,7 @@ export default {
},
edit (data, record) {
this.data = Object.assign({}, data)
+ this.model = Object.assign({}, record)
// 获取章节条款下拉
this.initSectionClauseList()
const { inspectContentId, requirement, executionStatus, attachment, evaluateScore } = record.enterpriseStandardInspectReport || {}
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
index f2ed8e66..7ee6772f 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
@@ -116,6 +116,7 @@ export default {
},
edit (data, record) {
this.data = Object.assign({}, data)
+ this.model = Object.assign({}, record)
this.form = Object.assign({}, record)
// 获取章节条款下拉
this.initSectionClauseList()
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
index f79da865..1994028b 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
@@ -100,7 +100,7 @@ import InspectionProcessReport
from '@views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport'
import InspectionProcessRectificationPlan
from '@views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan'
-import { EsInspectionPlan, EsInspectionProcess } from '@/enums/commonEnums'
+import { EsInspectionProcess } from '@/enums/commonEnums'
import { editInspectProcessTable } from '@api/workCenter'
import { getAction } from '@api/manage'
export default {
@@ -267,9 +267,6 @@ export default {
return
}
this.filters.projectId = this.projectId
- if (this.currentNode === EsInspectionPlan.fillInComments.value) {
- this.filters.nodeId = this.$route.query.nodeId
- }
this.loadData()
}
}
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
index 9d7f2bbe..2c0caf6e 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
@@ -128,10 +128,9 @@ export default {
]
}
},
- created () {
- },
methods: {
show (record) {
+ this.filters.inspectStatus = '1'
this.loadData()
this.model = Object.assign({}, record)
this.visible = true
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
index ccecbd4b..795d9195 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
@@ -76,7 +76,7 @@
-
+
@@ -107,9 +107,13 @@ import PersonnelInfo from '@comp/PersonnelInfo'
import ProcessDetailList from '@comp/ProcessDetailList'
import ExtensionRequestTable from '@views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable'
import UserSelectModal from '@comp/selection/UserSelectModal'
-import { InspectionExtensionRequestProcess, ProcessKey } from '@/enums/commonEnums'
+import { EsInspectionPlan, InspectionExtensionRequestProcess, ProcessKey } from '@/enums/commonEnums'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
-import { getInspectPlanDetail, getInspectPlanProjectId } from '@api/workCenter'
+import {
+ approvalInspectExtension,
+ getInspectExtensionDetail,
+ getInspectExtensionProjectId, saveInspectExtension, startInspectExtension, transferInspectExtension
+} from '@api/workCenter'
export default {
name: 'InspectionExtensionRequestProcess',
@@ -136,6 +140,8 @@ export default {
xs: { span: 24 },
sm: { span: 22 }
},
+ // 流程key
+ processKey: ProcessKey.INSPECTION_EXTENSION_REQUEST_PROCESS.value,
// 当前流程信息
InspectionExtensionRequestProcess,
info: {},
@@ -187,9 +193,14 @@ export default {
this.currentNode = nodeId || InspectionExtensionRequestProcess.initiate.value
this.currentNodeName = taskName || InspectionExtensionRequestProcess.initiate.text
this.projectId = projectId
- this.btn = InspectionExtensionRequestProcess.propertyOfValue('btn', this.currentNode)
+ this.btn = InspectionExtensionRequestProcess.propertyOfValue('btn', this.currentNode) || 0
+ // 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
+ if (nodeId && !EsInspectionPlan.keyOfValue(nodeId)) {
+ // 审批和同意按钮
+ this.btn = 24
+ }
// 查询人员信息
- this.getPersonInfoStructure(ProcessKey.INSPECTION_EXTENSION_REQUEST_PROCESS.value, () => {
+ this.getPersonInfoStructure(this.processKey, () => {
this.initPersonInfoData(this.currentNode === InspectionExtensionRequestProcess.initiate.value)
})
// 如果是待办进来,就获取详情数据
@@ -207,7 +218,7 @@ export default {
getProjectId () {
this.loading = true
// 否则就是创建一个新的流程
- getInspectPlanProjectId().then(res => {
+ getInspectExtensionProjectId().then(res => {
if (res) {
this.projectId = res + ''
}
@@ -220,9 +231,8 @@ export default {
*/
loadPage () {
const { projectId, taskId } = this.$route.query
- this.btn = InspectionExtensionRequestProcess.propertyOfValue('btn', this.currentNode)
this.loading = true
- getInspectPlanDetail({
+ getInspectExtensionDetail({
projectId,
taskId
}).then(res => {
@@ -267,15 +277,14 @@ export default {
personnelObj[key] = personnelObj[key].split(',')
}
}
- // 通过表格中的所属部门人员获取稽查征求意见对象
- const userList = this.$refs.inspectionPlanTable.dataSource.map(item => item.objectOfConsultation.split(',')).flat(Infinity)
- personnelObj.opinionFillList = Array.from(new Set(userList))
+ const liaisonsList = this.$refs.extensionRequestTable.dataSource.map(item => item.liaisons)
+ personnelObj.liaisonsList = Array.from(new Set(liaisonsList)).filter(item => item)
}
return personnelObj
},
// 获取页面参数
async getPageParams (isValidate = true) {
- if (this.$refs.inspectionPlanTable.dataSource.length === 0) {
+ if (this.$refs.extensionRequestTable.dataSource.length === 0) {
this.$message.warning(this.$t('addAtLeastOneRowOfData'))
throw new Error('base')
}
@@ -328,7 +337,7 @@ export default {
taskId: this.$route.query.taskId,
userId
}
- Promise.resolve(params).then(res => {
+ transferInspectExtension(params).then(res => {
if (res.success) {
this.$message.success(res.message)
this.goBack()
@@ -347,7 +356,7 @@ export default {
this.loading = true
this.getPageParams(false).then(res => {
console.log(res)
- return Promise.resolve(res)
+ return saveInspectExtension(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -370,10 +379,10 @@ export default {
let fn
switch (this.currentNode) {
case InspectionExtensionRequestProcess.initiate.value:
- fn = Promise.resolve
+ fn = startInspectExtension
break
default:
- fn = Promise.resolve
+ fn = approvalInspectExtension
break
}
this.getPageParams().then(res => {
@@ -400,7 +409,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = true
- return Promise.resolve(res)
+ return approvalInspectExtension(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -422,7 +431,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = false
- return Promise.resolve(res)
+ return approvalInspectExtension(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
index 40075bc7..c4b6b6b3 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:can-drag="true"
rowKey="id"
+ :loading="loading"
:pagination="false"
:scroll="{x: '100%'}"
@change="tableOnChange">
@@ -28,7 +29,7 @@
@@ -64,6 +65,8 @@ import ExtensionRequestTableModal
from '@views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal'
import RequestExtensionModal from '@views/workCenter/inspectionExtensionRequestProcess/modules/RequestExtensionModal'
import { InspectionExtensionRequestProcess } from '@/enums/commonEnums'
+import { editInspectExtensionTable } from '@api/workCenter'
+import { getAction } from '@api/manage'
export default {
name: 'ExtensionRequestTable',
components: { RequestExtensionModal, ExtensionRequestTableModal, JTable },
@@ -73,12 +76,19 @@ export default {
currentNode: {
type: String,
required: true
+ },
+ // 项目id
+ projectId: {
+ type: String,
+ required: true
}
},
data () {
return {
+ disableMixinCreated: true,
url: {
- list: ''
+ list: '/esinspectdelayapply/processEsInspectDelayApply/queryByList',
+ delete: '/esinspectdelayapply/processEsInspectDelayApply/delete'
},
model: {},
userList: [],
@@ -98,56 +108,56 @@ export default {
title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardNumber'),
align: 'center',
width: 180,
- dataIndex: 'inspectionBasisStandardNumber',
+ dataIndex: 'inspectNo',
scopedSlots: { customRender: 'standard' }
},
{ // 稽查依据标准名称
title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardName'),
align: 'center',
width: 180,
- dataIndex: 'inspectionBasisStandardName',
+ dataIndex: 'inspectName',
scopedSlots: { customRender: 'standard' }
},
{ // 计划稽查对象
title: this.$t('workCenter.esInspectionPlan.planInspectionObjects'),
align: 'center',
width: 120,
- dataIndex: 'planInspectionObjects',
+ dataIndex: 'planInspectObject_dictText',
scopedSlots: { customRender: 'text' }
},
{ // 计划稽查日期
title: this.$t('workCenter.esInspectionPlan.planInspectionDate'),
align: 'center',
width: 120,
- dataIndex: 'planInspectionDate',
+ dataIndex: 'planInspectDate',
scopedSlots: { customRender: 'text' }
},
{ // 稽查负责人
title: this.$t('workCenter.esInspectionPlan.inspectionDirector'),
align: 'center',
width: 120,
- dataIndex: 'inspectionDirector',
+ dataIndex: 'inspectUserDictText',
scopedSlots: { customRender: 'text' }
},
{ // 状态
title: this.$t('workCenter.incExtensionRequest.state'),
align: 'center',
width: 120,
- dataIndex: 'state',
+ dataIndex: 'inspectStatus_dictText',
scopedSlots: { customRender: 'text' }
},
{ // 申请延期日期
title: this.$t('workCenter.incExtensionRequest.requestExtensionDate'),
align: 'center',
width: 120,
- dataIndex: 'requestExtensionDate',
+ dataIndex: 'requestDelayDate',
scopedSlots: { customRender: 'text' }
},
{ // 延期说明
title: this.$t('workCenter.incExtensionRequest.extensionDescription'),
align: 'center',
width: 120,
- dataIndex: 'extensionDescription',
+ dataIndex: 'delayDescription',
scopedSlots: { customRender: 'text' }
},
{ // 稽查联络人
@@ -157,7 +167,7 @@ export default {
],
align: 'center',
width: 200,
- dataIndex: 'inspectionContactPerson',
+ dataIndex: 'liaisons',
scopedSlots: { customRender: 'inspectionContactPerson' }
},
{
@@ -204,12 +214,41 @@ export default {
})
}
},
+ watch: {
+ // 列表查询带上项目id
+ projectId: {
+ immediate: true,
+ handler (val) {
+ if (!val) {
+ return
+ }
+ this.filters.projectId = this.projectId
+ if (this.currentNode === InspectionExtensionRequestProcess.contactEvaluation.value) {
+ this.filters.nodeId = this.$route.query.nodeId
+ }
+ this.loadData()
+ }
+ }
+ },
mounted () {
if (this.isInitiate) {
this.getUserList()
}
},
methods: {
+ // 修改:稽查联络人
+ changeRowData (record, field) {
+ editInspectExtensionTable({
+ id: record.id,
+ [field]: record[field]
+ }).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ } else {
+ this.$message.warn(res.message)
+ }
+ })
+ },
// 申请延期
handleRequestExtension (record) {
this.$refs.requestExtensionModal.edit(record)
@@ -245,7 +284,43 @@ export default {
return this.getNumParentNode(el.parentNode, n - 1)
},
handleAdd () {
- this.$refs.extensionRequestTableModal.show()
+ this.$refs.extensionRequestTableModal.show({
+ projectId: this.projectId
+ })
+ },
+ loadData (arg) {
+ if (!this.url.list) {
+ this.$message.warning('请设置url.list属性!')
+ return
+ }
+ // 加载数据 若传入参数1则加载第一页的内容
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ const params = this.getQueryParams()// 查询条件
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ // update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
+ const data = res.result.records || res.result
+ this.dataSource = data.map(item => {
+ return {
+ ...item,
+ liaisons: item.liaisons || undefined
+ }
+ })
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ // update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
}
}
}
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue
index 95f9f074..e0bf4dfd 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue
@@ -3,12 +3,12 @@
:title="title"
:width="drawerWidth"
:visible="visible"
- :confirmLoading="confirmLoading"
+ :confirmLoading="loading"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
:cancelText="$t('close')">
-
+