Skip to content

Z
zhichan
Commit 3c758c3a by 刘泽奇
Options

123

parent e65f5e12
Showing with 156 additions and 32 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.html
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<span @click="loginOut" v-if="user_Name">退出</span> <span @click="loginOut" v-if="user_Name">退出</span>
</div> </div>
<div v-else> <div v-else>
<a href="https://login.jdcloud.com/?returnUrl=https%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist" class="jdindentlist-header-login" >登录</a> <a href="https://login.jdcloud.com/?returnUrl=https%3A%2F%2Ftm.plus.jdcloud.com%2F%23%2Fjd%2Fjdindentlist"
class="jdindentlist-header-login">登录</a>
<a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com" style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px; <a href="https://user.jdcloud.com/register?source=jdcloud&ReturnUrl=https%3A%2F%2Fwww.jdcloud.com" style="display:inline-block;color: #fff;padding: 0 15px;background:linear-gradient(80deg,#3171ff 0,#a14faf 100%);border-radius:13px;height: 26px;
line-height: 26px;">免费注册</a> line-height: 26px;">免费注册</a>
</div> </div>
</div> </div>
<div> <div>
<div style="display:flex;height: 60px;align-items: center;"> <div style="display:flex;height: 60px;align-items: center;">
<div style="background:#ffffff; <div style="background:#ffffff;
...@@ -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">
...@@ -166,6 +161,16 @@ ...@@ -166,6 +161,16 @@
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="channelFrom == \'bw\'" prop="payStatus" label="付款状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.payStatusName"
:disabled="scope.row.payStatusName ? false : true">
<p solt="content">
{{scope.row.payStatusName ? scope.row.payStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl"> <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName" <el-tooltip placement="top" :content="scope.row.deliveryStatusName"
...@@ -203,6 +208,9 @@ ...@@ -203,6 +208,9 @@
<el-button v-show="showSelf(scope.$index, scope.row)" <el-button v-show="showSelf(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini" style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button> @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showPayStatus(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goPayment(scope.$index, scope.row)">去付款</el-button>
<el-button v-show="showSup(scope.$index, scope.row)" <el-button v-show="showSup(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini" style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goScheme(scope.$index, scope.row)">确认注册方案</el-button> @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
...@@ -219,6 +227,12 @@ ...@@ -219,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">
...@@ -461,31 +475,124 @@ ...@@ -461,31 +475,124 @@
</div> </div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div> </div>
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list">
<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="订单编号">
</el-table-column> <template slot-scope="scope">
<el-table-column prop="deliveryOrderNo" label="交付单号"> <el-tooltip placement="top" :content="scope.row.channelServiceNo">
<p solt="content">{{scope.row.channelServiceNo}}
</p>
</el-tooltip>
</template>
</el-table-column> -->
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo"
:disabled="scope.row.itemName ? false : true">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo"
:disabled="scope.row.itemName ? false : true">
<p solt="content">
{{scope.row.deliveryOrderNo ? scope.row.deliveryOrderNo : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="itemName" label="业务类型"> <el-table-column prop="itemName" label="业务类型" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.itemName"
:disabled="scope.row.itemName ? false : true">
<p solt="content">{{scope.row.itemName ? scope.row.itemName : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="tmName" label="商标名称"> <el-table-column prop="tmName" label="商标名称" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.tmName"
:disabled="scope.row.tmName ? false : true">
<p solt="content">{{scope.row.tmName ? scope.row.tmName : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCodes" label="商标类别"> <el-table-column prop="nclOneCodes" label="类别">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCodes"
:disabled="scope.row.nclOneCodes ? false : true">
<p solt="content">
{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCount" label="商标件数"> <el-table-column prop="nclOneCount" label="件数" width="" class-name="jdindentlist-brand-count">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.nclOneCount"
:disabled="scope.row.nclOneCount ? false : true">
<p solt="content">{{scope.row.nclOneCount?scope.row.nclOneCount: \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="申请人"> <el-table-column prop="name" label="申请人">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.name"
:disabled="scope.row.name ? false : true">
<p solt="content">{{scope.row.name ? scope.row.name :\'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="totalSum" label="订单金额"> <el-table-column prop="totalSum" label="订单金额">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.totalSum"
:disabled="scope.row.totalSum ? false : true">
<p solt="content">{{scope.row.totalSum ? scope.row.totalSum : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column v-if="channelFrom == \'bw\'" prop="payStatus" label="付款状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.payStatusName"
:disabled="scope.row.payStatusName ? false : true">
<p solt="content">
{{scope.row.payStatusName ? scope.row.payStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl"> <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryStatusName"
:disabled="scope.row.deliveryStatusName ? false : true">
<p solt="content">
{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="CreateDate" label="下单时间"> <el-table-column prop="CreateDate" label="下单时间">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.CreateDate"
:disabled="scope.row.CreateDate ? false : true">
<p solt="content">{{scope.row.CreateDate ? scope.row.CreateDate: \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime"> <el-table-column prop="submitTime" label="递交时间" class-name="subtime">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.submitTime"
:disabled="scope.row.submitTime ? false : true">
<p solt="content">
{{scope.row.submitTime ? scope.row.submitTime : \'---\'}}
</p>
</el-tooltip>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="操作"> <el-table-column prop="address" label="操作" class-name="jdindentlist-tablecolumn-handle">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-show="showDetails(scope.$index, scope.row)" <el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini" style="border:0;width:100%;color: #0F8EE9;" size="mini"
...@@ -493,6 +600,9 @@ ...@@ -493,6 +600,9 @@
<el-button v-show="showSelf(scope.$index, scope.row)" <el-button v-show="showSelf(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini" style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button> @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showPayStatus(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goPayment(scope.$index, scope.row)">去付款</el-button>
<el-button v-show="showSup(scope.$index, scope.row)" <el-button v-show="showSup(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini" style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goScheme(scope.$index, scope.row)">确认注册方案</el-button> @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
...@@ -504,13 +614,12 @@ ...@@ -504,13 +614,12 @@
</el-table> </el-table>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-sizes="[10, 20, 30, 40]" :page-size="10" layout="prev, pager, next,jumper" :page-size="20" layout="prev, pager, next,jumper" :total="countPage">
:total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
\ No newline at end of file
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