Skip to content

Z
zhichan
Commit 16592e5c by 刘泽奇
Options

123

parent d31b401b
Showing with 104 additions and 31 deletions
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</div> </div>
<div> <div>
<p>商标名称：<span>{{deliveryInfo.tmName}}</span></p> <p>商标名称：<span>{{deliveryInfo.tmName}}</span></p>
<p>商标类型：<span>{{deliveryInfo.tmType}}</span></p> <p>商标类型：<span>{{deliveryInfo.tmFormType}}</span></p>
<p>商标说明：<span>{{deliveryInfo.notes}}</span></p> <p>商标说明：<span>{{deliveryInfo.notes}}</span></p>
</div> </div>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
广告销售 广告销售
<span>-1213</span> <span>-1213</span>
<span>初审公告</span> <span>初审公告</span>
<span v-if="itemName" @click="showDialog(2)"><i class="el-icon-edit"></i> 修改</span> <span v-if="itemName" @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>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
付款信息 付款信息
</div> </div>
<div> <div>
<span>实付金额：<span>{{form.totalSum}}</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> -->
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item label="商标名称" style="width:845px;float:left" prop="name" <el-form-item label="商标名称" style="width:845px;float:left" prop="name"
v-if="form.tmFormType != 4"> v-if="form.tmFormType != 4">
<el-input v-model="form.name" style="width:330px" placeholder="请输入商标名称"></el-input><span <el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称"></el-input><span
v-if="form.tmFormType == 5" v-if="form.tmFormType == 5"
style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span> style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span>
</el-form-item> </el-form-item>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
}, },
form: { form: {
tmFormType: 3, tmFormType: 3,
name: "", tmName: "",
picUrl: "", picUrl: "",
colorizedPicUrl: "", colorizedPicUrl: "",
selecttype: "自主选择", selecttype: "自主选择",
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
notes: "", notes: "",
}, },
rules: { rules: {
name: [ tmName: [
{ required: true, message: '请输入商标名称' } { required: true, message: '请输入商标名称' }
], ],
picUrl: [ picUrl: [
...@@ -305,7 +305,10 @@ ...@@ -305,7 +305,10 @@
channelUserId: "", channelUserId: "",
itemName: '', itemName: '',
deliveryStatus: "", deliveryStatus: "",
totalSum:"", totalSum: "",
/*大类下标 */
nclIndex:"",
editNcl:{},
} }
}, },
mounted: function() { mounted: function() {
...@@ -320,7 +323,7 @@ ...@@ -320,7 +323,7 @@
that.d["success_action_status"] = d.data.success_action_status; that.d["success_action_status"] = d.data.success_action_status;
that.action = d.data.url; that.action = d.data.url;
}); });
console.log(this.$route.query, '11111111111'); console.log(this.$route.query, '11111111111', this.form.tmFormType);
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;
...@@ -353,7 +356,7 @@ ...@@ -353,7 +356,7 @@
default: default:
break; break;
} }
} }
}, },
...@@ -364,6 +367,7 @@ ...@@ -364,6 +367,7 @@
}, },
methods: { methods: {
/*初始化订单数据 */ /*初始化订单数据 */
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.$root.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard");
...@@ -418,8 +422,9 @@ ...@@ -418,8 +422,9 @@
initOrderFlow(){ initOrderFlow(){
}, },
showDialog(from){ showDialog(from,index){
this.popupValue = from; this.popupValue = from;
this.nclIndex = index;
this.dialogTableVisible = true; this.dialogTableVisible = true;
switch (from) { switch (from) {
case 1: case 1:
...@@ -532,7 +537,6 @@ ...@@ -532,7 +537,6 @@
console.log(err); console.log(err);
}, },
uploadsuccess2(result, obj){ uploadsuccess2(result, obj){
if (obj.flag == "zfpz") { if (obj.flag == "zfpz") {
this.pay.offlinePayDocument = result; this.pay.offlinePayDocument = result;
} }
...@@ -962,14 +966,15 @@ ...@@ -962,14 +966,15 @@
} }
}, },
word2pic(){ word2pic(){
if (this.form.name == "" || this.form.name == null) { if (this.form.tmName == "" || this.form.tmName == null) {
this.loading = true; this.loading = true;
this.loading = false; this.loading = false;
return false; return false;
} }
var that = this; var that = this;
this.loading = true; this.loading = true;
var word2pic = { "key": this.form.name }; var word2pic = { "word": this.form.tmName };
console.log(word2pic, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
var word2pic = this.$root.copyParams(word2pic, "word2pic", "/action/tmTools/springBoard"); var word2pic = this.$root.copyParams(word2pic, "word2pic", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) {
if (d.status == 0) { if (d.status == 0) {
...@@ -1267,27 +1272,69 @@ ...@@ -1267,27 +1272,69 @@
console.log(v); console.log(v);
switch (v) { switch (v) {
case '商标信息': case '商标信息':
this.form.channelUserId = this.channelUserId; /*
this.form.channelUserId = this.channelUserId;
*/
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) => {
console.log(res); if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '修改成功!'
});
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
}); });
break; break;
case '商标类别': case '商标类别':
var obj = this.$root.copyParams(this.form, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes"); this.editNcl.deliveryOrderNo = this.deliveryOrderNo;
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne;
this.editNcl.nclSmallCodes = this.nclOne;
console.log(this.nclInfo,this.nclOne,`xxxxxxxxxxxxxxxxxxxxxxxx`);
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) => {
console.log(res); if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '修改成功!'
});
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
}); });
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", "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); if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '提交成功!'
});
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
}); });
...@@ -1296,7 +1343,18 @@ ...@@ -1296,7 +1343,18 @@
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) => {
console.log(res); if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '提交成功!'
});
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
}); });
...@@ -1305,7 +1363,18 @@ ...@@ -1305,7 +1363,18 @@
this.applyInfo.deliveryOrderNo = this.deliveryOrderNo; this.applyInfo.deliveryOrderNo = this.deliveryOrderNo;
var obj = this.$root.copyParams(this.applyInfo, "updateContacts", "/action/tmOrder/springBoard", "yes", "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); if (res.status == 0) {
console.log(res);
this.dialogTableVisible = false;
this.$message({
type: 'success',
message: '提交成功!'
});
this.$router.go(0);
} else {
this.$message(res.msg);
}
}).catch((e) => { }).catch((e) => {
this.$message(e); this.$message(e);
}); });
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<el-table :header-cell-style="{background:\'#F5F5F5;\'}" :data="tableData" style="width: 100%"> <el-table :header-cell-style="{background:\'#F5F5F5;\'}" :data="tableData" style="width: 100%">
<el-table-column prop="channelServiceNo" label="订单编号"> <el-table-column prop="channelServiceNo" label="订单编号">
</el-table-column> </el-table-column>
<el-table-column prop="itemCode" label="交付单号"> <el-table-column prop="deliveryOrderNo" label="交付单号">
</el-table-column> </el-table-column>
<el-table-column prop="itemName" label="业务类型"> <el-table-column prop="itemName" label="业务类型">
</el-table-column> </el-table-column>
...@@ -88,13 +88,13 @@ ...@@ -88,13 +88,13 @@
</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="scope.$index" style="border:0;color: #0F8EE9;" size="mini" <el-button v-show="!showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;" size="mini"
@click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp; @click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp;
</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;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;margin:0;"
size="mini" @click="goScheme(scope.$index, scope.row) = true">确认注册方案</el-button> size="mini" @click="goScheme(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
...@@ -276,14 +276,14 @@ ...@@ -276,14 +276,14 @@
/* /*
console.log(index, row); console.log(index, row);
*/ */
if ((row.itemName == "商标自助注册" || row.itemName == "商标自主注册") && row.deliveryStatusName == "待上传材料") { if ((row.itemCode == "zzsbzc") && row.deliveryStatusName == "待上传材料") {
return true; return true;
} else { } else {
return false; return false;
} }
}, },
showSup(index, row){ showSup(index, row){
if (row.itemName == "专家辅助注册") { if (row.itemCode == "fzsbzc") {
return true; return true;
} else { } else {
return false; return false;
...@@ -298,13 +298,13 @@ ...@@ -298,13 +298,13 @@
} }
}, },
goScheme(index, row){ goScheme(index, row){
if (row.itemName == "待确认注册方案") { console.log(index,row);
return true;
} else {
return false;
}
this.$router.push({ this.$router.push({
path:'/1688/jdregscheme',
query:{
channelUserId: this.$root.channelUserId,
deliveryOrderNo:row.deliveryOrderNo,
}
}); });
}, },
handleSizeChange(){ handleSizeChange(){
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -299,6 +299,10 @@ ...@@ -299,6 +299,10 @@
var that = this; var that = this;
var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc'; var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
var orderParams = this.$router.history.current.query.orderParams; var orderParams = this.$router.history.current.query.orderParams;
if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111");
}
if (orderParams) { if (orderParams) {
this.form = orderParams.tm; this.form = orderParams.tm;
this.apply = orderParams.apply; this.apply = orderParams.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