Merge branch 'master' into 标准拆分译文变更
# Conflicts: # src/common/lang/en-us.js # src/common/lang/zh-cn.js # src/views/documentTool/documentSplit/modules/SplitAddForm.vue # src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
This commit is contained in:
danshihao
+56
-28
@@ -26,14 +26,13 @@
|
||||
<j-dict-select-tag dict-code="yn"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.sameAsPreviousVersion')"
|
||||
@nameChange="(name) => nameChange(name, 'isSameAsPrevVersion')"
|
||||
@dictChange="(name) => dictChange(name, 'isSameAsPrevVersion')"
|
||||
v-decorator="['isSameAsPrevVersion']"/>
|
||||
</a-form-item>
|
||||
<!--相对上一版变化点说明-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.explanationOfChangePoints')" :colon="false">
|
||||
<a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.standardInterpretationProcess.explanationOfChangePoints')"
|
||||
:maxLength="500"
|
||||
:rows="4"
|
||||
<a-input :placeholder="$t('pleaseEnter') + $t('workCenter.standardInterpretationProcess.explanationOfChangePoints')"
|
||||
:maxLength="50"
|
||||
:disabled="disabled"
|
||||
v-decorator="['changeDescription']" />
|
||||
</a-form-item>
|
||||
@@ -46,26 +45,33 @@
|
||||
</a-form-item>
|
||||
<!--涉及系统/部件-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.involvingSystemsComponents')" :colon="false">
|
||||
<tree-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.involvingSystemsComponents')"
|
||||
filedName="partName"
|
||||
type="checkbox"
|
||||
options-href="/laws/standard/partName/"
|
||||
:nameStr="model.partName"
|
||||
:disabled="disabled"
|
||||
@nameChange="nameChange"
|
||||
v-decorator="['partName']" />
|
||||
<tree-data-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.involvingSystemsComponents')"
|
||||
v-decorator="['partName']"
|
||||
fieldName="partName"
|
||||
:nameStr="model.partName_dictText"
|
||||
:disabled="disabled"
|
||||
@nameChange="nameChange"
|
||||
optionsHref="/laws/standard/partName/queryFirstList"/>
|
||||
<!--<tree-selection :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.involvingSystemsComponents')"-->
|
||||
<!-- filedName="partName"-->
|
||||
<!-- type="checkbox"-->
|
||||
<!-- options-href="/laws/standard/partName/"-->
|
||||
<!-- :nameStr="model.partName_dictText"-->
|
||||
<!-- :disabled="disabled"-->
|
||||
<!-- @nameChange="nameChange"-->
|
||||
<!-- v-decorator="['partName']" />-->
|
||||
</a-form-item>
|
||||
<!--关键控制器-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.keyController')" :colon="false">
|
||||
<j-multi-select-tag dict-code="key_controller"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.keyController')"
|
||||
@nameChange="(name) => nameChange(name, 'keyController')"
|
||||
@dictChange="(name) => dictChange(name, 'keyController')"
|
||||
v-decorator="['keyController']"/>
|
||||
</a-form-item>
|
||||
<!--责任部门-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.responsibleDepartment')" :colon="false">
|
||||
<j-select-depart :placeholder="$t('pleaseEnter')+$t('workCenter.standardInterpretationProcess.responsibleDepartment')"
|
||||
<j-select-depart :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.responsibleDepartment')"
|
||||
:backDepart="true"
|
||||
:disabled="disabled"
|
||||
multi
|
||||
@@ -79,12 +85,12 @@
|
||||
<j-multi-select-tag dict-code="responsible_module"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.responsibleDepartmentModule')"
|
||||
@nameChange="(name) => nameChange(name, 'responsibleModule')"
|
||||
@dictChange="(name) => dictChange(name, 'responsibleModule')"
|
||||
v-decorator="['responsibleModule']"/>
|
||||
</a-form-item>
|
||||
<!--关联部门-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.relatedDepartments')" :colon="false">
|
||||
<j-select-depart :placeholder="$t('pleaseEnter')+$t('workCenter.standardInterpretationProcess.relatedDepartments')"
|
||||
<j-select-depart :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.relatedDepartments')"
|
||||
:backDepart="true"
|
||||
:disabled="disabled"
|
||||
multi
|
||||
@@ -98,7 +104,7 @@
|
||||
<j-multi-select-tag dict-code="related_module"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.relatedDepartmentsModule')"
|
||||
@nameChange="(name) => nameChange(name, 'relatedModule')"
|
||||
@dictChange="(name) => dictChange(name, 'relatedModule')"
|
||||
v-decorator="['relatedModule']"/>
|
||||
</a-form-item>
|
||||
<!--适用车型-->
|
||||
@@ -106,7 +112,7 @@
|
||||
<j-multi-select-tag dict-code="applicable_vehicle_type"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.applications')"
|
||||
@nameChange="(name) => nameChange(name, 'applications')"
|
||||
@dictChange="(name) => dictChange(name, 'applications')"
|
||||
v-decorator="['applications']"/>
|
||||
</a-form-item>
|
||||
<!--动力类型-->
|
||||
@@ -114,7 +120,7 @@
|
||||
<j-multi-select-tag dict-code="dynamic_type"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.powerType')"
|
||||
@nameChange="(name) => nameChange(name, 'powerType')"
|
||||
@dictChange="(name) => dictChange(name, 'powerType')"
|
||||
v-decorator="['powerType']"/>
|
||||
</a-form-item>
|
||||
<!--专业领域-->
|
||||
@@ -126,6 +132,7 @@
|
||||
tree-checkable
|
||||
treeCheckStrictly
|
||||
@change="treeNameChange($event, 'domainArea')"
|
||||
:replaceFields="{title: isChinese() ? 'title' : 'enTitle'}"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.professionalField')"/>
|
||||
</a-form-item>
|
||||
<!--配置需求-->
|
||||
@@ -133,26 +140,26 @@
|
||||
<j-multi-select-tag dict-code="configuration_requirements"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.configurationRequirements')"
|
||||
@nameChange="(name) => nameChange(name, 'configurationRequirements')"
|
||||
@dictChange="(name) => dictChange(name, 'configurationRequirements')"
|
||||
v-decorator="['configurationRequirements']"/>
|
||||
</a-form-item>
|
||||
<!--新认证车实施日期-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.newCertificationImplementationDate')" :colon="false">
|
||||
<j-multiple-date-picker :placeholder="$t('pleaseEnter')+$t('workCenter.standardInterpretationProcess.newCertificationImplementationDate')"
|
||||
<j-multiple-date-picker :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.newCertificationImplementationDate')"
|
||||
fieldName="newCerImplementDate"
|
||||
:disabled="disabled"
|
||||
v-decorator="['newCerImplementDate']" />
|
||||
</a-form-item>
|
||||
<!--新生产车实施日期-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.newProduceImplementationDate')" :colon="false">
|
||||
<j-multiple-date-picker :placeholder="$t('pleaseEnter')+$t('workCenter.standardInterpretationProcess.newProduceImplementationDate')"
|
||||
<j-multiple-date-picker :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.newProduceImplementationDate')"
|
||||
fieldName="newProductionImplementation"
|
||||
:disabled="disabled"
|
||||
v-decorator="['newProductionImplementation']" />
|
||||
</a-form-item>
|
||||
<!--注册日期-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.registrationDate')" :colon="false">
|
||||
<j-multiple-date-picker :placeholder="$t('pleaseEnter')+$t('workCenter.standardInterpretationProcess.registrationDate')"
|
||||
<j-multiple-date-picker :placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.registrationDate')"
|
||||
fieldName="registrationDate"
|
||||
:disabled="disabled"
|
||||
v-decorator="['registrationDate']" />
|
||||
@@ -160,7 +167,7 @@
|
||||
<!--企业标准-->
|
||||
<a-form-item :label="$t('workCenter.standardInterpretationProcess.enterpriseStandards')" :colon="false">
|
||||
<standard-selection :source="StandardSource.ENTERPRISE.value"
|
||||
:placeholder="$t('pleaseEnter')+$t('workCenter.standardInterpretationProcess.enterpriseStandards')"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.enterpriseStandards')"
|
||||
:disabled="disabled"
|
||||
:disabledSourceSearch="true"
|
||||
type="radio"
|
||||
@@ -228,7 +235,7 @@
|
||||
<j-multi-select-tag dict-code="investigation_stage"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('pleaseSelect')+$t('workCenter.standardInterpretationProcess.investigationStage')"
|
||||
@nameChange="(name) => nameChange(name, 'investigationStage')"
|
||||
@dictChange="(name) => dictChange(name, 'investigationStage')"
|
||||
v-decorator="['investigationStage']"/>
|
||||
</a-form-item>
|
||||
<!--P3证明符合性的交付物名称-->
|
||||
@@ -267,13 +274,14 @@
|
||||
<script>
|
||||
import JMultipleDatePicker from '@comp/JMultipleDatePicker'
|
||||
import StandardSelection from '@comp/selection/StandardSelection'
|
||||
import TreeSelection from '@comp/selection/TreeSelection'
|
||||
import { StandardSource } from '@/enums/commonEnums'
|
||||
import STreeSelect from '@comp/STreeSelect'
|
||||
import { getFormDictTreeList } from '@api/api'
|
||||
import { findNodeByField } from '@/utils/util'
|
||||
import TreeDataSelection from '@comp/selection/TreeDataSelection'
|
||||
export default {
|
||||
name: 'InterpretationClauseTableModal',
|
||||
components: { STreeSelect, TreeSelection, StandardSelection, JMultipleDatePicker },
|
||||
components: { TreeDataSelection, STreeSelect, StandardSelection, JMultipleDatePicker },
|
||||
data () {
|
||||
return {
|
||||
StandardSource,
|
||||
@@ -346,6 +354,20 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
// 字典回显
|
||||
dictChange (dict, field) {
|
||||
console.log('字典回显', dict, field)
|
||||
if (Array.isArray(dict)) {
|
||||
this.model[field + '_dictText'] = dict.map(item => item.text).join(',')
|
||||
this.model[field + '_dictTextEn'] = dict.map(item => item.enText).join(',')
|
||||
} else if (dict) {
|
||||
this.model[field + '_dictText'] = dict.text
|
||||
this.model[field + '_dictTextEn'] = dict.enText
|
||||
} else {
|
||||
this.model[field + '_dictText'] = ''
|
||||
this.model[field + '_dictTextEn'] = ''
|
||||
}
|
||||
},
|
||||
// 下拉多选获取名称
|
||||
nameChange (name, field) {
|
||||
this.model[field + '_dictText'] = name
|
||||
@@ -355,15 +377,21 @@ export default {
|
||||
// 如果没有值就清空名字
|
||||
if (!depart) {
|
||||
this.model[field + '_dictText'] = ''
|
||||
this.model[field + '_dictTextEn'] = ''
|
||||
}
|
||||
},
|
||||
// 部门名称
|
||||
departNameChange (departList, field) {
|
||||
this.model[field + '_dictText'] = departList.map(item => item.text).join(',')
|
||||
this.model[field + '_dictTextEn'] = departList.map(item => item.text).join(',')
|
||||
},
|
||||
// 下拉树名称
|
||||
treeNameChange (list, field) {
|
||||
this.model[field + '_dictText'] = list.map(item => item.label).join(',')
|
||||
console.log('tree', list, field)
|
||||
// 通过value查找对应节点
|
||||
const nodes = list.map(item => findNodeByField(this.professionalFieldTreeList, item.value, 'value'))
|
||||
this.model[field + '_dictText'] = nodes.map(item => item.title).join(',')
|
||||
this.model[field + '_dictTextEn'] = nodes.map(item => item.enTitle).join(',')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user