Skip to content

Z
zhichan
Commit 3cedda34 by 刘泽奇
Options

123

parent 95fe8b40
Showing with 54 additions and 59 deletions
igirl-channel-web/app/front/entry/public/js/index.js
......@@ -156,8 +156,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
showPhoneNum: false,
rsData: [],
channelPath: "",
channelUserId:"123",
channelUserToken:"123",
channelUserId:"",
};
},
created() {
......@@ -192,13 +191,14 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
// 处理参数方法
copyParams(actionBody, actionType, url, isUser = "no") {
var data = this.commonParams;
data.actionProcess = this.$root.getChannelPath()
data.actionProcess = this.$root.getChannelPath();
data.actionType = actionType;
data.actionBody = actionBody || {};
data.requrl = this.host + url;
data.isUser = isUser;
let currentDate = Math.floor(new Date().getTime() / 1000);
data.actionBody.timeStamp = currentDate;
data.actionBody.channelUserId = this.$root.channelUserId;
var newObj = JSON.parse(JSON.stringify(data));
return newObj;
},
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -309,7 +309,6 @@
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;
......@@ -317,39 +316,27 @@
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.deliveryOrderNo = this.$route.query.channelOrder ? this.$route.query.channelOrder.deliveryOrderNo : this.$route.query.deliveryOrderNo;
console.log(this.$route.query, '11111111111');
if (this.$route.query.channelUser && this.$route.query.channelOrder) {
let channelUser = JSON.parse(this.$route.query.channelUser);
let channelOrder = JSON.parse(this.$route.query.channelOrder);
console.log(channelOrder, `zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz`);
/*渠道单号 */
this.channelServiceNo = channelOrder.channelServiceNo;
/*交付单号 */
this.deliveryOrderNo = channelOrder.deliveryOrderNo;
this.channelUserId = channelUser.channelUserId;
console.log(this.channelUserId, `vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv`);
if (this.$route.query.deliveryOrderNo != "" && this.$route.query.channelUserId != "") {
this.deliveryOrderNo = this.$route.query.deliveryOrderNo;
this.$root.channelUserId = this.$route.query.channelUserId;
this.initIndent();
}
this.initIndent();
},
created: function() {
},
computed: {
},
methods: {
/*初始化订单数据 */
initIndent(){
var deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard");
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 deliveryObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmOrderInfo", "/action/tmOrder/springBoard");
var applyObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmApplyInfo", "/action/tmOrder/springBoard");
var nclObj = this.$root.copyParams({ "deliveryOrderNo": this.deliveryOrderNo, "channelUserId": this.$root.channelUserId }, "getTmNclList", "/action/tmOrder/springBoard");
let [loadingA, loadingB, loadingC] = [1, 1, 1];
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", deliveryObj).then((d) => {
......@@ -1105,14 +1092,14 @@
obj = { companyName: this.apply.name };
var obj = this.$root.copyParams(obj, "getEntregistryByCompanyName", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
console.log(d, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
if (d.creditCode && d.creditCode != "") {
this.apply.applyAddr = d.businessAddress;
this.apply.code = d.creditCode;
}
console.log(d, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
if (d.creditCode && d.creditCode != "") {
this.apply.applyAddr = d.businessAddress;
this.apply.code = d.creditCode;
}
});
},
},
setKey(name, flag){
name = name.substring(name.length - 5);
var myDate = new Date();
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -92,7 +92,7 @@
@click="viewDetails(scope.$index, scope.row)">   详情    
</el-button>
<el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
size="mini" @click="showUploadStuff = true">上传材料</el-button>
size="mini" @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
size="mini" @click="goScheme(scope.$index, scope.row) = true">确认注册方案</el-button>
</template>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -216,6 +216,7 @@
orderId: "",
stuff: {},
showUploadStuff: false,
currentOrderNo: "",
}
},
created: function() {
......@@ -255,7 +256,7 @@
},
viewDetails(index, row) {
console.log(index, row);
this.$router.push({ path: "/1688/jdindentdetail", query: { deliveryOrderNo: row.deliveryOrderNo } });
this.$router.push({ path: "/1688/jdindentdetail", query: { deliveryOrderNo: row.deliveryOrderNo, channelUserId: this.$root.channelUserId } });
},
showSelf(index, row){
if (row.itemName == "商标自助注册" || row.itemName == "商标自主注册") {
......@@ -276,22 +277,23 @@
},
handleSizeChange(){
if (this.currentPage && this.$root.channelUserId != "") {
if (this.$root.channelUserId != "") {
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.loading = false;
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 });
});
}
});
}
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.loading = false;
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 });
});
}
});
},
reset(){
this.channelServiceNo = null;
......@@ -400,7 +402,7 @@
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.stuff.sealAuthorizeStuff = d.data.url;
that.stuff.gzwtsUrl = d.data.url;
console.log(d.data.url);
} else {
that.$refs[obj.flag][0].result = "";
......@@ -424,7 +426,7 @@
that.loading2 = false;
that.loading3 = false;
that.loading = false;
that.stuff.descUrl = obj.result
that.stuff.smwjUrl = obj.result
}
},
......@@ -435,18 +437,24 @@
this.stuff = {};
this.showUploadStuff = false;
},
uploadMaterials(index, row){
console.log(row, `zzzzzzzzzzzzzzzzzzzzzz`);
this.showUploadStuff = true;
this.currentOrderNo = row.deliveryOrderNo;
},
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);
console.log(this.stuff);
this.stuff.deliveryOrderNo = this.currentOrderNo;
var obj = this.$root.copyParams(this.stuff, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
console.log(res);
if (res.status == 0) {
this.showUploadStuff = false;
this.$message({ message: "上传成功", type: 'success' });
}
})
}).catch((e) => {
this.$message(e);
});
},
},
vname: "gsb-jdindentlist"
......
igirl-channel-web/package-lock.json
......@@ -144,7 +144,7 @@
}
},
"ali-oss": {
"version": "4.15.0",
"version": "4.16.0",
"resolved": "https://registry.npmjs.org/ali-oss/-/ali-oss-4.15.0.tgz",
"integrity": "sha512-3WK0vI5Q7CSgp34Ke46rng9h3uXXHVTu2bJv6ni2/RbmklPzpbAFdPC3WYLdWEWA87J4ugokWYEfMhAMaZZVfA==",
"requires": {
......
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