Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
v-model="formInline.nioNumber"
|
||||
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -31,7 +31,7 @@
|
||||
<span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="state">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Required')">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('Required')" v-model="formInline.isMust">
|
||||
<a-select-option v-for="(item, key) in isRequired" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
{{ item.label }}
|
||||
@@ -52,7 +52,7 @@
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
v-model="formInline.paramsName"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -84,7 +84,7 @@
|
||||
:title="$t('parameterBatch')">{{$t('parameterBatch')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.state"
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.paramsBatch"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('parameterBatch')"
|
||||
:type="'select'"
|
||||
@@ -98,7 +98,7 @@
|
||||
<span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.state"
|
||||
<j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
|
||||
:disabled="disabled"
|
||||
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
|
||||
:type="'select'"
|
||||
@@ -117,7 +117,7 @@
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
v-model="formInline.description"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -131,7 +131,7 @@
|
||||
:title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<j-multi-select-tag class="box-input" v-model="stateOne"
|
||||
<j-multi-select-tag class="box-input" v-model="formInline.certCategory"
|
||||
@change='Onchange'
|
||||
v-on:changelabel='Onchangelabel'
|
||||
:disabled="disabled"
|
||||
@@ -149,8 +149,8 @@
|
||||
<span class="title-text-text"
|
||||
:title="$t('controlType')">{{$t('controlType')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')">
|
||||
<a-form-model-item class="itemModel" prop="controlType">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
|
||||
<a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
{{ item.label }}
|
||||
@@ -166,7 +166,7 @@
|
||||
<span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')">
|
||||
<a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.controlVerify">
|
||||
<a-select-option v-for="(item, key) in controlVerification" :key="key" :value="item.value">
|
||||
<span style="display: inline-block;width: 100%" :title=" item.label ">
|
||||
{{ item.label }}
|
||||
@@ -187,7 +187,7 @@
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
v-model="formInline.controlValues"
|
||||
:placeholder="$t('PleaseEnter')+$t('controlAlternatives')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
@@ -201,10 +201,13 @@
|
||||
:title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="formInline.paramsTemplateName"
|
||||
:placeholder="$t('PleaseEnter')+$t('attachmentTemplate')"/>
|
||||
<a-button type="primary" class="button-text"
|
||||
@click="clickButtonToUpload(item)">
|
||||
<!-- {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||-->
|
||||
<!-- formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
|
||||
<!-- }}-->
|
||||
{{ $t('clickUpload') }}
|
||||
</a-button>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -212,32 +215,32 @@
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="24" >
|
||||
<a-tabs>
|
||||
<a-tab-pane v-for='(item,index) in tabCertificationCategory' :tab="item.valitemOne" :key="index + 1">
|
||||
<a-tab-pane v-for='(item,index) in certCategoryParamsInfoEOList' :tab="item.textVal" :key="index + 1">
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('controlType')">{{$t('controlType')}}</span>
|
||||
:title="$t('standard')">{{$t('standard')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="item.valitemOne"
|
||||
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
|
||||
v-model="item.textVal"
|
||||
:placeholder="$t('PleaseEnter')+$t('standard')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
|
||||
<span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="technologyTerritory">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="item.valitemTwo"
|
||||
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
|
||||
v-model="item.paramsName"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -247,13 +250,13 @@
|
||||
<div class="box-title-text">
|
||||
<div class="title-text">
|
||||
<span class="title-text-text"
|
||||
:title="$t('controlType')">{{$t('controlType')}}</span>
|
||||
:title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
|
||||
</div>
|
||||
<a-form-model-item class="itemModel" prop="paramsTemplateName">
|
||||
<a-input class="box-input"
|
||||
:disabled="disabled"
|
||||
v-model="item.valitemthree"
|
||||
:placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
|
||||
v-model="item.description"
|
||||
:placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
|
||||
</a-form-model-item>
|
||||
</div>
|
||||
</a-col>
|
||||
@@ -310,7 +313,7 @@ export default {
|
||||
{value:9, label: '四位小数' },
|
||||
],
|
||||
CategoryTreeList: [], // 技术领域
|
||||
tabCertificationCategory: [], // 认证类别得tab栏
|
||||
certCategoryParamsInfoEOList: [], // 认证类别得tab栏
|
||||
formInline: {},
|
||||
confirmLoading: false,
|
||||
visible: false,
|
||||
@@ -345,27 +348,32 @@ export default {
|
||||
this.getSysCategoryTree()
|
||||
},
|
||||
methods: {
|
||||
clickButtonToUpload(item) {
|
||||
// this.$refs.uploadFile.perentHandleFunc()
|
||||
// this.$refs.uploadFile.state = item.flag
|
||||
// this.$refs.uploadFile.visible = true
|
||||
// this.uploadName = item.db_field_name
|
||||
// getAction('sys/common/getFileInfos', { id: this.formInline[item.db_field_name] }).then((res) => {
|
||||
// if (res.success) {
|
||||
// this.$refs.uploadFile.perentHandleFunc(res.result)
|
||||
// } else {
|
||||
// this.$refs.uploadFile.perentHandleFunc()
|
||||
// }
|
||||
// })
|
||||
},
|
||||
Onchangelabel(val) {
|
||||
this.tabCertificationCategory = []
|
||||
this.certCategoryParamsInfoEOList = []
|
||||
console.log(val,'val。。。')
|
||||
val.forEach((item) => {
|
||||
let valItem = {
|
||||
valitemOne: item.text,
|
||||
valitemTwo: item.value,
|
||||
valitemthree: '',
|
||||
let _tt = {
|
||||
textVal: item.text, // tab
|
||||
certCategory: '', // 所属认证类别
|
||||
paramsNumber: '', // 编号
|
||||
paramsName: '', // 参数名称
|
||||
description: ''// 参数说明
|
||||
}
|
||||
this.tabCertificationCategory.push(valItem)
|
||||
this.certCategoryParamsInfoEOList.push(_tt)
|
||||
})
|
||||
console.log(this.tabCertificationCategory,'this.tabCertificationCategory')
|
||||
// if(val.length > 0) {
|
||||
//
|
||||
// }
|
||||
// if(val.length > 0) {
|
||||
// this.tabCertificationCategory = []
|
||||
// } else {
|
||||
// this.tabCertificationCategory = []
|
||||
// console.log(this.tabCertificationCategory,'this.tabCertificationCategorythis.tabCertificationCategory')
|
||||
// }
|
||||
},
|
||||
Onchange() {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user