Skip to content

Z
zhichan
Commit 14cc0b09 by 宋毅
Options

tj

parent 92e884f6
Showing with 1485 additions and 1120 deletions
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
...@@ -5,514 +5,141 @@ class tmqueryCtl extends CtlBase { ...@@ -5,514 +5,141 @@ class tmqueryCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.channelApiUrl = settings.channelApiUrl(); this.channelApiUrl = settings.channelApiUrl();
this.appInfo = {
1688: { appkey: "201911051030", secret: "eeb18393aade40149287b024d8ba0850", selfRegistProduct: ["5743091"] }
};
this.execClient = system.getObject("util.execClient");
} }
async doPost(pobj,obj){ async doPost(pobj, obj, req) {
var rc = system.getObject("util.execClient"); var rc = system.getObject("util.execClient");
try { try {
var reqobj = { if (!pobj.requrl) {
"actionProcess": "jd", return system.getResult(null, "requrl不能为空");
"actionType": "",
"sign":"2FviZ9PGws8Pt1fBhq0t90mjUvI",
"actionBody": null
};
var requrl = obj.requrl;
reqobj.actionType = obj.actionType || "";
reqobj.actionBody = obj.actionBody || null;
if(!requrl){
return {
status: -2,
msg: "请求地址不能为空"
};
} }
if(!obj.actionType){ if (!pobj.actionProcess) {
return { return system.getResult(null, "actionProcess不能为空");
status: -3,
msg: "actionType不能为空"
};
} }
if(!obj.actionBody){ if (!pobj.actionType) {
return { return system.getResult(null, "actionType不能为空");
status: -4, }
msg: "actionBody不能为空" if (!pobj.actionBody) {
}; return system.getResult(null, "actionBody不能为空");
} }
var rtn = await rc.execPost(reqobj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
//访问接口测试实例
async test(obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/findTrademarkNameAccurate";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 精确查询接口
async findTrademarkNameAccurate(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/findTrademarkNameAccurate";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 模糊查询接口
async findTrademarkName(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/findTrademarkName";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// s申请号查询接口
async findTrademarkzchAccurate(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/findTrademarkzchAccurate";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 申请人查询接口
async findTrademarkzcr(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/findTrademarkzcr";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 商标查询接口
async tradeMarkDetail(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/tradeMarkDetail";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 公告首页接口
async noticequeryTMZCSQ(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/noticequeryTMZCSQ";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 公告检索接口
async noticequery(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/noticequery";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 尼斯详情接口
async getNclDetail(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/getNclDetail";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 9.尼斯分类检索
async nclFuwuSearch(obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/nclFuwuSearch";
console.log("requrl:" + requrl);
try {
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 12.尼斯查询（二）
async getNclByLikeNameAndNcl(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/getNclByLikeNameAndNcl";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 11.尼斯查询（一）
async getNcl(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/getNcl";
console.log("requrl:" + requrl);
try {
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 13.公司核名
async icheming(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/icheming";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 14.文字转图片
async word2pic(obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/word2pic";
console.log("requrl:" + requrl);
try {
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 15.彩色图片转黑白
async uploadStandardTm(obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/uploadStandardTm";
console.log("requrl:" + requrl);
try {
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 16.获取oss上传参数
async getOssConfig(obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/tool/toolApi/getOssConfig";
console.log("requrl:" + requrl);
try {
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 17.图片转pdf
async pic2pdf(obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/pic2pdf";
console.log("requrl:" + requrl);
try {
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
}
}
// 18.企业模糊查询 var reqobj = {
async getCompanyInfoByLikeName(pobj, obj) { "actionProcess": pobj.actionProcess || "",
var rc = system.getObject("util.execClient"); "actionType": pobj.actionType || "",
var rtn = null; "sign": pobj.sign || "",
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/getCompanyInfoByLikeName"; "isUser": pobj.isUser || "yes",//是否需要验证用户，no否，yes是
console.log("requrl:" + requrl); "actionBody": pobj.actionBody || null
try { };
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet var tokenInfo = await this.getToken(reqobj.actionProcess);
var j = JSON.parse(rtn.stdout); if (tokenInfo.status != 0) {
return j; return tokenInfo;
} catch (e) { }
console.log(e); if (!reqobj.sign) {
return { var signInfo = await this.createSign(reqobj.actionBody, tokenInfo.data.secret);
status: -1, if (signInfo.status != 0) {
msg: "操作失败", return signInfo;
err: e.stack }
}; reqobj.sign = signInfo.data;
} }
} var reqUrl = this.channelApiUrl + pobj.requrl;
// var result = await this.execClient.execPostTK(reqobj, reqUrl, tokenInfo.data.token);
async adjustWTSSize(obj) { if (!result) {
var rc = system.getObject("util.execClient"); return system.getResult(null, "处理请求失败");
var rtn = null; }
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/adjustWTSSize"; if (result.status && result.status != 0) {
console.log("requrl:" + requrl); return result;
try { }
rtn = await rc.execGet(obj, requrl);//此为post调用，get: rc.execGet if (pobj.actionType == "getChannelOrderInfo") {
var j = JSON.parse(rtn.stdout); var tmpSkipUrl = await this.getPageSkipUrl(reqobj.actionProcess, reqobj.actionBody.itemCode);
return j; if (!tmpSkipUrl) {
} catch (e) { return system.getResult(null, "获取页面url失败");
console.log(e); }
return { result.skipUrl = tmpSkipUrl;
status: -1, }//获取渠道订单信息
msg: "操作失败", return result;
err: e.stack } catch (e) {
}; return system.getResult(null, "操作失败");
} }
} }
// async getPageSkipUrl(reqType, itemCode) {
async noticesearch(pobj, obj) { var self = this;
var rc = system.getObject("util.execClient"); var skipUrl = "";
var rtn = null; switch (reqType) {
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/noticesearch"; case "1688":
console.log("requrl:" + requrl); if (self.appInfo["1688"].selfRegistProduct.indexOf(itemCode) < 0) {
try { skipUrl = "/#/1688/jdindentlist";
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet } else {
var j = JSON.parse(rtn.stdout); skipUrl = "/#/1688/selftmreg";
return j; }
} catch (e) { break;
console.log(e); default:
return { break;
status: -1, }
msg: "操作失败", return skipUrl;
err: e.stack }
}; async getToken(reqType) {
} var self = this;
} var token = "";
// var reqTokenUrl = this.channelApiUrl + "/auth/accessAuth/getToken";
async getCompanyInfoNoUser(pobj, obj) { var reqParam = {};
var rc = system.getObject("util.execClient"); switch (reqType) {
var rtn = null; case "1688":
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/getCompanyInfoNoUser"; reqParam = self.appInfo["1688"];
console.log("requrl:" + requrl); break;
try { default:
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet break;
var j = JSON.parse(rtn.stdout); }
return j; if (!reqParam.appkey || !reqParam.secret) {
} catch (e) { return system.getResult(null, "reqType类型有误，请求失败");
console.log(e); }
return { var rtn = await this.execClient.execPost(reqParam, reqTokenUrl);
status: -1, if (!rtn.stdout) {
msg: "操作失败", return system.getResult(null, "获取token失败");
err: e.stack }
}; var tokenResult = JSON.parse(rtn.stdout);
} if (tokenResult.status == 0) {
} tokenResult.data.secret = reqParam.secret;
// 注册公告期号 }
async noticezcggsearch(pobj, obj) { return tokenResult;
var rc = system.getObject("util.execClient"); }
var rtn = null; /**
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/noticezcggsearch"; * 验证签名
console.log("requrl:" + requrl); * @param {*} params 要验证的参数
try { * @param {*} app_key 应用的校验key
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet */
var j = JSON.parse(rtn.stdout); async createSign(params, app_key) {
return j; if (!params) {
} catch (e) { return system.getResult(null, "请求参数为空");
console.log(e); }
return { if (!params.sign) {
status: -1, return system.getResult(null, "请求参数sign为空");
msg: "操作失败", }
err: e.stack if (!params.times_tamp) {
}; return system.getResult(null, "请求参数times_tamp为空");
} }
} var signArr = [];
var keys = Object.keys(params).sort();
async sbzuixinsearch(pobj, obj) { if (keys.length == 0) {
var rc = system.getObject("util.execClient"); return system.getResult(null, "请求参数信息为空");
var rtn = null; }
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/sbzuixinsearch"; for (let k = 0; k < keys.length; k++) {
console.log("requrl:" + requrl); const tKey = keys[k];
try { if (tKey != "sign" && params[tKey]) {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet signArr.push(tKey + "=" + params[tKey]);
var j = JSON.parse(rtn.stdout); }
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
} }
} if (signArr.length == 0) {
return system.getResult(null, "请求参数组装签名参数信息为空");
async gettwoNcl(pobj, obj) {
var rc = system.getObject("util.execClient");
var rtn = null;
var requrl = this.channelApiUrl + "/api/trademark/tmqueryApi/gettwoNcl";
console.log("requrl:" + requrl);
try {
rtn = await rc.execPost(obj, requrl);//此为post调用，get: rc.execGet
var j = JSON.parse(rtn.stdout);
return j;
} catch (e) {
console.log(e);
return {
status: -1,
msg: "操作失败",
err: e.stack
};
} }
var resultSignStr = signArr.join("&") + "&key=" + app_key;
var resultTmpSign = md5(resultSignStr).toUpperCase();
return system.getResultSuccess(resultTmpSign);
} }
} }
module.exports = tmqueryCtl; module.exports = tmqueryCtl;
// var task = new tmqueryCtl(); // var task = new tmqueryCtl();
......
igirl-channel-web/app/base/db/impl/common/connection.js
...@@ -6,6 +6,7 @@ var glob = require("glob"); ...@@ -6,6 +6,7 @@ var glob = require("glob");
class DbFactory{ class DbFactory{
constructor(){ constructor(){
const dbConfig=settings.database(); const dbConfig=settings.database();
const dbConfighb=settings.databasehb();
this.db=new Sequelize(dbConfig.dbname, this.db=new Sequelize(dbConfig.dbname,
dbConfig.user, dbConfig.user,
dbConfig.password, dbConfig.password,
...@@ -18,6 +19,8 @@ class DbFactory{ ...@@ -18,6 +19,8 @@ class DbFactory{
async initModels(){ async initModels(){
var self=this; var self=this;
var modelpath=path.normalize(path.join(__dirname, '../..'))+"/models/"; var modelpath=path.normalize(path.join(__dirname, '../..'))+"/models/";
console.log("modelpath=====================================================");
console.log(modelpath);
var models=glob.sync(modelpath+"/**/*.js"); var models=glob.sync(modelpath+"/**/*.js");
console.log(models.length); console.log(models.length);
models.forEach(function(m){ models.forEach(function(m){
...@@ -74,6 +77,12 @@ class DbFactory{ ...@@ -74,6 +77,12 @@ class DbFactory{
} }
return this.db; return this.db;
} }
getConhb(){
var that=this;
if(settings.env=="dev"){
}
return this.dbhb;
}
} }
module.exports=DbFactory; module.exports=DbFactory;
// const dbf=new DbFactory(); // const dbf=new DbFactory();
......
igirl-channel-web/app/base/db/metadata/apps/platform.js
module.exports = { module.exports = {
"appid": "bfe73612fa024822941e3e1ecd9a06e1", "appid": "201911051030",
"label": "研发开放平台", "label": "研发开放平台",
"config": { "config": {
"rstree": { "rstree": {
...@@ -40,7 +40,7 @@ module.exports = { ...@@ -40,7 +40,7 @@ module.exports = {
{ {
"code": "exit", "code": "exit",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "exit", "path": ":channel/exit",
"isMenu": false, "isMenu": false,
"label": "退出", "label": "退出",
"isctl": "no" "isctl": "no"
...@@ -48,7 +48,7 @@ module.exports = { ...@@ -48,7 +48,7 @@ module.exports = {
{ {
"code": "register", "code": "register",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "register", "path": ":channel/register",
"isMenu": false, "isMenu": false,
"label": "注册", "label": "注册",
"isctl": "no" "isctl": "no"
...@@ -56,7 +56,7 @@ module.exports = { ...@@ -56,7 +56,7 @@ module.exports = {
{ {
"code": "login", "code": "login",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "login", "path": ":channel/login",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -64,7 +64,7 @@ module.exports = { ...@@ -64,7 +64,7 @@ module.exports = {
{ {
"code": "jdtrademark", "code": "jdtrademark",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdtrademark", "path": ":channel/jdtrademark",
"isMenu": false, "isMenu": false,
"label": "商标首页", "label": "商标首页",
"isctl": "no" "isctl": "no"
...@@ -72,7 +72,7 @@ module.exports = { ...@@ -72,7 +72,7 @@ module.exports = {
{ {
"code": "jdicbc", "code": "jdicbc",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdicbc", "path": ":channel/jdicbc",
"isMenu": false, "isMenu": false,
"label": "工商核名", "label": "工商核名",
"isctl": "no" "isctl": "no"
...@@ -80,7 +80,7 @@ module.exports = { ...@@ -80,7 +80,7 @@ module.exports = {
{ {
"code": "jdbycquerytm", "code": "jdbycquerytm",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdbycquerytm", "path": ":channel/jdbycquerytm",
"isMenu": false, "isMenu": false,
"label": "商标检索", "label": "商标检索",
"isctl": "no" "isctl": "no"
...@@ -88,7 +88,7 @@ module.exports = { ...@@ -88,7 +88,7 @@ module.exports = {
{ {
"code": "jdbycnoticetm", "code": "jdbycnoticetm",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdbycnoticetm", "path": ":channel/jdbycnoticetm",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -96,7 +96,7 @@ module.exports = { ...@@ -96,7 +96,7 @@ module.exports = {
{ {
"code": "bycnoticeindex", "code": "bycnoticeindex",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "bycnoticeindex", "path": ":channel/bycnoticeindex",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -104,7 +104,7 @@ module.exports = { ...@@ -104,7 +104,7 @@ module.exports = {
{ {
"code": "jdbycncldetail", "code": "jdbycncldetail",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdbycncldetail", "path": ":channel/jdbycncldetail",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -112,7 +112,7 @@ module.exports = { ...@@ -112,7 +112,7 @@ module.exports = {
{ {
"code": "icorder", "code": "icorder",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "icorder", "path": ":channel/icorder",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -120,7 +120,7 @@ module.exports = { ...@@ -120,7 +120,7 @@ module.exports = {
{ {
"code": "selftmreg", "code": "selftmreg",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "selftmreg", "path": ":channel/selftmreg",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -128,7 +128,7 @@ module.exports = { ...@@ -128,7 +128,7 @@ module.exports = {
{ {
"code": "admin", "code": "admin",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "admin", "path": ":channel/admin",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -136,7 +136,7 @@ module.exports = { ...@@ -136,7 +136,7 @@ module.exports = {
{ {
"code": "jdbycdetailtm", "code": "jdbycdetailtm",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdbycdetailtm", "path": ":channel/jdbycdetailtm",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -144,7 +144,7 @@ module.exports = { ...@@ -144,7 +144,7 @@ module.exports = {
{ {
"code": "jdbycnoticedetailtm", "code": "jdbycnoticedetailtm",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdbycnoticedetailtm", "path": ":channel/jdbycnoticedetailtm",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -152,7 +152,7 @@ module.exports = { ...@@ -152,7 +152,7 @@ module.exports = {
{ {
"code": "jdindentdetail", "code": "jdindentdetail",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdindentdetail", "path": ":channel/jdindentdetail",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -160,7 +160,24 @@ module.exports = { ...@@ -160,7 +160,24 @@ module.exports = {
{ {
"code": "jdindentlist", "code": "jdindentlist",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "jdindentlist", "path": ":channel/jdindentlist",
"isMenu": false,
"label": "登录",
"isctl": "no"
},
{
"code": "jdregscheme",
"icon": "fa fa-power-off",
"path": ":channel/jdregscheme",
"isMenu": false,
"label": "登录",
"isctl": "no"
},
{
"code": "proxy",
"icon": "fa fa-power-off",
"path": ":channel/proxy",
"isMenu": false, "isMenu": false,
"label": "登录", "label": "登录",
"isctl": "no" "isctl": "no"
...@@ -169,26 +186,27 @@ module.exports = { ...@@ -169,26 +186,27 @@ module.exports = {
}, },
"bizs": { "bizs": {
"admin": { "title": "后台首页", "config": null, "path": "/admin", "comname": "admin" }, "proxy": { "title": "后台首页", "config": null, "path": "/:channel/proxy", "comname": "proxy" },
"jdindentlist": { "title": "后台首页", "config": null, "path": "/jdindentlist", "comname": "jdindentlist" }, "jdregscheme": { "title": "后台首页", "config": null, "path": "/:channel/jdregscheme", "comname": "jdregscheme" },
"jdindentdetail": { "title": "后台首页", "config": null, "path": "/jdindentdetail", "comname": "jdindentdetail" }, "jdindentlist": { "title": "后台首页", "config": null, "path": "/:channel/jdindentlist", "comname": "jdindentlist" },
"jdbycnoticedetailtm": { "title": "后台首页", "config": null, "path": "/jdbycnoticedetailtm", "comname": "jdbycnoticedetailtm" }, "jdindentdetail": { "title": "后台首页", "config": null, "path": "/:channel/jdindentdetail", "comname": "jdindentdetail" },
"jdbycdetailtm": { "title": "后台首页", "config": null, "path": "/jdbycdetailtm", "comname": "jdbycdetailtm" }, "jdbycnoticedetailtm": { "title": "后台首页", "config": null, "path": "/:channel/jdbycnoticedetailtm", "comname": "jdbycnoticedetailtm" },
"login": { "title": "登录", "config": null, "path": "/login", "comname": "login" }, "jdbycdetailtm": { "title": "后台首页", "config": null, "path": "/:channel/jdbycdetailtm", "comname": "jdbycdetailtm" },
"selftmreg": { "title": "登录", "config": null, "path": "/selftmreg", "comname": "selftmreg" }, "login": { "title": "登录", "config": null, "path": "/:channel/login", "comname": "login" },
"icorder": { "title": "登录", "config": null, "path": "/icorder", "comname": "icorder" }, "selftmreg": { "title": "登录", "config": null, "path": "/:channel/selftmreg", "comname": "selftmreg" },
"jdbycncldetail": { "title": "登录", "config": null, "path": "/jdbycncldetail", "comname": "jdbycncldetail" }, "icorder": { "title": "登录", "config": null, "path": "/:channel/icorder", "comname": "icorder" },
"bycnoticeindex": { "title": "登录", "config": null, "path": "/bycnoticeindex", "comname": "bycnoticeindex" }, "jdbycncldetail": { "title": "登录", "config": null, "path": "/:channel/jdbycncldetail", "comname": "jdbycncldetail" },
"jdbycnoticetm": { "title": "登录", "config": null, "path": "/jdbycnoticetm", "comname": "jdbycnoticetm" }, "bycnoticeindex": { "title": "登录", "config": null, "path": "/:channel/bycnoticeindex", "comname": "bycnoticeindex" },
"jdbycquerytm": { "title": "登录", "config": null, "path": "/jdbycquerytm", "comname": "jdbycquerytm" }, "jdbycnoticetm": { "title": "登录", "config": null, "path": "/:channel/jdbycnoticetm", "comname": "jdbycnoticetm" },
"jdicbc": { "title": "登录", "config": null, "path": "/jdicbc", "comname": "jdicbc" }, "jdbycquerytm": { "title": "登录", "config": null, "path": "/:channel/jdbycquerytm", "comname": "jdbycquerytm" },
"jdtrademark": { "title": "登录", "config": null, "path": "/jdtrademark", "comname": "jdtrademark" }, "jdicbc": { "title": "登录", "config": null, "path": "/:channel/jdicbc", "comname": "jdicbc" },
"register": { "title": "注册", "config": null, "path": "/register", "comname": "register" }, "jdtrademark": { "title": "登录", "config": null, "path": "/:channel/jdtrademark", "comname": "jdtrademark" },
"home": { "title": "前台首页", "config": null, "path": "/", "comname": "home" }, "register": { "title": "注册", "config": null, "path": "/:channel/register", "comname": "register" },
"myapp": { "title": "我的APP", "config": null, "path": "/myapp", "comname": "myapp" }, "home": { "title": "前台首页", "config": null, "path": "/:channel/", "comname": "home" },
"approle": { "title": "角色", "config": null, "path": "/approle", "comname": "approle" }, "myapp": { "title": "我的APP", "config": null, "path": "/:channel/myapp", "comname": "myapp" },
"appuser": { "title": "用户", "config": null, "path": "/appuser", "comname": "appuser" }, "approle": { "title": "角色", "config": null, "path": "/:channel/approle", "comname": "approle" },
"allapps": { "title": "所有APP", "config": null, "path": "/allapps", "comname": "allapps" }, "appuser": { "title": "用户", "config": null, "path": "/:channel/appuser", "comname": "appuser" },
"allapps": { "title": "所有APP", "config": null, "path": "/:channel/allapps", "comname": "allapps" },
}, },
"pauths": [ "pauths": [
"add", "edit", "delete", "export", "show" "add", "edit", "delete", "export", "show"
......
igirl-channel-web/app/base/utils/execClient.js
var childproc = require('child_process'); var childproc = require('child_process');
const util = require('util'); const util = require('util');
const exec = util.promisify(require('child_process').exec); const exec = util.promisify(require('child_process').exec);
const uuidv4 = require('uuid/v4');
class ExecClient { class ExecClient {
constructor() { constructor() {
this.cmdPostPattern = "curl -k -H 'Content-type: application/json' -d '{data}' {url}"; this.cmdPostPattern = "curl -k -H 'Content-type: application/json' -d '{data}' {url}";
this.cmdGetPattern = "curl -G -X GET '{url}'"; this.cmdGetPattern = "curl -G -X GET '{url}'";
this.cmdPostTK = "curl -k -H 'Content-type: application/json' -H 'token:{tk}' -H 'request-id:{requestId}' -d '{data}' {url}";
}
getUUID() {
var uuid = uuidv4();
var u = uuid.replace(/\-/g, "");
return u;
}
async execPostTK(subData, url, token) {
let cmd = this.FetchPostTK(subData, url, token);
var result = await this.exec(cmd, {
maxBuffer: 1024 * 1024 * 15
});
var rtn = result.stdout;
if (rtn) {
return JSON.parse(rtn);
} else {
return null;
}
}
FetchPostTK(subData, url, token) {
var data = JSON.stringify(subData);
var requestId = this.getUUID();
var cmd = this.cmdPostTK.replace(/\{data\}/g,
data).replace(/\{url\}/g, url).replace(/\{tk\}/g, token).replace(/\{requestId\}/g, requestId);
return cmd;
} }
async exec(cmd) { async exec(cmd) {
//await后面表达式返回的promise对象，是then的语法糖，await返回then函数的返回值 //await后面表达式返回的promise对象，是then的语法糖，await返回then函数的返回值
//异常需要try/catch自己捕获或外部catch捕获 //异常需要try/catch自己捕获或外部catch捕获
const {stdout, stderr} = await exec(cmd); const { stdout, stderr } = await exec(cmd);
return {stdout, stderr}; return { stdout, stderr };
} }
async exec2(cmd) { async exec2(cmd) {
return exec(cmd, {encoding: "base64"}); return exec(cmd, { encoding: "base64" });
} }
FetchPostCmd(subData, url) { FetchPostCmd(subData, url) {
...@@ -66,8 +90,8 @@ class ExecClient { ...@@ -66,8 +90,8 @@ class ExecClient {
var options = { var options = {
timeout: timeOut, timeout: timeOut,
}; };
const {stdout, stderr} = await exec(cmd, options); const { stdout, stderr } = await exec(cmd, options);
return {stdout, stderr}; return { stdout, stderr };
} }
} }
......
igirl-channel-web/app/config/routes/web.js
var url = require("url"); var url = require("url");
var System = require("../../base/system"); var System = require("../../base/system");
var metaCtl=System.getObject("web.common.metaCtl"); var metaCtl = System.getObject("web.common.metaCtl");
var userCtl=System.getObject("web.auth.userCtl"); var tmqueryCtl = System.getObject("web.trademark.tmqueryCtl");
module.exports = function (app) { module.exports = function (app) {
app.get("/auth",async function(req,res){ app.get("/1688/proxy", async function (req, res) {
await userCtl.authByCode(req); var params = {
res.redirect("/"); actionProcess: "1688",
requrl: "/action/tmOrder/springBoard",
actionType: "getChannelOrderInfo",
actionBody: req.query
};
if (params.actionBody.sign) {
params.sign = params.actionBody.sign;
delete params.actionBody["sign"];
}
var result = await tmqueryCtl.doPost(params, null, req);
if (result.status != 0) {
res.end(JSON.stringify(result));
return;
}
var skipUrl = result.skipUrl + "?itemCode=" + result.itemCode + "&channelUser=" + JSON.stringify(result.data.channelUser) + "&channelOrder=" + JSON.stringify(result.data.channelOrder) + "&channelParams=" + result.channelParams;
res.redirect(skipUrl);
}); });
app.get("/",async function(req,res){
app.get("/", async function (req, res) {
console.log(req.hostname); console.log(req.hostname);
var appinfo=await metaCtl.getAppInfo(req); var appinfo = await metaCtl.getAppInfo(req);
if(!appinfo){ if (!appinfo) {
res.render("index",{appinfo:null,app:null}); res.render("index", { appinfo: null, app: null });
}else{ } else {
res.render("index",appinfo); res.render("index", appinfo);
} }
}); });
app.get("/admin",async function(req,res){ app.get("/admin", async function (req, res) {
var appinfo=await metaCtl.getAppInfo(req); var appinfo = await metaCtl.getAppInfo(req);
res.render("admin",appinfo); res.render("admin", appinfo);
}); });
app.get('/web/:gname/:qname/:method', function (req, res) { app.get('/web/:gname/:qname/:method', function (req, res) {
var classPath = req.params["qname"]; var classPath = req.params["qname"];
var methodName = req.params["method"]; var methodName = req.params["method"];
var gname=req.params["gname"]; var gname = req.params["gname"];
classPath=gname+"."+classPath; classPath = gname + "." + classPath;
var params = []; var params = [];
params.push(methodName); params.push(methodName);
params.push(req.body); params.push(req.body);
params.push(req.query); params.push(req.query);
params.push(req); params.push(req);
var p = null; var p = null;
var invokeObj = System.getObject("web." + classPath); var invokeObj = System.getObject("web." + classPath);
if (invokeObj["doexec"]) { if (invokeObj["doexec"]) {
...@@ -42,19 +58,19 @@ module.exports = function (app) { ...@@ -42,19 +58,19 @@ module.exports = function (app) {
}); });
app.post('/web/:gname/:qname/:method', function (req, res) { app.post('/web/:gname/:qname/:method', function (req, res) {
var classPath = req.params["qname"]; var classPath = req.params["qname"];
var methodName = req.params["method"]; var methodName = req.params["method"];
var gname=req.params["gname"]; var gname = req.params["gname"];
var params = []; var params = [];
classPath=gname+"."+classPath; classPath = gname + "." + classPath;
var tClientIp = System.get_client_ip(req); var tClientIp = System.get_client_ip(req);
req.body.clientIp = tClientIp; req.body.clientIp = tClientIp;
req.body.agent= req.headers["user-agent"]; req.body.agent = req.headers["user-agent"];
req.body.classname=classPath; req.body.classname = classPath;
params.push(methodName); params.push(methodName);
params.push(req.query);
params.push(req.body); params.push(req.body);
params.push(req); params.push(req.query);
params.push(req);
var p = null; var p = null;
var invokeObj = System.getObject("web." + classPath); var invokeObj = System.getObject("web." + classPath);
if (invokeObj["doexec"]) { if (invokeObj["doexec"]) {
......
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
...@@ -74,7 +74,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -74,7 +74,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}); });
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
console.log(from,to,'~~~~~~~~~~~~~~~~~~~~~~'); console.log(from, to, '~~~~~~~~~~~~~~~~~~~~~~');
next(); next();
}); });
Vue.use(window['vue-cropper']); Vue.use(window['vue-cropper']);
...@@ -85,13 +85,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -85,13 +85,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
data: function () { data: function () {
return { return {
// 请求地址 // 请求地址
host: `http://zcchannel.apps.com:3003`, host: ``,
// 请求头携带参数 // 请求头携带参数
globelHeader: {}, globelHeader: {},
// 通用接口参数 // 通用接口参数
commonParams: { commonParams: {
"actionProcess": "jd", "actionProcess": "",
"actionType": " subTmOrder ",
"sign": "2FviZ9PGws8Pt1fBhq0t90mjUvI", "sign": "2FviZ9PGws8Pt1fBhq0t90mjUvI",
"actionBody": {}, "actionBody": {},
"actionType": "", "actionType": "",
...@@ -156,7 +155,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -156,7 +155,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
themename: "", themename: "",
showWxrm: false, showWxrm: false,
showPhoneNum: false, showPhoneNum: false,
rsData: [] rsData: [],
channelPath: ""
}; };
}, },
created() { created() {
...@@ -181,17 +181,29 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -181,17 +181,29 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
this.checkLogin(); this.checkLogin();
}, },
methods: { methods: {
// 返回当前接入渠道标识
getChannelPath() {
var from = this.$route.path;
var path = from.match(/\/(\S*)\//)[1];
this.$root.channelPath = path;
return path;
},
// 处理参数方法 // 处理参数方法
copyParams(actionBody, actionType, url) { copyParams(actionBody, actionType, url, isUser = "no") {
let data = this.commonParams; var data = this.commonParams;
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;
console.log(data, data.requrl,"1111111111111"); data.isUser = isUser;
var newObj = Object.assign(data, {}); let currentDate = Math.floor(new Date().getTime() / 1000);
console.log(newObj, "xxxxxxxxxxxxxxxxxxx"); data.actionBody.timestamp = currentDate;
var newObj = JSON.parse(JSON.stringify(data));
return newObj; return newObj;
}, },
handleOpen(key, keyPath) { handleOpen(key, keyPath) {
console.log(key, keyPath); console.log(key, keyPath);
}, },
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
} }
.jdindentdetail { .jdindentdetail {
padding: 0 30px 30px;
padding: 30px 30px 30px;
background: #F9F9F9; background: #F9F9F9;
} }
...@@ -348,14 +349,15 @@ ...@@ -348,14 +349,15 @@
text-align: center; text-align: center;
} }
.jdindentdetail-main-official-img .license-uploader .el-upload { .jdindentdetail-main-official-img .license-uploader {
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
margin-bottom: 3px;
} }
.jdindentdetail-main-official-img .license-uploader .el-upload:hover { .jdindentdetail-main-official-img .license-uploader:hover {
border-color: #409EFF; border-color: #409EFF;
} }
...@@ -471,7 +473,6 @@ ...@@ -471,7 +473,6 @@
.jdindentdetail-diag .el-dialog__header { .jdindentdetail-diag .el-dialog__header {
text-align: center;
border-bottom: 1px solid #E8E8E8; border-bottom: 1px solid #E8E8E8;
padding: 0; padding: 0;
font-size: 24px; font-size: 24px;
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
<div class="jdindentdetail-warpper"> <div class="jdindentdetail-warpper">
<div class="jdindentdetail-header"> <!-- <div class="jdindentdetail-header">
<div>个人中心</div> <div>个人中心</div>
<div> <div>
<span>欢迎</span> <span>欢迎</span>
<span>1366*565445</span> <span>1366*565445</span>
<span>退出</span> <span>退出</span>
</div> </div>
</div> </div> -->
<div class="jdindentdetail"> <div class="jdindentdetail">
<div class="jdindentdetail-nav"> <!-- <div class="jdindentdetail-nav">
<span>当前位置：</span> <span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: \'/\' }">我的订单</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: \'/1688/jdindentlist?deliveryOrderNo=\' + deliveryOrderNo }">我的订单</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item> <el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div> -->
<div class="jdindentdetail-main"> <div class="jdindentdetail-main">
<div class="jdindentdetail-flow"> <div class="jdindentdetail-flow">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="6" align-center> <el-steps :active="6" align-center>
<el-step title="待付款" description="21-123-1231"></el-step> <el-step title="待付款" description=""></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>
...@@ -32,10 +32,9 @@ ...@@ -32,10 +32,9 @@
</div> </div>
<div class="jdindentdetail-main-step-row"> <div class="jdindentdetail-main-step-row">
<div> <div>
<el-steps direction="vertical" :active="2"> <el-steps direction="vertical" :active="currentStep">
<el-step title="2018-12-07 13:21:44 已上传回执文件：z8602253081 "></el-step> <el-step v-for="(item, index) in orderFlow"
<el-step title="2018-12-07 13:21:44 已上传回执文件：z8602253081 "></el-step> :title="item.createDate +\' \' +item.opContent"></el-step>
<el-step title="2018-12-07 13:21:44 已上传回执文件：z8602253081 "></el-step>
</el-steps> </el-steps>
</div> </div>
</div> </div>
...@@ -49,23 +48,23 @@ ...@@ -49,23 +48,23 @@
</div> </div>
<div> <div>
<p> <p>
<img src="" alt=""> <img :src="deliveryInfo.colorizedPicUrl" alt="">
</p> </p>
<p>商标图样</p> <p>商标图样</p>
</div> </div>
<div> <div>
<p>商标名称：<span>12312</span></p> <p>商标名称：<span>{{deliveryInfo.tmName}}</span></p>
<p>商标类型：<span>321</span></p> <p>商标类型：<span>{{deliveryInfo.tmType}}</span></p>
<p>商标说明：<span>312</span></p> <p>商标说明：<span>{{deliveryInfo.notes}}</span></p>
</div> </div>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-type-box"> <div class="jdindentdetail-main-type-box" v-for="(item, index) in nclInfo" :key="index">
<div class="jdindentdetail-main-type"> <div class="jdindentdetail-main-type">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
商标类别 {{item.nclOneCodes}}
</div> </div>
<div class="jdindentdetail-main-type-title"> <div class="jdindentdetail-main-type-title">
广告销售 广告销售
...@@ -76,41 +75,22 @@ ...@@ -76,41 +75,22 @@
<div class="jdindentdetail-main-type-services"> <div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p> <p>商品服务项目：</p>
<ul> <ul>
<li v-for="(item, index) in 77" :key="index">{{item}}</li> <li v-for="(item, index) in item.nclSmallCodes" :key="index">{{item.pcode}}{{item.name}}
</li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="jdindentdetail-main-receipt"> <div class="jdindentdetail-main-receipt">
官方回执文件: 官方回执文件:
<span>商标注册申请书</span> <span>{{item.officialTypeName}}</span>
<span>商标注册申请受理通知书</span> <!-- <span>商标注册申请书</span>
<span>商标注册申请初步审定公告通知书</span>
</div>
</div>
<div class="jdindentdetail-main-type-box">
<div class="jdindentdetail-main-type">
<div class="jdindentdetail-main-type-title">
09 科学仪器
<span>-1213</span>
<span>待递交</span>
<span @click="showDialog(2)"><i class="el-icon-edit"></i> 修改</span>
</div>
<div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p>
<ul>
<li v-for="(item, index) in 77" :key="index">{{item}}</li>
</ul>
</div>
</div>
<div class="jdindentdetail-main-receipt">
官方回执文件:
<span>商标注册申请书</span>
<span>商标注册申请受理通知书</span> <span>商标注册申请受理通知书</span>
<span>商标注册申请初步审定公告通知书</span> <span>商标注册申请初步审定公告通知书</span> -->
</div> </div>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
...@@ -120,37 +100,32 @@ ...@@ -120,37 +100,32 @@
</div> </div>
<div class="jdindentdetail-main-official-img"> <div class="jdindentdetail-main-official-img">
<div> <div>
<el-upload class="license-uploader" action="https://jsonplaceholder.typicode.com/posts/" <div class="license-uploader">
:show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img src="/imgs/indent/pdf.png" alt=""> <img :src="applyInfo.businessLicensePic ? applyInfo.businessLicensePic : \'/imgs/indent/pdf.png\'"
alt="">
</div> </div>
</el-upload> </div>
<p>营业执照</p> <p>营业执照</p>
</div> </div>
<div> <div>
<el-upload class="license-uploader" action="https://jsonplaceholder.typicode.com/posts/" <div class="license-uploader">
:show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img src="/imgs/indent/jpg.png" alt=""> <img :src="orderFlow.gzwtsUrl?orderFlow.gzwtsUrl:\'/imgs/indent/jpg.png\'" alt="">
</div> </div>
</el-upload> </div>
<p>委托书</p> <p>委托书</p>
<p style="color:#2692FF;">生成委托书</p> <!-- <p style="color:#2692FF;">生成委托书</p> -->
</div> </div>
<div> <div>
<el-upload class="license-uploader" action="https://jsonplaceholder.typicode.com/posts/" <div class="license-uploader">
:show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="license"> <img v-if="imageUrl" :src="imageUrl" class="license">
<div class="license-uploader-icon" v-else> <div class="license-uploader-icon" v-else>
<img src="/imgs/indent/jpg.png" alt=""> <img src="/imgs/indent/jpg.png" alt="">
</div> </div>
</el-upload> </div>
<p>优先权证明</p> <p>优先权证明</p>
</div> </div>
</div> </div>
...@@ -161,10 +136,10 @@ ...@@ -161,10 +136,10 @@
申请人信息-（中国大陆-企业） <span @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> 申请人信息-（中国大陆-企业） <span @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>公司名称：</span><span>123213</span></li> <li><span>公司名称：</span><span>{{applyInfo.name}}</span></li>
<li><span>统一社会信用代码：</span><span>21332132</span></li> <li><span>统一社会信用代码：</span><span>{{applyInfo.code}}</span></li>
<li><span>公司地址：</span><span>23131</span></li> <li><span>公司地址：</span><span>{{applyInfo.applyAddr}}</span></li>
<li><span>邮编地址：</span><span>231321</span></li> <li><span>邮编地址：</span><span>{{applyInfo.zipCode}}</span></li>
</ul> </ul>
</div> </div>
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
...@@ -173,14 +148,14 @@ ...@@ -173,14 +148,14 @@
订单联系人 <span @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span> 订单联系人 <span @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>联系人：</span><span>123213</span></li> <li><span>联系人：</span><span>{{applyInfo.contacts}}</span></li>
<li><span>手机号码：</span><span>21332132</span></li> <li><span>手机号码：</span><span>{{applyInfo.mobile}}</span></li>
<li><span>电子邮箱：</span><span>23131</span></li> <li><span>电子邮箱：</span><span>{{applyInfo.email}}</span></li>
<li><span>座机号码：</span><span>231321</span></li> <li><span>座机号码：</span><span>{{applyInfo.zipCode}}</span></li>
</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>
...@@ -192,14 +167,14 @@ ...@@ -192,14 +167,14 @@
<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>
<!-- 修改弹窗 --> <!-- 修改弹窗 -->
<div class="jdindentdetail-diag"> <div class="jdindentdetail-diag">
<el-dialog :title="headerInfo" width="62.5%" :visible.sync="dialogTableVisible"> <el-dialog :title="headerInfo" width="62.5%" :visible.sync="dialogTableVisible" center>
<div v-show="headerInfo==\'商标信息\'"> <div v-show="headerInfo==\'商标信息\'">
<el-form v-if="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm" <el-form v-if="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm"
label-width="120px"> label-width="120px">
...@@ -302,17 +277,16 @@ ...@@ -302,17 +277,16 @@
</div> </div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</el-form> </el-form>
<div style="width:100%;text-align:center;margin-top: 40px;">
<el-button style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">提交</el-button>
</div>
</div> </div>
<div v-show="headerInfo==\'商标类别\'"> <div v-show="headerInfo==\'商标类别\'">
<el-container style="height: 600px;background-color:white; border: 1px solid #D6DAEB;"> <el-container style="height: 600px;background-color:white; border: 1px solid #D6DAEB;">
<el-aside width="35%" style="text-align:center;background-color:white;position: relative;"> <el-aside width="35%" style="text-align:center;background-color:white;position: relative;">
<div class="selftmreg_Stickie"> <div class="selftmreg_Stickie">
<el-button size="small" style="border-radius:0;" @click="checkClick">分类</el-button> <el-button size="small" style="border-radius:0;" @click="checkClick">分类</el-button>
<el-input @blur="searchInputBlur" style="width:60%;margin: 0 10px" placeholder="输入关键字进行过滤" <el-input @blur="searchInputBlur" style="width:60%;height:31px;margin: 0"
@keyup.enter.native="nclSearch" suffix-icon="el-icon-search" v-model="filterText"> placeholder="输入关键字进行过滤" @keyup.enter.native="nclSearch" suffix-icon="el-icon-search"
v-model="filterText">
<i slot="suffix" style="position:relative;top:8%;right:5%;z-index:1" <i slot="suffix" style="position:relative;top:8%;right:5%;z-index:1"
class="el-input__icon" @click="nclSearch"> class="el-input__icon" @click="nclSearch">
<span><i class="tool-query" style="font-size : 1.5em;"></i></span> <span><i class="tool-query" style="font-size : 1.5em;"></i></span>
...@@ -331,7 +305,8 @@ ...@@ -331,7 +305,8 @@
</el-checkbox> </el-checkbox>
</div> </div>
<div style="float:left;text-align:right;width:50%;"> <div style="float:left;text-align:right;width:50%;">
<el-button type="text" style="padding: 0 10px;color:#828282;" @click="checkConfirm">确定 <el-button type="text" style="padding: 0 10px;color:#828282;" @click="checkConfirm">
确定
</el-button> </el-button>
</div> </div>
<div style="clear:both"> <div style="clear:both">
...@@ -405,9 +380,7 @@ ...@@ -405,9 +380,7 @@
</el-main> </el-main>
</el-container> </el-container>
</el-container> </el-container>
<div style="width:100%;text-align:center;margin-top: 40px;">
<el-button style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">提交</el-button>
</div>
</div> </div>
<div v-show="headerInfo==\'交官文件\'"> <div v-show="headerInfo==\'交官文件\'">
<el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px"> <el-form ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px">
...@@ -463,9 +436,7 @@ ...@@ -463,9 +436,7 @@
@click="toViewImg(apply.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')"> @click="toViewImg(apply.customerType == \'ent\' ? \'/imgs/sbzc/yyzzD1.png\' : \'imgs/sbzc/yyzzD.png\')">
查看大图</div> 查看大图</div>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i>
材料要求盖章/签字清晰完整，建议盖章/签字在文件中间空白处不压字<br />格式为<span>PDF</span>或<span>JPG</span>，大小不能超过<span>10M</span><br /><span>商标局声明：自2018年1月1日起，国内申请人办理商标注册、异议、变更、转让、续展等商标事宜，应当使用标注统一社会信用代码身份证明文件，未使用则不予受理</span>。
</div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items" v-if="apply.customerType==\'person\'" label=""> <el-form-item class="gsb_items" v-if="apply.customerType==\'person\'" label="">
<div class="title special">上传材料：身份证明</div> <div class="title special">上传材料：身份证明</div>
...@@ -534,9 +505,7 @@ ...@@ -534,9 +505,7 @@
@click="toViewImg(apply.customerType == \'ent\' ? \'/imgs/sbzc/wtsD1.png\' : \'imgs/sbzc/wtsD.png\')"> @click="toViewImg(apply.customerType == \'ent\' ? \'/imgs/sbzc/wtsD1.png\' : \'imgs/sbzc/wtsD.png\')">
查看大图</div> 查看大图</div>
</div> </div>
<div class="text"> <i class="el-icon-warning"></i>
材料要求盖章/签字清晰完整，建议盖章/签字在文件中间空白处不压字<br />请上传由申请人盖章或签字的中文代理委托书彩色扫描件，格式为<span>JPG</span>宽高的大小为<br /><span>4000px~600px</span>，<span>300dpi</span>分辨率，大小不能超过<span>10M</span>。
</div>
</el-form-item> </el-form-item>
<el-form-item class="gsb_items" label=""> <el-form-item class="gsb_items" label="">
<div class="title">上传材料：优先权证明 <a <div class="title">上传材料：优先权证明 <a
...@@ -580,9 +549,7 @@ ...@@ -580,9 +549,7 @@
</div> </div>
</div> </div>
<div style="width:100%;text-align:center;margin-top: 40px;">
<el-button style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">提交</el-button>
</div>
</el-form> </el-form>
</div> </div>
<div v-show="headerInfo==\'申请人信息\'"> <div v-show="headerInfo==\'申请人信息\'">
...@@ -607,17 +574,17 @@ ...@@ -607,17 +574,17 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称" <el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectent v-if="currentUser" allowcreate="true" showhistory="true" <gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="true"
@historychange="historyapplierchange" @change="applierChange" size="medium" @historychange="historyapplierchange" @change="applierChange" size="medium"
v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true" v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName" isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称"></gsb-selectent> style="position:relative;width:100%;" placeHolder="请输入选择公司名称"></gsb-selectentjd>
<gsb-selectent v-if="!currentUser" frombrowser="true" allowcreate="true" <gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true"
showhistory="true" @historychange="historyapplierchange" @change="applierChange" showhistory="true" @historychange="historyapplierchange" @change="applierChange"
size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName" size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" autoComplete="true" isFilter="true" refModel="tool" labelField="entName"
valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectent> </gsb-selectentjd>
</el-form-item> </el-form-item>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名" <el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
...@@ -702,9 +669,7 @@ ...@@ -702,9 +669,7 @@
</div> </div>
</div> </div>
<div style="width:100%;text-align:center;margin-top: 40px;">
<el-button style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">提交</el-button>
</div>
</el-form> </el-form>
</div> </div>
<div v-show="headerInfo==\'订单联系人\'"> <div v-show="headerInfo==\'订单联系人\'">
...@@ -819,16 +784,16 @@ ...@@ -819,16 +784,16 @@
<el-input v-model="apply.fax" placeHolder="请输入传真号"> </el-input> <el-input v-model="apply.fax" placeHolder="请输入传真号"> </el-input>
</el-form-item> </el-form-item>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
</div> </div>
<div style="width:100%;text-align:center;margin-top: 40px;">
<el-button style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">提交</el-button>
</div>
</el-form> </el-form>
</div> </div>
<span slot="footer" class="dialog-footer">
<el-button @click="submitEdit(headerInfo)"
style="width:140px;height:36px;background:rgba(38,146,255,1);border-radius:4px;color:#fff;">
提交</el-button>
</span>
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -63,14 +63,7 @@ ...@@ -63,14 +63,7 @@
} }
}; };
return { return {
/**订单图片 */
imageUrl: '',
/*当前状态 */
active: 1,
/*弹窗标题*/
headerInfo: '',
dialogTableVisible: false,
innerVisible: false,
/*注册副本 */ /*注册副本 */
announcementsImgType: false, announcementsImgType: false,
announcementsType: false, announcementsType: false,
...@@ -293,42 +286,107 @@ ...@@ -293,42 +286,107 @@
toViewImgKey: null, toViewImgKey: null,
toViewImgType: false, toViewImgType: false,
toViewImgSrc: null, toViewImgSrc: null,
popupValue:"", /**订单图片 */
imageUrl: '',
/*当前状态 */
active: 1,
/*弹窗标题*/
headerInfo: '',
dialogTableVisible: false,
innerVisible: false,
/**订单编号 */
deliveryOrderNo: '',
deliveryInfo: { 'colorizedPicUrl': "" },
applyInfo: {},
nclInfo: [],
/* */
orderFlow: {},
currentStep: "",
} }
}, },
mounted: function() { mounted: function() {
this.initIndent(); var that = this;
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
that.d["key"] = "key";
that.d["Bucket"] = d.data.Bucket;
that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
that.d["Signature"] = d.data.Signature;
that.d["policy"] = d.data.policy;
that.d["success_action_status"] = d.data.success_action_status;
that.action = d.data.url;
console.log(that.action, `oooooooooooooooooooooooooooo`);
});
console.log(this.$route.query.deliveryOrderNo, '11111111111');
if(this.$route.query.deliveryOrderNo){
this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
this.initIndent();
}
}, },
created: function() { created: function() {
}, },
methods: { methods: {
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw); /*初始化订单数据 */
},
beforeAvatarUpload(file) {
const isJPG = file.type === 'image/jpeg';
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isJPG) {
this.$message.error('上传头像图片只能是 JPG 格式!');
}
if (!isLt2M) {
this.$message.error('上传头像图片大小不能超过 2MB!');
}
return isJPG && isLt2M;
},
initIndent(){ initIndent(){
console.log(21321); console.log(this.$route.query);
var defaultD = { var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo }, "getTmOrderInfo", "/action/tmOrder/springBoard");
"deliveryOrderNo": "346c3091684e4e0eef" var applyObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo }, "getTmApplyInfo", "/action/tmOrder/springBoard");
}; var nclObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo }, "getTmNclList", "/action/tmOrder/springBoard");
var obj = this.$root.copyParams(defaultD, "getTmApplyInfo", "/action/tmOrder/springBoard"); let [loadingA, loadingB, loadingC] = [1, 1, 1];
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.loading = true;
console.log(d); this.$root.postReq("/web/trademark/tmqueryCtl/doPost", deliveryObj).then((d) => {
loadingA = 0;
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
console.log(d, `deliveryInfo`);
this.deliveryInfo = d.data.tm;
this.orderFlow = d.data.orderFlow;
this.currentStep = this.orderFlow.length;
this.orderFlow.map((item, index) => {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false });
})
}
}).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
this.$root.loading = false;
} }
}); });
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", applyObj).then((d) => {
loadingB = 0;
console.log(d, `applyObj`);
if (d.status == 0 && d.data) {
this.applyInfo = d.data;
console.log(this.applyInfo, `vvvvvvvvvvvvvvvvvvvvvvvvv`)
}
}).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
this.$root.loading = false;
}
});
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", nclObj).then((d) => {
loadingC = 0;
console.log(d, `nclObj`);
if (d.status == 0 && d.data) {
this.nclInfo = d.data;
this.nclInfo.map((item, index) => {
item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
console.log(item.nclSmallCodes);
})
}
}).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
this.$root.loading = false;
}
});
},
/*订单流程 */
initOrderFlow(){
}, },
showDialog(from){ showDialog(from){
this.popupValue = from; this.popupValue = from;
...@@ -761,7 +819,7 @@ ...@@ -761,7 +819,7 @@
this.nclOne.splice(index, 1); this.nclOne.splice(index, 1);
} }
this.updatePriceType = false; this.updatePriceType = false;
this.updatePrice();
var json = { json: this.nclOne }; var json = { json: this.nclOne };
var jsonStr = JSON.stringify(json); var jsonStr = JSON.stringify(json);
}, },
...@@ -808,7 +866,7 @@ ...@@ -808,7 +866,7 @@
this.nclOne.splice(index, 1); this.nclOne.splice(index, 1);
} }
this.updatePriceType = false; this.updatePriceType = false;
this.updatePrice();
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
...@@ -874,7 +932,7 @@ ...@@ -874,7 +932,7 @@
}) })
} }
this.updatePriceType = false; this.updatePriceType = false;
this.updatePrice();
} else if (this.nclOne.length != 0 && !a) { } else if (this.nclOne.length != 0 && !a) {
this.nclOne.forEach((item, index) => { this.nclOne.forEach((item, index) => {
if (item.name == ppncl.name) { if (item.name == ppncl.name) {
...@@ -958,7 +1016,7 @@ ...@@ -958,7 +1016,7 @@
}; };
this.nclOne.push(data); this.nclOne.push(data);
} }
this.updatePrice();
} }
}, },
nclThreeIsExist(name, nclThree){ nclThreeIsExist(name, nclThree){
...@@ -1016,57 +1074,7 @@ ...@@ -1016,57 +1074,7 @@
return false; return false;
}); });
}, },
updatePrice(){
var totalSum = 0;
var flag = true;
var invoiceTaxRate = Number(this.serviceitem.rateConfig || 0);
var totalDiscountsRate = Number(this.serviceitem.discountsRateConfig || 0);
var totalServiceCharge = Number(this.serviceitem.serviceCharge || 0);
var price = Number(this.serviceitem.price || 0);
var shui = 0;
var totalPublicExpense = 0;
for (var i = 0; i < this.nclOne.length; i++) {
totalPublicExpense = totalPublicExpense + this.nclOne[i].price;
}
totalServiceCharge = Number(totalServiceCharge) * this.nclOne.length;
totalSum = Number(totalPublicExpense) + Number(totalServiceCharge);
var maxTotalDiscounts = Number(price) * this.nclOne.length * Number(totalDiscountsRate) / 100;
maxTotalDiscounts = maxTotalDiscounts.toFixed(2);
var totalTaxes = totalSum / (1 + invoiceTaxRate / 100) * invoiceTaxRate / 100;
totalTaxes = totalTaxes.toFixed(2);
var minSum = Number(totalServiceCharge) + Number(totalPublicExpense) - Number(maxTotalDiscounts);
minSum = minSum.toFixed(2);
minSum = Number(minSum);
if (totalSum < minSum && this.updatePriceType) {
this.$message.warning('订单金额不足');
flag = false;
}
var totalDiscounts = 0;
if (Number(totalSum) < (Number(totalServiceCharge) + Number(totalPublicExpense))) {
totalDiscounts = Number(totalServiceCharge) + Number(totalPublicExpense) - Number(totalSum);
totalDiscounts = totalDiscounts.toFixed(2);
}
if (totalDiscounts > maxTotalDiscounts) {
this.$message.warning('优惠金额超过最大额度');
flag = false;
}
var totalProfitSum = Number(totalSum) - Number(totalPublicExpense);
totalProfitSum = totalProfitSum.toFixed(2);
this.form.totalSum = totalSum;
this.form.totalServiceCharge = totalServiceCharge;
this.form.totalPublicExpense = totalPublicExpense;
this.form.totalDiscounts = totalDiscounts;
this.form.totalTaxes = totalTaxes;
this.form.totalProfitSum = totalProfitSum;
if (!this.serviceitem || !this.serviceitem.price) {
this.$message.warning('获取产品信息错误');
flag = false;
}
return flag;
},
appendNode(data, pnode) { appendNode(data, pnode) {
this.$refs.tree.append(data, pnode); this.$refs.tree.append(data, pnode);
this.nclOne.forEach((item, index) => { this.nclOne.forEach((item, index) => {
...@@ -1105,83 +1113,20 @@ ...@@ -1105,83 +1113,20 @@
} }
this.nclOne = data; this.nclOne = data;
} }
this.updatePrice();
}); });
}, },
selfclear(){ selfclear(){
this.nclOne = []; this.nclOne = [];
}, },
submitForm(formName) {
this.updatePriceType = true;
var that = this;
console.log(formName);
if (formName == "form" || formName == "apply") {
this.$refs[formName].validate((valid) => {
if (valid) {
if (formName == "form") {
var flag = that.updatePrice();
if (!flag) {
return;
}
}
if (formName == "form" && that.nclOne.length < 1) {
that.$message.warning(`请选择商标分类`);
return false;
}
that.toTop();
that.step = Number(that.step) + 1;
} else {
console.log('error submit!!');
return false;
}
});
}
if (formName == "order") {
this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name;
this.savehistory();
var obj = { tm: this.form, apply: this.apply, nclones: this.nclOne, itemCode: this.itemCode };
if (!this.currentUser) {
obj["step"] = this.step;
localStorage.setItem("afterLogin", JSON.stringify({
title: "自主商标注册",
name: "/selftmreg",
params: { itemCode: this.itemCode, orderParams: obj }
}));
this.$root.pushx({
title: "登录",
name: "/login"
});
return false;
}
that.$root.postReq("/web/trademark/tmqueryCtl/createTmOrder", obj).then(function (d) {
if (d.code == "1") {
var order = d.data;
that.toTop();
that.$message.warning("订单提交成功");
that.$root.pushx({
title: "订单支付",
name: "/orderpay",
params: {
orderNum: order.code
}
});
} else {
that.$message.warning(d.msg);
}
that.$root.hideMask();
}).catch(function (e) {
that.$message.warning("操作失败");
that.$root.hideMask();
});
}
},
savehistory(){ savehistory(){
var entobj = { var entobj = {
regLocation: this.apply.applyAddr, entName: this.apply.name, domainEntName: this.apply.name, creditCode: this.apply.code, regLocation: this.apply.applyAddr, entName: this.apply.name, domainEntName: this.apply.name, creditCode: this.apply.code,
businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo, businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo,
identityCardPic: this.apply.identityCardPic identityCardPic: this.apply.identityCardPic
}; };
console.log(entobj); console.log(entobj,`wwwwwwwwwwwwwwwwwwwwwwwwwwwww`);
if (this.apply.customerType == "ent") { if (this.apply.customerType == "ent") {
var entData = localStorage.getItem("historyentlist"); var entData = localStorage.getItem("historyentlist");
var o = ""; var o = "";
...@@ -1414,7 +1359,16 @@ ...@@ -1414,7 +1359,16 @@
this.checkedNcl = []; this.checkedNcl = [];
this.nclSearch(); this.nclSearch();
}, },
submitEdit(v){
/*
商标信息
商标类别
交官文件
申请人信息
订单联系人
*/
console.log(v);
}
}, },
vname: "gsb-jdindentdetail" vname: "gsb-jdindentdetail"
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
} }
.jdindentlist-inquire-form .el-input__inner { .jdindentlist-inquire-form .el-input__inner {
width: 200px; width: 175px;
height: 36px; height: 36px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
border-radius: 4px; border-radius: 4px;
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
} }
.jdindentlist-list .el-table th>.cell { .jdindentlist-list .el-table th>.cell {
text-align: center; text-align: left;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
...@@ -133,4 +133,15 @@ ...@@ -133,4 +133,15 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.jdindentlist-list .el-table .el-table_1_column_11{
padding-right: 21px;
}
.jdindentlist-null{
width: 34.57%;
height: 333px;
margin: 10.37% auto 0;
}
.jdindentlist-null>div:nth-child(1) img{
width: 100%;
height: 100%;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
<div class="jdindentlist-warpper"> <div class="jdindentlist-warpper">
<div class="jdindentlist-header"> <!-- <div class="jdindentlist-header">
<div>个人中心</div> <div>个人中心</div>
<div> <div>
<span>欢迎</span> <span>欢迎</span>
<span>1366*565445</span> <span>1366*565445</span>
<span>退出</span> <span>退出</span>
</div> </div>
</div> </div> -->
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form"> <div class="jdindentlist-inquire-form">
<div><span>订单编号：</span> <div><span>订单编号：</span>
<el-input v-model="input" placeholder="请输入内容"></el-input> <el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>业务单号：</span> <div><span>交付单号：</span>
<el-input v-model="input" placeholder="请输入内容"></el-input> <el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>业务类型：</span> <div><span>业务类型：</span>
<el-select v-model="value" placeholder="请选择"> <el-select v-model="itemName" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div><span>下单时间：</span> <div><span>下单时间：</span>
<div class="block"> <div class="block">
<span class="demonstration"></span> <span class="demonstration"></span>
<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels <el-date-picker v-model="inputDate" @change="dateChecked(inputDate)" type="daterange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" start-placeholder="起始" end-placeholder="结束" :picker-options="pickerOptions">
:picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div><span>商标名称：</span> <div><span>商标名称：</span>
<el-input v-model="input" placeholder="请输入内容"></el-input> <el-input v-model="tmName" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>申请人：</span> <div><span>申请人：</span>
<el-input v-model="input" placeholder="请输入内容"></el-input> <el-input v-model="name" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>商标状态：</span> <div><span>交付状态：</span>
<el-select v-model="value" placeholder="请选择"> <el-select v-model="deliveryStatusName" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div><span>付款状态：</span> <!-- <div><span>付款状态：</span>
<el-select v-model="value" placeholder="请选择"> <el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
</div> </div>
<div> <div>
<el-button>重设</el-button> <el-button @click="reset()">重设</el-button>
<el-button>查询</el-button> <el-button @click="find()">查询</el-button>
</div>
</div>
<div class="jdindentlist-null" v-if="!tableData">
<div>
<img src="/imgs/listnull.png" alt="">
</div> </div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div> </div>
<div class="jdindentlist-list"> <div class="jdindentlist-list" v-else>
<el-table :header-cell-style="{background:\'#F5F5F5\'}" :data="tableData" style="width: 100%" <el-table :header-cell-style="{background:\'#F5F5F5;\'}" :data="tableData" style="width: 100%">
:row-class-name="tableRowClassName"> <el-table-column prop="channelServiceNo" label="订单编号">
<el-table-column prop="date" label="订单编号">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="业务编号"> <el-table-column prop="itemCode" label="交付单号">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="业务类型"> <el-table-column prop="itemName" label="业务类型">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="商标名称"> <el-table-column prop="tmName" label="商标名称">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="商标类别"> <el-table-column prop="nclOneCodes" label="商标类别">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="商标件数"> <el-table-column prop="nclOneCount" label="商标件数">
</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="name" label="订单总额"> <el-table-column prop="totalSum" label="订单总额">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="商标状态"> <el-table-column prop="deliveryStatusName" label="交付状态">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="付款状态"> <el-table-column prop="CreateDate" label="下单时间">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="下单时间"> <el-table-column prop="submitTime" label="递交时间">
</el-table-column>
<el-table-column prop="address" label="递交时间">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="操作"> <el-table-column prop="address" label="操作">
<template slot-scope="scope">
<el-button style="border:0;color: #0F8EE9;" size="mini"
@click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp;
</el-button>
<el-button v-show="showBtn(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
size="mini" @click="showUploadStuff = true">上传材料</el-button>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination background layout="prev, pager, next,jumper" :total="1000"> <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" :page-size="10"
background layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<div class="jdindentlist-dialog">
<div v-show="showUploadStuff">
<div
style="position: fixed;width:100%;z-index:999;background-color:black;top:0;left:0;right:0;bottom: 0;opacity: 0.5;">
</div>
<div style="position:fixed;height:400px;top:20%;left:20%;right:25%;z-index: 9999;background-color:white;">
<div>
<h4 style="text-align:left;margin-left:2%;">上传资料</h4>
<div style="padding:20px 0;text-align: center">
<el-form ref="stuff" :model="stuff" class="demo-ruleForm" label-width="0">
<el-form-item style="float:left;width:25%;text-align:center" label="">
<div v-loading="loading">
<img width="110px" height="120px" style="border:2px dashed #e9e9e9"
@click="window.open(stuff.businessLicensePic)" v-if="stuff.businessLicensePic"
src="imgs/sbzc/pdf.png" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button type="primary" @click="loadingKey = 0">营业执照上传</el-button>
</gsb-upload>
</el-form-item>
<el-form-item style="float:left;width:25%;text-align:center"
v-if="stuff.customerType==\'person\'" label="">
<div v-loading="loading1">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9"
@click="window.open(stuff.identityCardPic)" v-if="stuff.identityCardPic"
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/PDF20180904.jpg" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
</div>
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button type="primary" @click="loadingKey = 1">身份证明上传</el-button>
</gsb-upload>
</el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" label="">
<div v-loading="loading2">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9"
@click="window.open(stuff.sealAuthorizeStuff)" v-if="stuff.sealAuthorizeStuff"
:src="stuff.sealAuthorizeStuff" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button type="primary" @click="loadingKey = 2">代理委托书上传</el-button>
</gsb-upload>
</el-form-item>
<el-form-item style="float:left;width:25%;text-align:center" label="">
<div v-loading="loading3">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9"
@click="window.open(stuff.descUrl)" v-if="stuff.descUrl" :src="stuff.descUrl" />
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else
src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg" />
</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action"
filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@error="error">
<el-button type="primary" @click="loadingKey = 3">优先权文件上传</el-button>
</gsb-upload>
</el-form-item>
<div style="clear:both;"></div>
</el-form>
<div style="text-align:center;padding:50px 0;">
<el-button @click="hideUploadStuff">取消</el-button>
<el-button type="primary" @click="uploadStuffs">确认</el-button>
</div>
<div style="clear:both"></div>
</div>
<div style="clear:both"></div>
</div>
</div>
</div>
</div>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
{ {
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
var that = this;
var validateMethod = function (rule, value, callback) {
if (rule.field == "mobile") {
if (/^1[23456789]\d{9}$/.test(value) == false) {
return callback(new Error("请输入正确格式的手机号"));
} else {
return callback();
}
}
return callback();
};
return { return {
input: "", input: "",
options: [{ businessType: [
value: '选项1', {
label: '黄金糕' value: '选项1',
}, { label: '自主注册'
value: '选项2', },
label: '双皮奶' {
}, { value: '选项2',
value: '选项3', label: '专家辅助注册'
label: '蚵仔煎' },
}, {
value: '选项4', ],
label: '龙须面' DeliveryStatus: [
}, { {
value: '选项5', value: '选项1',
label: '北京烤鸭' label: '提交订单'
}], },
value: '', {
value: '选项2',
label: '待上传材料'
},
{
value: '选项3',
label: '已审核'
},
{
value: '选项4',
label: '审核不同过'
},
{
value: '选项5',
label: '已递交'
},
{
value: '选项6',
label: '已完成'
},
{
value: '选项6',
label: '已关闭'
}
],
indentInfo: {
"channelServiceNo": "",
"deliveryOrderNo": "",
"itemCode": "",
"deliveryStatus": "",
"payStatus": "",
"tmName": "",
"name": "",
"startTime": "",
"entTime": "",
"pageIndex": 1,
"pageSize": 10
},
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
text: '最近一周', text: '最近一周',
onClick(picker) { onClick(picker) {
console.log(picker);
const end = new Date(); const end = new Date();
const start = new Date(); const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
...@@ -47,32 +97,131 @@ ...@@ -47,32 +97,131 @@
} }
}] }]
}, },
value1: '',
value2: '', /*input绑定值 */
tableData: [{ channelServiceNo: null,
date: '2016-05-02', deliveryOrderNo: null,
name: '王小虎', tmName: null,
address: '上海市普陀区金沙江路 1518 弄', name: null,
}, { itemName: null,
date: '2016-05-04', inputDate: null,
name: '王小虎', startTime: null,
address: '上海市普陀区金沙江路 1518 弄' entTime: null,
}, { deliveryStatusName: null,
date: '2016-05-01', /**$ */
name: '王小虎', CreateDate: null,
address: '上海市普陀区金沙江路 1518 弄', tableData: [],
}, { currentPage: 1,
date: '2016-05-03', countPage: "",
name: '王小虎', pageSize: null,
address: '上海市普陀区金沙江路 1518 弄' /* 上传资料弹框 */
}]
loading: false,
loading1: false,
loading2: false,
loading3: false,
loadingKey: 0,
sumparams: ["totalSum", "nclOneCodesNum"],
multipleSelection: [],
isSingleSelect: false,
bizCode: "",
centerDialogVisible: false,
activeIndex: "1",
totalSum: 0,
sfs: [
{ field: 'totalSum', label: '订单金额' },
],
form1: {
title: "",
taxNum: "",
email: "",
},
form2: {
title: "",
taxNum: "",
companyAddress: "",
companyMobile: "",
companyBank: "",
bankNum: "",
picUrl: "",
recipient: "",
mobile: "",
city: "",
address: "",
},
rules1: {
title: [
{ required: true, message: '请输入发票抬头', trigger: 'blur' },
],
taxNum: [
{ required: true, message: '请输入纳税号', trigger: 'blur' },
],
email: [
{ required: true, message: '请输入发票接收邮箱', trigger: 'blur' },
{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
]
},
rules2: {
title: [
{ required: true, message: '请输入发票抬头', trigger: 'blur' },
],
taxNum: [
{ required: true, message: '请输入纳税号', trigger: 'blur' },
],
companyAddress: [
{ required: true, message: '请输入备案地址', trigger: 'blur' },
],
companyMobile: [
{ required: true, message: '请输入备案电话', trigger: 'blur' },
],
companyBank: [
{ required: true, message: '请输入开户银行', trigger: 'blur' },
],
bankNum: [
{ required: true, message: '请输入银行账户', trigger: 'blur' },
],
fileUrl: [
{ required: true, message: '请上传纳税资格证明', trigger: 'blur' },
],
recipient: [
{ required: true, message: '请输入收件人', trigger: 'blur' },
],
mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ validator: validateMethod, trigger: 'blur' },
],
address: [
{ required: true, message: '请输入详细地址', trigger: 'blur' },
],
},
d: {},
action: "",
addressInfo: [],
index: 0,
orderId: "",
stuff: {},
showUploadStuff: false,
} }
}, },
mounted: function() { mounted: function() {
this.initIndent(); var that = this;
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
that.d["key"] = "key";
that.d["Bucket"] = d.data.Bucket;
that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
that.d["Signature"] = d.data.Signature;
that.d["policy"] = d.data.policy;
that.d["success_action_status"] = d.data.success_action_status;
that.action = d.data.url;
console.log(that.action, `oooooooooooooooooooooooooooo`);
});
this.handleSizeChange();
}, },
created: function() { created: function() {
console.log(new Date(), new Date().toLocaleString('chinese', { hour12: false }));
}, },
methods: { methods: {
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
...@@ -83,19 +232,183 @@ ...@@ -83,19 +232,183 @@
} }
return ''; return '';
}, },
initIndent(){ viewDetails(index, row) {
console.log(21321); console.log(index, row);
var defaultD = { this.$router.push({ path: "/1688/jdindentdetail", query: { deliveryOrderNo: row.deliveryOrderNo } });
"deliveryOrderNo": "346c3091684e4e0eef" },
}; showBtn(index, row){
var obj = this.$root.copyParams(defaultD, "getTmApplyInfo", "/action/tmOrder/springBoard"); if (row.deliveryStatusName == "待上传材料") {
return true;
} else {
return false;
}
},
handleSizeChange(){
console.log(this.currentPage);
if (this.currentPage) {
this.indentInfo.pageIndex = this.currentPage;
}
var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard");
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;
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.tableData = d.data;
this.countPage = d.data.length;
d.data.map((item, index) => {
item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
});
} }
console.log(d);
}); });
} },
reset(){
this.channelServiceNo = null;
this.deliveryOrderNo = null;
this.name = null;
this.itemName = null;
this.tmName = null;
this.CreateDate = null;
this.deliveryStatusName = null;
},
find(){
this.indentInfo.channelServiceNo = this.channelServiceNo;
this.indentInfo.deliveryOrderNo = this.deliveryOrderNo;
this.indentInfo.name = this.name;
this.indentInfo.itemName = this.itemName;
this.indentInfo.tmName = this.tmName;
this.indentInfo.CreateDate = this.CreateDate;
this.indentInfo.deliveryStatusName = this.deliveryStatusName;
this.indentInfo.startTime = this.startTime || "";
this.indentInfo.entTime = this.entTime || "";
this.handleSizeChange();
},
dateChecked(v){
this.startTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
this.entTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
console.log(this.startTime, this.entTime);
},
/**上传资料弹窗 */
setKey(name, flag){
name = name.substring(name.length - 5);
var myDate = new Date();
var key = "zc_" + Math.round(Math.random() * 500) + myDate.getMonth() + myDate.getTime() + myDate.getFullYear() + myDate.getDate() + myDate.getHours() + myDate.getMinutes() + myDate.getSeconds() + myDate.getMilliseconds() + name.replace(" ", "");
this.$refs[flag].d.key = key;
},
uploadsuccess(obj){
var that = this;
if (this.loadingKey == 1) {
that.loading1 = true;
} else if (this.loadingKey == 2) {
that.loading2 = true;
} else if (this.loadingKey == 3) {
that.loading3 = true;
} else if (this.loadingKey == 0) {
that.loading = true;
}
if (obj.flag == "yyzz") {
this.$root.getReq("/web/toolCtl/pic2pdf", { "key": obj.key }).then(function (d) {
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.stuff.businessLicensePic = d.data.url;
} else {
that.stuff.businessLicensePic = "";
that.$message.warning(`上传失败请重新上传`);
return false;
}
}).catch(function (e) {
that.stuff.businessLicensePic = "";
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
that.$message.warning(`上传失败请重新上传`);
return false;
})
}
if (obj.flag == "sfz") {
this.$root.getReq("/web/toolCtl/pic2pdf", { "key": obj.key }).then(function (d) {
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.stuff.identityCardPic = d.data.url;
} else {
that.stuff.identityCardPic = "";
that.$message.warning(`上传失败请重新上传`);
return false;
}
}).catch(function (e) {
that.stuff.identityCardPic = "";
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
that.$message.warning(`上传失败请重新上传`);
return false;
})
}
if (obj.flag == "wts") {
this.$root.getReq("/web/toolCtl/adjustWTSSize", { "key": obj.key }).then(function (d) {
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.stuff.sealAuthorizeStuff = d.data.url;
console.log(d.data.url);
} else {
that.$refs[obj.flag][0].result = "";
that.$message.warning(`上传失败请重新上传`);
return false;
}
}).catch(function () {
that.$refs[obj.flag][0].result = "";
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
that.$message.warning(`上传失败请重新上传`);
return false;
});
}
if (obj.flag == "yxq") {
that.loading1 = false;
that.loading2 = false;
that.loading3 = false;
that.loading = false;
that.stuff.descUrl = obj.result
}
},
error(err){
this.$message.warning(`上传失败，请重新上传`);
},
hideUploadStuff(){
this.stuff = {};
this.showUploadStuff = false;
},
uploadStuffs(){
var obj = this.stuff;
var that = this;
this.$root.postReq("/web/orderCtl/uploadStuffs", obj).then(function (d) {
if (d && d.code == 1) {
that.hideUploadStuff();
that.$refs.grid.fetchData();
} else {
that.$message.warning(d.msg);
}
})
},
}, },
vname: "gsb-jdindentlist" vname: "gsb-jdindentlist"
} }
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.css 0 → 100755
.jdregschemesubmit-footer {
text-align: center;
margin-top: 15px;
}
.jdregschemesubmit-footer-box button {
width: 208px;
height: 40px;
background: rgba(255, 255, 255, 1);
color: #0F8EE9;
border-radius: 0;
border: 1px solid rgba(15, 142, 233, 1);
}
.jdregschemesubmit-footer-box button:nth-child(2) {
background: rgba(15, 142, 233, 1);
}
.jdregschemesubmit-footer-box+div {
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(130, 130, 130, 1);
margin-top: 15px;
}
..jdregscheme-nav {
height: 70px;
box-sizing: border-box;
width: 100%;
margin: 0 auto;
width:261px;
height:22px;
font-size:16px;
font-weight:400;
padding: 10px 0;
;}
.jdregscheme-footer-main>div>div{
text-align: center;
}
.jdregscheme_border{
width:100%;
height:2px;
}
.jdregscheme_border,.dialog-footer,.el-dialog__title,.jdregscheme-footer-main>div>div{
display: block;
}
.dialog-footer{
width: 100%;
}
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.html 0 → 100755
<div class="jdregscheme">
<el-form ref="form" :rules="rules" :model="form" class="demo-ruleForm"
style="background:rgba(249,249,249,1);padding: 30px" label-width="120px">
<div class="selftmreg_main" style="width: 96%;margin: 0 auto;padding:0 50px;background: #fff">
<div class="jdregscheme-nav" style="padding-top: 20px">
<span style="float: left;line-height: 22px;color:rgba(130,130,130,1);">当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right" style="float: left;line-height:22px">
<el-breadcrumb-item><a style="color:rgba(130,130,130,1);">我的订单</a></el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: \'/\' }">
<a style="font-weight:800">确认注册方案</a>
</el-breadcrumb-item>
</el-breadcrumb>
<div style="clear:both"></div>
<div class="selftmreg_shu"></div>
</div>
<div style="display:inline-block;margin-right:10px;">
<h4><i class="selftmreg_shuxian"></i>商标信息</h4>
</div>
<div style="display:inline-block;color:#409EFF" @click="function(){toTop();step=1}"></div>
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标类型:</div>
<div style="display:inline-block;padding-left:10px;">{{tm_form_type[form.tmFormType]}}</div>
</div>
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标名称:</div>
<div style="display:inline-block;padding-left:10px;">{{form.name}}</div>
</div>
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标图样:</div>
<div style="display:inline-block;vertical-align: top;padding-left:10px;">
<img :src="form.colorizedPicUrl"
style="height:100px;width:100px;border: 2px dashed rgb(233, 233, 233);">
</div>
</div>
<div style="width: 100%;margin-bottom: 23px">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;line-height: 25px">
商标类别:</div>
<div style="width:84%;display:inline-block;padding-left:10px;vertical-align: top;">
<!-- <div v-for="item in nclOne">
<div style="font-size: 20px; color: #373737;font-weight:400;line-height: 25px">
{{item.type ?\'第 \' +item.code + \' 类 \' : item.code}} {{item.name}}
</div>
<div style="margin: 10px 0;">
<span v-for="child in item.nclThree" style="line-height: 25px;margin-right:20px;color: #373737;font-weight: 400;font-family:PingFangSC-Regular,PingFang SC;">{{child.code}}
{{child.name}}</span>
</div>
</div> -->
</div>
</div>
<div style="clear:both"></div>
</div>
<div style="display:inline-block;margin-right:10px;">
<h4><i class="selftmreg_shuxian"></i>申请人及联系人信息</h4>
</div>
<div style="display:inline-block;color:#409EFF" @click="function(){toTop();step=2}"></div>
<div style="width: 100%;font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人资质:</div>
<div style="display:inline-block;padding-left:10px;">
{{apply.customerType=="ent"?"企业":""}}{{apply.customerType=="person"?"个人":""}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div v-if="apply.customerType==\'ent\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">公司名称:</div>
<div v-if="apply.customerType==\'person\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人姓名:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.name}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">邮政编码:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.zipCode}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div v-if="apply.customerType==\'ent\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">公司地址:</div>
<div v-if="apply.customerType==\'person\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人地址:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.applyAddr}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">联系人:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.contacts}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">联系电话:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.mobile}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">电子邮箱:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.email}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">信用编码:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.code}}</div>
</div>
<div style="clear:both"></div>
<div v-if="apply.customerType==\'person\'"
style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div style="width:120px;display:inline-block;text-align: right;color:#636569;">身份证号:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.identityCardNo}}</div>
</div>
<div style="clear:both"></div>
</div>
<h4><i class="selftmreg_shuxian"></i>材料信息</h4>
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px;padding-left: 40px;box-sizing: border-box;">
<div v-if="apply.businessLicensePic"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px">
<img @click="window.open(apply.businessLicensePic)" v-if="apply.businessLicensePic"
src="/imgs/sbzc/yyzzD.png"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
line-height:20px;display: block;text-align: center">企业营业执照 </span>
</div>
<div v-if="apply.identityCardPic"
style="position: relative;display:inline-block;padding-left:10px;cursor: pointer;margin-right: 50px">
<img @click="window.open(apply.identityCardPic)" v-if="apply.identityCardPic"
src="/imgs/sbzc/wtsD.png"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
line-height:20px;display: block;text-align: center;">委托书
<a
style="color:#0F8EE9;position: absolute;bottom: -20px;width: 80px;left: 15px;text-align: center;text-decoration: underline;line-height: 22px">生成委托书</a>
</span>
</div>
<div v-if="apply.sealAuthorizeStuff"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px;">
<img :src="apply.sealAuthorizeStuff"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
line-height:20px;display: block;text-align: center">优先权证明 <i
style="color: rgb(15, 142, 233);" class="el-icon-question "></i></span>
</div>
<div v-if="apply.descUrl"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px">
<img :src="apply.descUrl"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737;
line-height:20px;text-align: center;display: block;text-align: center">身份证明 </span>
</div>
</div>
<div style="clear:both"></div>
</div>
<div class="jdregschemesubmit_cart">
<el-dialog title="不同意该方案理由" style="
padding-bottom: 30px;
font-size:24px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:600 !important;
color:#333333;
line-height:12px;
letter-spacing:1px;" :visible.sync="apply.centerDialogVisible" width="70%" center>
<span style="display:block; border-bottom: 1px solid #E8E8E8;margin-top: -20px;"></span>
<span style="padding-left: 10px;
display: block;
line-height:16px;
margin-top: 40px;
font-weight: 600px;
border-left: 3px solid rgba(15,142,233,1);
letter-spacing: 0;
height:16px;
font-size:16px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:600;
color:#535353;
">输入不同意理由</span>
<span style="display:block;width:100%;margin-bottom: -20px">
<textarea placeholder="请输入不同意该方案的理由，该理由同步到制作该注册方案业务员后台。" style="
width:80%;
margin:30px 0 0 50px;
height:114px;
resize: none;
border: 1px solid #B5B5B5;
font-weight: 400;
　　 padding-left:10px;
color: #B5B5B5;
padding:10px 0;
font-size: 14px;
font-family:PingFangSC-Regular,PingFang SC;
color:rgba(181,181,181,1);
text-indent:1em;
"></textarea>
</span>
<span slot="footer" class="dialog-footer" >
<el-button type="primary" @click="submitForm = false" style="width:140px;
height:36px;
background:rgba(38,146,255,1);
border-radius:4px;">保存</el-button>
</span>
</el-dialog>
</div>
</div>
<br />
<div class="jdregschemesubmit-footer">
<div class="jdregschemesubmit-footer-box">
<el-button type="primary" @click="submitForm(\'order\')">不同意该注册方案</el-button>
<el-button type="primary" @click="AgreedForm(\'order\')"> 同意该注册方案</el-button>
</div>
<div> <i class="el-icon-warning" style="color:#0F8EE9;"></i> 注：如果同意该注册方案后，我们即可递交商标局，如果不同意，请填写理由。</div>
</div>
</el-form>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdregscheme/jdregscheme.js 0 → 100755
{
template: '${tmpl}',
data: function() {
var validateAddr = (rule, value, callback) => {
var x = /(([省])|([中][国])|([中][华][人][民][共][和][国])|([北][京][市])|([上][海][市])|([天][津][市])|([重][庆][市])|([内][蒙][古])|([广][西])|([宁][夏])|([新][疆])|([西][藏])|([内][蒙][古][自][治][区])|([新][疆][维][吾][尔][自][治][区])|([广][西][壮][族][自][治][区])|([宁][夏][回][族][自][治][区])|([西][藏][自][治][区]))/g.test(value);
if (!x) {
callback(new Error('请核对地址，必须写所在省份名称！'));
} else {
callback();
}
};
var mobileValidator = (rule, value, callback) => {
var x = /((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/g.test(value);
if (!x) {
callback(new Error('联系电话格式错误！'));
} else {
callback();
}
};
var emailValidator = (rule, value, callback) => {
var x = /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(value);
if (!x) {
callback(new Error('电子邮箱格式错误！'));
} else {
callback();
}
};
var colorizedtm = (rule, value, callback) => {
if ((this.form.tmFormType == "7" || this.form.tmFormType == "6") && value == "") {
callback(new Error('请上传彩色商标图样'));
} else {
callback();
}
};
var validateIdCard = (rule, value, callback) => {
if (this.form.type == "person") {
if (value == "") {
callback(new Error('请输入身份证号码'));
} else {
var x = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value);
if (!x) {
callback(new Error('身份证格式错误'));
} else {
callback();
}
}
} else {
callback();
}
};
var validateSFZ = (rule, value, callback) => {
if (this.apply.customerType == "person" && value == "") {
callback(new Error('身份证明不能为空'));
} else {
callback();
}
};
var code = (rule, value, callback) => {
if (this.apply.customerType == "ent" && !this.apply.code) {
callback(new Error('请输入信用代码'));
} else {
callback();
}
};
return {
ldms: [],
form: {
tmFormType: 3,
name: "",
picUrl: "",
colorizedPicUrl: "",
selecttype: "自主选择",
totalPublicExpense: 0,
totalTaxes: 0,
totalSum: 0,
totalDiscounts: 0,
totalServiceCharge: 0,
totalProfitSum: 0,
remark: "",
sveItemRateConfig: "",
},
rules: {
name: [
{ required: true, message: '请输入商标名称' }
],
picUrl: [
{ required: true, message: '请上传商标图样' }
],
colorizedPicUrl: [
{ validator: colorizedtm, trigger: 'blur' }
],
tmFormType: [
{ required: true, message: '请选择商标类型' }
],
},
tm_form_type: { "1": "立体", "3": "文字图标", "4": "图形商标", "5": "图形及文字商标", "6": "颜色", "7": "彩色" },
nclOne: [],
apply: {
customerType: "ent",
name: "",
code: "",
identityCardNo: "",
applyAddr: "",
applyArea: "",
zipCode: "",
contacts: "",
mobile: "",
email: "",
tel: "",
fax: "",
businessLicensePic: "",
identityCardPic: "",
sealAuthorizeStuff: "",
descUrl: "",
notes: "",
centerDialogVisible: false
},
isRead: false,
nclOne: []
}
},
mounted: function() {
},
created: function() {
},
methods: {
submitForm(done){
this.apply.centerDialogVisible = true
},
AgreedForm(){
this.$router.push({ path: "/1688/jdindentdetail"});
}
},
vname: "gsb-jdregscheme"
}
igirl-channel-web/app/front/vues/pages/proxy/proxy.html 0 → 100644
<div>
asdad
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/proxy/proxy.js 0 → 100644
{
template: '${tmpl}',
data: function() {
return {
ldms: [],
}
},
mounted: function() {
this.$root.getChannelPath()
},
created: function() {
},
methods: {
},
vname: "gsb-proxy"
}
igirl-channel-web/app/front/vues/pages/selftmreg/index.css
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
height: 34px !important; height: 34px !important;
line-height: 34px !important; line-height: 34px !important;
} }
#selftmreg
#selftmreg .el-step__head.is-success { #selftmreg .el-step__head.is-success {
color: #409EFF; color: #409EFF;
border-color: #409EFF; border-color: #409EFF;
...@@ -410,6 +410,7 @@ ...@@ -410,6 +410,7 @@
.upload-dialog { .upload-dialog {
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center;
padding: 17px 0px; padding: 17px 0px;
position: absolute; position: absolute;
top: 0px; top: 0px;
...@@ -488,6 +489,7 @@ ...@@ -488,6 +489,7 @@
font-size: 16px; font-size: 16px;
margin: 20px 0px; margin: 20px 0px;
float: left; float: left;
text-align: center;
} }
.pointsRule span { .pointsRule span {
...@@ -506,7 +508,7 @@ ...@@ -506,7 +508,7 @@
} }
.pointsRule ul li { .pointsRule ul li {
width: 24%; width: 32%;
display: list-item; display: list-item;
text-align: center; text-align: center;
float: left; float: left;
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -16,10 +16,8 @@ ...@@ -16,10 +16,8 @@
:style="pointsRuleBackColor(1)"></i></a></li> :style="pointsRuleBackColor(1)"></i></a></li>
<li :style="pointsRuleBackColor(2)"><a><em class="before"></em><span <li :style="pointsRuleBackColor(2)"><a><em class="before"></em><span
:style="pointsRuleColor(2)">填写申请人信息</span><i :style="pointsRuleBackColor(2)"></i></a></li> :style="pointsRuleColor(2)">填写申请人信息</span><i :style="pointsRuleBackColor(2)"></i></a></li>
<li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span
:style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li>
<li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span <li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">支付订单</span></a></li> :style="pointsRuleColor(4)">提交订单</span></a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -230,12 +228,10 @@ ...@@ -230,12 +228,10 @@
</div> </div>
<div style="width:100%;margin-top: 20px;box-sizing: border-box;"> <div style="width:100%;margin-top: 20px;box-sizing: border-box;">
<div class="tabButtomPrcie"> <div class="tabButtomPrcie">
<!-- <span style="margin-right:10px;text-align: center;">服务费：￥<i style="color:#ff4422;font-style: normal;">{{form.totalServiceCharge}}</i></span> --> <!-- <span style="margin-right:30px;text-align: center;color: #03004C;">官费总额：<i
<span style="margin-right:30px;text-align: center;color: #03004C;">官费总额：<i
style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span> style="color:#E50778;font-style: normal;">￥{{form.totalPublicExpense}}</i></span>
<!-- <span style="margin-right:10px;text-align: center;">发票税费：￥<i style="color:#ff4422;font-style: normal;">{{form.totalTaxes}}</i></span> -->
<span style="margin-right:30px;text-align: center;color: #03004C;">应付总额：<i <span style="margin-right:30px;text-align: center;color: #03004C;">应付总额：<i
style="color:#E50778;font-style: normal;font-size: 24px;">￥{{form.totalSum}}</i></span> style="color:#E50778;font-style: normal;font-size: 24px;">￥{{form.totalSum}}</i></span> -->
<el-button type="primary" style=" background: #0989C5;border-radius:0;color:#fff;" <el-button type="primary" style=" background: #0989C5;border-radius:0;color:#fff;"
@click="submitForm(\'form\')">下一步</el-button> @click="submitForm(\'form\')">下一步</el-button>
</div> </div>
...@@ -298,12 +294,12 @@ ...@@ -298,12 +294,12 @@
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称" <el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false" <gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false"
@historychange="historyapplierchange" @change="applierChange" size="medium" v-model="apply.name" @change="applierChange" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd> </gsb-selectentjd>
<gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true" showhistory="false" <gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true" showhistory="false"
@historychange="historyapplierchange" @change="applierChange" size="medium" v-model="apply.name" @change="applierChange" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd> </gsb-selectentjd>
...@@ -311,13 +307,13 @@ ...@@ -311,13 +307,13 @@
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名" <el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<!-- <el-input placeHolder="请输入身份证姓名" v-model="apply.name"></el-input> --> <!-- <el-input placeHolder="请输入身份证姓名" v-model="apply.name"></el-input> -->
<gsb-selectperson v-if="currentUser" @input="selectpersoninput" allowcreate="true" showhistory="true" <gsb-selectperson v-if="currentUser" @input="selectpersoninput" allowcreate="true" showhistory="false"
@historychange="historyapplierchange" size="medium" v-model="apply.name" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名"> labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
</gsb-selectperson> </gsb-selectperson>
<gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput" allowcreate="true" <gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput" allowcreate="true"
showhistory="true" @historychange="historyapplierchange" size="medium" v-model="apply.name" showhistory="false" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名"> labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
</gsb-selectperson> </gsb-selectperson>
...@@ -406,7 +402,7 @@ ...@@ -406,7 +402,7 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" v-if="apply.businessLicensePic && toViewImgKey == \'a\'"> <div class="upload-dialog" v-show="apply.businessLicensePic && toViewImgKey == \'a\'">
<div @click="window.open(apply.businessLicensePic)">查看大图</div> <div @click="window.open(apply.businessLicensePic)">查看大图</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error"> :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
...@@ -437,7 +433,7 @@ ...@@ -437,7 +433,7 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" v-if="apply.identityCardPic && toViewImgKey == \'d\'"> <div class="upload-dialog" v-show="apply.identityCardPic && toViewImgKey == \'d\'">
<div @click="window.open(apply.identityCardPic)">查看大图</div> <div @click="window.open(apply.identityCardPic)">查看大图</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error"> :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
...@@ -467,7 +463,7 @@ ...@@ -467,7 +463,7 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" v-if="apply.sealAuthorizeStuff && toViewImgKey == \'b\'"> <div class="upload-dialog" v-show="apply.sealAuthorizeStuff && toViewImgKey == \'b\'">
<div @click="window.open(apply.sealAuthorizeStuff)">查看大图</div> <div @click="window.open(apply.sealAuthorizeStuff)">查看大图</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error"> :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
...@@ -501,7 +497,7 @@ ...@@ -501,7 +497,7 @@
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" v-if="apply.descUrl && toViewImgKey == \'c\'"> <div class="upload-dialog" v-show="apply.descUrl && toViewImgKey == \'c\'">
<div @click="window.open(apply.descUrl)">查看大图</div> <div @click="window.open(apply.descUrl)">查看大图</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error"> :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
...@@ -521,42 +517,7 @@ ...@@ -521,42 +517,7 @@
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;" alt=""> <img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;" alt="">
</el-dialog> </el-dialog>
</div> </div>
<!-- <div>
<el-form-item class="gsb_items" style="float:left;" label="" >
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" @click="window.open(apply.businessLicensePic)" v-if="apply.businessLicensePic" src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/PDF20180904.jpg"/>
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg"/>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<el-button type="primary" >营业执照上传</el-button>
</gsb-upload>
</el-form-item>
<el-form-item class="gsb_items" style="float:left;" v-if="apply.customerType==\'person\'" label="">
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" @click="window.open(apply.identityCardPic)" v-if="apply.identityCardPic" src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/PDF20180904.jpg"/>
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg"/>
<br/>
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<el-button type="primary" >身份证明上传</el-button>
</gsb-upload>
</el-form-item>
<el-form-item class="gsb_items" style="float:left;" label="" >
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" @click="window.open(apply.sealAuthorizeStuff)" v-if="apply.sealAuthorizeStuff" :src="apply.sealAuthorizeStuff"/>
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg"/>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<el-button type="primary" >代理委托书上传</el-button>
</gsb-upload>
<div @click="createWTS" style="color:red;font-size:13px;cursor:pointer;">
生成委托书
</div>
</el-form-item>
<el-form-item class="gsb_items" style="float:left;" label="" >
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" @click="window.open(apply.descUrl)" v-if="apply.descUrl" :src="apply.descUrl"/>
<img width="120px" height="120px" style="border:2px dashed #e9e9e9" v-else src="http://gsb-zc.oss-cn-beijing.aliyuncs.com/empty2018082212365411225525855.jpg"/>
<br/>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<el-button type="primary" >优先权证明上传</el-button>
</gsb-upload>
</el-form-item>
<div style="clear:both;"></div>
</div> -->
</div> </div>
<div style="text-align:center;padding-bottom:50px;" class="step2-footer"> <div style="text-align:center;padding-bottom:50px;" class="step2-footer">
<el-button @click="tobefore">上一步</el-button> <el-button @click="tobefore">上一步</el-button>
...@@ -691,16 +652,7 @@ ...@@ -691,16 +652,7 @@
</div> </div>
<div style="clear:both"></div> <div style="clear:both"></div>
</div> </div>
<!-- <h4><i class="selftmreg_shuxian"></i>订单金额</h4>
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px;padding-left: 40px;box-sizing: border-box;">
<span style="margin-right:20px;">服务费总额：￥{{form.totalServiceCharge}}</span>
<span style="margin-right:20px;">官费总额：￥{{form.totalPublicExpense}}</span>
<span style="margin-right:20px;">发票税费：￥{{form.totalTaxes}}</span>
<span style="margin-right:20px;">应付总额：￥{{form.totalSum}}</span>
</div>
<div style="clear:both"></div>
</div> -->
</div> </div>
<br /> <br />
<div class="step3-submit"> <div class="step3-submit">
...@@ -708,11 +660,11 @@ ...@@ -708,11 +660,11 @@
<div style="width:49%;text-align: left;display: inline-block;"> <div style="width:49%;text-align: left;display: inline-block;">
<div style="width: 100%;margin-bottom: 23px;box-sizing: border-box;padding-left: 17px;"> <div style="width: 100%;margin-bottom: 23px;box-sizing: border-box;padding-left: 17px;">
<!-- <span style="margin-right:20px;">服务费总额：￥{{form.totalServiceCharge}}</span> --> <!-- <span style="margin-right:20px;">服务费总额：￥{{form.totalServiceCharge}}</span> -->
<span <!-- <span
style="margin-right:20px;font-size:14px;font-family:PingFangSC;font-weight:400;color:#666666;">官费总额：￥{{form.totalPublicExpense}}</span> style="margin-right:20px;font-size:14px;font-family:PingFangSC;font-weight:400;color:#666666;">官费总额：￥{{form.totalPublicExpense}}</span> -->
<!-- <span style="margin-right:20px;">发票税费：￥{{form.totalTaxes}}</span> --> <!-- <span style="margin-right:20px;">发票税费：￥{{form.totalTaxes}}</span> -->
<span <!-- <span
style="margin-right:20px;font-size:16px;font-family:PingFangSC;font-weight:600;color:#E50778;">应付总额：￥{{form.totalSum}}</span> style="margin-right:20px;font-size:16px;font-family:PingFangSC;font-weight:600;color:#E50778;">应付总额：￥{{form.totalSum}}</span> -->
</div> </div>
</div> </div>
<div style="width:50%;text-align: right;display: inline-block;float: right;padding-right: 20px; <div style="width:50%;text-align: right;display: inline-block;float: right;padding-right: 20px;
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -283,7 +283,10 @@ ...@@ -283,7 +283,10 @@
floatBoxDemo: false, floatBoxDemo: false,
toViewImgKey: null, toViewImgKey: null,
toViewImgType: false, toViewImgType: false,
toViewImgSrc: null toViewImgSrc: null,
channelOrder: null,
channelParams: null,
channelUser: null,
} }
}, },
computed: Vuex.mapState({ computed: Vuex.mapState({
...@@ -305,24 +308,7 @@ ...@@ -305,24 +308,7 @@
if (itemCode != null) { if (itemCode != null) {
this.itemCode = itemCode; this.itemCode = itemCode;
/*
this.$root.getReq("/web/serviceitemCtl/findOneByCode", { code: itemCode }).then(function (d) {
if (d && d.code == 1 && d.data.isPubed) {
var data = d.data;
that.serviceitem = data;
that.itemPrice = data.price || 0;
that.serviceCharge = data.serviceCharge || 0;
that.totalDiscountsRate = data.discountsRateConfig || 0;
that.invoiceTaxRate = data.rateConfig || 0;
that.form.sveItemRateConfig = data.rateConfig || 0;
that.publicExpense = data.publicExpense || 0;
} else {
that.$message.warning(d.msg);
}
}).catch(function (e) {
that.$message.warning("获取产品失败");
})
*/
} else { } else {
this.$message.warning('code参数错误'); this.$message.warning('code参数错误');
return; return;
...@@ -343,18 +329,30 @@ ...@@ -343,18 +329,30 @@
}, },
mounted: function() { mounted: function() {
this.$root.getChannelPath();
var that = this; var that = this;
that.toTop(); that.toTop();
console.log(this.tm_form_type); console.log(this.tm_form_type);
this.$root.postReq("/web/trademark/tmqueryCtl/getOssConfig", "").then(function (d) { var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
that.d["key"] = "key"; that.d["key"] = "key";
that.d["Bucket"] = d.Bucket; that.d["Bucket"] = d.data.Bucket;
that.d["OSSAccessKeyId"] = d.OSSAccessKeyId; that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
that.d["Signature"] = d.Signature; that.d["Signature"] = d.data.Signature;
that.d["policy"] = d.policy; that.d["policy"] = d.data.policy;
that.d["success_action_status"] = d.success_action_status; that.d["success_action_status"] = d.data.success_action_status;
that.action = d.url; that.action = d.data.url;
console.log(that.action, `oooooooooooooooooooooooooooo`);
}); });
if (this.$route.query.channelOrder) {
this.channelOrder = JSON.parse(this.$route.query.channelOrder);
this.channelParams = this.$route.query.channelParams;
this.channelUser = JSON.parse(this.$route.query.channelUser);
console.log(this.$route.query, this.channelInfo, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
}
}, },
methods: { methods: {
pointsRuleColor(i) { pointsRuleColor(i) {
...@@ -442,7 +440,6 @@ ...@@ -442,7 +440,6 @@
}, },
error(err){ error(err){
this.$message.warning(`上传失败，请重新上传`); this.$message.warning(`上传失败，请重新上传`);
console.log(err);
}, },
uploadsuccess2(result, obj){ uploadsuccess2(result, obj){
...@@ -463,8 +460,6 @@ ...@@ -463,8 +460,6 @@
} }
if (obj.flag == "picUrl") { if (obj.flag == "picUrl") {
console.log("黑白图样------调整宽高");
var uploadStandardTm = { "key": obj.key }; var uploadStandardTm = { "key": obj.key };
var uploadStandardTm = this.$root.copyParams(uploadStandardTm, "uploadStandardTm", "/action/tmTools/springBoard"); var uploadStandardTm = this.$root.copyParams(uploadStandardTm, "uploadStandardTm", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", uploadStandardTm).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", uploadStandardTm).then(function (d) {
...@@ -519,7 +514,9 @@ ...@@ -519,7 +514,9 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
var word2pic = { word: this.form.name }; console.log(obj);
var word2pic = { "key": obj.result };
console.log(this.form, `zzzzzzzzzzzzzzzzzzzzzzzzzz`);
var word2pic = this.$root.copyParams(word2pic, "pic2pdf", "/action/tmTools/springBoard"); var word2pic = this.$root.copyParams(word2pic, "pic2pdf", "/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) {
that.loading1 = false; that.loading1 = false;
...@@ -571,7 +568,7 @@ ...@@ -571,7 +568,7 @@
}) })
} }
if (obj.flag == "wts") { if (obj.flag == "wts") {
var adjustWTSSize = { "key": obj.key }; var adjustWTSSize = { "key": obj.result };
var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard"); var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) {
that.loading1 = false; that.loading1 = false;
...@@ -761,8 +758,7 @@ ...@@ -761,8 +758,7 @@
this.nclOne[index].price = 0; this.nclOne[index].price = 0;
this.nclOne.splice(index, 1); this.nclOne.splice(index, 1);
} }
this.updatePriceType = false;
this.updatePrice();
var json = { json: this.nclOne }; var json = { json: this.nclOne };
var jsonStr = JSON.stringify(json); var jsonStr = JSON.stringify(json);
}, },
...@@ -808,8 +804,6 @@ ...@@ -808,8 +804,6 @@
if (dataRecieve.length == 0) { if (dataRecieve.length == 0) {
this.nclOne.splice(index, 1); this.nclOne.splice(index, 1);
} }
this.updatePriceType = false;
this.updatePrice();
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
...@@ -874,8 +868,6 @@ ...@@ -874,8 +868,6 @@
} }
}) })
} }
this.updatePriceType = false;
this.updatePrice();
} else if (this.nclOne.length != 0 && !a) { } else if (this.nclOne.length != 0 && !a) {
this.nclOne.forEach((item, index) => { this.nclOne.forEach((item, index) => {
if (item.name == ppncl.name) { if (item.name == ppncl.name) {
...@@ -959,7 +951,6 @@ ...@@ -959,7 +951,6 @@
}; };
this.nclOne.push(data); this.nclOne.push(data);
} }
this.updatePrice();
} }
}, },
nclThreeIsExist(name, nclThree){ nclThreeIsExist(name, nclThree){
...@@ -1017,57 +1008,7 @@ ...@@ -1017,57 +1008,7 @@
return false; return false;
}); });
}, },
updatePrice(){
var totalSum = 0;
var flag = true;
var invoiceTaxRate = Number(this.serviceitem.rateConfig || 0);
var totalDiscountsRate = Number(this.serviceitem.discountsRateConfig || 0);
var totalServiceCharge = Number(this.serviceitem.serviceCharge || 0);
var price = Number(this.serviceitem.price || 0);
var shui = 0;
var totalPublicExpense = 0;
for (var i = 0; i < this.nclOne.length; i++) {
totalPublicExpense = totalPublicExpense + this.nclOne[i].price;
}
totalServiceCharge = Number(totalServiceCharge) * this.nclOne.length;
totalSum = Number(totalPublicExpense) + Number(totalServiceCharge);
var maxTotalDiscounts = Number(price) * this.nclOne.length * Number(totalDiscountsRate) / 100;
maxTotalDiscounts = maxTotalDiscounts.toFixed(2);
var totalTaxes = totalSum / (1 + invoiceTaxRate / 100) * invoiceTaxRate / 100;
totalTaxes = totalTaxes.toFixed(2);
var minSum = Number(totalServiceCharge) + Number(totalPublicExpense) - Number(maxTotalDiscounts);
minSum = minSum.toFixed(2);
minSum = Number(minSum);
if (totalSum < minSum && this.updatePriceType) {
this.$message.warning('订单金额不足');
flag = false;
}
var totalDiscounts = 0;
if (Number(totalSum) < (Number(totalServiceCharge) + Number(totalPublicExpense))) {
totalDiscounts = Number(totalServiceCharge) + Number(totalPublicExpense) - Number(totalSum);
totalDiscounts = totalDiscounts.toFixed(2);
}
if (totalDiscounts > maxTotalDiscounts) {
this.$message.warning('优惠金额超过最大额度');
flag = false;
}
var totalProfitSum = Number(totalSum) - Number(totalPublicExpense);
totalProfitSum = totalProfitSum.toFixed(2);
this.form.totalSum = totalSum;
this.form.totalServiceCharge = totalServiceCharge;
this.form.totalPublicExpense = totalPublicExpense;
this.form.totalDiscounts = totalDiscounts;
this.form.totalTaxes = totalTaxes;
this.form.totalProfitSum = totalProfitSum;
if (!this.serviceitem || !this.serviceitem.price) {
this.$message.warning('获取产品信息错误');
flag = false;
}
return flag;
},
appendNode(data, pnode) { appendNode(data, pnode) {
this.$refs.tree.append(data, pnode); this.$refs.tree.append(data, pnode);
this.nclOne.forEach((item, index) => { this.nclOne.forEach((item, index) => {
...@@ -1106,24 +1047,18 @@ ...@@ -1106,24 +1047,18 @@
} }
this.nclOne = data; this.nclOne = data;
} }
this.updatePrice();
}); });
}, },
selfclear(){ selfclear(){
this.nclOne = []; this.nclOne = [];
}, },
submitForm(formName) { submitForm(formName) {
this.updatePriceType = true;
var that = this; var that = this;
console.log(formName);
if (formName == "form" || formName == "apply") { if (formName == "form" || formName == "apply") {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
if (formName == "form") { if (formName == "form") {
var flag = that.updatePrice();
if (!flag) {
return;
}
} }
if (formName == "form" && that.nclOne.length < 1) { if (formName == "form" && that.nclOne.length < 1) {
that.$message.warning(`请选择商标分类`); that.$message.warning(`请选择商标分类`);
...@@ -1137,10 +1072,20 @@ ...@@ -1137,10 +1072,20 @@
} }
}); });
} }
if (formName == "order") { if (formName == "order") {
this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name; this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name;
this.savehistory(); this.savehistory();
var obj = { tm: this.form, apply: this.apply, nclones: this.nclOne, itemCode: this.itemCode }; var obj = {
tm: this.form,
apply: this.apply,
nclones: this.nclOne,
itemCode: this.itemCode,
channelParams: this.channelParams,
channelOrder: this.channelOrder,
channelUser: this.channelUser,
};
/*
if (!this.currentUser) { if (!this.currentUser) {
obj["step"] = this.step; obj["step"] = this.step;
localStorage.setItem("afterLogin", JSON.stringify({ localStorage.setItem("afterLogin", JSON.stringify({
...@@ -1154,11 +1099,16 @@ ...@@ -1154,11 +1099,16 @@
}); });
return false; return false;
} }
that.$root.postReq("/web/trademark/tmqueryCtl/createTmOrder", obj).then(function (d) { */
if (d.code == "1") { var obj = this.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
if (d.status == 0) {
var order = d.data; var order = d.data;
that.toTop(); that.toTop();
that.$message.warning("订单提交成功"); that.$message.warning("订单提交成功");
that.$router.push({ path: "/1688/jdindentlist" });
/*
that.$root.pushx({ that.$root.pushx({
title: "订单支付", title: "订单支付",
name: "/orderpay", name: "/orderpay",
...@@ -1166,15 +1116,18 @@ ...@@ -1166,15 +1116,18 @@
orderNum: order.code orderNum: order.code
} }
}); });
*/
} else { } else {
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
that.$root.hideMask();
}).catch(function (e) { }).catch(function (e) {
that.$message.warning("操作失败"); that.$message.warning("操作失败");
that.$root.hideMask();
}); });
} }
}, },
savehistory(){ savehistory(){
var entobj = { var entobj = {
...@@ -1182,7 +1135,6 @@ ...@@ -1182,7 +1135,6 @@
businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo, businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo,
identityCardPic: this.apply.identityCardPic identityCardPic: this.apply.identityCardPic
}; };
console.log(entobj);
if (this.apply.customerType == "ent") { if (this.apply.customerType == "ent") {
var entData = localStorage.getItem("historyentlist"); var entData = localStorage.getItem("historyentlist");
var o = ""; var o = "";
...@@ -1236,17 +1188,6 @@ ...@@ -1236,17 +1188,6 @@
localStorage.setItem("historypersonlist", ostring); localStorage.setItem("historypersonlist", ostring);
} }
}, },
historyapplierchange(d){
if (d) {
this.apply.name = d.entName || "";
this.apply.applyAddr = d.regLocation || "";
this.apply.code = d.creditCode || "";
this.apply.businessLicensePic = d.businessLicensePic || "";
this.apply.identityCardNo = d.identityCardNo || "";
this.apply.identityCardPic = d.identityCardPic || "";
}
},
selectpersoninput(v){ selectpersoninput(v){
if (v != this.apply.name) { if (v != this.apply.name) {
this.apply.name = v; this.apply.name = v;
...@@ -1257,36 +1198,22 @@ ...@@ -1257,36 +1198,22 @@
this.apply.identityCardPic = ""; this.apply.identityCardPic = "";
} }
}, },
applierChange(){ applierChange(v){
var getEntregistryByCompanyName = { companyName: this.apply.name }; obj = { companyName: this.apply.name };
var getEntregistryByCompanyName = this.$root.copyParams(getEntregistryByCompanyName, "getEntregistryByCompanyName", "/action/tmTools/springBoard"); var obj = this.$root.copyParams(obj, "getEntregistryByCompanyName", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", getEntregistryByCompanyName).then(d => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
console.log(d, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
if (d.creditCode && d.creditCode != "") { if (d.creditCode && d.creditCode != "") {
this.apply.applyAddr = d.businessAddress; this.apply.applyAddr = d.businessAddress;
this.apply.code = d.creditCode; this.apply.code = d.creditCode;
} }
}); });
this.findOneByCustomerName();
}, },
findOneByCustomerName(){
var that = this;
this.$root.getReq("/web/trademark/tmqueryCtl/findOneByCustomerName", { name: this.apply.name }).then(d => {
if (d && d.code == 1 && d.data) {
if (d.data.businessLicensePic) {
this.apply.businessLicensePic = d.data.businessLicensePic;
}
if (d.data.identityCardPic) {
this.apply.identityCardPic = d.data.identityCardPic;
}
}
});
},
setKey(name, flag){ setKey(name, flag){
name = name.substring(name.length - 5); name = name.substring(name.length - 5);
var myDate = new Date(); var myDate = new Date();
var key = "zc_" + flag + Math.round(Math.random() * 10000) + myDate.getTime() + myDate.getFullYear() + myDate.getMonth() + myDate.getDate() + ".jpg"; var key = "zc_" + flag + Math.round(Math.random() * 10000) + myDate.getTime() + myDate.getFullYear() + myDate.getMonth() + myDate.getDate() + ".jpg";
this.$refs[flag].d.key = key; this.$refs[flag].d.key = key;
}, },
tobefore(){ tobefore(){
...@@ -1364,7 +1291,6 @@ ...@@ -1364,7 +1291,6 @@
that.$root.showMask(); that.$root.showMask();
var url = window.location.href.split("#")[0] + "wts?" + "params=" + params; var url = window.location.href.split("#")[0] + "wts?" + "params=" + params;
this.$root.getReq("/web/trademark/tmqueryCtl/createWTS", { "url": url }).then(function (d) { this.$root.getReq("/web/trademark/tmqueryCtl/createWTS", { "url": url }).then(function (d) {
console.log(d);
if (d.data.url != "" && d.data.url != null) { if (d.data.url != "" && d.data.url != null) {
window.open(d.data.url); window.open(d.data.url);
} else { } else {
......
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