Skip to content

Z
zhichan
Commit ab1f941c by 刘泽奇
Options

123

parent 5acecf38
Showing with 132 additions and 107 deletions
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/vues/pages/companydetail/companydetail.css
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
.companydetail-warpper { .companydetail-warpper {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding-bottom: 30px;
} }
.companydetail-warpper>.jdindentdetail { .companydetail-warpper>.jdindentdetail {
...@@ -14,40 +15,35 @@ ...@@ -14,40 +15,35 @@
.companydetail-warpper .jdindentdetail-flow { .companydetail-warpper .jdindentdetail-flow {
border: 0; border: 0;
} }
.companydetail-warpper .jdindentdetail-flow .el-step.is-center .el-step__description{
padding: 0;
}
.companydetail-warpper .jdindentdetail-main-title { .companydetail-warpper .jdindentdetail-main-title {
margin: 20px 0; margin: 20px 0;
} }
.company-title{
.companydetail-info table { width: 100%;
display: block; height: 17px;
height: auto; display: flex;
width: 940px; align-items: center;
border-collapse: collapse; line-height: 17px;
margin: 0 auto; margin-bottom: 8px;
margin-top: 15px;
font-size: 12px;
} }
.company-title>div{
.companydetail-info table tr td { height: 12px;
text-align: center; width: 2px;
height: 38px; background: #3071FE;
width: 144px; margin-right: 4px;
border: 1px solid #e7eaf3;
} }
.companydetail-info table tr:nth-child(1) { .companydetail-warpper .el-table td, .el-table th.is-leaf{
height: 48px; text-align: center
} }
.companydetail-info table tr:nth-child(1)>td:nth-child(1) {
width: 48px;
}
.companydetail-info table tr:nth-of-type(2),
.companydetail-info table tr:nth-of-type(4) {
background: rgb(246, 249, 255);
color: #777777;
}
.companydetail-name-header { .companydetail-name-header {
background: #eef2fb !important; background: #eef2fb !important;
...@@ -57,6 +53,7 @@ ...@@ -57,6 +53,7 @@
.companydetail-official { .companydetail-official {
display: flex; display: flex;
font-size: 12px; font-size: 12px;
flex-wrap: wrap;
} }
.companydetail-official>div { .companydetail-official>div {
...@@ -69,7 +66,7 @@ ...@@ -69,7 +66,7 @@
.companydetail-official>div>p:nth-child(1) { .companydetail-official>div>p:nth-child(1) {
border: 1px solid #dee0eb; border: 1px solid #dee0eb;
width: 89px; width: 124px;
height: 89px; height: 89px;
display: flex; display: flex;
align-items: center; align-items: center;
......
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.html
...@@ -22,9 +22,13 @@ ...@@ -22,9 +22,13 @@
height:6px; height:6px;
border-radius:100%;margin: 0 10px 0 20px;"> border-radius:100%;margin: 0 10px 0 20px;">
</div> </div>
<div style="font-size: 16px;"> <!-- <div style="font-size: 16px;">
{{companyName}} {{companyName}}
</div> </div> -->
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">订单列表</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb>
</div> </div>
</div> </div>
<div class="jdindentdetail"> <div class="jdindentdetail">
...@@ -36,28 +40,33 @@ ...@@ -36,28 +40,33 @@
<el-breadcrumb-item>订单详情</el-breadcrumb-item> <el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> --> </div> -->
<div class="jdindentdetail-main-title"> <div class="company-title">
<div></div>
交付流程 交付流程
</div> </div>
<div class="jdindentdetail-flow"> <div class="jdindentdetail-flow">
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process"> <el-steps :active="currentStep" align-center process-status="process">
<!-- <el-step v-show="itemCode" title="方案不通过"></el-step> --> <!-- <el-step v-show="itemCode" title="方案不通过"></el-step> -->
<el-step title="已下单"></el-step> <el-step title="已下单" :description="payTime"></el-step>
<el-step title="园区入驻审核"></el-step> <el-step title="园区入驻审核" description="1个工作日完成"></el-step>
<el-step title="上传工商注册材料"></el-step> <el-step title="上传工商注册材料" description="请在45个自然日内完成"></el-step>
<el-step title="工商审核环节"></el-step> <el-step title="工商审核环节" description="10个工作日内"></el-step>
<el-step title="刻章环节"></el-step> <el-step title="刻章环节" description="5个工作日内"></el-step>
<el-step title="证件邮寄环节"></el-step> <el-step title="证件邮寄环节" description="3个工作日内"></el-step>
<el-step title="已签收"></el-step> <el-step title="已签收" description=""></el-step>
</el-steps> </el-steps>
</div> </div>
</div> </div>
<div class="jdindentdetail-main-title"> <div class="company-title">
<div>
</div>
企业信息 企业信息
</div> </div>
<div class="companydetail-name"> <div class="companydetail-name">
<el-table :data="enterprise" style="margin:0 auto" header-row-class-name="companydetail-name-header"> <el-table border :data="enterprise" style="margin:0 auto"
header-row-class-name="companydetail-name-header">
<el-table-column prop="companyName" label="公司名称" width="180"> <el-table-column prop="companyName" label="公司名称" width="180">
</el-table-column> </el-table-column>
...@@ -86,60 +95,49 @@ ...@@ -86,60 +95,49 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="jdindentdetail-main-title"> <div class="company-title">
注册资本 / 出资比例 <div></div>
注册资本
</div> </div>
<div class="companydetail-info"> <div class="companydetail-info">
<table> <el-table border :data="regInfo" style="margin:0 auto"
<tr style="background: #f6f9ff;"> header-row-class-name="companydetail-name-header">
<!-- <td rowspan="7" width="50" style="text-align:center;background: #f6f9ff;">注 <br> <el-table-column prop="capital" label="注册资本（万元）">
册<br>资<br>本<br>/<br>出<br>资<br>比<br>例 </el-table-column>
</td> --> <el-table-column prop="deadline" label="经验期限（年）">
<td colspan="2">注册资金（万元）{{capital}}</td> </el-table-column>
<td colspan="2">经营期限（年）{{deadline}}</td> <el-table-column prop="capiDate" label="注册资本实缴日期（年）">
<td colspan="2">注册资本实缴日期（年）{{capiDate}}</td> </el-table-column>
</tr> </el-table>
<tr>
<td>法人股东姓名</td>
<td>出资金额（万）</td>
<td>出资比例</td>
<td>证件号</td>
<td>联系电话/手机</td>
<td>联系地址</td>
</tr>
<tr v-for="(item, index) in legalShareholder" :key="index">
<td>{{item.stockName}}</td>
<td>{{item.shouldCapi}}</td>
<td>{{item.stockPercent}}</td>
<td>{{item.creditCode}}</td>
<td>{{item.phone}}</td>
<td>{{item.address}}</td>
</tr>
<tr>
<td>自然人股东姓名</td>
<td>出资金额（万）</td>
<td>出资比例</td>
<td>证件号</td>
<td>联系电话/手机</td>
<td>联系地址</td>
</tr>
<tr v-for="(item, index) in shareholder" :key="index">
<td>{{item.stockName}}</td>
<td>{{item.shouldCapi}}</td>
<td>{{item.stockPercent}}</td>
<td>{{item.idCard}}</td>
<td>{{item.phone}}</td>
<td>{{item.address}}</td>
</tr>
</table>
</div> </div>
<div class="company-title">
<div class="jdindentdetail-main-title"> <div></div>
出资比例
</div>
<div class="companydetail-info">
<el-table border :data="allShareholder" style="margin:0 auto"
header-row-class-name="companydetail-name-header">
<el-table-column prop="id" label="序号">
</el-table-column>
<el-table-column prop="stockName" label="法人/自然人股东姓名">
</el-table-column>
<el-table-column prop="stockPercent" label="出资比例">
</el-table-column>
<el-table-column prop="unifyCode" label="证件号">
</el-table-column>
<el-table-column prop="phone" label="联系电话">
</el-table-column>
<el-table-column prop="address" label="联系地址">
</el-table-column>
</el-table>
</div>
<div class="company-title">
<div></div>
基本信息 基本信息
</div> </div>
<div class="companydetail-baseinfo"> <div class="companydetail-baseinfo">
<el-table :data="employees" header-row-class-name="companydetail-name-header"> <el-table border :data="employees" header-row-class-name="companydetail-name-header">
<el-table-column prop="position" label="任职信息" width="180"> <el-table-column prop="position" label="任职信息" width="180">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" width="180"> <el-table-column prop="name" label="姓名" width="180">
...@@ -155,7 +153,8 @@ ...@@ -155,7 +153,8 @@
</el-table> </el-table>
</div> </div>
<div class="jdindentdetail-main-title"> <div class="company-title">
<div></div>
材料 材料
</div> </div>
<div class="companydetail-official"> <div class="companydetail-official">
...@@ -166,7 +165,7 @@ ...@@ -166,7 +165,7 @@
<p>{{item.name}}</p> <p>{{item.name}}</p>
</div> </div>
</div> </div>
<!-- <div class="jdindentdetail-main-title"> <!-- <div class="company-title">
官方回执 官方回执
</div> </div>
<div class="companydetail-reply"> <div class="companydetail-reply">
...@@ -177,11 +176,12 @@ ...@@ -177,11 +176,12 @@
<p>营业执照</p> <p>营业执照</p>
</div> </div>
</div> --> </div> -->
<div class="jdindentdetail-main-title"> <div class="company-title">
<div></div>
收件人信息 收件人信息
</div> </div>
<div class="companydetail-consignee"> <div class="companydetail-consignee">
<el-table :data="logistics" style="margin:0 auto;margin-top: 30px;" <el-table border :data="logistics" style="margin:0 auto;margin-top: 30px;"
header-row-class-name="companydetail-name-header"> header-row-class-name="companydetail-name-header">
<el-table-column prop="recipient" label="收件人" width="180"> <el-table-column prop="recipient" label="收件人" width="180">
</el-table-column> </el-table-column>
......
igirl-channel-web/app/front/vues/pages/companydetail/companydetail.js
...@@ -2,21 +2,24 @@ ...@@ -2,21 +2,24 @@
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
return { return {
listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} }, listPath: {
path: `/${this.$root.channelName}/jdindentlist`,
query: {
channelUserId: this.$route.query.channelUserId,
}
},
currentStep: 0, currentStep: 0,
companyData: [], companyData: [],
channelFrom: null, channelFrom: null,
user_Name: "", user_Name: "",
companyName: '', companyName: '',
enterprise: [], enterprise: [],
capital: '', allShareholder: [],
deadline: "",
capiDate: "",
legalShareholder: [],
shareholder: [],
employees: [], employees: [],
logistics: [], logistics: [],
attachFiles: [], attachFiles: [],
payTime: '',
regInfo: []
} }
}, },
mounted: function() { mounted: function() {
...@@ -26,6 +29,9 @@ ...@@ -26,6 +29,9 @@
console.log(this.user_Name, "bbbbbbbbbbbbbbbbbbbbbbbb"); console.log(this.user_Name, "bbbbbbbbbbbbbbbbbbbbbbbb");
} }
}); });
if (this.$route.query.payTime) {
this.payTime = this.$route.query.payTime
}
this.getChannelFrom(); this.getChannelFrom();
this.getDetail(); this.getDetail();
this.getFlow(); this.getFlow();
...@@ -35,10 +41,15 @@ ...@@ -35,10 +41,15 @@
}, },
methods: { methods: {
getFlow(){ getFlow(){
console.log(this.$route.query.channelUserId, "llllllllllllllllllllllllllllllllllllll");
if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId;
}
let obj = this.$root.copyParams({ let obj = this.$root.copyParams({
"channelUserId": this.$root.channelUserId, "channelUserId": this.$root.channelUserId,
"orderNo": this.$route.query.orderNo || "203915601880842" "orderNo": this.$route.query.orderNo || "203915601880842"
}, "getOrderDeliveryInfo", "/action/tmOrder/springBoard", 'yes', 'yes'); }, "getOrderDeliveryInfo", "/action/tmOrder/springBoard", 'yes', 'yes');
console.log(obj);
/* /*
obj.actionBody.channelUserId = '15010929366'; obj.actionBody.channelUserId = '15010929366';
*/ */
...@@ -93,12 +104,31 @@ ...@@ -93,12 +104,31 @@
enterpriseInfo.area = d.data.area; enterpriseInfo.area = d.data.area;
enterpriseInfo.depositRatio = d.data.depositRatio; enterpriseInfo.depositRatio = d.data.depositRatio;
enterpriseInfo.scope = d.data.scope; enterpriseInfo.scope = d.data.scope;
this.capital = d.data.capital; let capital = {};
this.deadline = d.data.deadline; capital.capital = d.data.capital;
this.capiDate = d.data.capiDate; capital.deadline = d.data.deadline;
capital.capiDate = d.data.capiDate;
this.regInfo.push(capital);
this.enterprise.push(enterpriseInfo); this.enterprise.push(enterpriseInfo);
this.legalShareholder = d.data.legalShareholder; let legalShareholder = d.data.legalShareholder;
this.shareholder = d.data.shareholder; let shareholder = d.data.shareholder;
/*合并数组 */
legalShareholder.map((item, index) => {
item.stockName = `${item.stockName}(法人)`;
item.unifyCode = item.creditCode;
});
shareholder.map((item, index) => {
item.stockName = `${item.stockName}(自然人)`;
item.unifyCode = item.idCard;
});
legalShareholder.push.apply(legalShareholder, shareholder);
this.allShareholder = legalShareholder;
this.allShareholder.map((item, index) => {
item.id = index + 1;
});
console.log(shareholder, "bbbbbbbbbbbbnnnnnnnnnnnnnnnnnnn");
this.employees = d.data.employees; this.employees = d.data.employees;
this.logistics.push(d.data.logistics); this.logistics.push(d.data.logistics);
this.attachFiles = d.data.attachFiles; this.attachFiles = d.data.attachFiles;
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
</div> </div>
<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-size="20" layout="prev, pager, next,jumper" :total="countPage"> :page-size="20" layout="prev, pager, next,jumper" :total="countPage||1">
</el-pagination> </el-pagination>
</div> </div>
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
</div> </div>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="getIcbcList()" :current-page.sync="currentPage2" :page-size="20" <el-pagination @current-change="getIcbcList()" :current-page.sync="currentPage2" :page-size="20"
layout="prev, pager, next,jumper" :total="IndustryCountPage"> layout="prev, pager, next,jumper" :total="IndustryCountPage||1">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -630,8 +630,7 @@ ...@@ -630,8 +630,7 @@
query: { query: {
orderNo: row.orderNo, orderNo: row.orderNo,
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryStatus: this.deliveryStatus, payTime:row.payTime
totalSum: row.totalSum,
} }
}); });
}, },
...@@ -725,9 +724,8 @@ ...@@ -725,9 +724,8 @@
this.$root.loading = false; this.$root.loading = false;
console.log({ ...d.data }); console.log({ ...d.data });
this.icbcData = d.data; this.icbcData = d.data;
/* this.IndustryCountPage = d.dataCount;
this.IndustryCountPage = d.data.IndustryCountPage;
*/
}) })
} else { } else {
this.$message('当前未登录'); this.$message('当前未登录');
......
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