Skip to content

Z
zhichan
Commit c51a335e by 尹亚亭
Options

query

parent 763a5d92
Showing with 582 additions and 189 deletions
channel-access/src/api/tmOrder.js
......@@ -31,9 +31,28 @@ export function getProductDetail(channelitemcode) {
// 自主提报商标注册方式的获取订单编号
// 商标提报
export function subSelfregTmOrder(channelitemcode) {
export function submitSelfregTmOrder(channelitemcode) {
return http.post(baseUrl, {
actionBody: {
itemCode: "zzsbzc",
channelParams: {},
channelUser: {
channelUserId: "z1203155540315474420",
channelUserName: "testUser",
channelUserMoblie: "15010929368",
nickname: "",
orgName: "",
orgPath: ""
},
channelOrder: {
channelServiceNo: "z1203155540315474420",
channelOrderNo: "z12031,z1203d1",
needNo: "z120303d1",
quantity: 1,
nclCount: 10,
payStatus: "yfk",
payTime: "2019-09-11 10:23:21"
},
apply: {
applyAddr: "上海市杨浦区国定路346号三楼0624室",
applyArea: "",
......@@ -57,22 +76,18 @@ export function subSelfregTmOrder(channelitemcode) {
smwjUrl: "",
zipCode: "100000"
},
channelOrder: {
channelServiceNo: "z1203155540315474420",
channelOrderNo: "z12031,z1203d1",
needNo: "z120303d1",
quantity: 1,
nclCount: 10,
payStatus: "yfk",
payTime: "2019-09-11 10:23:21"
},
channelUser: {
channelUserId: "z1203155540315474420",
channelUserName: "testUser",
channelUserMoblie: "15010929368",
nickname: "",
orgName: "",
orgPath: ""
tm: {
colorizedPicUrl:
"https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg",
tmName: "testbiao",
picUrl:
"https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg",
selecttype: "自主选择",
tmFormType: "3",
totalPublicExpense: 270,
totalServiceCharge: 0,
totalSum: 270,
totalTaxes: "0.00"
},
nclones: [
{
......@@ -97,6 +112,7 @@ export function subSelfregTmOrder(channelitemcode) {
}
]
},
actionType: "subTmOrder"
actionType: "subTmOrder",
actionProcess: "bw"
});
}
channel-access/src/api/tmQuery.js
......@@ -36,3 +36,31 @@ export function findTrademarkzcr(name, pageSize, currentPage) {
}
});
}
// 近12期初审公告
export function noticequeryTMZCSQ() {
return http.post(baseUrl, {
actionType: "noticequeryTMZCSQ",
actionBody: {
noticetype: "TMZCSQ"
}
});
}
// 公告列表检索接口
export function noticequery() {
return http.post(baseUrl, {
actionType: "noticequery",
actionBody: {
noticenumber: "1656",
applynumber: "",
tmname: "大爱城控股",
applier: "",
noticetype: "TMZCSQ",
nclNum: "all",
// 公告列表检索接口
pageSize: 20,
currentPage: 1
}
});
}
channel-access/src/assets/css/reset.scss
......@@ -23,22 +23,22 @@ ol,
ul,
dd,
dl {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
li {
list-style: none;
list-style: none;
}
a {
text-decoration: none;
color: #666;
text-decoration: none;
color: #666;
}
i,
em {
font-style: normal;
font-style: normal;
}
h1,
......@@ -49,55 +49,55 @@ h5,
h6,
b,
strong {
font-weight: normal;
font-weight: normal;
}
img {
border: none;
display: block;
border: none;
display: block;
}
input {
outline: none;
outline: none;
}
body {
font-family: PingFangSC, "helvetica neue", "hiragino sans gb", "Segoe UI", Calibri, "microsoft yahei ui", "microsoft yahei", simsun, sans-serif;
font-size: 14px;
color: #333;
font-family: MicrosoftYaHei, PingFangSC, "helvetica neue", "hiragino sans gb",
"Segoe UI", Calibri, "microsoft yahei ui", "microsoft yahei", simsun,
sans-serif;
font-size: 14px;
color: #333;
}
html,
body {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
table {
border-collapse: collapse;
border-collapse: collapse;
}
a:hover {}
a:hover {
}
/*万能清除法，针对ie8及以上的浏览器的高度塌陷*/
.clearfix:after {
content: " ";
display: block;
clear: both;
height: 0;
visibility: hidden;
content: " ";
display: block;
clear: both;
height: 0;
visibility: hidden;
}
/*ie7及以下的浏览器的高度塌陷*/
.clearfix {
zoom: 1;
zoom: 1;
}
/* border-spacing调整相邻单元格间距*/
// table {
......@@ -107,15 +107,15 @@ a:hover {}
// border-spacing: 0;
// }
* {
// margin: 0;
// padding: 0;
// list-style: none;
// text-decoration: none;
// outline: none;
box-sizing: border-box;
// margin: 0;
// padding: 0;
// list-style: none;
// text-decoration: none;
// outline: none;
box-sizing: border-box;
}
// html,
// body {
// font-size: 14px;
// }
\ No newline at end of file
// }
channel-access/src/router/index.js
......@@ -99,8 +99,14 @@ const routes = [
name: "guaranteereg",
component: () => import("@/views/pages/guaranteereg/Guaranteereg")
},
// 公告查询 十二期公告 首页
{
path: "/bycnoticetm",
name: "bycnoticetm",
component: () => import("@/views/pages/bycnoticetm/Bycnoticetm")
},
// 公告查询 查询页面 查询页
{
// path: "/bycnoticeindex",
path: "/bycnoticeindex",
name: "bycnoticeindex",
component: () => import("@/views/pages/bycnoticeindex/Bycnoticeindex")
......@@ -117,22 +123,22 @@ const router = new VueRouter({
}
});
router.beforeEach((to, from, next) => {
let userpin = getCookie("userpin");
if (
to.path == "/user/login" ||
to.path == "/user/register" ||
to.path == "/user/forgetPassword" ||
to.path == "/jdtrademark"
) {
next();
} else {
if (userpin == "" || userpin == null) {
next("/user/login");
} else {
next();
}
}
});
// router.beforeEach((to, from, next) => {
// let userpin = getCookie("userpin");
// if (
// to.path == "/user/login" ||
// to.path == "/user/register" ||
// to.path == "/user/forgetPassword" ||
// to.path == "/jdtrademark"
// ) {
// next();
// } else {
// if (userpin == "" || userpin == null) {
// next("/user/login");
// } else {
// next();
// }
// }
// });
export default router;
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue 0 → 100644
<template>
<div>
<!-- 头部导航面包屑 -->
<div class="nav">
<span>商标公告查询</span>
</div>
<!-- 查询选择表单 -->
<div class="choice-form">
<el-form :inline="true" :model="choiceForm" :rules="rule">
<el-row class="first-row">
<el-form-item label="公告类型：" class="left-span">
<el-select
v-model="choiceForm.type"
placeholder="商标初步审定公告"
class="info-box"
@change="changeOption"
>
<el-option label="商标初步审定公告" value="chushen"></el-option>
<el-option
label="商标注册公告（一）"
value="gonggaoyi"
></el-option>
<el-option
label="商标注册公告（二）"
value="gonggaoer"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="公告期号：" class="left-span" prop="num">
<el-input
v-model="choiceForm.num"
placeholder="请输入公告期号"
class="info-box"
></el-input>
</el-form-item>
<el-button type="primary" @click="onSubmit" class="btn-size left-span"
>查询</el-button
>
</el-row>
</el-form>
</div>
<!-- 初审公告 -->
<div class="record">
<span>最新12期初审公告</span>
</div>
<!-- 公告表格 -->
<div class="brand-form-wrap">
<el-table :data="brandData" class="brand-form">
<el-table-column
prop="notice_issue"
label="公告期"
align="center"
width="240"
>
</el-table-column>
<el-table-column
prop="date"
label="初审公告日期"
align="center"
></el-table-column>
<el-table-column
prop="enddate"
label="异议申请截止日期"
align="center"
></el-table-column>
<el-table-column
prop="lastday"
label="异议申请剩余时间"
align="center"
></el-table-column>
<el-table-column prop="operation" label="操作" align="center">
<el-button type="text" size="small">公告详情</el-button>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
import { noticequeryTMZCSQ } from "@/api/tmQuery.js";
export default {
data() {
return {
// 查询选择表单数据
choiceForm: {
// 公告类型
type: "chushen",
// 公告期号
num: null
},
rule: {},
// 商标表格数据
brandData: []
};
},
methods: {
onSubmit() {
// console.log("submit!", this.choiceForm.num);
// console.log(typeof this.choiceForm.num);
if (this.choiceForm.num == null) {
console.log("konhkongkong");
this.$message({
message: "请输入目标",
type: "warning"
});
}
// 判断为
// if () {
// this.$message({
// message: "工期号只能是数字",
// type: "warning"
// });
// }
else {
this.$router.push({
path: "/bycnoticeindex",
query: {
type: this.choiceForm.type,
noticenum: this.choiceForm.num
}
});
}
},
changeOption(value) {
// console.log(value);
this.choiceForm.type = value;
console.log("change change", this.choiceForm.type);
}
},
created() {
// 刷新页面取消查询的query参数
this.$router.push("/bycnoticetm");
noticequeryTMZCSQ().then(res => {
this.brandData = res.data.rows;
});
},
mounted() {
console.log(this.choiceForm.type);
}
};
</script>
<style lang="scss" scoped>
/* 头部导航面包屑 */
.nav {
width: 1200px;
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
span {
font-weight: 500;
line-height: 20px;
font-size: 16px;
color: #03004c;
}
}
/* 查询选择表单 */
.choice-form {
background: #f7f8fc;
border: 1px solid #eff1f9;
width: 1198px;
height: 76px;
margin: 0 auto;
.first-row {
margin-top: 18px;
button.el-button {
background: #0989c5;
width: 80px;
height: 34px;
padding: 0;
box-sizing: border-box;
border-radius: 0;
line-height: 0;
}
}
.left-span {
margin-left: 20px;
height: 34px;
}
.info-box {
width: 300px;
border-radius: 0px;
}
.btn-size {
width: 60px;
height: 34px;
font-family: PingFangSC-Regular;
font-size: 14px;
}
}
/* 最新12期初审公告 */
.record {
width: 1200px;
margin: 0 auto;
height: 40px;
span {
padding-left: 17px;
font-size: 14px;
color: rgb(130, 130, 130);
line-height: 40px;
}
}
/* 商标表格 */
.brand-form-wrap {
width: 1198px;
margin: 0 auto;
border: 1px solid #d6daeb;
margin-bottom: 100px;
.brand-form {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
> .el-table__body-wrapper
> .el-table__body
> tbody
> .el-table__row
> .el-table_1_column_4
> .cell {
color: rgb(255, 90, 0);
}
}
}
</style>
channel-access/src/views/pages/guaranteereg/Guaranteereg.vue
......@@ -26,9 +26,6 @@
</p>
<div class="priceMsg">
<div v-if="productPriceList.length != 0">
<!-- <span
>总价<b>¥{{ (servicecharge + officialfee) * count }}</b></span
> -->
<span
>总价<b
>¥{{ productPriceList[clickedproduct].price * count }}</b
......@@ -89,7 +86,6 @@
<div class="productdetails-main-space"></div>
<div class="productdetails-main-bottom-pic">
<h3><span>产品详情</span><i></i></h3>
<!-- <img src="@/assets/imgs/dbsqPic.jpg" alt="" /> -->
<img :src="productDetails.desc_url" alt="" />
</div>
</div>
......@@ -102,10 +98,16 @@ import { getProductDetail } from "@/api/tmOrder.js";
export default {
data() {
return {
// 购买数量 默认为1
count: 1,
clickedproduct: 0,
// 该商标注册方式的详情数据
productDetails: {},
productPriceList: []
// 该商标注册方式的详情数据中的 产品服务价格列表数据
productPriceList: [],
// 点击切换的服务项下表
clickedproduct: 0,
// 记录注册类型 是 专家辅助申请 还是 担保申请
regType: ""
};
},
......@@ -114,7 +116,9 @@ export default {
this.$router.push({
path: "/placeorder",
query: {
count: this.count
count: this.count,
regType: this.regType,
serviceIndex: this.clickedproduct
}
});
}
......@@ -123,22 +127,23 @@ export default {
this.regType = this.$route.query.channelItemCode;
// 专家辅助申请 或是 担保申请
getProductDetail(this.$route.query.channelItemCode).then(res => {
// 请求数据并装填到productDetails里面
if (res.status == 0) {
if (res.data.length == 0) {
// 服务器端返回的数据为空
this.$notify({
title: "警告",
message: "没有该商品",
type: "warning"
});
// alert("服务器返回的数据为空");
} else {
// 请求数据并装填到productDetails里面
this.productDetails = res.data[0];
console.log("注册申请", this.productDetails);
// console.log("注册申请", this.productDetails);
this.productPriceList = res.data[0].productPriceList;
console.log("服务项", this.productPriceList);
// console.log("服务项", this.productPriceList);
}
} else {
// 服务器端请求失败
this.$notify.error({
title: "错误",
message: res.msg
......
channel-access/src/views/pages/placeorder/index.vue
......@@ -4,8 +4,21 @@
<div class="placeorder-main-container">
<div class="main-container-top">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item>首页</el-breadcrumb-item>
<el-breadcrumb-item>专家辅助商标注册</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/jdtrademark' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item
:to="{
path: 'guaranteereg?channelItemCode=' + $route.query.regType
}"
>{{
$route.query.regType == "FW_GOODS-580010-1"
? "专家辅助商标注册"
: $route.query.regType == "FW_GOODS-581978-1"
? "担保商标注册"
: ""
}}</el-breadcrumb-item
>
<el-breadcrumb-item>下单</el-breadcrumb-item>
</el-breadcrumb>
</div>
......@@ -82,6 +95,7 @@
</template>
<script>
import { getProductDetail } from "@/api/tmOrder.js";
export default {
data() {
//验证电话
......@@ -132,26 +146,66 @@ export default {
trigger: ["blur", "change"]
}
]
}
//
},
// 该商标注册方式的详情数据中的 产品服务价格列表数据
productPriceList: []
};
},
created() {
console.log(this.$route.query);
// 专家辅助申请 或是 担保申请,请求对应的商标注册申请方式下的数据
getProductDetail(this.$route.query.regType).then(res => {
if (res.status == 0) {
if (res.data.length == 0) {
this.$notify({
title: "警告",
message: "没有该商品", // 服务器端返回的数据为空
type: "warning"
});
} else {
// 得到数据中选择的服务项列表
this.productPriceList = res.data[0].productPriceList;
console.log("服务项", this.productPriceList);
// 判断渠道类型
if (this.$route.query.regType == "FW_GOODS-580010-1") {
this.tableData[0].name = "专家辅助商标注册";
this.tableData[0].official = this.productPriceList[
this.$route.query.serviceIndex
].public_expense;
this.tableData[0].service = this.productPriceList[
this.$route.query.serviceIndex
].service_charge;
} else if (this.$route.query.regType == "FW_GOODS-581978-1") {
console.log(this.productPriceList, "111111111");
this.tableData[0].name = "担保商标注册";
this.tableData[0].official = this.productPriceList[
this.$route.query.serviceIndex
].public_expense;
this.tableData[0].service = this.productPriceList[
this.$route.query.serviceIndex
].service_charge;
}
// this.tableData[0].total =
// (this.tableData[0].official + this.tableData[0].service) *
// this.tableData[0].count;
this.tableData[0].total =
this.productPriceList[this.$route.query.serviceIndex].price *
this.tableData[0].count;
}
} else {
this.$notify.error({
title: "错误", // 服务器端请求失败
message: res.msg
});
}
});
//
this.tableData[0].count = this.$route.query.count;
if (this.$route.query.type == "zjfz") {
this.tableData[0].name = "专家辅助商标注册";
this.tableData[0].official = 300;
this.tableData[0].service = 380;
} else if (this.$route.query.type == "dbsb") {
this.tableData[0].name = "担保商标注册";
this.tableData[0].official = 300;
this.tableData[0].service = 1080;
}
this.tableData[0].total =
(this.tableData[0].official + this.tableData[0].service) *
this.tableData[0].count;
},
mounted() {},
methods: {
submitForm() {
if (this.active) {
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
......@@ -252,6 +252,7 @@
</template>
<script>
import { submitSelfregTmOrder } from "@/api/tmOrder.js";
export default {
data() {
return {
......@@ -280,6 +281,9 @@ export default {
this.brandIcon = brandIcon;
// 确认订单编号的请求
submitSelfregTmOrder().then(res => {
console.log(res);
});
}
};
</script>
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
......@@ -490,7 +490,7 @@ export default {
// 树形结构的处理节点是否被选中
handleCheckChange(data, checked, indeterminate) {
console.log("check-change", 11111111111, indeterminate, data);
// console.log("check-change", 11111111111, indeterminate, data);
// 检测第三级节点是否被选中(一级节点两位code，二级节点四位code,三级节点6位或是0位code)
if (data.code.length !== 2 || data.code.length !== 4) {
......@@ -505,7 +505,7 @@ export default {
let datacode = data.pcode.substring(0, 2);
// 被选中的数据小于十条
if (this.classDataList.length < 10) {
console.log(this.classDataList);
// console.log(this.classDataList);
// 被选中的数据属于同一个类别
if (datacode == this.classCode) {
let index = this.classDataList.findIndex((item, index) => {
......@@ -560,7 +560,7 @@ export default {
},
// 树形结构的节点数据的装填
loadNode(node, resolve) {
console.log(node, "loadNode load function");
// console.log(node, "loadNode load function");
var hasChild;
// 没有搜索过
if (this.notSearched) {
......
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