Skip to content

Z
zhichan
Commit 3c758c3a by 刘泽奇
Options

123

parent e65f5e12
Showing with 26 additions and 10 deletions
igirl-channel-web/app/front/entry/public/js/index.js
...@@ -183,6 +183,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -183,6 +183,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
homeUrl: "", homeUrl: "",
footerText: "", footerText: "",
superAdmin: null, superAdmin: null,
fromListPath: "",
}; };
}, },
created() { created() {
...@@ -205,16 +206,23 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -205,16 +206,23 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
this.getUserInfo(); this.getUserInfo();
} }
}, },
watch: { watch: {
// 监听路由变化 // 监听路由变化
$route: { $route: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;;", val, oldVal);
if (val.path == "/bw/jdindentdetail") {
this.fromListPath = oldVal.path;
console.log(this.fromListPath,'ttttttttttttttttttttttttttttttt');
};
if (val.fullPath == "/jd/jdtrademark" && location.hostname == "tm.plus.jdcloud.com") { if (val.fullPath == "/jd/jdtrademark" && location.hostname == "tm.plus.jdcloud.com") {
this.jdSelfHeaderShow = true; this.jdSelfHeaderShow = true;
this.jdSelfFooterShow = true; this.jdSelfFooterShow = true;
this.channelName = location.hash.split('/')[1]; this.channelName = location.hash.split('/')[1];
} };
}, },
// 深度观察监听 // 深度观察监听
deep: true deep: true
......
igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js
...@@ -595,6 +595,13 @@ ...@@ -595,6 +595,13 @@
} }
}); });
}, },
showPayStatus(index, row){
if (row.payStatus == "dfk" && this.channelFrom == "bw") {
return true;
} else {
return false;
}
},
showSelf(index, row){ showSelf(index, row){
/* /*
console.log(index, row); console.log(index, row);
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
show: false, show: false,
}, },
listPath: { listPath: {
path: `/${this.$root.channelName}/jdindentlist`, path: this.$root.fromListPath || `/${this.$root.channelName}/jdindentlist`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
break; break;
default: default:
/*京东模式 最多智能选择十项 */ /*京东模式 最多智能选择十项 */
if (newVal.length > 0) { if (newVal.length > 0) {
if (newVal.length > 1) { if (newVal.length > 1) {
if (this.$refs.tree) { if (this.$refs.tree) {
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -82,13 +82,8 @@ ...@@ -82,13 +82,8 @@
<el-button @click="reset">重置</el-button> <el-button @click="reset">重置</el-button>
</div> </div>
</div> </div>
<div class="jdindentlist-null" v-if="tableData.length == 0">
<div> <div class="jdindentlist-list">
<img src="/imgs/listnull.png" alt="">
</div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<div class="jdindentlist-list" v-else>
<el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%"> <el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%">
<!-- <el-table-column prop="channelServiceNo" label="订单编号"> <!-- <el-table-column prop="channelServiceNo" label="订单编号">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -232,6 +227,12 @@ ...@@ -232,6 +227,12 @@
</div> </div>
</div> </div>
<div class="jdindentlist-null" v-if="tableData.length == 0">
<div>
<img src="/imgs/listnull.png" alt="">
</div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
</div> </div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
:visible.sync="showUploadStuff"> :visible.sync="showUploadStuff">
......
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