Commit 0e926bd1 by Jianli Ou

对接境外条码查询gln查询接口

parent 493f10b7
...@@ -48,7 +48,23 @@ const searchGlossary = (params = {}) => { ...@@ -48,7 +48,23 @@ const searchGlossary = (params = {}) => {
// 条码查询—境外码查询-通过GTIN查询验证产品 // 条码查询—境外码查询-通过GTIN查询验证产品
const searchGtin = (params = {}) => { const searchGtin = (params = {}) => {
return GET(`${Prefix}/office/vbgOutSearch/api/verified`, params) return POST(`${Prefix}/office/vbgOutSearch/api/verified`, params)
}
// 条码查询—境外码查询-通过GLN查询
const searchGLN = (params = {}) => {
return POST(`${Prefix}/office/vbgOutSearch/api/searchGLN`, params)
}
// 条码查询—境外码查询-验证其他GS1标识
const searchGs1 = (params = {}) => {
return POST(`${Prefix}/office/vbgOutSearch/api/otherKey`, params)
}
// 条码查询—境外码查询-验证企业
const searchQy = (params = {}) => {
return POST(`${Prefix}/office/vbgOutSearch/api/firmSearch`, params)
}
// 国家列表
const searchCountry = (params = {}) => {
return GET(`${Prefix}/office/vbgOutSearch/api/searchCountry`, params)
} }
export default { export default {
...@@ -60,5 +76,9 @@ export default { ...@@ -60,5 +76,9 @@ export default {
searchBike, searchBike,
searchGlossary, searchGlossary,
searchCodeGln, searchCodeGln,
searchGtin searchGtin,
searchGLN,
searchGs1,
searchQy,
searchCountry
} }
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<div class="col-lg-12 result-info hrefInfo2"> <div class="col-lg-12 result-info hrefInfo2">
<p><span>企业名称:</span><span>{{GtinResultData.gs1Licence.licenseeName}}</span></p> <p><span>企业名称:</span><span>{{GtinResultData.gs1Licence.licenseeName}}</span></p>
<p><span>地址:</span><span>{{addressInfo(GtinResultData.gs1Licence.address)}}</span></p> <p><span>地址:</span><span>{{addressInfo(GtinResultData.gs1Licence.address)}}</span></p>
<p><span>网址:</span><span>{{GtinResultData.gs1Licence.website || '--'}}</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类型:</span><span>{{GtinResultData.gs1Licence.licenceType}}</span></p>
<p><span>License Key:</span><span>{{GtinResultData.gs1Licence.licenceKey}}</span></p> <p><span>License Key:</span><span>{{GtinResultData.gs1Licence.licenceKey}}</span></p>
<p><span>发码MO:</span><span>{{GtinResultData.gs1Licence.licensingMO.moName}}</span></p> <p><span>发码MO:</span><span>{{GtinResultData.gs1Licence.licensingMO.moName}}</span></p>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<div class="gtin-cnt"> <div class="gtin-cnt">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<el-input placeholder="请输入GLN" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input> <el-input v-model="glnInputValue" placeholder="请输入GLN" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div> </div>
<!-- <div class="col-lg-1">--> <!-- <div class="col-lg-1">-->
<!-- <el-button class="gtin-btn">查询</el-button>--> <!-- <el-button class="gtin-btn">查询</el-button>-->
...@@ -184,11 +184,11 @@ ...@@ -184,11 +184,11 @@
</div> </div>
<p class="search-num">搜索样例:<span>9506000140445</span></p> <p class="search-num">搜索样例:<span>9506000140445</span></p>
</div> </div>
<div class="gtin-result"> <div v-if="glnResultData" class="gtin-result">
<div class="gtin-result-tip"> <div class="gtin-result-tip">
<img src="../../assets/image/search/gtinIcon.png" /> <img src="../../assets/image/search/gtinIcon.png" />
<div> <div>
<p>此商品条码已经由“Activate Test Account”公司注册</p> <p>此商品条码已经由“{{glnResultData.gs1Licence.licenseeName}}”公司注册</p>
</div> </div>
</div> </div>
<el-tabs v-model="gtinActiveName2" @tab-click="handleClick"> <el-tabs v-model="gtinActiveName2" @tab-click="handleClick">
...@@ -197,161 +197,175 @@ ...@@ -197,161 +197,175 @@
<p>此GLN数据包含以下内容:</p> <p>此GLN数据包含以下内容:</p>
<el-collapse v-model="collapseActiveName" accordion> <el-collapse v-model="collapseActiveName" accordion>
<el-collapse-item title="法人实体" name="1"> <el-collapse-item title="法人实体" name="1">
<p style="font-size:16px;color:#002C6C;">GS1 AISBL</p> <p style="font-size:16px;color:#002C6C;">{{glnResultData.LEGAL_ENTITY.organizationName[0].value}}</p>
<p style="font-size:14px;color:#454545;">法人实体有效</p> <p style="font-size:14px;color:#454545;">法人实体有效</p>
<ul> <ul>
<li> <li>
<p><span>GLN</span><span>9506000140445</span></p> <p><span>GLN</span><span>{{glnResultData.LEGAL_ENTITY.gln}}</span></p>
</li> </li>
<li> <li>
<p><span>GLN类型</span><span>Legal entity</span></p> <p><span>GLN类型</span><span>{{glnResultData.LEGAL_ENTITY.glnType}}</span></p>
</li> </li>
<li> <li>
<p><span>名称</span><span>(en)GS1 AISBL</span></p> <p><span>名称</span><span>({{glnResultData.LEGAL_ENTITY.organizationName[0].language}}){{glnResultData.LEGAL_ENTITY.organizationName[0].value}}</span></p>
</li> </li>
<li> <li>
<p><span>组织角色</span><span>(en)GS1 AISBL</span></p> <!-- <p><span>组织角色</span><span>(en)GS1 AISBL</span></p>-->
<p><span>组织角色</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>父级位置</span><span>9506000140445</span></p> <!-- <p><span>父级位置</span><span>9506000140445</span></p>-->
<p><span>父级位置</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>相关地址</span><span>9506000140445</span></p> <!-- <p><span>相关地址</span><span>9506000140445</span></p>-->
<p><span>相关地址</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>其他标识</span><span>9506000140445</span></p> <!-- <p><span>其他标识</span><span>9506000140445</span></p>-->
<p><span>其他标识</span><span>--</span></p>
</li> </li>
</ul> </ul>
<p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p> <p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p>
<ul> <ul>
<li> <li>
<p><span>邮箱</span><span>info@gs1.org</span></p> <p><span>邮箱</span><span>{{glnResultData.LEGAL_ENTITY.contactPoint[0].email}}</span></p>
</li> </li>
<li> <li>
<p><span>电话</span><span>3227887800</span></p> <p><span>电话</span><span>{{glnResultData.LEGAL_ENTITY.contactPoint[0].telephone}}</span></p>
</li> </li>
<li> <li>
<p><span>网址</span><span>https://www.gs1.org</span></p> <p><span>网址</span><span>{{glnResultData.LEGAL_ENTITY.contactPoint[0].website}}</span></p>
</li> </li>
<li> <li>
<p><span>可获取语言</span><span>Unknown</span></p> <!-- <p><span>可获取语言</span><span>Unknown</span></p>-->
<p><span>可获取语言</span><span>--</span></p>
</li> </li>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由Active Test Account企业提供,并于2023年5月2日最新更新</p>
</ul> </ul>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由Active Test Account企业提供,并于2023年5月2日最新更新</p>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="固定物理位置" name="2"> <el-collapse-item title="固定物理位置" name="2">
<p style="font-size:16px;color:#002C6C;">布鲁塞尔办公室</p> <p style="font-size:16px;color:#002C6C;">{{glnResultData.FIXED_PHYSICAL_LOCATION.physicalLocationName[0].value}}</p>
<p style="font-size:14px;color:#454545;">固定物理位置有效</p> <p style="font-size:14px;color:#454545;">固定物理位置有效</p>
<ul> <ul>
<li> <li>
<p><span>GLN</span><span>9506000140445</span></p> <p><span>GLN</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.gln}}</span></p>
</li> </li>
<li> <li>
<p><span>GLN类型</span><span>Legal entity</span></p> <p><span>GLN类型</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.glnType}}</span></p>
</li> </li>
<li> <li>
<p><span>名称</span><span>(en)GS1 AISBL</span></p> <p><span>名称</span><span>({{glnResultData.FIXED_PHYSICAL_LOCATION.physicalLocationName[0].language}}){{glnResultData.FIXED_PHYSICAL_LOCATION.physicalLocationName[0].value}}</span></p>
</li> </li>
<li> <li>
<p><span>组织角色</span><span>(en)GS1 AISBL</span></p> <!-- <p><span>组织角色</span><span>(en)GS1 AISBL</span></p>-->
<p><span>组织角色</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>父级位置</span><span>9506000140445</span></p> <!-- <p><span>父级位置</span><span>9506000140445</span></p>-->
<p><span>父级位置</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>相关地址</span><span>9506000140445</span></p> <!-- <p><span>相关地址</span><span>9506000140445</span></p>-->
<p><span>相关地址</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>其他标识</span><span>9506000140445</span></p> <!-- <p><span>其他标识</span><span>9506000140445</span></p>-->
<p><span>其他标识</span><span>--</span></p>
</li> </li>
</ul> </ul>
<p style="font-size:16px;color:#002C6C;margin-top:15px">企业位置</p> <p style="font-size:16px;color:#002C6C;margin-top:15px">企业位置</p>
<p style="font-size:14px;color:#454545;">地址</p> <p style="font-size:14px;color:#454545;">地址</p>
<ul> <ul>
<li> <li>
<p><span>邮政名称</span><span>info@gs1.org</span></p> <p><span>邮政名称</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.address[0].postalName.value}}</span></p>
</li> </li>
<li> <li>
<p><span>国家代码</span><span>3227887800</span></p> <p><span>国家代码</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.address[0].countryCode}}</span></p>
</li> </li>
<li> <li>
<p><span>城市</span><span>https://www.gs1.org</span></p> <p><span>城市</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.address[0].addressLocality.value}}</span></p>
</li> </li>
<li> <li>
<p><span>街道地址</span><span>Unknown</span></p> <p><span>街道地址</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.address[0].streetAddress.value}}</span></p>
</li> </li>
<li> <li>
<p><span>邮政编码</span><span>Unknown</span></p> <p><span>邮政编码</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.address[0].postalCode}}</span></p>
</li> </li>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由Active Test Account企业提供,并于2023年5月2日最新更新</p>
</ul> </ul>
<p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p> <p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p>
<ul> <ul>
<li> <li>
<p><span>邮箱</span><span>info@gs1.org</span></p> <p><span>邮箱</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].email}}</span></p>
</li> </li>
<li> <li>
<p><span>电话</span><span>3227887800</span></p> <p><span>电话</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].telephone}}</span></p>
</li> </li>
<li> <li>
<p><span>网址</span><span>https://www.gs1.org</span></p> <p><span>网址</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].website}}</span></p>
</li> </li>
<li> <li>
<p><span>可获取语言</span><span>Unknown</span></p> <!-- <p><span>可获取语言</span><span>Unknown</span></p>-->
<p><span>可获取语言</span><span>--</span></p>
</li> </li>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p>
</ul> </ul>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="数字位置" name="3"> <el-collapse-item title="数字位置" name="3">
<p style="font-size:16px;color:#002C6C;">EDI 网关</p> <p style="font-size:16px;color:#002C6C;">{{glnResultData.DIGITAL_LOCATION.digitalLocationName[0].value}}</p>
<p style="font-size:14px;color:#454545;">数字位置有关</p> <p style="font-size:14px;color:#454545;">数字位置有关</p>
<ul> <ul>
<li> <li>
<p><span>GLN</span><span>9506000140445</span></p> <p><span>GLN</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.gln}}</span></p>
</li> </li>
<li> <li>
<p><span>GLN类型</span><span>Legal entity</span></p> <p><span>GLN类型</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.glnType}}</span></p>
</li> </li>
<li> <li>
<p><span>名称</span><span>(en)GS1 AISBL</span></p> <p><span>名称</span><span>({{glnResultData.DIGITAL_LOCATION.digitalLocationName[0].language}}){{glnResultData.DIGITAL_LOCATION.digitalLocationName[0].value}}</span></p>
</li> </li>
<li> <li>
<p><span>组织角色</span><span>(en)GS1 AISBL</span></p> <!-- <p><span>组织角色</span><span>(en)GS1 AISBL</span></p>-->
<p><span>组织角色</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>父级位置</span><span>9506000140445</span></p> <!-- <p><span>父级位置</span><span>9506000140445</span></p>-->
<p><span>父级位置</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>相关地址</span><span>9506000140445</span></p> <!-- <p><span>相关地址</span><span>9506000140445</span></p>-->
<p><span>相关地址</span><span>--</span></p>
</li> </li>
<li> <li>
<p><span>其他标识</span><span>9506000140445</span></p> <!-- <p><span>其他标识</span><span>9506000140445</span></p>-->
<p><span>其他标识</span><span>--</span></p>
</li> </li>
</ul> </ul>
<p style="font-size:16px;color:#002C6C;margin-top:15px">企业位置</p> <p style="font-size:16px;color:#002C6C;margin-top:15px">企业位置</p>
<p style="font-size:14px;color:#454545;">数字位置</p> <p style="font-size:14px;color:#454545;">数字位置</p>
<ul> <ul>
<li> <li>
<p><span>数字地址</span><span>info@gs1.org</span></p> <p><span>数字地址</span><span>{{glnResultData.DIGITAL_LOCATION.digitalAddress}}</span></p>
</li> </li>
</ul> </ul>
<p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p> <p v-if="glnResultData.DIGITAL_LOCATION.contactPoint" style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p>
<ul> <ul v-if="glnResultData.DIGITAL_LOCATION.contactPoint">
<li> <li>
<p><span>邮箱</span><span>info@gs1.org</span></p> <p><span>邮箱</span><span>{{glnResultData.DIGITAL_LOCATION.contactPoint[0].email}}</span></p>
</li> </li>
<li> <li>
<p><span>电话</span><span>3227887800</span></p> <p><span>电话</span><span>{{glnResultData.DIGITAL_LOCATION.contactPoint[0].telephone}}</span></p>
</li> </li>
<li> <li>
<p><span>网址</span><span>https://www.gs1.org</span></p> <p><span>网址</span><span>{{glnResultData.DIGITAL_LOCATION.contactPoint[0].website}}</span></p>
</li> </li>
<li> <li>
<p><span>可获取语言</span><span>Unknown</span></p> <!-- <p><span>可获取语言</span><span>Unknown</span></p>-->
<p><span>可获取语言</span><span>--</span></p>
</li> </li>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p> <p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p>
</ul> </ul>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="链接至其他信息" name="4"> <el-collapse-item title="链接至其他信息" name="4">
<p style="font-size:16px;color:#002C6C;">有零售商</p> <p style="font-size:16px;color:#002C6C;">有零售商</p>
...@@ -367,12 +381,18 @@ ...@@ -367,12 +381,18 @@
<div class="commodityInfo"> <div class="commodityInfo">
<div class="commodityInfo-cnt row"> <div class="commodityInfo-cnt row">
<div class="col-lg-12 result-info hrefInfo2"> <div class="col-lg-12 result-info hrefInfo2">
<p><span>企业名称:</span><span>09506000140445</span></p> <!-- <p><span>企业名称:</span><span>09506000140445</span></p>-->
<p><span>地址:</span><span>(en)Sticky's</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>网址:</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类型:</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>License Key:</span><span>10000217(Jams/Marmalades(Shelf Stable))</span></p>-->
<p><span>发码MO:</span><span>500(Gram)</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>{{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>
</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数据由于2021年5月2日由GS1 Global Office提供,并于2023年6月1日最新更新</p>
...@@ -380,6 +400,7 @@ ...@@ -380,6 +400,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<span style="color: rgb(255, 59, 48)" v-else>{{ errorMsg }}</span>
</div> </div>
<div v-if="active=='third'"> <div v-if="active=='third'">
<p class="tab-cnt-title">输入GS1标识</p> <p class="tab-cnt-title">输入GS1标识</p>
...@@ -388,12 +409,12 @@ ...@@ -388,12 +409,12 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row"> <div class="row">
<div class="col-lg-6" > <div class="col-lg-6" >
<el-select placeholder="请选择GS1标识" filterable style="width:100%;margin-top:5px"> <el-select v-model="gs1Type" placeholder="请选择GS1标识" filterable style="width:100%;margin-top:5px">
<el-option v-for="(item, index) in GS1_Mark_List" :label="item.label" :value="item.value" :key="`GS1_Mark_${index}`"></el-option> <el-option v-for="(item, index) in GS1_Mark_List" :label="item.label" :value="item.value" :key="`GS1_Mark_${index}`"></el-option>
</el-select> </el-select>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<el-input placeholder="请输入GS1标识" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input> <el-input v-model="gs1InputValue" placeholder="请输入GS1标识" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<!-- <p class="search-num">搜索样例:<span>9506000140445</span></p>--> <!-- <p class="search-num">搜索样例:<span>9506000140445</span></p>-->
</div> </div>
</div> </div>
...@@ -417,12 +438,12 @@ ...@@ -417,12 +438,12 @@
</div> </div>
<p class="search-num">搜索样例:<span>9506000140445</span></p> <p class="search-num">搜索样例:<span>9506000140445</span></p>
</div> </div>
<div class="gtin-result"> <div v-if="gs1ResultData" class="gtin-result">
<div class="gtin-result-tip" style="margin-top:20px"> <div class="gtin-result-tip" style="margin-top:20px">
<img src="../../assets/image/search/gtinIcon.png" /> <img src="../../assets/image/search/gtinIcon.png" />
<div> <div>
<p>9506000140445</p> <p>{{gs1ResultData.gtin}}</p>
<p>此商品条码已经由“Activate Test Account”公司注册</p> <p>此商品条码已经由“{{gs1ResultData.licenseeName}}”公司注册</p>
</div> </div>
</div> </div>
<el-tabs v-model="gtinActiveName3" @tab-click="handleClick" class="tab3"> <el-tabs v-model="gtinActiveName3" @tab-click="handleClick" class="tab3">
...@@ -430,12 +451,18 @@ ...@@ -430,12 +451,18 @@
<div class="commodityInfo"> <div class="commodityInfo">
<div class="commodityInfo-cnt row"> <div class="commodityInfo-cnt row">
<div class="col-lg-12 result-info hrefInfo2"> <div class="col-lg-12 result-info hrefInfo2">
<p><span>企业名称:</span><span>09506000140445</span></p> <!-- <p><span>企业名称:</span><span>09506000140445</span></p>-->
<p><span>地址:</span><span>(en)Sticky's</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>网址:</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类型:</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>License Key:</span><span>10000217(Jams/Marmalades(Shelf Stable))</span></p>-->
<p><span>发码MO:</span><span>500(Gram)</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>{{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>
</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数据由于2021年5月2日由GS1 Global Office提供,并于2023年6月1日最新更新</p>
...@@ -443,20 +470,27 @@ ...@@ -443,20 +470,27 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<span style="color: rgb(255, 59, 48)" v-else>{{ errorMsg }}</span>
</div> </div>
<div v-if="active=='four'"> <div v-if="active=='four'">
<p class="tab-cnt-title">选择国家并填写企业名称</p> <div class="y-center" style="justify-content: space-between;">
<p class="tab-cnt-title">选择国家并填写企业名称</p>
<div @click="otherFiled = !otherFiled" class="tab-cnt-title" style="display: flex; align-items: center; margin-bottom: 10px; font-size: 14px; cursor: pointer;">
<img src="../../assets/image/search/expand.png" style="width: 18px; height: 18px; margin-right: 5px;"/>
{{otherFiled ? '收起' : '展开'}}可选字段
</div>
</div>
<div class="gtin-cnt"> <div class="gtin-cnt">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row"> <div class="row">
<div class="col-lg-6" > <div class="col-lg-6" >
<el-select placeholder="请选择国家" filterable style="width:100%;margin-top:5px"> <el-select v-model="countryCode" placeholder="请选择国家" filterable clearable style="width:100%;margin-top:5px">
<el-option v-for="(item, index) in countryList" :label="item.label" :value="item.value" :key="`Country_${index}`"> </el-option> <el-option v-for="(item, index) in countryList" :label="item.label" :value="item.value" :key="`Country_${index}`"> </el-option>
</el-select> </el-select>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<el-input placeholder="请输入企业名称" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input> <el-input v-model="licenseeName" placeholder="请输入企业名称" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<!-- <p class="search-num">搜索样例:<span>9506000140445</span></p>--> <!-- <p class="search-num">搜索样例:<span>9506000140445</span></p>-->
</div> </div>
</div> </div>
...@@ -465,6 +499,33 @@ ...@@ -465,6 +499,33 @@
<!-- <el-button class="gtin-btn">查询</el-button>--> <!-- <el-button class="gtin-btn">查询</el-button>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
<div v-if="otherFiled" class="row" style="margin-top: 15px;">
<div class="col-lg-12">
<div class="row">
<div class="col-lg-6" >
<el-input v-model="streetAddress" placeholder="请输入街道地址(选填)" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
</div>
</div>
</div>
<div v-if="otherFiled" class="row" style="margin-top: 15px;">
<div class="col-lg-12">
<div class="row">
<div class="col-lg-6" >
<el-input v-model="postalCode" placeholder="请输入邮编(选填)" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
</div>
</div>
</div>
<div v-if="otherFiled" class="row" style="margin-top: 15px;">
<div class="col-lg-12">
<div class="row">
<div class="col-lg-6" >
<el-input v-model="addressLocality" placeholder="请输入城市名称(选填)" style="margin-top:5px"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
</div>
</div>
</div>
<div class="row y-center" style="margin-top: 15px;"> <div class="row y-center" style="margin-top: 15px;">
<div class="col-lg-6"> <div class="col-lg-6">
<el-input v-model="captcha" placeholder="请输入验证码"></el-input> <el-input v-model="captcha" placeholder="请输入验证码"></el-input>
...@@ -478,14 +539,14 @@ ...@@ -478,14 +539,14 @@
<el-button class="gtin-btn" @click="searchQY">查询</el-button> <el-button class="gtin-btn" @click="searchQY">查询</el-button>
</div> </div>
</div> </div>
<p class="search-num">搜索样例:<span>9506000140445</span></p> <p class="search-num">搜索样例:<span>企业名称</span></p>
</div> </div>
<div class="gtin-result"> <div v-if="qyResultData" class="gtin-result">
<div class="gtin-result-tip" style="margin-top:20px"> <div class="gtin-result-tip" style="margin-top:20px">
<img src="../../assets/image/search/gtinIcon.png" /> <img src="../../assets/image/search/gtinIcon.png" />
<div> <div>
<p>9506000140445</p> <p>与GS1相关的搜索查询到{{total}}个结果</p>
<p>此商品条码已经由“Activate Test Account”公司注册</p> <p>本服务显示匹配搜索条件的前20条记录</p>
</div> </div>
</div> </div>
<p class="tab-cnt-title" style="margin-top:25px">搜索结果</p> <p class="tab-cnt-title" style="margin-top:25px">搜索结果</p>
...@@ -493,34 +554,23 @@ ...@@ -493,34 +554,23 @@
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column prop="licenceKey" label="License标识"/>
prop="date" <el-table-column prop="licenseeName" label="企业名称"/>
label="License标识" <el-table-column prop="" label="城市">
width="180"> <template v-slot="scope">{{scope.row.address.addressLocality.value}}</template>
</el-table-column>
<el-table-column
prop="name"
label="企业名称"
width="180">
</el-table-column>
<el-table-column
prop="city"
label="城市">
</el-table-column>
<el-table-column
prop="address"
label="国家">
</el-table-column> </el-table-column>
<el-table-column prop="countrytitle" label="国家"/>
</el-table> </el-table>
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="1000"> :page-size="pageSize"
:current-page="currPage"
:total="totalMaxShowNum">
</el-pagination> </el-pagination>
</div> </div>
<span style="color: rgb(255, 59, 48)" v-else>{{ errorMsg }}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="notice"> <div class="notice">
...@@ -557,27 +607,11 @@ export default { ...@@ -557,27 +607,11 @@ export default {
gtinActiveName2:'first', gtinActiveName2:'first',
gtinActiveName3:'first', gtinActiveName3:'first',
collapseActiveName:1, collapseActiveName:1,
tableData: [{ currPage: 1,
date: '2016-05-02', pageSize: 10,
name: '王小虎', total: 0,
city:'江苏', totalMaxShowNum: 0,
address: 'Belgium' tableData: [],
}, {
date: '2016-05-04',
name: '王小虎',
city:'江苏',
address: 'Belgium'
}, {
date: '2016-05-01',
name: '王小虎',
city:'江苏',
address: 'Belgium'
}, {
date: '2016-05-03',
name: '王小虎',
city:'江苏',
address: 'Belgium'
}],
search: {code: ""}, search: {code: ""},
searchCodeShow: "", searchCodeShow: "",
showResult: false, showResult: false,
...@@ -586,8 +620,21 @@ export default { ...@@ -586,8 +620,21 @@ export default {
errorMsg: '', errorMsg: '',
GtinInputValue: '09506000134352', GtinInputValue: '09506000134352',
GtinResultData: '', GtinResultData: '',
glnInputValue: '9506000140445',
glnResultData: '',
gs1Type: '',
gs1InputValue: '',
GS1_Mark_List: GS1_Mark_List, GS1_Mark_List: GS1_Mark_List,
countryList: countryListFunc() gs1ResultData: '',
countryCode: '',
licenseeName: 'GS1 Demo Account',
streetAddress: '', // 街道地址
postalCode: '', // 邮政编码
addressLocality: '', // 城市名称
otherFiled: false,
qyResultData: '',
// countryList: countryListFunc()
countryList: []
}; };
}, },
created() { created() {
...@@ -599,19 +646,27 @@ export default { ...@@ -599,19 +646,27 @@ export default {
...mapState(["urls"]), ...mapState(["urls"]),
addressInfo: () => { addressInfo: () => {
return (address) => { return (address) => {
const {addressLocality, addressRegion, addressSuburb, streetAddress} = address const {addressLocality, addressRegion, addressSuburb, streetAddress} = {
addressLocality: {language: '', value: ''},
addressRegion: {language: '', value: ''},
addressSuburb: {language: '', value: ''},
streetAddress: {language: '', value: ''},
...address
}
const language = addressLocality.language || addressRegion.language || addressSuburb.language || streetAddress.language const language = addressLocality.language || addressRegion.language || addressSuburb.language || streetAddress.language
return `(${language}) ${addressLocality.value} ${addressRegion.value} ${addressSuburb.value} ${streetAddress.value}` return `(${language}) ${ addressLocality.value} ${addressRegion.value} ${addressSuburb.value} ${streetAddress.value}`
} }
} }
}, },
mounted(){ mounted(){
this.file = window.location.protocol + '//' + window.location.hostname + ':9091/office/uploadFileResource/' this.file = window.location.protocol + '//' + window.location.hostname + ':9091/office/uploadFileResource/'
this.searchCountry()
}, },
methods: { methods: {
// tab切换 // tab切换
changeTab(active){ changeTab(active){
this.active=active this.active=active
this.errorMsg = ''
this.captcha = '' this.captcha = ''
this.getCaptcha(); this.getCaptcha();
}, },
...@@ -634,7 +689,6 @@ export default { ...@@ -634,7 +689,6 @@ export default {
const searchResult = await this.$api.search.searchGtin(params); const searchResult = await this.$api.search.searchGtin(params);
const {returnCode, returnMsg, data} = searchResult; const {returnCode, returnMsg, data} = searchResult;
if (returnCode === "0") { if (returnCode === "0") {
console.log('请求成功了')
this.GtinResultData = data ? data[0] : '' this.GtinResultData = data ? data[0] : ''
!data && (this.errorMsg = '没有查询到相关信息!') !data && (this.errorMsg = '没有查询到相关信息!')
} else { } else {
...@@ -643,58 +697,93 @@ export default { ...@@ -643,58 +697,93 @@ export default {
} }
this.getCaptcha(); this.getCaptcha();
}, },
async searchCountry() {
const searchResult = await this.$api.search.searchCountry();
searchResult.data = [{countrytitle: '全部', twocode: null}, ...searchResult.data]
const {data} = searchResult;
this.countryList = data.map(item => {
return {...item, label: item.countrytitle, value: item.twocode }
})
},
async searchGLN() { async searchGLN() {
// this.errorMsg ='正在查询……' this.glnResultData = ''
// const params = { this.errorMsg ='正在查询……'
// uuid: this.uuid, const params = {
// captcha: this.captcha gln: this.glnInputValue,
// }; uuid: this.uuid,
// const searchResult = await this.$api.search.searchGtin(params); captcha: this.captcha
// const {returnCode, returnMsg, data} = searchResult; };
// if (returnCode === "0") { const searchResult = await this.$api.search.searchGLN(params);
// console.log('请求成功了') const {returnCode, returnMsg, data} = searchResult;
// this.GtinResultData = data ? data[0] : '' if (returnCode === "0") {
// !data && (this.errorMsg = '没有查询到相关信息!') if (data && data[0].glnRecords) {
// } else { data[0].glnRecords.forEach(item => {
// this.showResult = true; if (item.glnType === 'LEGAL_ENTITY') data[0].LEGAL_ENTITY = item
// this.errorMsg = returnMsg || '您输入的商品条码格式不正确,请确认后重试。'; if (item.glnType === 'FIXED_PHYSICAL_LOCATION') data[0].FIXED_PHYSICAL_LOCATION = item
// } if (item.glnType === 'DIGITAL_LOCATION') data[0].DIGITAL_LOCATION = item
})
}
this.glnResultData = data ? data[0] : ''
console.log(this.glnResultData)
!data && (this.errorMsg = '没有查询到相关信息!')
} else {
this.showResult = true;
this.errorMsg = returnMsg || '没有查询到相关信息!';
}
this.getCaptcha(); this.getCaptcha();
}, },
async searchGS1() { async searchGS1() {
// this.errorMsg ='正在查询……' this.gs1ResultData = ''
// const params = { this.errorMsg ='正在查询……'
// uuid: this.uuid, const params = {
// captcha: this.captcha keyType: this.gs1Type,
// }; keyValue: this.gs1InputValue,
// const searchResult = await this.$api.search.searchGtin(params); uuid: this.uuid,
// const {returnCode, returnMsg, data} = searchResult; captcha: this.captcha
// if (returnCode === "0") { };
// console.log('请求成功了') const searchResult = await this.$api.search.searchGs1(params);
// this.GtinResultData = data ? data[0] : '' const {returnCode, returnMsg, data} = searchResult;
// !data && (this.errorMsg = '没有查询到相关信息!') if (returnCode === "0") {
// } else { // if (data && this.gs1Type === 'GTIN') data[0] = {...data[0], gs1Licence: data[0]}
// this.showResult = true; this.gs1ResultData = data ? data[0] : ''
// this.errorMsg = returnMsg || '您输入的商品条码格式不正确,请确认后重试。'; !data && (this.errorMsg = '没有查询到相关信息!')
// } } else {
this.showResult = true;
this.errorMsg = returnMsg || '您输入的GS1标识不正确,请确认后重试。';
}
this.getCaptcha(); this.getCaptcha();
}, },
searchQY() { async searchQY() {
// this.errorMsg ='正在查询……' this.qyResultData = ''
// const params = { this.errorMsg ='正在查询……'
// uuid: this.uuid, const params = {
// captcha: this.captcha countryCode: this.countryCode,
// }; licenseeName: this.licenseeName,
// const searchResult = await this.$api.search.searchGtin(params); streetAddress: this.otherFiled ? this.streetAddress : '',
// const {returnCode, returnMsg, data} = searchResult; postalCode: this.otherFiled ? this.postalCode : '',
// if (returnCode === "0") { addressLocality: this.otherFiled ? this.addressLocality : '',
// console.log('请求成功了') uuid: this.uuid,
// this.GtinResultData = data ? data[0] : '' captcha: this.captcha,
// !data && (this.errorMsg = '没有查询到相关信息!') pageindex: this.currPage,
// } else { pagesize: this.pageSize
// this.showResult = true; };
// this.errorMsg = returnMsg || '您输入的商品条码格式不正确,请确认后重试。'; const searchResult = await this.$api.search.searchQy(params);
// } const {returnCode, returnMsg, data} = searchResult;
if (returnCode === "0") {
data.list = data.list.map(item => {
item.address = item.address || {addressLocality: {language: '', value: ''}, countryCode: ''}
return {...item, countrytitle: (this.countryList.find(country => country.twocode === item.address.countryCode) || {countrytitle: ''}).countrytitle}
})
console.log(data.list)
this.qyResultData = data.list
this.tableData = data.list
this.total = data.totalCount
this.totalMaxShowNum = Math.min(data.totalCount, 20)
!data && (this.errorMsg = '没有查询到相关信息!')
} else {
this.showResult = true;
this.errorMsg = returnMsg || '没有查询到相关信息!';
}
this.getCaptcha(); this.getCaptcha();
}, },
async handleSearch() { async handleSearch() {
......
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