Commit 55e4c9f4 by tang

feat: 查询服务优化,右上角优化

parent e00bfd00
...@@ -59,13 +59,6 @@ export default { ...@@ -59,13 +59,6 @@ export default {
}, },
{ {
id: uuid("gs_nav"), id: uuid("gs_nav"),
name: "医疗器械唯一标识(UDI)",
index: 4,
link: "http://healthcare.ancc.org.cn/webhug/UDI/page1.html",
},
{
id: uuid("gs_nav"),
name: "全球商品数据共享平台", name: "全球商品数据共享平台",
index: 5, index: 5,
link: "http://b2b.gds.org.cn/", link: "http://b2b.gds.org.cn/",
...@@ -76,6 +69,13 @@ export default { ...@@ -76,6 +69,13 @@ export default {
index: 6, index: 6,
link: "https://www.ebrun.com/kh/2019gs1crossborder/index-pc.html", link: "https://www.ebrun.com/kh/2019gs1crossborder/index-pc.html",
}, },
{
id: uuid("gs_nav"),
name: "UDI一站式服务",
index: 4,
link: "http://healthcare.ancc.org.cn/webhug/UDI/page1.html",
},
], ],
}, },
{ {
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
<img src="../../assets/image/head/search.png" alt=""/> <img src="../../assets/image/head/search.png" alt=""/>
</div> </div>
<div @click="toAdmin" style="color: #00799e;display:flex;align-items: center;cursor: pointer;margin-left: 14px" v-if="user.username"> <div @click="toAdmin" style="color: #00799e;display:flex;align-items: center;cursor: pointer;margin-left: 14px" v-if="user.username">
<!-- <img style="width:22px;"--> <img style="width:22px;"
<!-- src="../../assets/image/mymanage/pic_touxiang.png" alt="">--> src="../../assets/image/mymanage/pic_touxiang.png" alt="">
<span style="">个人中心:</span> <!-- <span style="">个人中心:</span>-->
<span style="margin-left: 4px;font-weight: bold">{{ user.username }}</span> <span class="gs-hover" style="margin-left: 4px;font-weight: bold">{{ user.username }}</span>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
export default { export default {
data() { data() {
return { return {
search: {code: "", pack: "", result: ''}, search: {code: "", pack: "0", result: ''},
result: null, result: null,
}; };
}, },
......
...@@ -79,6 +79,12 @@ ...@@ -79,6 +79,12 @@
import validation from "@/views/Search/validation"; import validation from "@/views/Search/validation";
import {mapState} from "vuex"; import {mapState} from "vuex";
const errorText = {
"1":'没有符合条件的记录!',
"2":'未找到该商品条码信息!',
"10":'厂商识别代码已注销!',
"14":'搜索频率过多!',
}
export default { export default {
mixins: [validation], mixins: [validation],
data() { data() {
...@@ -109,10 +115,10 @@ export default { ...@@ -109,10 +115,10 @@ export default {
const searchGlnRes = await this.$api.search.searchGln(params); const searchGlnRes = await this.$api.search.searchGln(params);
const {returnCode, data} = searchGlnRes; const {returnCode, data} = searchGlnRes;
if (returnCode === "0") { if (returnCode === "0") {
if (data.returnCode === '0') { if (data.returnCode === '0' || data.returnCode === '3') {
this.result = [data]; this.result = [data];
} else { } else {
this.errorMsg = searchGlnRes.returnMsg || "暂无数据"; this.errorMsg = errorText[data.returnCode] || "数据查询异常!";
} }
} else { } else {
this.errorMsg = this.errorMsg =
......
...@@ -83,6 +83,12 @@ ...@@ -83,6 +83,12 @@
<script> <script>
import {getUUID} from "@/utils/utils"; import {getUUID} from "@/utils/utils";
const errorText = {
"1":'没有符合条件的记录!',
"2":'未找到该商品条码信息!',
"10":'厂商识别代码已注销!',
"14":'搜索频率过多!',
}
export default { export default {
data() { data() {
return { return {
...@@ -127,7 +133,7 @@ export default { ...@@ -127,7 +133,7 @@ export default {
if (data.returnCode === '0' || data.returnCode === '3') { if (data.returnCode === '0' || data.returnCode === '3') {
this.result = [data]; this.result = [data];
} else { } else {
this.errorMsg = "暂无数据"; this.errorMsg = errorText[data.returnCode] || "数据查询异常!";
} }
} else { } else {
this.errorMsg = this.errorMsg =
......
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
mixins: [validation], mixins: [validation],
data() { data() {
return { return {
type: '', type: '1',
options: [ options: [
{label: '中文标题', value: '1'}, {label: '中文标题', value: '1'},
{label: '英文标题', value: '2'}, {label: '英文标题', value: '2'},
......
...@@ -67,14 +67,14 @@ ...@@ -67,14 +67,14 @@
header-cell-class-name="search-table-hc" header-cell-class-name="search-table-hc"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="shortCode" label="缩短码"> <el-table-column prop="shortCode" label="缩短码" width="80px">
</el-table-column> </el-table-column>
<el-table-column prop="produceName" label="商品名称"> <el-table-column prop="produceName" label="商品名称" width="170px">
</el-table-column> </el-table-column>
<el-table-column prop="brandName" label="商标"></el-table-column> <el-table-column prop="brandName" label="商标"></el-table-column>
<el-table-column prop="produceStyle" label=规格></el-table-column> <el-table-column prop="produceStyle" label=规格 width="80px"></el-table-column>
<el-table-column prop="producePack" label="包装"></el-table-column> <el-table-column prop="producePack" label="包装" width="100px"></el-table-column>
<el-table-column prop="firmName" label="厂商名称"></el-table-column> <el-table-column prop="firmName" label="厂商名称" width="210px"></el-table-column>
</el-table> </el-table>
</template> </template>
<span class="error-msg" v-else>{{ errorMsg }}</span> <span class="error-msg" v-else>{{ errorMsg }}</span>
......
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