Skip to content

Z
zhichan
Commit 0127decc by 刘泽奇
Options

123

parent 0d48eece
Showing with 49 additions and 35 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/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -57,8 +57,7 @@ ...@@ -57,8 +57,7 @@
.jdindentdetail-nav { .jdindentdetail-nav {
height: 70px; height: 70px;
box-sizing: border-box; box-sizing: border-box;
width: 100%; padding: 1.42% 2.64% 2.7% 3.28%;
margin: 0 auto;
line-height: 70px; line-height: 70px;
} }
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process"> <el-steps :active="currentStep" align-center process-status="process">
<el-step v-show="itemName" title="待上传材料" description=""></el-step> <el-step v-if="itemCode" title="待上传材料" description=""></el-step>
<el-step v-if="!itemName" title="待确认方案"></el-step> <el-step v-if="!itemCode" title="待确认方案"></el-step>
<!-- <el-step v-show="itemName" title="方案不通过"></el-step> --> <!-- <el-step v-show="itemCode" 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>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<div class="jdindentdetail-info"> <div class="jdindentdetail-info">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
商标信息 <span v-show="itemName" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span> 商标信息 <span v-show="itemCode" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div> <div>
<p> <p>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
<div> <div>
<p>商标名称：<span>{{deliveryInfo.tmName?deliveryInfo.tmName:\"-\"}}</span></p> <p>商标名称：<span>{{deliveryInfo.tmName?deliveryInfo.tmName:\"-\"}}</span></p>
<p>商标类型：<span>{{deliveryInfo.tmFormType?deliveryInfo.tmFormType:\"-\"}}</span></p> <p>商标类型：<span>{{brandType?brandType:\"-\"}}</span></p>
<p>商标说明：<span>{{deliveryInfo.notes?deliveryInfo.notes:\"-\"}}</span></p> <p>商标说明：<span>{{deliveryInfo.notes?deliveryInfo.notes:\"-\"}}</span></p>
</div> </div>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
{{item.nclOneCodes}} {{item.nclOneCodes}}
<span>{{item.tmRegistNum}}</span> <span>{{item.tmRegistNum}}</span>
<span>{{item.officialTypeName}}</span> <span>{{item.officialTypeName}}</span>
<span v-show="itemName" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span> <span v-show="itemCode" @click="showDialog(2,index)"><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>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div class="jdindentdetail-main-official"> <div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
交官文件 <span v-show="itemName" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span> 交官文件 <span v-show="itemCode" @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>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,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">
申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="itemName" 申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="itemCode"
@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,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 v-show="itemName" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span> 订单联系人 <span v-show="itemCode" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li> <li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>
...@@ -171,8 +171,8 @@ ...@@ -171,8 +171,8 @@
</div> </div>
<div> <div>
<span>实付金额： <span>¥{{form.totalSum?form.totalSum:\' -\'}}</span></span> <span>实付金额： <span>¥{{form.totalSum?form.totalSum:\' -\'}}</span></span>
<span>官费：<span>¥300.00</span></span> <!-- <span>官费：<span>¥300.00</span></span>
<span>服务费：<span>¥213</span></span> <span>服务费：<span>¥213</span></span> -->
</div> </div>
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
nclInfo: [], nclInfo: [],
/* */ /* */
orderFlow: {}, orderFlow: {},
currentStep: "1", currentStep: null,
channelUserId: "", channelUserId: "",
itemName: '', itemName: '',
deliveryStatus: "", deliveryStatus: "",
...@@ -319,12 +319,13 @@ ...@@ -319,12 +319,13 @@
listPath: { listPath: {
path: '/1688/jdindentlist', path: '/1688/jdindentlist',
query: { query: {
channelUserId: this.$root.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
} }
}, },
showConfrim: false, showConfrim: false,
agree: false, agree: false,
brandType:"",
} }
}, },
mounted: function() { mounted: function() {
...@@ -344,7 +345,7 @@ ...@@ -344,7 +345,7 @@
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.channelUserId = this.$root.channelUserId = this.$route.query.channelUserId; this.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 != "") { if (this.$route.query.deliveryStatus != "") {
...@@ -390,7 +391,7 @@ ...@@ -390,7 +391,7 @@
handler(newVal, oldVal){ handler(newVal, oldVal){
if (newVal.length > 0) { if (newVal.length > 0) {
if (newVal.length > 1) { if (newVal.length > 1) {
if(this.$refs.tree){ if (this.$refs.tree) {
this.$refs.tree.setChecked(newVal[1], false); this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false); this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop(); newVal.pop();
...@@ -426,9 +427,9 @@ ...@@ -426,9 +427,9 @@
/*初始化订单数据 */ /*初始化订单数据 */
initIndent(){ initIndent(){
var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard"); var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$route.query.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard");
var applyObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmApplyInfo", "/action/tmOrder/springBoard"); var applyObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$route.query.channelUserId }, "getTmApplyInfo", "/action/tmOrder/springBoard");
var nclObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmNclList", "/action/tmOrder/springBoard"); var nclObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$route.query.channelUserId }, "getTmNclList", "/action/tmOrder/springBoard");
let [loadingA, loadingB, loadingC] = [1, 1, 1]; let [loadingA, loadingB, loadingC] = [1, 1, 1];
this.$root.loading = true; this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", deliveryObj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", deliveryObj).then((d) => {
...@@ -439,6 +440,20 @@ ...@@ -439,6 +440,20 @@
this.form = JSON.parse(JSON.stringify(this.deliveryInfo)); this.form = JSON.parse(JSON.stringify(this.deliveryInfo));
this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo)); this.editDeliveryInfo = JSON.parse(JSON.stringify(this.deliveryInfo));
this.form.tmFormType = Number(this.form.tmFormType); this.form.tmFormType = Number(this.form.tmFormType);
switch (this.form.tmFormType) {
case 3:
this.brandType = "文字";
break;
case 4:
this.brandType = "图形";
break;
case 5:
this.brandType = "文字及图形";
break;
default:
break;
}
this.itemCode = d.data.tm.itemCode == 'zzsbzc' ? true : false;
console.log(this.form, "lllllllllllllllllllllllllllllll"); console.log(this.form, "lllllllllllllllllllllllllllllll");
this.orderFlow = d.data.orderFlow; this.orderFlow = d.data.orderFlow;
this.orderFlow.map((item, index) => { this.orderFlow.map((item, index) => {
...@@ -470,7 +485,9 @@ ...@@ -470,7 +485,9 @@
this.nclInfo = d.data; this.nclInfo = d.data;
this.nclInfo.map((item, index) => { this.nclInfo.map((item, index) => {
item.nclSmallCodes = JSON.parse(item.nclSmallCodes); item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
/*
console.log(item, item.nclSmallCodes, "////////////////////////////////"); console.log(item, item.nclSmallCodes, "////////////////////////////////");
*/
item.code = item.nclOneCodes; item.code = item.nclOneCodes;
item.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi, "") - 1].name; item.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi, "") - 1].name;
item.nclThree = item.nclSmallCodes; item.nclThree = item.nclSmallCodes;
...@@ -1382,10 +1399,10 @@ ...@@ -1382,10 +1399,10 @@
this.agree = agree; this.agree = agree;
this.showConfrim = false; this.showConfrim = false;
this.$root.loading = true; this.$root.loading = true;
}else{ } else {
return; return;
} }
} }
} }
var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.editNcl, "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) => {
...@@ -1474,7 +1491,7 @@ ...@@ -1474,7 +1491,7 @@
default: default:
break; break;
} }
}, },
closeConfrim(){ closeConfrim(){
this.showConfrim = false; this.showConfrim = false;
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -152,8 +152,8 @@ ...@@ -152,8 +152,8 @@
<el-form-item style="float:left;width:25%;text-align:center" label=""> <el-form-item style="float:left;width:25%;text-align:center" label="">
<div v-loading="loading2"> <div v-loading="loading2">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" <img width="120px" height="120px" style="border:2px dashed #e9e9e9"
@click="window.open(stuff.sealAuthorizeStuff)" v-if="stuff.sealAuthorizeStuff" @click="window.open(stuff.gzwtsUrl)" v-if="stuff.gzwtsUrl"
:src="stuff.sealAuthorizeStuff" /> :src="stuff.gzwtsUrl" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else <img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="/imgs/zwcl.png" /> src="/imgs/zwcl.png" />
</div> </div>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<el-form-item style="float:left;width:25%;text-align:center" label=""> <el-form-item style="float:left;width:25%;text-align:center" label="">
<div v-loading="loading3"> <div v-loading="loading3">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" <img width="120px" height="120px" style="border:2px dashed #e9e9e9"
@click="window.open(stuff.descUrl)" v-if="stuff.descUrl" :src="stuff.descUrl" /> @click="window.open(stuff.smwjUrl)" v-if="stuff.smwjUrl" :src="stuff.smwjUrl" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else <img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="/imgs/zwcl.png" /> src="/imgs/zwcl.png" />
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -264,8 +264,7 @@ ...@@ -264,8 +264,7 @@
path: "/1688/jdindentdetail", path: "/1688/jdindentdetail",
query: { query: {
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelUserId: this.$root.channelUserId, channelUserId: this.$route.query.channelUserId,
itemName: this.currentOrderType,
deliveryStatus: this.deliveryStatus, deliveryStatus: this.deliveryStatus,
totalSum: row.totalSum, totalSum: row.totalSum,
} }
...@@ -293,7 +292,6 @@ ...@@ -293,7 +292,6 @@
} }
}, },
showDetails(idx, row){ showDetails(idx, row){
console.log(row.deliveryStatusName, `222222222222222`);
if (row.deliveryStatus != "dqrfa") { if (row.deliveryStatus != "dqrfa") {
if(this.showReg(idx,row)){ if(this.showReg(idx,row)){
return false return false
...@@ -305,7 +303,6 @@ ...@@ -305,7 +303,6 @@
}, },
showReg(idx, row){ showReg(idx, row){
console.log(row.tmName , row.nclOneCodes , row.name,row);
if (row.itemCode == 'zzsbzc') { if (row.itemCode == 'zzsbzc') {
if (!row.tmName || !row.nclOneCodes || !row.name) { if (!row.tmName || !row.nclOneCodes || !row.name) {
return true; return true;
...@@ -319,7 +316,7 @@ ...@@ -319,7 +316,7 @@
this.$router.push({ this.$router.push({
path: '/1688/jdregscheme', path: '/1688/jdregscheme',
query: { query: {
channelUserId: this.$root.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
} }
}); });
...@@ -328,7 +325,7 @@ ...@@ -328,7 +325,7 @@
this.$router.push({ this.$router.push({
path: '/1688/selftmreg', path: '/1688/selftmreg',
query: { query: {
channelUserId: this.$root.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelOrderNo:row.channelServiceNo, channelOrderNo:row.channelServiceNo,
} }
...@@ -336,12 +333,13 @@ ...@@ -336,12 +333,13 @@
window.scrollTo(0, 0); window.scrollTo(0, 0);
}, },
handleSizeChange(){ handleSizeChange(){
if (this.$root.channelUserId != "") { if (this.$route.query.channelUserId != "") {
this.indentInfo.pageIndex = this.currentPage; this.indentInfo.pageIndex = this.currentPage;
var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard", "yes", "yes"); 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;
console.log(d.data);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.tableData = d.data; this.tableData = d.data;
this.countPage = d.data.length; this.countPage = d.data.length;
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
<div id="selftmreg" style="background-color:white;"> <div id="selftmreg" style="background-color:white;">
<div class="jdindentdetail-nav" style="width:1200px;margin:0 auto;"> <div class="jdindentdetail-nav" style="width:1200px;margin:0 auto;padding: 0;">
<span>当前位置：</span> <span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心 <el-breadcrumb-item :to="listPath">交付中心
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
listPath: { listPath: {
path: '/1688/jdindentlist', path: '/1688/jdindentlist',
query: { query: {
channelUserId: this.$root.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
} }
}, },
......
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