diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue index 8d6273f1..d5e3f1e1 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue @@ -460,7 +460,7 @@ export default { // 是否试行 this.formInline.tryFlag = result.try_flag // 试行周期 - this.formInline.trialPeriod = result.trial_period + this.formInline.trialPeriod = result.trial_period || undefined // 零部件名称 this.formInline.partName = result.part_name this.formInline.partName_dictText = result.part_name_dictText diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index bab61035..1a060491 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -149,7 +149,9 @@ export default { // 把数据抛出,在线编辑不知道要不要抛 const data = {} data.formInline = this.$refs.baseInfoForm.formInline - data.formInline.standardSystem = data.formInline.standardSystem.map(item => item.value).join(',') + if (data.formInline.standardSystem && data.formInline.standardSystem.length > 0) { + data.formInline.standardSystem = data.formInline.standardSystem.map(item => item.value).join(',') + } data.dataSource = this.dataSource return data }, @@ -159,7 +161,9 @@ export default { await this.$refs.baseInfoForm.$refs.ruleForm.validate(valid => { if (valid) { data.formInline = this.$refs.baseInfoForm.formInline - data.formInline.standardSystem = data.formInline.standardSystem.map(item => item.value).join(',') + if (data.formInline.standardSystem && data.formInline.standardSystem.length > 0) { + data.formInline.standardSystem = data.formInline.standardSystem.map(item => item.value).join(',') + } data.dataSource = this.dataSource } else { data = false diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index 05ce4cce..2532541c 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -237,7 +237,7 @@ export default { methods: { // 根据流程id获取数据并回显 getProcessData (taskId) { - this.laoding = true + this.loading = true enStandardStartUseGetDataById(taskId).then(res => { if (res.success) { this.model = res.result