Skip to content

Z
zhichan
Commit 1e0316dc by 刘泽奇
Options

123

parent ba070bd4
Showing with 103 additions and 49 deletions
igirl-channel-web/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/app/front/entry/public/js/index.js
...@@ -189,13 +189,14 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -189,13 +189,14 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}, },
// 处理参数方法 // 处理参数方法
copyParams(actionBody, actionType, url, isUser = "no") { copyParams(actionBody, actionType, url, isUser = "no",isDecryptUser = "no") {
var data = this.commonParams; var data = this.commonParams;
data.actionProcess = this.$root.getChannelPath(); data.actionProcess = this.$root.getChannelPath();
data.actionType = actionType; data.actionType = actionType;
data.actionBody = actionBody || {}; data.actionBody = actionBody || {};
data.requrl = this.host + url; data.requrl = this.host + url;
data.isUser = isUser; data.isUser = isUser;
data.isDecryptUser = isDecryptUser;
let currentDate = Math.floor(new Date().getTime() / 1000); let currentDate = Math.floor(new Date().getTime() / 1000);
data.actionBody.timeStamp = currentDate; data.actionBody.timeStamp = currentDate;
data.actionBody.channelUserId = this.$root.channelUserId; data.actionBody.channelUserId = this.$root.channelUserId;
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
商标流程 商标流程
</div> </div>
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="3" align-center> <el-steps :active="currentStep" align-center>
<el-step title="待上传材料" description=""></el-step> <el-step v-if="itemName" title="待上传材料" description=""></el-step>
<el-step title="待确认方案"></el-step> <el-step v-if="!itemName" title="待确认方案"></el-step>
<el-step title="方案不通过"></el-step> <!-- <el-step v-if="itemName" title="方案不通过"></el-step> -->
<el-step title="待审核"></el-step> <el-step title="待审核"></el-step>
<el-step title="待递交"></el-step> <el-step title="待递交"></el-step>
<el-step title="已递交"></el-step> <el-step title="已递交"></el-step>
<el-step title="已完成"></el-step> <el-step title="已完成"></el-step>
</el-steps> </el-steps>
</div> </div>
<div class="jdindentdetail-main-step-row"> <div class="jdindentdetail-main-step-row">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
<div class="jdindentdetail-info"> <div class="jdindentdetail-info">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
商标信息 <span @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span> 商标信息 <span v-if="itemName" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div> <div>
<p> <p>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
广告销售 广告销售
<span>-1213</span> <span>-1213</span>
<span>初审公告</span> <span>初审公告</span>
<span @click="showDialog(2)"><i class="el-icon-edit"></i> 修改</span> <span v-if="itemName" @click="showDialog(2)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div class="jdindentdetail-main-type-services"> <div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p> <p>商品服务项目：</p>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<div class="jdindentdetail-main-official"> <div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
交官文件 <span @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span> 交官文件 <span v-if="itemName" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div class="jdindentdetail-main-official-img"> <div class="jdindentdetail-main-official-img">
<div> <div>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-applicant"> <div class="jdindentdetail-main-applicant">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
申请人信息-（中国大陆-企业） <span @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> 申请人信息-（中国大陆-企业） <span v-if="itemName" @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>公司名称：</span><span>{{applyInfo.name}}</span></li> <li><span>公司名称：</span><span>{{applyInfo.name}}</span></li>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-contact"> <div class="jdindentdetail-main-contact">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
订单联系人 <span @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span> 订单联系人 <span v-if="itemName" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>联系人：</span><span>{{applyInfo.contacts}}</span></li> <li><span>联系人：</span><span>{{applyInfo.contacts}}</span></li>
...@@ -152,19 +152,19 @@ ...@@ -152,19 +152,19 @@
</ul> </ul>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<!-- <div class="jdindentdetail-main-payment"> <div class="jdindentdetail-main-payment">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
付款信息 付款信息
</div> </div>
<div> <div>
<span>实付金额：<span>¥300.00</span></span> <span>实付金额：<span>{{form.totalSum}}</span></span>
<span>官费：<span>¥300.00</span></span> <span>官费：<span>¥300.00</span></span>
<span>支付时间：<span>¥300.00</span></span> <!-- <span>支付时间：<span>¥300.00</span></span> -->
<span>优惠额度：<span>¥300.00</span></span> <!-- <span>优惠额度：<span>¥300.00</span></span> -->
<span>服务费：<span>¥213</span></span> <span>服务费：<span>¥213</span></span>
<span>支付方式：<span>¥213</span></span> <!-- <span>支付方式：<span>¥213</span></span> -->
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -301,8 +301,11 @@ ...@@ -301,8 +301,11 @@
nclInfo: [], nclInfo: [],
/* */ /* */
orderFlow: {}, orderFlow: {},
currentStep: "", currentStep: "1",
channelUserId: "", channelUserId: "",
itemName: '',
deliveryStatus: "",
totalSum:"",
} }
}, },
mounted: function() { mounted: function() {
...@@ -321,12 +324,41 @@ ...@@ -321,12 +324,41 @@
if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") { if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") {
this.deliveryOrderNo = this.$route.query.deliveryOrderNo; this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
this.$root.channelUserId = this.$route.query.channelUserId; this.$root.channelUserId = this.$route.query.channelUserId;
this.itemName = this.$route.query.itemName == "商标自助注册" || this.$route.query.itemName == "商标自主注册" ? true : false;
this.initIndent(); this.initIndent();
} }
if (this.$route.query.deliveryStatus != "") {
this.deliveryStatus = this.$route.query.deliveryStatus;
console.log(this.deliveryStatus, this.currentStep, `llllllllllllllllllll`);
switch (this.deliveryStatus) {
case "dsccl":
this.currentStep = 1;
break;
case "dqrfa":
this.currentStep = 1;
break;
case "dsh":
this.currentStep = 2;
break;
case "ddj":
this.currentStep = 3;
break;
case "ydj":
this.currentStep = 4;
break;
case "ywc":
this.currentStep = 5;
break;
default:
break;
}
}
}, },
created: function() { created: function() {
}, },
computed: { computed: {
...@@ -345,7 +377,6 @@ ...@@ -345,7 +377,6 @@
console.log(d, `deliveryInfo`); console.log(d, `deliveryInfo`);
this.deliveryInfo = d.data.tm; this.deliveryInfo = d.data.tm;
this.orderFlow = d.data.orderFlow; this.orderFlow = d.data.orderFlow;
this.currentStep = this.orderFlow.length;
this.orderFlow.map((item, index) => { this.orderFlow.map((item, index) => {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false }); item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false });
}) })
...@@ -1238,7 +1269,7 @@ ...@@ -1238,7 +1269,7 @@
switch (v) { switch (v) {
case '商标信息': case '商标信息':
this.form.channelUserId = this.channelUserId; this.form.channelUserId = this.channelUserId;
var obj = this.$root.copyParams(this.form, "updateTmInfo", "/action/tmOrder/springBoard", "yes"); var obj = this.$root.copyParams(this.form, "updateTmInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res); console.log(res);
}).catch((e) => { }).catch((e) => {
...@@ -1246,7 +1277,7 @@ ...@@ -1246,7 +1277,7 @@
}); });
break; break;
case '商标类别': case '商标类别':
var obj = this.$root.copyParams(this.form, "updateNclInfo", "/action/tmOrder/springBoard", "yes"); var obj = this.$root.copyParams(this.form, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res); console.log(res);
}).catch((e) => { }).catch((e) => {
...@@ -1255,7 +1286,7 @@ ...@@ -1255,7 +1286,7 @@
break; break;
case '交官文件': case '交官文件':
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes"); var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res); console.log(res);
}).catch((e) => { }).catch((e) => {
...@@ -1264,7 +1295,7 @@ ...@@ -1264,7 +1295,7 @@
break; break;
case '申请人信息': case '申请人信息':
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes"); var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res); console.log(res);
}).catch((e) => { }).catch((e) => {
...@@ -1273,7 +1304,7 @@ ...@@ -1273,7 +1304,7 @@
break; break;
case '订单联系人': case '订单联系人':
this.applyInfo.deliveryOrderNo = this.deliveryOrderNo; this.applyInfo.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.applyInfo, "updateContacts", "/action/tmOrder/springBoard", "yes"); var obj = this.$root.copyParams(this.applyInfo, "updateContacts", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res); console.log(res);
}).catch((e) => { }).catch((e) => {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -136,6 +136,9 @@ ...@@ -136,6 +136,9 @@
.jdindentlist-list .el-table .el-table_1_column_11{ .jdindentlist-list .el-table .el-table_1_column_11{
padding-right: 25px; padding-right: 25px;
} }
.jdindentlist-list .el-table .el-table_1_column_9{
color: red;
}
.jdindentlist-null{ .jdindentlist-null{
width: 34.57%; width: 34.57%;
height: 333px; height: 333px;
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -17,44 +17,46 @@ ...@@ -17,44 +17,46 @@
input: "", input: "",
businessType: [ businessType: [
{ {
value: '选项1', value: 'zzzc',
label: '自主注册' label: '自助注册'
}, },
{ {
value: '选项2', value: 'zzfzzc',
label: '专家辅助注册' label: '专家辅助注册'
}, },
], ],
DeliveryStatus: [ DeliveryStatus: [
{ {
value: '选项1', value: 'dsccl',
label: '提交订单' label: '待上传材料'
}, },
{ {
value: '选项2', value: 'dqrfa',
label: '待上传材料' label: '待确认方案'
},
{
value: 'fabtg',
label: '方案不通过'
}, },
{ {
value: '选项3', value: 'dsh',
label: '已审核' label: '待审核'
}, },
{ {
value: '选项4', value: 'ddj',
label: '审核不同过' label: '待递交'
}, },
{ {
value: '选项5', value: 'ydj',
label: '已递交' label: '已递交'
}, },
{ {
value: '选项6', value: 'ywc',
label: '已完成' label: '已完成'
}, },
{
value: '选项6',
label: '已关闭'
}
], ],
indentInfo: { indentInfo: {
"channelServiceNo": "", "channelServiceNo": "",
...@@ -217,6 +219,7 @@ ...@@ -217,6 +219,7 @@
stuff: {}, stuff: {},
showUploadStuff: false, showUploadStuff: false,
currentOrderNo: "", currentOrderNo: "",
currentOrderType:"",
} }
}, },
created: function() { created: function() {
...@@ -256,10 +259,24 @@ ...@@ -256,10 +259,24 @@
}, },
viewDetails(index, row) { viewDetails(index, row) {
console.log(index, row); console.log(index, row);
this.$router.push({ path: "/1688/jdindentdetail", query: { deliveryOrderNo: row.deliveryOrderNo, channelUserId: this.$root.channelUserId } }); this.currentOrderType = row.itemName;
this.deliveryStatus = row.deliveryStatus;
this.$router.push({
path: "/1688/jdindentdetail",
query: {
deliveryOrderNo: row.deliveryOrderNo,
channelUserId: this.$root.channelUserId,
itemName: this.currentOrderType,
deliveryStatus:this.deliveryStatus,
totalSum:row.totalSum,
}
});
}, },
showSelf(index, row){ showSelf(index, row){
if (row.itemName == "商标自助注册" || row.itemName == "商标自主注册") { /*
console.log(index, row);
*/
if ((row.itemName == "商标自助注册" || row.itemName == "商标自主注册") && row.deliveryStatusName == "待上传材料") {
return true; return true;
} else { } else {
return false; return false;
...@@ -279,7 +296,7 @@ ...@@ -279,7 +296,7 @@
handleSizeChange(){ handleSizeChange(){
if (this.$root.channelUserId != "") { if (this.$root.channelUserId != "") {
this.indentInfo.pageIndex = this.currentPage; this.indentInfo.pageIndex = this.currentPage;
var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard","yes","yes");
this.$root.loading = true; this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
this.$root.loading = false; this.$root.loading = false;
...@@ -441,11 +458,13 @@ ...@@ -441,11 +458,13 @@
console.log(row, `zzzzzzzzzzzzzzzzzzzzzz`); console.log(row, `zzzzzzzzzzzzzzzzzzzzzz`);
this.showUploadStuff = true; this.showUploadStuff = true;
this.currentOrderNo = row.deliveryOrderNo; this.currentOrderNo = row.deliveryOrderNo;
this.currentName = row.name;
}, },
uploadStuffs(){ uploadStuffs(){
console.log(this.stuff); console.log(this.stuff);
this.stuff.deliveryOrderNo = this.currentOrderNo; this.stuff.deliveryOrderNo = this.currentOrderNo;
var obj = this.$root.copyParams(this.stuff, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes"); this.stuff.name = this.currentName;
var obj = this.$root.copyParams(this.stuff, "updateCustomerInfo", "/action/tmOrder/springBoard","yes","yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res); console.log(res);
if (res.status == 0) { if (res.status == 0) {
......
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