Skip to content

G
gs1
Commit db895a67 by tang
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/Home/index.vue
parents 28ead92d 4b78567a
Showing with 381 additions and 119 deletions
src/axios/module/business.js
...@@ -17,6 +17,12 @@ const businessGetTop4 = (params = {}) => { ...@@ -17,6 +17,12 @@ const businessGetTop4 = (params = {}) => {
return POST(`${Prefix}/office/policy/api/getTop4`, params) return POST(`${Prefix}/office/policy/api/getTop4`, params)
} }
// 右侧条码公告前四条数据
const businessGetEanUpcTop4 = (params = {}) => {
return POST(`${Prefix}/office/eanupc/api/getEanUpcTop4`, params)
}
// 条码注册/注销公告 // 条码注册/注销公告
const businessGetEanUpcByCondition = (params = {}) => { const businessGetEanUpcByCondition = (params = {}) => {
return POST(`${Prefix}/office/eanupc/api/getEanUpcByCondition`, params) return POST(`${Prefix}/office/eanupc/api/getEanUpcByCondition`, params)
...@@ -45,6 +51,7 @@ const businessGetFaqById = (params = {}) => { ...@@ -45,6 +51,7 @@ const businessGetFaqById = (params = {}) => {
export default { export default {
businessDownLoad, businessDownLoad,
businessGetTop4, businessGetTop4,
businessGetEanUpcTop4,
businessGetEanUpcByCondition, businessGetEanUpcByCondition,
businessGetDetailById, businessGetDetailById,
businessGetPlanBranchList, businessGetPlanBranchList,
......
src/components/layout/footer.vue
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<div class="foot"> <div class="foot">
<div class="container"> <div class="container">
<div class="link"> <div class="link">
<div>国家市场监督管理总局</div> <div><a href="https://www.samr.gov.cn/">国家市场监督管理总局</a></div>
<div>国家标准化管理委员会</div> <div><a href="http://www.sac.gov.cn/">国家标准化管理委员会</a></div>
<div>地方编码分支机构</div> <div><a href="/Org/Branch">地方编码分支机构</a></div>
<div>国际物品编码组织(GS1)</div> <div><a href="https://www.gs1.org/">国际物品编码组织(GS1)</a></div>
<div>国际物品编码组织(GS1)成员网站</div> <div><a href="/Org/GS1Members">国际物品编码组织(GS1)成员网站</a></div>
</div> </div>
<div class="foot-line"></div> <div class="foot-line"></div>
<div class="row foot-bottom"> <div class="row foot-bottom">
...@@ -16,7 +16,14 @@ ...@@ -16,7 +16,14 @@
<div>咨询电话：400-7000-690</div> <div>咨询电话：400-7000-690</div>
</div> </div>
<div class="beian"> <div class="beian">
<div>京ICP备11036137号-10</div><span>|</span><div><img src="../../assets/image/foot/beian.png" alt="" />京公网安备11010102001434号</div> <div>京ICP备11036137号-10</div>
<span>|</span>
<div>
<img
src="../../assets/image/foot/beian.png"
alt=""
/>京公网安备11010102001434号
</div>
</div> </div>
<div class="address"> <div class="address">
地址：北京市东城区安定门外大街138号皇城国际大厦座3-6层<span>|</span>邮编：100011 地址：北京市东城区安定门外大街138号皇城国际大厦座3-6层<span>|</span>邮编：100011
...@@ -57,26 +64,26 @@ export default { ...@@ -57,26 +64,26 @@ export default {
<style lang="scss"> <style lang="scss">
@media screen and (max-width: 992px) { @media screen and (max-width: 992px) {
.foot{ .foot {
.link{ .link {
div{ div {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
} }
.foot-bottom{ .foot-bottom {
div{ div {
font-size: 12px !important; font-size: 12px !important;
} }
} }
.copright{ .copright {
div{ div {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
} }
.beian{ .beian {
span{ span {
padding: 0 8px !important; padding: 0 8px !important;
} }
} }
...@@ -106,8 +113,11 @@ export default { ...@@ -106,8 +113,11 @@ export default {
padding: 22px 0; padding: 22px 0;
div { div {
line-height: 30px; line-height: 30px;
color: #0e2c6b;
font-size: 14px; a {
color: #0e2c6b;
font-size: 14px;
}
// font-family: PingFangSC-Regular, PingFang SC; // font-family: PingFangSC-Regular, PingFang SC;
} }
} }
...@@ -117,7 +127,6 @@ export default { ...@@ -117,7 +127,6 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
} }
.copright { .copright {
display: flex; display: flex;
...@@ -130,11 +139,11 @@ export default { ...@@ -130,11 +139,11 @@ export default {
} }
} }
} }
.beian{ .beian {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
span{ span {
padding: 0 20px; padding: 0 20px;
} }
} }
......
src/components/layout/header/mock.js
...@@ -386,7 +386,7 @@ export const nav = [ ...@@ -386,7 +386,7 @@ export const nav = [
link: "/Business/Guide5", link: "/Business/Guide5",
breadcrumb: [ breadcrumb: [
{ name: "业务大厅", path: "/Business" }, { name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" }, { name: "我是系统成员", path: "/Business/Register" },
{ name: "我要培训——现场培训/线上培训" }, { name: "我要培训——现场培训/线上培训" },
], ],
}, },
...@@ -394,10 +394,10 @@ export const nav = [ ...@@ -394,10 +394,10 @@ export const nav = [
id: uuid("gs_nav"), id: uuid("gs_nav"),
name: "我要续展", name: "我要续展",
index: 2, index: 2,
link: "/Business/Guide6", link: "/Business/Renewal",
breadcrumb: [ breadcrumb: [
{ name: "业务大厅", path: "/Business" }, { name: "业务大厅", path: "/Business" },
{ name: "操作指南", path: "/Business/Guide" }, { name: "我是系统成员", path: "/Business/Register" },
{ name: "我要续展" }, { name: "我要续展" },
], ],
}, },
...@@ -412,7 +412,7 @@ export const nav = [ ...@@ -412,7 +412,7 @@ export const nav = [
breadcrumb: [ breadcrumb: [
{ name: "业务大厅", path: "/Business" }, { name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" }, { name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" }, { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "零售商品" }, { name: "零售商品" },
], ],
}, },
...@@ -488,7 +488,7 @@ export const nav = [ ...@@ -488,7 +488,7 @@ export const nav = [
breadcrumb: [ breadcrumb: [
{ name: "业务大厅", path: "/Business" }, { name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" }, { name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" }, { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "非零售商品" }, { name: "非零售商品" },
], ],
}, },
...@@ -501,7 +501,7 @@ export const nav = [ ...@@ -501,7 +501,7 @@ export const nav = [
breadcrumb: [ breadcrumb: [
{ name: "业务大厅", path: "/Business" }, { name: "业务大厅", path: "/Business" },
{ name: "我是系统成员", path: "/Business/Register" }, { name: "我是系统成员", path: "/Business/Register" },
// { name: "我要编码", path: "/Business/Code1?id=1-1" }, { name: "我要编码", path: "/Business/Code1?id=1-1" },
{ name: "物流单元" }, { name: "物流单元" },
], ],
}, },
......
src/views/Business/GLN.vue
...@@ -112,9 +112,10 @@ export default { ...@@ -112,9 +112,10 @@ export default {
}, },
methods: { methods: {
ckxqJump() { ckxqJump() {
this.$router.push({ window.open('/Knowledge/xts', '_blank');
path: '/Knowledge/xts' // this.$router.push({
}) // path: '/Knowledge/xts'
// })
} }
}, },
}; };
......
src/views/Business/NoticeMsg.vue
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
>{{msg.logoutFlag}}</span> >{{msg.logoutFlag}}</span>
</td> </td>
</tr> </tr>
<!-- <tr v-if="this.$route.query.id === 'zhuxiao'">
<!-- <tr v-if="this.$route.query.type === 'zhuxiao'">
<th>注销时间：</th> <th>注销时间：</th>
<td> <td>
<span <span
...@@ -127,11 +128,11 @@ export default { ...@@ -127,11 +128,11 @@ export default {
vertical-align: top; vertical-align: top;
border-top: 1px solid #dddddd; border-top: 1px solid #dddddd;
} }
&:nth-child(odd) { // &:nth-child(odd) {
td { // td {
border-bottom: 0; // border-bottom: 0;
} // }
} // }
} }
} }
} }
......
src/views/Business/copms/dffzjg.vue
...@@ -3,7 +3,14 @@ ...@@ -3,7 +3,14 @@
<cate :father="dffzjgCate"></cate> <cate :father="dffzjgCate"></cate>
<div class="container"> <div class="container">
<div class="row dffzjg-ul"> <div class="row dffzjg-ul">
<div class="col-auto" v-for="(tmp, i) in 20" :key="i">北京{{i}}</div> <div
class="col-auto"
v-for="(tmp, i) in list"
:key="i"
@click="openMsg(tmp.branchCode)"
>
{{ tmp.name }}
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -21,17 +28,225 @@ export default { ...@@ -21,17 +28,225 @@ export default {
name: "地方分支机构", name: "地方分支机构",
ico: require("../../../assets/image/business/icon_jigou.png"), ico: require("../../../assets/image/business/icon_jigou.png"),
}, },
list: [
{
name: "北京",
branchCode: "1105",
},
{
name: "天津",
branchCode: "1201",
},
{
name: "河北",
branchCode: "1301",
},
{
name: "山西",
branchCode: "1405",
},
{
name: "内蒙古",
branchCode: "1505",
},
{
name: "辽宁",
branchCode: "2101",
},
{
name: "沈阳",
branchCode: "2105",
},
{
name: "大连",
branchCode: "2106",
},
{
name: "吉林",
branchCode: "2201",
},
{
name: "长春",
branchCode: "2205",
},
{
name: "黑龙江",
branchCode: "2301",
},
{
name: "哈尔滨",
branchCode: "",
},
{
name: "上海",
branchCode: "3101",
},
{
name: "江苏",
branchCode: "3201",
},
{
name: "南京办事处",
branchCode: "3205",
},
{
name: "浙江",
branchCode: "3301",
},
{
name: "杭州",
branchCode: "3302",
},
{
name: "宁波",
branchCode: "3302",
},
{
name: "安徽",
branchCode: "3405",
},
{
name: "福建",
branchCode: "3501",
},
{
name: "厦门办事处",
branchCode: "3505",
},
{
name: "江西",
branchCode: "3605",
},
{
name: "山东",
branchCode: "3701",
},
{
name: "青岛办事处",
branchCode: "3705",
},
{
name: "烟台办事处",
branchCode: "3706",
},
{
name: "河南",
branchCode: "4101",
},
{
name: "湖北",
branchCode: "4201",
},
{
name: "武汉",
branchCode: "4202",
},
{
name: "湖南",
branchCode: "4305",
},
{
name: "广东",
branchCode: "4401",
},
{
name: "深圳",
branchCode: "4402",
},
{
name: "广州",
branchCode: "4404",
},
{
name: "珠海",
branchCode: "4405",
},
{
name: "广西",
branchCode: "4505",
},
{
name: "海南",
branchCode: "4605",
},
{
name: "四川",
branchCode: "5101",
},
{
name: "成都办事处",
branchCode: "5105",
},
{
name: "重庆",
branchCode: "5106",
},
{
name: "贵州",
branchCode: "5205",
},
{
name: "云南",
branchCode: "5305",
},
{
name: "西藏",
branchCode: "5405",
},
{
name: "陕西",
branchCode: "6106",
},
{
name: "西安",
branchCode: "6107",
},
{
name: "甘肃",
branchCode: "6201",
},
{
name: "青海",
branchCode: "6305",
},
{
name: "宁夏",
branchCode: "6405",
},
{
name: "新疆",
branchCode: "6501",
},
],
}; };
}, },
methods: {
openMsg(branchCode) {
let routeData = this.$router.resolve({
path: '/Org/BranchMsg',
query: {
branchCode,
},
});
window.open(routeData.href, "_blank");
// this.$router.push({
// path: "/Org/BranchMsg",
// query: {
// branchCode,
// },
// });
},
},
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.dffzjg { .dffzjg {
@include module-box; @include module-box;
.dffzjg-ul { .dffzjg-ul {
padding: 10px 0; padding: 10px 0;
div{ div {
margin: 5px 0; margin: 5px 0;
cursor: pointer;
} }
} }
} }
......
src/views/Business/copms/tmgg.vue
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<div class="tmgg"> <div class="tmgg">
<cate :father="tmggCate"></cate> <cate :father="tmggCate"></cate>
<div class="container"> <div class="container">
<ul class="tmgg-ul"> <ul class="tmgg-ul">
<li v-for="(tmp, i) in list" :key="i"> <li v-for="(tmp, i) in list" :key="i" @click="openMsg(tmp)">
<span>【{{tmp.name}}】</span> <span>【{{ tmp.logoutFlag === '0' ? '注销' : '注册' }}】</span>
<span>{{tmp.content}}</span> <span>{{ tmp.firmName }}</span>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</template> </template>
...@@ -25,52 +25,68 @@ export default { ...@@ -25,52 +25,68 @@ export default {
ico: require("../../../assets/image/business/icon_gonggao.png"), ico: require("../../../assets/image/business/icon_gonggao.png"),
}, },
list: [ list: [
{
type: 'zhuce', ],
name: '注册',
content: '武隆区陈氏面条加工坊'
},
{
type: 'zhuce',
name: '注册',
content: '重庆功存科技有限公司'
},
{
type: 'zhuxiao',
name: '注销',
content: '杭州瀚扬科技有限公司'
},
{
type: 'zhuxiao',
name: '注销',
content: '贵州国伟自由行智能科技有限公司'
}
]
}; };
}, },
created() {
this.getEanUpcTop4();
},
methods: {
// 条码公告前四条数据
async getEanUpcTop4() {
// console.log(params, "params");
const businessGetEanUpcTop4Res =
await this.$api.business.businessGetEanUpcTop4();
const { success, data } = businessGetEanUpcTop4Res;
if (success) {
console.log(businessGetEanUpcTop4Res, "条码公告前四条数据");
this.list = data;
}
},
openMsg(tmp) {
console.log(tmp, 'openMsg');
let type;
if (tmp.logoutFlag === "0") {
type = "zhuxiao";
} else {
type = "zhuce";
}
let routeData = this.$router.resolve({
path: "/Business/Notice/Msg",
query: {
type,
fId: tmp.fid,
code: tmp.code,
},
});
window.open(routeData.href, "_blank");
},
},
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.tmgg { .tmgg {
@include module-box; @include module-box;
.tmgg-ul{ .tmgg-ul {
padding: 10px 0;
margin: 0;
li {
font-size: 14px;
display: flex;
align-items: center;
padding: 10px 0; padding: 10px 0;
margin: 0; cursor: pointer;
li{ span {
font-size: 14px; &:nth-child(1) {
display: flex; color: rgba(0, 121, 158, 1);
align-items: center; }
padding: 10px 0; &:nth-child(2) {
span{ flex: 1;
&:nth-child(1){ @include ellipsis;
color: rgba(0, 121, 158, 1); }
}
&:nth-child(2){
flex: 1;
@include ellipsis;
}
}
} }
}
} }
} }
</style> </style>
src/views/Business/copms/zcfg.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<cate :father="zcfgCate"></cate> <cate :father="zcfgCate"></cate>
<div class="container"> <div class="container">
<ul class="zcfg-ul"> <ul class="zcfg-ul">
<li v-for="(tmp, i) in list" :key="i"> <li v-for="(tmp, i) in list" :key="i" @click="openMsg(tmp.id)">
<span>{{tmp.title}}</span> <span>{{tmp.title}}</span>
</li> </li>
</ul> </ul>
...@@ -40,6 +40,15 @@ export default { ...@@ -40,6 +40,15 @@ export default {
} }
console.log(businessGetTop4Res, "右侧政策法规前四条数据"); console.log(businessGetTop4Res, "右侧政策法规前四条数据");
}, },
openMsg(id) {
let routeData = this.$router.resolve({
path: '/Knowledge/Statuteinfo',
query: {
id,
},
});
window.open(routeData.href, "_blank");
},
}, },
}; };
</script> </script>
...@@ -54,6 +63,7 @@ export default { ...@@ -54,6 +63,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 10px 0; padding: 10px 0;
cursor: pointer;
span { span {
&:nth-child(1) { &:nth-child(1) {
flex: 1; flex: 1;
......
src/views/Service/Partners/caseList.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<el-option <el-option
v-for="item in serviceList" v-for="item in serviceList"
:key="item.value" :key="item.value"
:label="item.value" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
...@@ -60,21 +60,21 @@ export default { ...@@ -60,21 +60,21 @@ export default {
total: 0, total: 0,
}, },
search: { search: {
service: "全部服务行业", service: "",
}, },
serviceList: [ serviceList: [
{ value: "全部服务行业" }, { value: "", label: "全部服务行业" },
{ value: "医疗" }, { value: "医疗", label: "医疗" },
{ value: "零售" }, { value: "零售", label: "零售" },
{ value: "电子商务" }, { value: "电子商务", label: "电子商务" },
{ value: "食品烟酒" }, { value: "食品烟酒", label: "食品烟酒" },
{ value: "物流" }, { value: "物流", label: "物流" },
{ value: "服装" }, { value: "服装", label: "服装" },
{ value: "快速消费品" }, { value: "快速消费品", label: "快速消费品" },
{ value: "消费电子产品" }, { value: "消费电子产品", label: "消费电子产品" },
{ value: "制造和零部件" }, { value: "制造和零部件", label: "制造和零部件" },
{ value: "建材" }, { value: "建材", label: "建材" },
{ value: "其他" }, { value: "其他", label: "其他" },
], ],
list: [], list: [],
}; };
......
src/views/Service/Partners/list.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-option <el-option
v-for="item in technologyList" v-for="item in technologyList"
:key="item.value" :key="item.value"
:label="item.value" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<el-option <el-option
v-for="item in serviceList" v-for="item in serviceList"
:key="item.value" :key="item.value"
:label="item.value" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
...@@ -79,30 +79,30 @@ export default { ...@@ -79,30 +79,30 @@ export default {
total: 0, total: 0,
}, },
search: { search: {
technology: "全部技术领域", technology: "",
service: "全部服务行业", service: "",
}, },
technologyList: [ technologyList: [
{ value: "全部技术领域" }, { value: "", label: '全部技术领域' },
{ value: "标识的打印和制作" }, { value: "标识的打印和制作", label: '标识的打印和制作' },
{ value: "系统集成" }, { value: "系统集成", label: '系统集成' },
{ value: "信息服务" }, { value: "信息服务", label: '信息服务' },
{ value: "咨询服务" }, { value: "咨询服务", label: '咨询服务' },
{ value: "其他" }, { value: "其他", label: '其他' },
], ],
serviceList: [ serviceList: [
{ value: "全部服务行业" }, { value: "", label: '全部服务行业' },
{ value: "医疗" }, { value: "医疗", label: '医疗' },
{ value: "零售" }, { value: "零售", label: '零售' },
{ value: "电子商务" }, { value: "电子商务", label: '电子商务' },
{ value: "食品烟酒" }, { value: "食品烟酒", label: '食品烟酒' },
{ value: "物流" }, { value: "物流", label: '物流' },
{ value: "服装" }, { value: "服装", label: '服装' },
{ value: "快速消费品" }, { value: "快速消费品", label: '快速消费品' },
{ value: "消费电子产品" }, { value: "消费电子产品", label: '消费电子产品' },
{ value: "制造和零部件" }, { value: "制造和零部件", label: '制造和零部件' },
{ value: "建材" }, { value: "建材", label: '建材' },
{ value: "其他" }, { value: "其他", label: '其他' },
], ],
list: [], list: [],
}; };
...@@ -142,6 +142,9 @@ export default { ...@@ -142,6 +142,9 @@ export default {
console.log(data, "服务商列表"); console.log(data, "服务商列表");
this.pageParams.total = data.totalCount; this.pageParams.total = data.totalCount;
this.list = data.list; this.list = data.list;
this.list.forEach(el => {
el.title = el.firmname;
})
} }
}, },
}, },
......
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