[update] 修改bug87726
This commit is contained in:
@@ -52,6 +52,7 @@ module.exports = {
|
|||||||
carTypeFileTemplateDownload: 'Model project file template download',
|
carTypeFileTemplateDownload: 'Model project file template download',
|
||||||
carTypeFileTemplateName: 'Model project file upload template',
|
carTypeFileTemplateName: 'Model project file upload template',
|
||||||
pleaseGenerate: 'Please generate data',
|
pleaseGenerate: 'Please generate data',
|
||||||
|
pleaseAnewGenerate: 'Please re-generate the data',
|
||||||
pleaseClickNext: 'Please click Next to display the information',
|
pleaseClickNext: 'Please click Next to display the information',
|
||||||
pleaseSelectDesignEngineer: 'Please select Design Engineer',
|
pleaseSelectDesignEngineer: 'Please select Design Engineer',
|
||||||
atLeastSelectOneDesignEngineer: 'Please select at least one design engineer'
|
atLeastSelectOneDesignEngineer: 'Please select at least one design engineer'
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ module.exports = {
|
|||||||
carTypeFileTemplateDownload: '车型项目文件模板下载',
|
carTypeFileTemplateDownload: '车型项目文件模板下载',
|
||||||
carTypeFileTemplateName: '车型项目文件上传模板',
|
carTypeFileTemplateName: '车型项目文件上传模板',
|
||||||
pleaseGenerate: '请先生成数据',
|
pleaseGenerate: '请先生成数据',
|
||||||
|
pleaseAnewGenerate: '请重新生成数据',
|
||||||
pleaseClickNext: '请点击下一步显示信息',
|
pleaseClickNext: '请点击下一步显示信息',
|
||||||
pleaseSelectDesignEngineer: '请选择设计工程师',
|
pleaseSelectDesignEngineer: '请选择设计工程师',
|
||||||
atLeastSelectOneDesignEngineer: '请至少选择一条数据的设计工程师'
|
atLeastSelectOneDesignEngineer: '请至少选择一条数据的设计工程师'
|
||||||
|
|||||||
+20
-1
@@ -476,7 +476,8 @@ export default {
|
|||||||
id: ''
|
id: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
isRejectedData: false // 是否是被驳回的
|
isRejectedData: false, // 是否是被驳回的
|
||||||
|
isChangeStandardAfterClickGenerate: true // 是否修改标准后点击了生成按钮
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
@@ -496,6 +497,11 @@ export default {
|
|||||||
if (this.standardDataSource[0].standardId) {
|
if (this.standardDataSource[0].standardId) {
|
||||||
this.initInterpretGetFileByStandardId(this.standardDataSource[0].standardId)
|
this.initInterpretGetFileByStandardId(this.standardDataSource[0].standardId)
|
||||||
}
|
}
|
||||||
|
// 如果是json回显的话会有改完标准是否重新点击了生成
|
||||||
|
console.log('------------isChangeStandardAfterClickGenerate', data.isChangeStandardAfterClickGenerate)
|
||||||
|
if (data.isChangeStandardAfterClickGenerate) {
|
||||||
|
this.isChangeStandardAfterClickGenerate = data.isChangeStandardAfterClickGenerate === '1'
|
||||||
|
}
|
||||||
const formInline = {}
|
const formInline = {}
|
||||||
formInline.modelFile = data.standardInfo.modelFile
|
formInline.modelFile = data.standardInfo.modelFile
|
||||||
formInline.applicableMarket = data.standardInfo.applicableMarket
|
formInline.applicableMarket = data.standardInfo.applicableMarket
|
||||||
@@ -519,6 +525,8 @@ export default {
|
|||||||
// 组合businessInfoDTO,抛出
|
// 组合businessInfoDTO,抛出
|
||||||
const data = {}
|
const data = {}
|
||||||
data.standardInfo = Object.assign({}, this.standardDataSource[0], this.formInline)
|
data.standardInfo = Object.assign({}, this.standardDataSource[0], this.formInline)
|
||||||
|
// 更换标准后是否重新生成了,保存json的时候存一下,防止保存之前改了标准,再次办理的时候直接提交校验不到改了标准
|
||||||
|
data.isChangeStandardAfterClickGenerate = this.isChangeStandardAfterClickGenerate ? '1' : '0'
|
||||||
data.detailInfoList = JSON.parse(JSON.stringify(this.dataList))
|
data.detailInfoList = JSON.parse(JSON.stringify(this.dataList))
|
||||||
return data
|
return data
|
||||||
},
|
},
|
||||||
@@ -531,6 +539,11 @@ export default {
|
|||||||
// 提示请先生成数据
|
// 提示请先生成数据
|
||||||
this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.pleaseGenerate'))
|
this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.pleaseGenerate'))
|
||||||
data = false
|
data = false
|
||||||
|
} else if (!this.isChangeStandardAfterClickGenerate) {
|
||||||
|
// 改了标准之后没有点击生成按钮
|
||||||
|
// 提示请重新生成数据
|
||||||
|
this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.pleaseAnewGenerate'))
|
||||||
|
data = false
|
||||||
} else {
|
} else {
|
||||||
data.standardInfo = Object.assign({}, this.standardDataSource[0], this.formInline)
|
data.standardInfo = Object.assign({}, this.standardDataSource[0], this.formInline)
|
||||||
data.detailInfoList = JSON.parse(JSON.stringify(this.dataList))
|
data.detailInfoList = JSON.parse(JSON.stringify(this.dataList))
|
||||||
@@ -624,6 +637,8 @@ export default {
|
|||||||
obj.newAuthImplDate = result.new_auth_impl_date
|
obj.newAuthImplDate = result.new_auth_impl_date
|
||||||
this.standardDataSource[0] = obj
|
this.standardDataSource[0] = obj
|
||||||
this.isGetDataAfter = true
|
this.isGetDataAfter = true
|
||||||
|
// 修改了标准没有点击生成按钮
|
||||||
|
this.isChangeStandardAfterClickGenerate = false
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning(res.message)
|
this.$message.warning(res.message)
|
||||||
}
|
}
|
||||||
@@ -647,6 +662,8 @@ export default {
|
|||||||
manualAddOk (result, isEdit) {
|
manualAddOk (result, isEdit) {
|
||||||
console.log(result)
|
console.log(result)
|
||||||
this.standardDataSource[0] = Object.assign({}, result)
|
this.standardDataSource[0] = Object.assign({}, result)
|
||||||
|
// 修改了标准没有点击生成按钮
|
||||||
|
this.isChangeStandardAfterClickGenerate = false
|
||||||
this.$emit('processNameChange', (result.standardNumber || '') + '-' + (result.standardName || '') + '-' + '法规符合性排查')
|
this.$emit('processNameChange', (result.standardNumber || '') + '-' + (result.standardName || '') + '-' + '法规符合性排查')
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
},
|
},
|
||||||
@@ -700,6 +717,8 @@ export default {
|
|||||||
})
|
})
|
||||||
this.dataSource = JSON.parse(JSON.stringify(dataSource))
|
this.dataSource = JSON.parse(JSON.stringify(dataSource))
|
||||||
this.dataList = JSON.parse(JSON.stringify(dataSource))
|
this.dataList = JSON.parse(JSON.stringify(dataSource))
|
||||||
|
// 点击了生成按钮
|
||||||
|
this.isChangeStandardAfterClickGenerate = true
|
||||||
} else {
|
} else {
|
||||||
if (Array.isArray(res.message) && res.message.length > 0) {
|
if (Array.isArray(res.message) && res.message.length > 0) {
|
||||||
this.messageLineFeed(this.$t('fileUploadError'), res.message)
|
this.messageLineFeed(this.$t('fileUploadError'), res.message)
|
||||||
|
|||||||
Reference in New Issue
Block a user