Skip to content

Z
zhichan
Commit f2412f60 by 刘泽奇
Options

123

parent ef40c652
Showing with 156 additions and 31 deletions
igirl-channel-web/app/base/db/metadata/apps/platform.js
...@@ -182,11 +182,19 @@ module.exports = { ...@@ -182,11 +182,19 @@ module.exports = {
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
}, },
{
"code": "push",
"icon": "fa fa-power-off",
"path": ":channel/push",
"isMenu": false,
"label": "登录",
"isctl": "no"
},
], ],
}, },
"bizs": { "bizs": {
"proxy": { "title": "后台首页", "config": null, "path": "/:channel/proxy", "comname": "proxy" }, "proxy": { "title": "后台首页", "config": null, "path": "/:channel/proxy", "comname": "proxy" },
"push": { "title": "后台首页", "config": null, "path": "/:channel/push", "comname": "push" },
"jdregscheme": { "title": "后台首页", "config": null, "path": "/:channel/jdregscheme", "comname": "jdregscheme" }, "jdregscheme": { "title": "后台首页", "config": null, "path": "/:channel/jdregscheme", "comname": "jdregscheme" },
"jdindentlist": { "title": "后台首页", "config": null, "path": "/:channel/jdindentlist", "comname": "jdindentlist" }, "jdindentlist": { "title": "后台首页", "config": null, "path": "/:channel/jdindentlist", "comname": "jdindentlist" },
"jdindentdetail": { "title": "后台首页", "config": null, "path": "/:channel/jdindentdetail", "comname": "jdindentdetail" }, "jdindentdetail": { "title": "后台首页", "config": null, "path": "/:channel/jdindentdetail", "comname": "jdindentdetail" },
......
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.js
...@@ -410,8 +410,8 @@ ...@@ -410,8 +410,8 @@
this.message.show = false; this.message.show = false;
clearTimeout(timer2); clearTimeout(timer2);
}, 2000); }, 2000);
} }
} }
}, },
...@@ -1337,12 +1337,13 @@ ...@@ -1337,12 +1337,13 @@
}, },
submitEdit(v){ submitEdit(v){
console.log(v); console.log(v);
this.$root.loading = true;
switch (v) { switch (v) {
case '商标信息': case '商标信息':
/* /*
this.form.channelUserId = this.channelUserId; this.form.channelUserId = this.channelUserId;
*/ */
this.$root.loading = true;
this.form.deliveryOrderNo = this.deliveryOrderNo; this.form.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.form, "updateTmInfo", "/action/tmOrder/springBoard", "yes", "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) => {
...@@ -1369,6 +1370,19 @@ ...@@ -1369,6 +1370,19 @@
this.editNcl.nclOneCodes = this.nclOne[0].code; this.editNcl.nclOneCodes = this.nclOne[0].code;
this.editNcl.nclSmallCodes = this.nclOne[0].nclThree; this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.nclInfo, this.nclOne, this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10) {
this.message.show = !this.message.show;
this.message.info = "小类必须选择10项";
var timer3 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer3);
}, 2000);
return;
}else{
this.$root.loading = true;
}
}
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) => {
if (res.status == 0) { if (res.status == 0) {
...@@ -1389,6 +1403,7 @@ ...@@ -1389,6 +1403,7 @@
}); });
break; break;
case '交官文件': case '交官文件':
this.$root.loading = true;
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply); console.log(this.apply);
var obj = this.$root.copyParams(this.apply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.apply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
...@@ -1410,6 +1425,7 @@ ...@@ -1410,6 +1425,7 @@
}); });
break; break;
case '申请人信息': case '申请人信息':
this.$root.loading = true;
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.apply, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes", "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) => {
...@@ -1430,6 +1446,7 @@ ...@@ -1430,6 +1446,7 @@
}); });
break; break;
case '订单联系人': case '订单联系人':
this.$root.loading = true;
this.apply.deliveryOrderNo = this.deliveryOrderNo; this.apply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.apply, `zzzzzzzzzzzzzzzzzzzz`); console.log(this.apply, `zzzzzzzzzzzzzzzzzzzz`);
var obj = this.$root.copyParams(this.apply, "updateContacts", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.apply, "updateContacts", "/action/tmOrder/springBoard", "yes", "yes");
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="申请人"> <el-table-column prop="name" label="申请人">
</el-table-column> </el-table-column>
<el-table-column prop="totalSum" label="订单总额"> <el-table-column prop="totalSum" label="订单金额">
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态"> <el-table-column prop="deliveryStatusName" label="交付状态">
</el-table-column> </el-table-column>
...@@ -88,13 +88,16 @@ ...@@ -88,13 +88,16 @@
</el-table-column> </el-table-column>
<el-table-column prop="address" label="操作"> <el-table-column prop="address" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-show="!showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;" size="mini" <el-button v-show="showDetails(scope.$index, scope.row)" style="border:0;width:100%;color: #0F8EE9;"
@click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp; size="mini" @click="viewDetails(scope.$index, scope.row)">
详情
</el-button> </el-button>
<el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;" <el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;width:100%;margin:0;"
size="mini" @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button> size="mini" @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;" <el-button v-show="showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;width:100%;margin:0;"
size="mini" @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button> size="mini" @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
<el-button v-show="showReg(scope.$index, scope.row)" style="border:0;width:100%;color: #0F8EE9;margin:0;"
size="mini" @click="goSelftmreg(scope.$index, scope.row)">去注册</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
created: function() { created: function() {
if (this.$route.query.channelUserId != "") { if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId; this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId,"11111111111"); console.log(this.$route.query.channelUserId, "11111111111");
} }
}, },
mounted: function() { mounted: function() {
...@@ -275,36 +275,64 @@ ...@@ -275,36 +275,64 @@
/* /*
console.log(index, row); console.log(index, row);
*/ */
if ((row.itemCode == "zzsbzc") && row.deliveryStatusName == "待上传材料") {
if ((row.deliveryStatus == "dsccl")) {
if(this.showReg(index,row)){
return false
}
return true; return true;
} else { } else {
return false; return false;
} }
}, },
showSup(index, row){ showSup(index, row){
if (row.itemCode == "fzsbzc") { if (row.deliveryStatus == "dqrfa") {
return true; return true;
} else { } else {
return false; return false;
} }
}, },
showDetails(idx,row){ showDetails(idx, row){
console.log(row.deliveryStatusName,`222222222222222`); console.log(row.deliveryStatusName, `222222222222222`);
if(row.deliveryStatusName != "待确认注册方案"){ if (row.deliveryStatus != "dqrfa") {
return false; if(this.showReg(idx,row)){
}else{ return false
}
return true; return true;
} else {
return false;
}
},
showReg(idx, row){
console.log(row.tmName , row.nclOneCodes , row.name,row);
if (row.itemCode == 'zzsbzc') {
if (!row.tmName || !row.nclOneCodes || !row.name) {
return true;
} else {
return false;
}
} }
}, },
goScheme(index, row){ goScheme(index, row){
console.log(index,row); console.log(index, row);
this.$router.push({ this.$router.push({
path:'/1688/jdregscheme', path: '/1688/jdregscheme',
query:{ query: {
channelUserId: this.$root.channelUserId,
deliveryOrderNo: row.deliveryOrderNo,
}
});
},
goSelftmreg(index, row){
this.$router.push({
path: '/1688/selftmreg',
query: {
channelUserId: this.$root.channelUserId, channelUserId: this.$root.channelUserId,
deliveryOrderNo:row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
} }
}); });
window.scrollTo(0, 0);
}, },
handleSizeChange(){ handleSizeChange(){
if (this.$root.channelUserId != "") { if (this.$root.channelUserId != "") {
...@@ -320,8 +348,8 @@ ...@@ -320,8 +348,8 @@
item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false }); item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
}); });
}else{ } else {
console.log(d,"getTmOrderList..........."); console.log(d, "getTmOrderList...........");
} }
}); });
} }
......
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.js
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,8 @@
return; return;
} }
var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(() => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (status == 0) { if (d.status == 0) {
this.$router.push({ this.$router.push({
path: "/1688/jdindentlist", path: "/1688/jdindentlist",
query: { query: {
...@@ -160,6 +160,8 @@ ...@@ -160,6 +160,8 @@
} }
}); });
console.log('[[[[[[[[[[[[[[[[[[[[[[[[[[[['); console.log('[[[[[[[[[[[[[[[[[[[[[[[[[[[[');
}else{
this.$message(d.msg);
} }
}); });
...@@ -169,10 +171,10 @@ ...@@ -169,10 +171,10 @@
var obj = {}; var obj = {};
obj.deliveryOrderNo = this.deliveryOrderNo; obj.deliveryOrderNo = this.deliveryOrderNo;
obj.channelUserId = this.$root.channelUserId; obj.channelUserId = this.$root.channelUserId;
obj.isConfirm = 1; obj.isConfirm = "1";
var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard"); var obj = this.$root.copyParams(obj, "tmConfirm", "/action/tmOrder/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(() => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (status == 0) { if (d.status == 0) {
this.$message({ this.$message({
showClose: true, showClose: true,
message: '确认方案成功', message: '确认方案成功',
...@@ -185,6 +187,8 @@ ...@@ -185,6 +187,8 @@
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
} }
}); });
}else{
this.$message(d.msg);
} }
}); });
......
igirl-channel-web/app/front/vues/pages/push/push.css 0 → 100644
.cjtpush{
display: flex;
width: 100%;
height: 80vh;
}
.cjtpush-box{
width: 50%;
margin: auto;
box-sizing: border-box;
padding: 30px;
border: 1px solid #cccccc;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/push/push.html 0 → 100644
<div class="cjtpush">
<div class="cjtpush-box">
<h2 style="width:100%;text-align:center;">
1688需求推送
</h2>
订单号：<el-input v-model="phone" placeholder="请输入内容"></el-input>
买家手机号：<el-input v-model="orderIndent" placeholder="请输入内容"></el-input>
<div style="width:100%;text-align:center;margin-top:20px;">
<el-button style="width: 100px;" @click="push">推送</el-button>
</div>
</div>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/push/push.js 0 → 100644
{
template: '${tmpl}',
data: function() {
return {
ldms: [],
phone:'',
orderIndent:''
}
},
mounted: function() {
this.$root.getChannelPath();
},
created: function() {
},
methods: {
push(){
}
},
vname: "gsb-push"
}
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<!-- page1 --> <!-- page1 -->
<el-form v-if="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px"> <el-form v-show="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<!-- <h4>商标信息</h4> --> <!-- <h4>商标信息</h4> -->
<!-- <div class="selftmreg_shu"></div> --> <!-- <div class="selftmreg_shu"></div> -->
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</el-form> </el-form>
<!-- page2 --> <!-- page2 -->
<el-form v-if="step==2" ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px"> <el-form v-show="step==2" ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main selfmreg-step2"> <div class="selftmreg_main selfmreg-step2">
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>填写申请人信息</h4> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>填写申请人信息</h4>
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
</div> </div>
</el-form> </el-form>
<!-- page3 --> <!-- page3 -->
<el-form v-if="step==3" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px"> <el-form v-show="step==3" ref="form" :rules="rules" :model="form" class="demo-ruleForm" label-width="120px">
<div class="selftmreg_main"> <div class="selftmreg_main">
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
<div style="display:inline-block;margin-right:10px;"> <div style="display:inline-block;margin-right:10px;">
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -364,8 +364,8 @@ ...@@ -364,8 +364,8 @@
this.message.show = false; this.message.show = false;
clearTimeout(timer2); clearTimeout(timer2);
}, 2000); }, 2000);
} }
} }
}, },
...@@ -1108,6 +1108,20 @@ ...@@ -1108,6 +1108,20 @@
}, },
submitForm(formName) { submitForm(formName) {
var that = this; var that = this;
console.log(formName, ";;;;;;;;;;;;;");
if (formName == "form") {
if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10) {
this.message.show = !this.message.show;
this.message.info = "小类必须选择10项";
var timer3 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer3);
}, 2000);
return;
}
}
};
if (formName == "form" || formName == "apply") { if (formName == "form" || formName == "apply") {
if (formName == "apply") { if (formName == "apply") {
console.log(this.apply); console.log(this.apply);
......
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