diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 9638fdbc..15f4cd2e 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -331,7 +331,7 @@
@@ -348,7 +348,7 @@
@@ -365,7 +365,7 @@
@@ -523,14 +523,13 @@ export default {
components: { UserSelection, StandardSelection, UploadFile, TreeSelection },
props: {
/**
- * 编辑角色,是主起草人的话三个日期标准化填了的,主起草人不能修改;是联络人的话标准化未填写,联络人必填
- * drafter: 主起草人
- * contact: 联络人
+ * 部所联络人汇总节点的话三个日期标准化填了的,主起草人不能修改;是联络人的话标准化未填写,联络人必填
*/
- editRole: {
- type: String,
+ // 当前节点
+ currentNode: {
+ type: Number,
required: false,
- default: ''
+ default: 1
},
/**
* 来源:是tableBaseInfo的话必填项不一样
@@ -750,7 +749,9 @@ export default {
this.initStandardSystemOptions()
if (this.source === 'tableBaseInfo') {
for (const item of Object.values(this.rules)) {
- item[0].required = true
+ if (!['draftPlannedCompleteDate', 'solicitationDraftPlanCompleteDate', 'planApprovalDate'].includes(item)) {
+ item[0].required = true
+ }
}
this.rules = Object.assign({}, this.rules)
console.log(this.rules)
@@ -775,7 +776,7 @@ export default {
this.model = Object.assign({}, record)
this.formInline = Object.assign({}, record)
// 三个日期,如果标准化填写了,主起草人不能修改,标准化未填写,联络人必填
- if (this.editRole === 'drafter') {
+ if ([6].includes(this.currentNode)) {
// 是主起草人的编辑
// 草稿计划完成日期的处理
if (this.formInline.draftPlannedCompleteDate) {
@@ -792,7 +793,11 @@ export default {
// 计划报批日期已经填写了, 主起草人不能修改
this.planSubmissionDateDisabled = true
}
- } else if (this.editRole === 'contact') {
+ // 三个日期不必填
+ this.rules.draftPlannedCompleteDate[0].required = false
+ this.rules.solicitationDraftPlanCompleteDate[0].required = false
+ this.rules.planApprovalDate[0].required = false
+ } else if ([7].includes(this.currentNode)) {
// 是联络人的编辑,只能编辑3个日期,如果标准化填过了不能修改,未填的话必填
this.disabled = true
// 草稿计划完成日期的处理
@@ -823,21 +828,17 @@ export default {
if (!this.formInline.applicationType) {
this.formInline.applicationType = this.ApplicationCategory.INITIATION.value
}
- if (this.formInline.enStandardSystem && this.formInline.enStandardSystem.length > 0) {
- this.formInline.enStandardSystem = this.formInline.enStandardSystem ? this.formInline.enStandardSystem.split(',').map(item => {
- return { value: item }
- }) : []
- }
+ this.formInline.enStandardSystem = this.formInline.enStandardSystem ? this.formInline.enStandardSystem.split(',').map(item => {
+ return { value: item }
+ }) : []
},
look (record) {
this.visible = true
this.model = Object.assign({}, record)
this.formInline = Object.assign({}, record)
- if (this.formInline.enStandardSystem && this.formInline.enStandardSystem.length > 0) {
- this.formInline.enStandardSystem = this.formInline.enStandardSystem ? this.formInline.enStandardSystem.split(',').map(item => {
- return { value: item }
- }) : []
- }
+ this.formInline.enStandardSystem = this.formInline.enStandardSystem ? this.formInline.enStandardSystem.split(',').map(item => {
+ return { value: item }
+ }) : []
this.disabled = true
},
// 获取标准体系下拉框数据
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
index c6db04af..2ab9dc68 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
@@ -40,7 +40,7 @@
-
+
@@ -64,18 +64,6 @@ export default {
default: 1
}
},
- computed: {
- // 当前节点编辑的角色,用做弹框中的编辑特殊判断
- editRole () {
- if (this.currentNode === 4) {
- return 'drafter'
- } else if (this.currentNode === 5) {
- return 'contact'
- } else {
- return ''
- }
- }
- },
data () {
return {
loading: false,