[update] 修改bug87822
This commit is contained in:
+18
-7
@@ -65,9 +65,8 @@
|
|||||||
:wrapperCol="$i18n.locale === EN ? longWrapperColEn : longWrapperCol"
|
:wrapperCol="$i18n.locale === EN ? longWrapperColEn : longWrapperCol"
|
||||||
:label="$t('standardNumber') + '/' + $t('standardName')"
|
:label="$t('standardNumber') + '/' + $t('standardName')"
|
||||||
:colon="formItemColon">
|
:colon="formItemColon">
|
||||||
<a-input placeholder=""
|
<a v-if="processInfoModel.standardId" @click.capture="standardClick">{{ processInfoModel.standardNumberName }}</a>
|
||||||
disabled
|
<div v-else>{{ processInfoModel.standardNumberName }}</div>
|
||||||
v-decorator="['standardNumberName']" />
|
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col v-if="[2, 3, 4, 6, 7, 8, 9, 10].includes(currentNode)" :span="24">
|
<a-col v-if="[2, 3, 4, 6, 7, 8, 9, 10].includes(currentNode)" :span="24">
|
||||||
@@ -77,9 +76,7 @@
|
|||||||
:wrapperCol="$i18n.locale === EN ? longWrapperColEn : longWrapperCol"
|
:wrapperCol="$i18n.locale === EN ? longWrapperColEn : longWrapperCol"
|
||||||
:label="$t('applicableMarket')"
|
:label="$t('applicableMarket')"
|
||||||
:colon="formItemColon">
|
:colon="formItemColon">
|
||||||
<a-input placeholder=""
|
<div>{{ processInfoModel.applicableMarket_dictText }}</div>
|
||||||
disabled
|
|
||||||
v-decorator="['applicableMarket_dictText']" />
|
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
@@ -333,6 +330,7 @@ export default {
|
|||||||
model: {},
|
model: {},
|
||||||
draftModel: null, // 草稿Json转化的对象
|
draftModel: null, // 草稿Json转化的对象
|
||||||
processInfoForm: this.$form.createForm(this),
|
processInfoForm: this.$form.createForm(this),
|
||||||
|
processInfoModel: {},
|
||||||
labelCol: {
|
labelCol: {
|
||||||
xs: { span: 24 },
|
xs: { span: 24 },
|
||||||
xl: { span: 6 },
|
xl: { span: 6 },
|
||||||
@@ -433,15 +431,19 @@ export default {
|
|||||||
if (this.model.infoJsonStr) {
|
if (this.model.infoJsonStr) {
|
||||||
// 标准编号/标准名称
|
// 标准编号/标准名称
|
||||||
param.standardNumberName = this.draftModel.businessInfoDTO.standardInfo.standardNumber + ' ' + this.draftModel.businessInfoDTO.standardInfo.standardName
|
param.standardNumberName = this.draftModel.businessInfoDTO.standardInfo.standardNumber + ' ' + this.draftModel.businessInfoDTO.standardInfo.standardName
|
||||||
|
// 标准id
|
||||||
|
param.standardId = this.draftModel.businessInfoDTO.standardInfo.standardId || ''
|
||||||
// 适用市场
|
// 适用市场
|
||||||
param.applicableMarket_dictText = this.draftModel.businessInfoDTO.standardInfo.applicableMarket_dictText
|
param.applicableMarket_dictText = this.draftModel.businessInfoDTO.standardInfo.applicableMarket_dictText
|
||||||
} else {
|
} else {
|
||||||
// 标准编号/标准名称
|
// 标准编号/标准名称
|
||||||
param.standardNumberName = this.model.businessInfoDTO.standardInfo.standardNumber + ' ' + this.model.businessInfoDTO.standardInfo.standardName
|
param.standardNumberName = this.model.businessInfoDTO.standardInfo.standardNumber + ' ' + this.model.businessInfoDTO.standardInfo.standardName
|
||||||
|
// 标准id
|
||||||
|
param.standardId = this.model.businessInfoDTO.standardInfo.standardId || ''
|
||||||
// 适用市场
|
// 适用市场
|
||||||
param.applicableMarket_dictText = this.model.businessInfoDTO.standardInfo.applicableMarket_dictText
|
param.applicableMarket_dictText = this.model.businessInfoDTO.standardInfo.applicableMarket_dictText
|
||||||
}
|
}
|
||||||
this.processInfoForm.setFieldsValue(pick(param, 'standardNumberName', 'applicableMarket_dictText'))
|
this.processInfoModel = Object.assign({}, param)
|
||||||
}
|
}
|
||||||
if (this.$refs.baseInfoRef) {
|
if (this.$refs.baseInfoRef) {
|
||||||
this.$refs.baseInfoRef.initData(this.draftModel ? this.draftModel.businessInfoDTO : this.model.businessInfoDTO)
|
this.$refs.baseInfoRef.initData(this.draftModel ? this.draftModel.businessInfoDTO : this.model.businessInfoDTO)
|
||||||
@@ -466,6 +468,15 @@ export default {
|
|||||||
this.processInfoForm.setFieldsValue(pick(param, 'processName'))
|
this.processInfoForm.setFieldsValue(pick(param, 'processName'))
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 标准编号、标准名称点击
|
||||||
|
standardClick () {
|
||||||
|
this.$openPageNewSheet({
|
||||||
|
path: '/standardRegulationLibrary/foreignStandardDetailPage',
|
||||||
|
query: {
|
||||||
|
id: this.processInfoModel.standardId
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
// 子组件控制loading
|
// 子组件控制loading
|
||||||
changeLoading (loading) {
|
changeLoading (loading) {
|
||||||
this.loading = loading
|
this.loading = loading
|
||||||
|
|||||||
Reference in New Issue
Block a user