diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index cee580df..70b133d5 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -232,11 +232,6 @@ module.exports = { creator: '创建人', initiator: '发起人', departOpinion: '所属部门意见', - node1: '稽查联络人发起计划', - node2: '稽查征求意见对象填写征求意见', - node3: '稽查联络人汇总', - node4: '相关人员会签', - node5: '联络人主管级领导批准', opinion: '意见', writeOpinion: '填写意见', solicitOpinion: '征求意见', @@ -280,5 +275,21 @@ module.exports = { requestExtensionDate: '申请延期日期', extensionDescription: '延期说明', inspectionContactPerson: '稽查联络人' + }, + // 企标稽查整改 + esInspectionRectification: { + inspectionBasis: '稽查依据', + accordingToTerms: '依据条款', + standardContentOrDemand: '标准内容或要求', + rectificationUnit: '整改单位', + nonCompliantDescription: '不符合项描述', + rectificationMeasures: '整改措施', + rectificationDirector: '整改负责人', + planDoneDate: '计划完成日期', + operationType: '操作类型', + rectificationResults: '整改结果', + file: '附件', + requestExtensionDate: '申请延期日期', + extensionDescription: '延期说明' } } diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 3ea839d1..4f1c35e8 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -249,11 +249,6 @@ module.exports = { creator: '创建人', initiator: '发起人', departOpinion: '所属部门意见', - node1: '稽查联络人发起计划', - node2: '稽查征求意见对象填写征求意见', - node3: '稽查联络人汇总', - node4: '相关人员会签', - node5: '联络人主管级领导批准', opinion: '意见', writeOpinion: '填写意见', solicitOpinion: '征求意见', @@ -297,5 +292,21 @@ module.exports = { requestExtensionDate: '申请延期日期', extensionDescription: '延期说明', inspectionContactPerson: '稽查联络人' + }, + // 企标稽查整改 + esInspectionRectification: { + inspectionBasis: '稽查依据', + accordingToTerms: '依据条款', + standardContentOrDemand: '标准内容或要求', + rectificationUnit: '整改单位', + nonCompliantDescription: '不符合项描述', + rectificationMeasures: '整改措施', + rectificationDirector: '整改负责人', + planDoneDate: '计划完成日期', + operationType: '操作类型', + rectificationResults: '整改结果', + file: '附件', + requestExtensionDate: '申请延期日期', + extensionDescription: '延期说明' } } diff --git a/src/components/selection/WorkGroupSelection.vue b/src/components/selection/WorkGroupSelection.vue index cd82f238..8fc67ed4 100644 --- a/src/components/selection/WorkGroupSelection.vue +++ b/src/components/selection/WorkGroupSelection.vue @@ -164,7 +164,7 @@ export default { }, // 点击选择按钮 workGroupClick () { - this.$refs.workGroupSelectionModal.show() + this.$refs.workGroupSelectionModal.show(this.textVals) }, // 输入框输入监听 indexClick (event) { diff --git a/src/components/selection/WorkGroupSelectionModal.vue b/src/components/selection/WorkGroupSelectionModal.vue index 56c45071..8c8650ab 100644 --- a/src/components/selection/WorkGroupSelectionModal.vue +++ b/src/components/selection/WorkGroupSelectionModal.vue @@ -96,10 +96,32 @@ export default { } }, methods: { - show () { + show (textVals) { this.visible = true this.checkedRows = [] this.checkedKeys = [] + if (textVals) { + this.$nextTick(() => { + const nodes = this.findKeysByNodes(textVals.split(',')) + this.checkedRows = nodes + this.checkedKeys = nodes.map(item => item.key) + }) + } + }, + findKeysByNodes (titles) { + const nodes = [] + function searchTree (node) { + if (titles.includes(node.title)) { + nodes.push(node) + } + if (node.children) { + for (const child of node.children) { + searchTree(child) + } + } + } + searchTree(this.treeData[0]) + return nodes }, // 处理工作组树数据结构 dealTreeData (treeData) { diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index 928382fa..74b61973 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -99,7 +99,7 @@ export default { }, { // 企标稽查整改 title: this.$t('workCenter.newProcess.enterpriseStandardInspectionAndRectification'), - path: '' + path: '/workCenter/EnterpriseStandardInspectionRectification' }, { // 权限申请流程 title: this.$t('workCenter.newProcess.permissionApplicationProcess'), diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue new file mode 100644 index 00000000..d0ae4d23 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/modules/BaseInfoForm.vue new file mode 100644 index 00000000..48b1c57f --- /dev/null +++ b/src/views/workCenter/enterpriseStandardInspectionRectification/modules/BaseInfoForm.vue @@ -0,0 +1,315 @@ + + + + +