Commit 36964a3d by 刘泽奇

123

parent 28c1af78
This source diff could not be displayed because it is too large. You can view the blob instead.
.companydetail-warpper .jdindentdetail-main-step-row>div { .companydetail-warpper .jdindentdetail-main-step-row>div {
min-height: 0; min-height: 0;
} }
.companydetail-warpper{
.companydetail-warpper {
width: 1320px; width: 1320px;
margin: 0 auto; margin: 0 auto;
} }
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
.companydetail-info table { .companydetail-info table {
display: block; display: block;
height: 295px; height: auto;
width: 940px; width: 940px;
border-collapse: collapse; border-collapse: collapse;
margin: 0 auto; margin: 0 auto;
...@@ -42,7 +43,8 @@ ...@@ -42,7 +43,8 @@
width: 48px; width: 48px;
} }
.companydetail-info table tr:nth-of-type(even) { .companydetail-info table tr:nth-of-type(2),
.companydetail-info table tr:nth-of-type(4) {
background: rgb(246, 249, 255); background: rgb(246, 249, 255);
color: #777777; color: #777777;
} }
...@@ -56,12 +58,15 @@ ...@@ -56,12 +58,15 @@
display: flex; display: flex;
font-size: 12px; font-size: 12px;
} }
.companydetail-official>div{
.companydetail-official>div {
margin-right: 20px; margin-right: 20px;
} }
.companydetail-official>div>p{
.companydetail-official>div>p {
text-align: center; text-align: center;
} }
.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: 89px;
...@@ -69,21 +74,27 @@ ...@@ -69,21 +74,27 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.companydetail-official>div>p:nth-child(1)>img{
.companydetail-reply { height: 100%;
width: 100%;
}
/* .companydetail-reply {
display: flex; display: flex;
font-size: 12px; font-size: 12px;
} }
.companydetail-reply>div{
.companydetail-reply>div {
margin-right: 20px; margin-right: 20px;
} }
.companydetail-reply>div>p{
.companydetail-reply>div>p {
text-align: center; text-align: center;
} }
.companydetail-reply>div>p:nth-child(1) { .companydetail-reply>div>p:nth-child(1) {
border: 1px solid #dee0eb; border: 1px solid #dee0eb;
width: 89px; width: 89px;
height: 89px; height: 89px;
display: flex; display: flex;
align-items: center; align-items: center;
} } */
\ No newline at end of file
...@@ -57,19 +57,32 @@ ...@@ -57,19 +57,32 @@
企业信息 企业信息
</div> </div>
<div class="companydetail-name"> <div class="companydetail-name">
<el-table :data="companyData" style="width: 940px;margin:0 auto" <el-table :data="enterprise" style="margin:0 auto" header-row-class-name="companydetail-name-header">
header-row-class-name="companydetail-name-header"> <el-table-column prop="companyName" label="公司名称" width="180">
<el-table-column prop="date" label="公司名称" width="180">
</el-table-column>
<el-table-column prop="alternative" label="备选名称" width="180">
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.alternative" :key="index">
{{item}}
</div>
</template>
</el-table-column>
<el-table-column prop="companyType" label="公司类型">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="备选名称" width="180"> <el-table-column prop="taxpayerType" label="纳税人类型">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="公司类型"> <el-table-column prop="orgType" label="组织形式">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="组织形式"> <el-table-column prop="area" label="注册地区">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="注册地区"> <el-table-column prop="detailAddress" label="注册地址">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="行业分类"> <el-table-column prop="industryType" label="行业分类">
</el-table-column>
<el-table-column prop="depositRatio" label="公积金缴存比例">
</el-table-column>
<el-table-column prop="scope" label="公司经营范围">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
...@@ -82,58 +95,43 @@ ...@@ -82,58 +95,43 @@
<!-- <td rowspan="7" width="50" style="text-align:center;background: #f6f9ff;">注 <br> <!-- <td rowspan="7" width="50" style="text-align:center;background: #f6f9ff;">注 <br>
册<br>资<br>本<br>/<br>出<br>资<br>比<br>例 册<br>资<br>本<br>/<br>出<br>资<br>比<br>例
</td> --> </td> -->
<td colspan="2">注册资金(万元)100</td> <td colspan="2">注册资金(万元){{capital}}</td>
<td colspan="2">经营期限(年)20</td> <td colspan="2">经营期限(年){{deadline}}</td>
<td colspan="2">注册资本实缴日期(年)20</td> <td colspan="2">注册资本实缴日期(年){{capiDate}}</td>
</tr> </tr>
<tr> <tr>
<td>法人股东姓名</td> <td>法人股东姓名</td>
<td>出资金额(万)</td> <td>出资金额(万)</td>
<td>出资比例</td> <td>出资比例</td>
<td>身份证</td> <td>证件</td>
<td>联系电话/手机</td> <td>联系电话/手机</td>
<td>联系地址</td> <td>联系地址</td>
</tr> </tr>
<tr> <tr v-for="(item, index) in legalShareholder" :key="index">
<td>1</td> <td>{{item.stockName}}</td>
<td></td> <td>{{item.shouldCapi}}</td>
<td>12</td> <td>{{item.stockPercent}}</td>
<td></td> <td>{{item.creditCode}}</td>
<td></td> <td>{{item.phone}}</td>
<td></td> <td>{{item.address}}</td>
</tr> </tr>
<tr> <tr>
<td>人股东姓名</td> <td>自然人股东姓名</td>
<td>出资金额(万)</td> <td>出资金额(万)</td>
<td>出资比例</td> <td>出资比例</td>
<td>身份证</td> <td>证件</td>
<td>联系电话/手机</td> <td>联系电话/手机</td>
<td>联系地址</td> <td>联系地址</td>
</tr> </tr>
<tr> <tr v-for="(item, index) in shareholder" :key="index">
<td></td> <td>{{item.stockName}}</td>
<td></td> <td>{{item.shouldCapi}}</td>
<td></td> <td>{{item.stockPercent}}</td>
<td></td> <td>{{item.idCard}}</td>
<td></td> <td>{{item.phone}}</td>
<td></td> <td>{{item.address}}</td>
</tr>
<tr>
<td>法人股东姓名</td>
<td>出资金额(万)</td>
<td>出资比例</td>
<td>身份证号</td>
<td>联系电话/手机</td>
<td>联系地址</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -141,80 +139,34 @@ ...@@ -141,80 +139,34 @@
基本信息 基本信息
</div> </div>
<div class="companydetail-baseinfo"> <div class="companydetail-baseinfo">
<el-table :data="companyData" style="width: 940px;margin:0 auto" <el-table :data="employees" header-row-class-name="companydetail-name-header">
header-row-class-name="companydetail-name-header"> <el-table-column prop="position" label="任职信息" width="180">
<el-table-column prop="date" 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">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="手机"> <el-table-column prop="phone" label="手机">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="固话"> <el-table-column prop="fixPhone" label="固话">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="住宅地址"> <el-table-column prop="address" label="住宅地址">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="邮箱"> <el-table-column prop="email" label="邮箱">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table :data="companyData" style="width: 940px;margin:0 auto;margin-top: 30px;"
header-row-class-name="companydetail-name-header">
<el-table-column prop="date" label="纳税人类别" width="180">
</el-table-column>
<el-table-column prop="name" label="公积金缴存比例(%)" width="180">
</el-table-column>
<el-table-column prop="address" label="公司经营范围">
</el-table-column>
</el-table>
</div> </div>
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
交官材料 材料
</div> </div>
<div class="companydetail-official"> <div class="companydetail-official">
<div> <div v-for="(item, index) in attachFiles" :key="index">
<p>
<img src="" alt="">
</p>
<p>法人身份证</p>
<p>正面</p>
</div>
<div>
<p>
<img src="" alt="">
</p>
<p>法人身份证</p>
<p>反面</p>
</div>
<div>
<p> <p>
<img src="" alt=""> <img :src="item.url" alt="">
</p> </p>
<p>自然人(1)身份证</p> <p>{{item.name}}</p>
<p>正面</p>
</div>
<div>
<p>
<img src="" alt="">
</p>
<p>自然人(1)身份证</p>
<p>正面</p>
</div>
<div>
<p>
<img src="" alt="">
</p>
<p>自然人(2)身份证</p>
<p>正面</p>
</div>
<div>
<p>
<img src="" alt="">
</p>
<p>自然人(2)身份证</p>
<p>正面</p>
</div> </div>
</div> </div>
<div class="jdindentdetail-main-title"> <!-- <div class="jdindentdetail-main-title">
官方回执 官方回执
</div> </div>
<div class="companydetail-reply"> <div class="companydetail-reply">
...@@ -224,20 +176,20 @@ ...@@ -224,20 +176,20 @@
</p> </p>
<p>营业执照</p> <p>营业执照</p>
</div> </div>
</div> </div> -->
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
收件人信息 收件人信息
</div> </div>
<div class="companydetail-consignee"> <div class="companydetail-consignee">
<el-table :data="companyData" style="width: 940px;margin:0 auto;margin-top: 30px;" <el-table :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="date" label="收件人" width="180"> <el-table-column prop="recipient" label="收件人" width="180">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="收件人地址" width="180"> <el-table-column prop="recipientAddress" label="收件人地址" width="180">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="收件人联系方式"> <el-table-column prop="recipientPhone" label="收件人联系方式">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="收件人邮箱"> <el-table-column prop="recipientPostcode" label="收件人邮编">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
......
...@@ -7,7 +7,16 @@ ...@@ -7,7 +7,16 @@
companyData: [], companyData: [],
channelFrom: null, channelFrom: null,
user_Name: "", user_Name: "",
companyName:'' companyName: '',
enterprise: [],
capital: '',
deadline: "",
capiDate: "",
legalShareholder: [],
shareholder: [],
employees: [],
logistics: [],
attachFiles:[],
} }
}, },
mounted: function() { mounted: function() {
...@@ -19,11 +28,26 @@ ...@@ -19,11 +28,26 @@
}); });
this.getChannelFrom(); this.getChannelFrom();
this.getDetail(); this.getDetail();
this.getFlow();
}, },
created: function() { created: function() {
}, },
methods: { methods: {
getFlow(){
let obj = this.$root.copyParams({
"channelUserId": "15010929366",
"orderNo": "203915601880842"
}, "getOrderDeliveryInfo", "/action/tmOrder/springBoard", 'yes', 'yes');
/*
obj.actionBody.channelUserId = '15010929366';
*/
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
console.log(d, ';;;;;;;;;;;;;;;;;;;;;;;');
this.$root.loading = false;
})
},
getDetail(){ getDetail(){
let obj = this.$root.copyParams({ let obj = this.$root.copyParams({
"idempotentNo": "203915601880842" "idempotentNo": "203915601880842"
...@@ -31,8 +55,28 @@ ...@@ -31,8 +55,28 @@
this.$root.loading = true; this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
this.$root.loading = false; this.$root.loading = false;
if (d.status == 0) { if (d.status == 0) {
this.companyName = d.data.companyName; this.companyName = d.data.companyName;
var enterpriseInfo = {};
enterpriseInfo.orgType = d.data.orgType;
enterpriseInfo.detailAddress = d.data.detailAddress;
enterpriseInfo.companyName = d.data.companyName;
enterpriseInfo.industryType = d.data.industryType;
enterpriseInfo.alternative = d.data.alternative;
enterpriseInfo.companyType = d.data.companyType;
enterpriseInfo.taxpayerType = d.data.taxpayerType;
enterpriseInfo.area = d.data.area;
enterpriseInfo.depositRatio = d.data.depositRatio;
enterpriseInfo.scope = d.data.scope;
this.capital = d.data.capital;
this.deadline = d.data.deadline;
this.capiDate = d.data.capiDate;
this.enterprise.push(enterpriseInfo);
this.legalShareholder = d.data.legalShareholder;
this.shareholder = d.data.shareholder;
this.employees = d.data.employees;
this.logistics.push(d.data.logistics);
this.attachFiles = d.data.attachFiles;
console.log("返回信息", { ...d.data }) console.log("返回信息", { ...d.data })
} else { } else {
console.log(d.msg); console.log(d.msg);
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<img :src="item.pic_url" alt=""> <img :src="item.pic_url" alt="">
</div> </div>
<div> <div>
{{item.item_name}} {{item.channel_item_name}}
</div> </div>
</div> </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<img :src="item.pic_url" alt=""> <img :src="item.pic_url" alt="">
</div> </div>
<div> <div>
{{item.item_name}} {{item.channel_item_name}}
</div> </div>
</div> </div>
......
...@@ -255,8 +255,11 @@ ...@@ -255,8 +255,11 @@
} }
}) })
}, },
toBuy(k){ toBuy(code){
console.log(k.path_code, k.path_name) console.log(code);
let productId = code.channel_item_code.split('-')[1];
console.log(code.channel_item_code.split('-'), "xxxxxxxxxxxxxx");
window.open(`https://market.jdcloud.com/service/details/${productId}`);
}, },
handleChange(e){ handleChange(e){
let city = this.regionValue[0]; let city = this.regionValue[0];
......
...@@ -421,7 +421,16 @@ ...@@ -421,7 +421,16 @@
<div class="jdindentlist"> <div class="jdindentlist">
<div class="jdindentlist-inquire"> <div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form"> <div class="jdindentlist-inquire-form">
<div><span>订单编号:</span> <div><span>产品名称:</span>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
<div><span>渠道单号:</span>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
<div><span>订单状态:</span>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
<!-- <div><span>订单编号:</span>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input> <el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>业务单号:</span> <div><span>业务单号:</span>
...@@ -456,7 +465,7 @@ ...@@ -456,7 +465,7 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<!-- <div><span>付款状态:</span> <!-- <div><span>付款状态:</span>
<el-select v-model="paymentStatus" placeholder="请选择"> <el-select v-model="paymentStatus" placeholder="请选择">
...@@ -476,32 +485,24 @@ ...@@ -476,32 +485,24 @@
<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> </el-table-column>
<el-table-column prop="deliveryOrderNo" label="交付单号"> <el-table-column prop="deliveryOrderNo" label="注册地区">
</el-table-column>
<el-table-column prop="itemName" label="业务类型">
</el-table-column>
<el-table-column prop="tmName" label="商标名称">
</el-table-column>
<el-table-column prop="nclOneCodes" label="商标类别">
</el-table-column> </el-table-column>
<el-table-column prop="nclOneCount" label="商标件数"> <el-table-column prop="itemName" label="公司类型">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="申请人"> <el-table-column prop="tmName" label="件数">
</el-table-column> </el-table-column>
<el-table-column prop="totalSum" label="订单金额"> <el-table-column prop="nclOneCodes" label="订单金额">
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl"> <el-table-column prop="nclOneCount" label="付款状态">
</el-table-column> </el-table-column>
<el-table-column prop="CreateDate" label="下单时间"> <el-table-column prop="name" label="下单时间">
</el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime">
</el-table-column> </el-table-column>
<el-table-column prop="address" label="操作"> <el-table-column prop="address" label="操作">
<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"
@click="viewDetails(scope.$index, scope.row)">详情</el-button> @click="viewDetails(scope.$index, scope.row)">详情</el-button>
<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="showSup(scope.$index, scope.row)" <el-button v-show="showSup(scope.$index, scope.row)"
...@@ -509,7 +510,7 @@ ...@@ -509,7 +510,7 @@
@click="goScheme(scope.$index, scope.row)">确认注册方案</el-button> @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
<el-button v-show="showReg(scope.$index, scope.row)" <el-button v-show="showReg(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;margin:0;" size="mini" style="border:0;width:100%;color: #0F8EE9;margin:0;" size="mini"
@click="goSelftmreg(scope.$index, scope.row)">去注册</el-button> @click="goSelftmreg(scope.$index, scope.row)">去注册</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -520,7 +521,7 @@ ...@@ -520,7 +521,7 @@
<p>很抱歉,没有查询到您要搜索的内容!您也可以减少筛选范围再尝试~</p> <p>很抱歉,没有查询到您要搜索的内容!您也可以减少筛选范围再尝试~</p>
</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="icbcCurrentPage"
:page-size="20" layout="prev, pager, next,jumper" :total="countPage"> :page-size="20" layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
......
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
CreateDate: null, CreateDate: null,
tableData: [], tableData: [],
currentPage: 1, currentPage: 1,
icbcCurrentPage: 1,
countPage: 0, countPage: 0,
pageSize: null, pageSize: null,
/* 上传资料弹框 */ /* 上传资料弹框 */
...@@ -413,13 +414,9 @@ ...@@ -413,13 +414,9 @@
pullDownForm: [], pullDownForm: [],
formValue: "", formValue: "",
icbcIndentInfo: { icbcIndentInfo: {
"channelItemName": "",
"channelServiceNo": "", "channelServiceNo": "",
"deliveryOrderNo": "", "orderStatus": "",
"itemCode": "",
"deliveryStatus": "",
"payStatus": "",
"tmName": "",
"name": "",
"startTime": "", "startTime": "",
"entTime": "", "entTime": "",
"pageIndex": 1, "pageIndex": 1,
...@@ -466,6 +463,9 @@ ...@@ -466,6 +463,9 @@
hidePage: true, hidePage: true,
user_Name: "", user_Name: "",
channelFrom: "", channelFrom: "",
icbcChannelItemName: '',
icbcChannelServiceNo: '',
icbcOrderStatus: '',
} }
}, },
...@@ -497,6 +497,7 @@ ...@@ -497,6 +497,7 @@
}); });
if (this.$root.channelUserId != "") { if (this.$root.channelUserId != "") {
this.handleSizeChange(); this.handleSizeChange();
this.getIcbcList();
} }
this.getChannelFrom(); this.getChannelFrom();
}, },
...@@ -679,6 +680,17 @@ ...@@ -679,6 +680,17 @@
}); });
window.scrollTo(0, 0); window.scrollTo(0, 0);
}, },
getIcbcList(){
if (this.$route.query.channelUserId != "") {
this.indentInfo.pageIndex = this.currentPage;
var obj = this.$root.copyParams(this.indentInfo, "getOrderList", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
this.$root.loading = false;
this.icbcData = d.data;
})
}
},
handleSizeChange(){ handleSizeChange(){
if (this.$route.query.channelUserId != "") { if (this.$route.query.channelUserId != "") {
this.indentInfo.pageIndex = this.currentPage; this.indentInfo.pageIndex = this.currentPage;
......
...@@ -240,9 +240,7 @@ ...@@ -240,9 +240,7 @@
}); });
}, },
jumpJdProductDetails(code){ jumpJdProductDetails(code){
console.log(this.$root.channelName); console.log(this.$root.channelName);
switch (this.$root.channelName) { switch (this.$root.channelName) {
case "jd": case "jd":
if (code.channelItemCode) { if (code.channelItemCode) {
......
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