Commit 1d710445 by Jianli Ou

数据不一致问题处理

parent a1349073
......@@ -100,14 +100,14 @@
<p v-else><span>产品描述:</span><span>未知</span></p>
<p v-if="GtinResultData.productImageUrl"><span>图片URL:</span><span>({{GtinResultData.productImageUrl[0].language}}){{GtinResultData.productImageUrl[0].value}}</span></p>
<p v-else><span>图片URL:</span><span>未知</span></p>
<p><span>产品类别:</span><span>{{GtinResultData.gpcCategoryCode || '--'}}</span></p>
<p><span>产品类别:</span><span>{{GtinResultData.gpcCategoryCode || '--'}}<br/>{{GtinResultData.gpcCategoryCodeEnName || '--'}}</span></p>
<p v-if="GtinResultData.netContent"><span>净含量:</span><span>{{GtinResultData.netContent[0].value}}{{GtinResultData.netContent[0].unitCode}}</span></p>
<p v-else><span>净含量:</span><span>未知</span></p>
<p v-if="GtinResultData.netContent"><span>目标市场:</span><span>{{GtinResultData.countryOfSaleCode[0].numeric}}</span></p>
<p v-else><span>目标市场:</span><span>未知</span></p>
</div>
</div>
<p style="font-size:13px;margin:15px 0 0 0 ;">该数据由Active Test Account企业提供,并于2023年5月2日最新更新</p>
<p style="font-size:13px;margin:15px 0 0 0 ;">该数据由{{GtinResultData.licenseeName}}企业提供,并于{{dateFormat(GtinResultData.dateUpdated)}}最新更新</p>
<p style="font-size:13px;">该GTIN信息完整</p>
</div>
<div v-if="GtinResultData.linkset && (GtinResultData.links.homepage || GtinResultData.links.hasRetailers || GtinResultData.links.sustainabilityInfo || GtinResultData.links.productSustainabilityInfo || GtinResultData.links.recipeInfo)" class="hrefInfo ">
......@@ -178,14 +178,14 @@
<div class="commodityInfo-cnt row">
<div class="col-lg-12 result-info hrefInfo2">
<p><span>企业名称:</span><span>{{GtinResultData.gs1Licence.licenseeName}}</span></p>
<p><span>地址:</span><span>{{addressInfo(GtinResultData.gs1Licence.address)}}</span></p>
<p><span>地址:</span><span v-html="addressInfo(GtinResultData.gs1Licence.address)"></span></p>
<p><span>网址:</span><span>{{GtinResultData.gs1Licence.contactPoint ? GtinResultData.gs1Licence.contactPoint[0].website : '--'}}</span></p>
<p><span>License类型:</span><span>{{GtinResultData.gs1Licence.licenceType}}</span></p>
<p><span>License Key:</span><span>{{GtinResultData.gs1Licence.licenceKey}}</span></p>
<p><span>发码MO:</span><span>{{GtinResultData.gs1Licence.licensingMO.moName}}</span></p>
</div>
</div>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由于2021年5月2日由GS1 Global Office提供,并于2023年6月1日最新更新</p>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由{{GtinResultData.gs1Licence.licensingMO.moName}}提供,并于{{dateFormat(GtinResultData.gs1Licence.dateUpdated)}}最新更新</p>
</div>
</el-tab-pane>
</el-tabs>
......@@ -449,14 +449,14 @@
<!-- <p><span>License Key:</span><span>10000217(Jams/Marmalades(Shelf Stable))</span></p>-->
<!-- <p><span>发码MO:</span><span>500(Gram)</span></p>-->
<p><span>企业名称:</span><span>{{glnResultData.gs1Licence.licenseeName}}</span></p>
<p><span>地址:</span><span>{{addressInfo(glnResultData.gs1Licence.address)}}</span></p>
<p><span>地址:</span><span v-html="addressInfo(glnResultData.gs1Licence.address)"></span></p>
<p><span>网址:</span><span>{{glnResultData.gs1Licence.contactPoint ? glnResultData.gs1Licence.contactPoint[0].website : '--'}}</span></p>
<p><span>License类型:</span><span>{{glnResultData.gs1Licence.licenceType}}</span></p>
<p><span>License Key:</span><span>{{glnResultData.gs1Licence.licenceKey}}</span></p>
<p><span>发码MO:</span><span>{{glnResultData.gs1Licence.licensingMO.moName}}</span></p>
</div>
</div>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由于2021年5月2日由GS1 Global Office提供,并于2023年6月1日最新更新</p>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由{{glnResultData.gs1Licence.licensingMO.moName}}提供,并于{{dateFormat(glnResultData.gs1Licence.dateUpdated)}}最新更新</p>
</div>
</el-tab-pane>
</el-tabs>
......@@ -520,14 +520,14 @@
<!-- <p><span>License Key:</span><span>10000217(Jams/Marmalades(Shelf Stable))</span></p>-->
<!-- <p><span>发码MO:</span><span>500(Gram)</span></p>-->
<p><span>企业名称:</span><span>{{gs1ResultData.gs1Licence.licenseeName}}</span></p>
<p><span>地址:</span><span>{{addressInfo(gs1ResultData.gs1Licence.address)}}</span></p>
<p><span>地址:</span><span v-html="addressInfo(gs1ResultData.gs1Licence.address)"></span></p>
<p><span>网址:</span><span>{{gs1ResultData.gs1Licence.contactPoint ? gs1ResultData.gs1Licence.contactPoint[0].website : '--'}}</span></p>
<p><span>License类型:</span><span>{{gs1ResultData.gs1Licence.licenceType}}</span></p>
<p><span>License Key:</span><span>{{gs1ResultData.gs1Licence.licenceKey}}</span></p>
<p><span>发码MO:</span><span>{{gs1ResultData.gs1Licence.licensingMO.moName}}</span></p>
</div>
</div>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由于2021年5月2日由GS1 Global Office提供,并于2023年6月1日最新更新</p>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由{{gs1ResultData.gs1Licence.licensingMO.moName}}提供,并于{{dateFormat(gs1ResultData.gs1Licence.dateUpdated)}}最新更新</p>
</div>
</el-tab-pane>
</el-tabs>
......@@ -617,7 +617,11 @@
:data="tableData"
style="width: 100%">
<el-table-column prop="licenceKey" label="License标识"/>
<el-table-column prop="licenseeName" label="企业名称"/>
<el-table-column prop="licenseeName" label="企业名称">
<template v-slot="scope">
<span class="link" @click="licenseeDialogShow(scope.row)">{{scope.row.licenseeName}}</span>
</template>
</el-table-column>
<el-table-column prop="" label="城市">
<template v-slot="scope">{{scope.row.address.addressLocality.value}}</template>
</el-table-column>
......@@ -647,6 +651,38 @@
<p style="color: #FF3B30;">2、本查询仅适用于中华人民共和国境外注册的商品条码信息。</p>
</div>
</div>
<el-dialog :visible.sync="licenseeDetailDialog"
top="30vh"
width="40%">
<div class="gtin-result">
<el-tabs class="tab3">
<el-tab-pane label="企业信息" >
<div class="commodityInfo">
<div class="commodityInfo-cnt row">
<div class="col-lg-12 result-info hrefInfo2">
<p><span>企业名称:</span><span>09506000140445</span></p>
<p><span>地址:</span><span>(en)Sticky's</span></p>
<p><span>网址:</span><span>(en)Sticky's Traditional Strawberry Jam Low Sugar 500 Gram</span></p>
<p><span>License类型:</span><span>(en)http://www.gs1.org/docs/09506000140445_A1C1.jpg</span></p>
<p><span>License Key:</span><span>10000217(Jams/Marmalades(Shelf Stable))</span></p>
<p><span>发码MO:</span><span>500(Gram)</span></p>
<!-- <p><span>企业名称:</span><span>{{gs1ResultData.gs1Licence.licenseeName}}</span></p>-->
<!-- <p><span>地址:</span><span v-html="addressInfo(gs1ResultData.gs1Licence.address)"></span></p>-->
<!-- <p><span>网址:</span><span>{{gs1ResultData.gs1Licence.contactPoint ? gs1ResultData.gs1Licence.contactPoint[0].website : '&#45;&#45;'}}</span></p>-->
<!-- <p><span>License类型:</span><span>{{gs1ResultData.gs1Licence.licenceType}}</span></p>-->
<!-- <p><span>License Key:</span><span>{{gs1ResultData.gs1Licence.licenceKey}}</span></p>-->
<!-- <p><span>发码MO:</span><span>{{gs1ResultData.gs1Licence.licensingMO.moName}}</span></p>-->
<!-- </div>-->
</div>
<p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由 gs1ResultData moName 提供,并于2023年12月13日最新更新</p>
<!-- <p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由{{gs1ResultData.gs1Licence.licensingMO.moName}}提供,并于{{dateFormat(gs1ResultData.gs1Licence.dateUpdated)}}最新更新</p>-->
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
</el-dialog>
</div>
</template>
......@@ -700,6 +736,8 @@ export default {
addressLocality: '', // 城市名称
otherFiled: false,
qyResultData: '',
licenseeDetail: {},
licenseeDetailDialog: false,
// countryList: countryListFunc()
countryList: []
};
......@@ -713,7 +751,8 @@ export default {
...mapState(["urls"]),
addressInfo: () => {
return (address) => {
const {addressLocality, addressRegion, addressSuburb, streetAddress} = {
const {postalName, addressLocality, addressRegion, addressSuburb, streetAddress, postalCode} = {
postalName: {language: '', value: ''},
addressLocality: {language: '', value: ''},
addressRegion: {language: '', value: ''},
addressSuburb: {language: '', value: ''},
......@@ -721,7 +760,19 @@ export default {
...address
}
const language = addressLocality.language || addressRegion.language || addressSuburb.language || streetAddress.language
return `(${language}) ${ addressLocality.value} ${addressRegion.value} ${addressSuburb.value} ${streetAddress.value}`
// return `(${language}) ${streetAddress.value} ${ addressLocality.value} ${addressRegion.value}`
return `${postalName.value}<br/>(${language}) ${streetAddress.value} ${ addressLocality.value} ${addressRegion.value}<br/>${postalCode}`
}
},
dateFormat: () => {
return (dateValue) => {
if (dateValue) {
dateValue = dateValue.substring(0, dateValue.indexOf('T'))
} else {
dateValue = new Date()
}
const value = new Date(dateValue)
return `${value.getFullYear()}${value.getMonth() + 1}${value.getDate()}日`
}
}
},
......@@ -968,6 +1019,10 @@ export default {
}
this.getCaptcha();
},
licenseeDialogShow(licenseeInfo) {
console.log('企业基本信息', licenseeInfo)
this.licenseeDetailDialog = true
},
async handleSearch() {
this.errorMsg ='正在查询……'
this.searchCodeShow = this.search.code;
......@@ -1391,6 +1446,11 @@ export default {
border-bottom-left-radius: 4px!important;
}
}
.link {
color: rgba(0, 121, 158, 1);
text-decoration: underline;
cursor: pointer;
}
.el-collapse-item__arrow {
transform: rotate(90deg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment