Skip to content

Z
zhichan
Commit 75228af5 by 刘泽奇
Options

123

parent f99b22ec
Showing with 97 additions and 46 deletions
igirl-channel-jdweb/.vscode/launch.json 0 → 100644
{
// 使用 IntelliSense 了解相关属性。
// 悬停以查看现有属性的描述。
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceFolder}/main.js"
}
]
}
\ No newline at end of file
igirl-channel-jdweb/app/front/entry/index.ejs
......@@ -22,7 +22,6 @@
<script src="/js/vue/axios.min.js"></script>
<script src="/js/vue/jquery.min.js"></script>
<!-- 京东公共头部和尾部js链接 -->
<script src="http://www.jdcloud.com/public/js/portalBar.js"></script>
<script>
var appinfo = JSON.parse(unescape('<%=appinfo?appinfo:null%>'));
//缓存当前的基础组件列表
......@@ -68,3 +67,4 @@
</body>
</html>
<script src="http://www.jdcloud.com/public/js/portalBar.js"></script>
\ No newline at end of file
igirl-channel-jdweb/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-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
......@@ -28,9 +28,9 @@
<div class="jdindentlist">
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
<div><span>订单编号：</span>
<!-- <div><span>订单编号：</span>
<el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input>
</div>
</div> -->
<div><span>交付单号：</span>
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input>
</div>
......@@ -84,14 +84,14 @@
</div>
<div class="jdindentlist-list" v-else>
<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">
<el-tooltip placement="top" :content="scope.row.channelServiceNo">
<p solt="content">{{scope.row.channelServiceNo}}
</p>
</el-tooltip>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="deliveryOrderNo" label="交付单号">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
......@@ -190,8 +190,8 @@
</el-table-column> -->
</el-table>
<div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination>
</div>
......@@ -441,8 +441,8 @@
</div>
<div class="jdindentlist-list" v-else>
<el-table header-row-class-name="companydetail-name-header" :data="tableData" style="width: 100%">
<el-table-column prop="channelServiceNo" label="订单编号">
</el-table-column>
<!-- <el-table-column prop="channelServiceNo" label="订单编号">
</el-table-column> -->
<el-table-column prop="deliveryOrderNo" label="交付单号">
</el-table-column>
<el-table-column prop="itemName" label="业务类型">
......@@ -481,8 +481,8 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.js
......@@ -18,13 +18,16 @@
businessType: [
{
value: 'zzzc',
label: '自助注册'
label: '自助申请'
},
{
value: 'zzfzzc',
label: '专家辅助注册'
label: '专家辅助申请'
},
{
value: 'dbsbzc',
label: '担保申请'
},
],
DeliveryStatus: [
{
......@@ -428,7 +431,7 @@
label: '已完成'
},
],
hidePage:true,
hidePage: true,
}
},
......@@ -597,8 +600,8 @@
this.tableData = d.data;
/* 没有分页参数 需要重新改*/
this.countPage = d.dataCount;
this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.countPage.length > 10 ? this.hidePage = false : this.hidePage = true;
console.log(this.hidePage, `xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
d.data.map((item, index) => {
if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
......@@ -56,9 +56,11 @@
/* padding: 0 20px; */
background: #eef2fb;
}
.jdindentlist-warpper .el-tabs--top{
.jdindentlist-warpper .el-tabs--top {
padding: 0 20px;
}
.jdindentlist-warpper .el-tabs__nav-scroll {
margin: 0;
}
......@@ -108,7 +110,7 @@
background: rgba(255, 255, 255, 1);
color: #333333;
border:1px solid #3071fe;
border: 1px solid #3071fe;
border-radius: 100px;
width: 58px;
height: 28px;
......@@ -152,15 +154,18 @@
background: #ffffff;
max-height: 30%;
box-sizing: border-box;
border: 1px solid #ebeef5;
/* padding: 32px 25px 25px; */
}
.el-table .cell{
.jdindentlist-warpper .el-table .cell {
text-align: center;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.jdindentlist-list .el-table th>.cell {
text-align: center;
font-size: 14px;
......@@ -174,9 +179,14 @@
}
.jdindentlist-list-page {
margin-top: 25px;
height: 40px;
width: 100%;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
background: #EBEEF5;
}
.jdindentlist-list .subtime {
......@@ -205,24 +215,39 @@
justify-content: space-around;
}
.dailogButton{
.dailogButton {
width: 100%;
text-align:left;
padding:10px 20px 20px;
text-align: left;
padding: 10px 20px 20px;
position: absolute;
bottom: 0;
left: 0;
box-sizing: border-box;
border-top: 1px solid #dee0eb;
}
.dailogButton>button{
.dailogButton>button {
border-radius: 100px;
padding: 6px 28px;
}
.el-table_1_column_12>.cell{
.jdindentlist-tablecolumn-handle>.cell {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
-webkit-line-clamp: 2 !important;
overflow: hidden;
}
.jdindentlist-brand-count>.cell {
width: 100px;
}
.jdindentlist-warpper .el-button {
background: none;
color: none;
}
.jdindentlist-warpper .el-button:hover {
background: none;
color: none;
}
\ No newline at end of file
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -28,9 +28,9 @@
<div class="jdindentlist">
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
<div><span>订单编号：</span>
<!-- <div><span>订单编号：</span>
<el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input>
</div>
</div> -->
<div><span>交付单号：</span>
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input>
</div>
......@@ -84,15 +84,15 @@
</div>
<div class="jdindentlist-list" v-else>
<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">
<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="交付单号">
</el-table-column> -->
<el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
<template slot-scope="scope">
<el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
<p solt="content">{{scope.row.deliveryOrderNo}}
......@@ -100,7 +100,7 @@
</el-tooltip>
</template>
</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">
<p solt="content">{{scope.row.itemName}}
......@@ -124,7 +124,7 @@
</el-tooltip>
</template>
</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">
<p solt="content">{{scope.row.nclOneCount}}
......@@ -172,7 +172,7 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="address" label="操作">
<el-table-column prop="address" label="操作" class-name="jdindentlist-tablecolumn-handle">
<template slot-scope="scope">
<el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini"
......@@ -190,8 +190,8 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination>
</div>
......@@ -481,8 +481,8 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10" background
<el-pagination @current-change="handleSizeChange()"
:current-page.sync="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -18,11 +18,15 @@
businessType: [
{
value: 'zzzc',
label: '自助注册'
label: '自助申请'
},
{
value: 'zzfzzc',
label: '专家辅助注册'
label: '专家辅助申请'
},
{
value: 'dbsbzc',
label: '担保申请'
},
],
......@@ -428,7 +432,7 @@
label: '已完成'
},
],
hidePage:true,
hidePage: true,
}
},
......@@ -551,7 +555,6 @@
} else {
return false;
}
},
showReg(idx, row){
if (row.itemCode == 'zzsbzc') {
......@@ -594,12 +597,16 @@
this.$root.loading = false;
console.log(d.data);
if (d.status == 0 && d.data) {
console.log(d.data,"12313213");
console.log(d.data, "12313213");
this.tableData = d.data;
/* 没有分页参数 需要重新改*/
this.countPage = d.dataCount;
this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
/**
* this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
*
*/
d.data.map((item, index) => {
if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
......@@ -613,7 +620,6 @@
}
});
} else {
this.hidePage = true;
console.log(d, "getTmOrderList...........");
}
});
......
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