|
|
@@ -39,8 +39,18 @@
|
|
|
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="国家" prop="Country" >
|
|
|
- <el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
|
|
|
- </el-input>
|
|
|
+ <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
|
|
|
+ </el-input>-->
|
|
|
+ <el-select v-model="formData.Country" filterable placeholder="请选择" :disabled="!canUpdateSupplier" style="width: 100%">
|
|
|
+ <el-option
|
|
|
+ v-for="item in countryListOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.value"
|
|
|
+ :value="item.value">
|
|
|
+ <span style="float: left">{{ item.value }}</span>
|
|
|
+ <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -412,6 +422,7 @@
|
|
|
CompanyTypeOptions: [],
|
|
|
UnitRelationAry: [],
|
|
|
countryoptions: [],
|
|
|
+ countryListOptions: [],
|
|
|
countryprops: {
|
|
|
value: 'adcode',
|
|
|
label: 'name',
|
|
|
@@ -420,10 +431,10 @@
|
|
|
CityAry: [],
|
|
|
LinkCityAry: [],
|
|
|
HSEOptions: [{
|
|
|
- value: '1',
|
|
|
+ value: 1,
|
|
|
label: '是'
|
|
|
}, {
|
|
|
- value: '0',
|
|
|
+ value: 0,
|
|
|
label: '否'
|
|
|
}],
|
|
|
|
|
|
@@ -486,10 +497,10 @@
|
|
|
message: '请输入邮箱地址',
|
|
|
trigger: 'change'
|
|
|
},
|
|
|
- {
|
|
|
- validator: this.checkemail,
|
|
|
- trigger: 'change'
|
|
|
- }],
|
|
|
+ {
|
|
|
+ validator: this.checkemail,
|
|
|
+ trigger: 'change'
|
|
|
+ }],
|
|
|
OrganCode: [{
|
|
|
required: true,
|
|
|
message: '请输入组织机构代码',
|
|
|
@@ -579,8 +590,9 @@
|
|
|
getDictOptions () {
|
|
|
if (this.dictData) {
|
|
|
this.UnitRelationOptions = this.dictData['UnitRelation']
|
|
|
- this.getCityList(this.dictData['GaodeMapChinaAreas'])
|
|
|
this.CompanyTypeOptions = this.dictData['CompanyType']
|
|
|
+ this.getCityList(this.dictData['GaodeMapChinaAreas'])
|
|
|
+ this.getCountryList(this.dictData['CountryList'])
|
|
|
let suppliers = this.dictData['CompanyNames']
|
|
|
for (let idx in suppliers) {
|
|
|
suppliers[idx]['value'] = suppliers[idx].SupplierName
|
|
|
@@ -600,6 +612,17 @@
|
|
|
countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
|
|
|
this.countryoptions = JSON.parse(countstr)
|
|
|
},
|
|
|
+ getCountryList (val) {
|
|
|
+ let tmpJson = JSON.parse(val)
|
|
|
+ this.countryListOptions = []
|
|
|
+ for (let idx in tmpJson) {
|
|
|
+ this.countryListOptions.push({
|
|
|
+ label: tmpJson[idx].split('-')[0],
|
|
|
+ value: tmpJson[idx].split('-')[1],
|
|
|
+ code: tmpJson[idx].split('-')[2]
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
unitRelationChange(value) {
|
|
|
this.formData.SpecTypeCode = value.join(',')
|
|
|
},
|
yuedefeng