Skip to content

Z
zhichan
Commit 7c4370ea by 刘泽奇
Options

123

parent 89ae61e5
Showing with 428 additions and 63 deletions
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/entry/public/js/index.js
...@@ -159,7 +159,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -159,7 +159,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
headerHidden: null, headerHidden: null,
channelName: '', channelName: '',
selfFooterShow: true, selfFooterShow: true,
}; };
}, },
created() { created() {
...@@ -177,8 +177,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -177,8 +177,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
mounted() { mounted() {
setTimeout(() => { setTimeout(() => {
if (location.hash.split('/')[1] == "jd") { if (location.hash.split('/')[1] == "jd") {
var find = location.hash.indexOf('/selftmreg'); var selftmreg = location.hash.includes('/selftmreg');
if (find != -1) { var OAjdlist = location.hash.includes('/OAjdlist');
var jdindentlist = location.hash.includes('/jdindentlist');
console.log(find, "lllllllllllllllllllllllllllllll")
if (OAjdlist || selftmreg || jdindentlist) {
$('.jdc-footer').hide(); $('.jdc-footer').hide();
} }
} else { } else {
......
igirl-channel-jdweb/app/front/vues/pages/OAjdcompany/OAjdcompany.html
...@@ -229,8 +229,6 @@ ...@@ -229,8 +229,6 @@
</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>
<el-table-column prop="address" label="收件人邮箱"> <el-table-column prop="address" label="收件人邮箱">
</el-table-column> </el-table-column>
</el-table> </el-table>
......
igirl-channel-jdweb/app/front/vues/pages/OAjddetails/OAjddetails.html
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="jdindentdetail"> <div class="jdindentdetail">
<div class="jdindentdetail-nav"> <div class="jdindentdetail-nav">
<span>当前位置：</span> <!-- <span>当前位置：</span> -->
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心 <el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item> </el-breadcrumb-item>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<div class="jdindentdetail-info"> <div class="jdindentdetail-info">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
商标信息 <span v-show="1" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span> 商标信息 <span v-show="0" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div> <div>
<p> <p>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
{{item.nclOneCodes}} {{item.nclOneCodes}}
<span>{{item.tmRegistNum}}</span> <span>{{item.tmRegistNum}}</span>
<span>{{item.officialTypeName}}</span> <span>{{item.officialTypeName}}</span>
<span v-show="1" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span> <span v-show="0" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div class="jdindentdetail-main-type-services"> <div class="jdindentdetail-main-type-services">
<p>商品服务项目：</p> <p>商品服务项目：</p>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<div class="jdindentdetail-main-official"> <div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
交官文件 <span v-show="1" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span> 交官文件 <span v-show="0" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div class="jdindentdetail-main-official-img"> <div class="jdindentdetail-main-official-img">
<div> <div>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-applicant"> <div class="jdindentdetail-main-applicant">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="1" 申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="0"
@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<div class="jdindentdetail-main-infohr"></div> <div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-contact"> <div class="jdindentdetail-main-contact">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
订单联系人 <span v-show="1" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span> 订单联系人 <span v-show="0" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li> <li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>
......
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<el-input v-model="name" placeholder="请输入内容"></el-input> <el-input v-model="name" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>交付状态：</span> <div><span>交付状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择"> <el-select v-model="checkedStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label" <el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div> </div>
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list" v-else>
<el-table :header-cell-style="{background:\'#F5F5F5;\'}" :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="交付单号">
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime"> <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"
...@@ -120,13 +120,14 @@ ...@@ -120,13 +120,14 @@
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>
<div class="jdindentlist-list-page"> <div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage" <el-pagination :hide-on-single-page="hidePage" @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :page-size="10" background layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
...@@ -315,13 +316,13 @@ ...@@ -315,13 +316,13 @@
<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="channelServiceNo" placeholder="请输入内容"></el-input> <el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>交付单号：</span> <div><span>业务单号：</span>
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input> <el-input v-model="icbcDeliveryOrderNo" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>业务类型：</span> <div><span>支付状态：</span>
<el-select v-model="itemName" placeholder="请选择"> <el-select v-model="icbcItemName" placeholder="请选择">
<el-option v-for="item in businessType" :key="item.value" :label="item.label" <el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
...@@ -329,33 +330,28 @@ ...@@ -329,33 +330,28 @@
</div> </div>
<div><span>下单时间：</span> <div><span>下单时间：</span>
<div class="block"> <div class="block">
<span class="demonstration"></span> <span class="Demonstration"></span>
<el-date-picker v-model="CreateDate" @change="dateChecked(CreateDate)" type="daterange" <el-date-picker v-model="icbcCreateDate" @change="icbcDateChecked(icbcCreateDate)"
align="right" start-placeholder="起始" end-placeholder="结束" type="daterange" align="right" start-placeholder="起始" end-placeholder="结束"
:picker-options="pickerOptions"> :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div><span>商标名称：</span> <div><span>注册地区：</span>
<el-input v-model="tmName" placeholder="请输入内容"></el-input> <el-cascader v-model="regionValue" :options="region" @change="checkedCity">
</el-cascader>
</div> </div>
<div><span>申请人：</span> <div><span>公司类型：</span>
<el-input v-model="name" placeholder="请输入内容"></el-input> <el-input v-model="icbcName" placeholder="请输入内容"></el-input>
</div>
<div><span>交付状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> </div>
<div><span>交付状态：</span> <div><span>流程状态：</span>
<el-select v-model="deliveryStatus" placeholder="请选择"> <el-select v-model="icbcCheckedStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label" <el-option v-for="item in icbcDeliveryStatus" :key="item.value" :label="item.label"
: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="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" <el-option v-for="item in options" :key="item.value" :label="item.label"
...@@ -365,8 +361,8 @@ ...@@ -365,8 +361,8 @@
</div> --> </div> -->
</div> </div>
<div> <div>
<el-button @click="find()">查询</el-button> <el-button @click="icbcFind()">查询</el-button>
<el-button @click="reset()">重置</el-button> <el-button @click="icbcReset()">重置</el-button>
</div> </div>
</div> </div>
<div class="jdindentlist-null" v-if="!tableData"> <div class="jdindentlist-null" v-if="!tableData">
...@@ -376,7 +372,7 @@ ...@@ -376,7 +372,7 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div> </div>
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list" v-else>
<el-table :header-cell-style="{background:\'#F5F5F5;\'}" :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="交付单号">
...@@ -417,7 +413,7 @@ ...@@ -417,7 +413,7 @@
</el-table-column> </el-table-column>
</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 :hide-on-single-page="hidePage" @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :page-size="10" background layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.js
...@@ -109,7 +109,9 @@ ...@@ -109,7 +109,9 @@
inputDate: null, inputDate: null,
startTime: null, startTime: null,
entTime: null, entTime: null,
deliveryStatus: null, icbcStartTime: null,
icbcEntTime: null,
checkedStatus: null,
/**$ */ /**$ */
CreateDate: null, CreateDate: null,
tableData: [], tableData: [],
...@@ -220,17 +222,221 @@ ...@@ -220,17 +222,221 @@
showUploadStuff: false, showUploadStuff: false,
currentOrderNo: "", currentOrderNo: "",
currentOrderType: "", currentOrderType: "",
navActive:'first', navActive: 'first',
toViewImgKey:"", toViewImgKey: "",
toViewImgType: false, toViewImgType: false,
toViewImgSrc: null, toViewImgSrc: null,
applyInfo:{}, applyInfo: {},
/* 公司注册选项 */
region: [
{
label: '北京',
value: '北京',
children: [{
value: '朝阳区',
label: '朝阳区',
},
{
value: '海淀区',
label: '海淀区',
},
{
value: '顺义区',
label: '顺义区',
},
{
value: '东城区',
label: '东城区',
},
{
value: '西城区',
label: '西城区',
},
{
value: '丰台区',
label: '丰台区',
},
{
value: '石景山区',
label: '石景山区',
},
]
},
{
value: '上海',
label: '上海',
children: [{
value: '杨浦区',
label: '杨浦区',
},
{
value: '嘉定区',
label: '嘉定区',
},
{
/*也是1的公司类型*/
value: '崇明区',
label: '崇明区',
},
]
},
{
label: '杭州',
value: '杭州',
children: [{
value: '西湖区',
label: '西湖区',
},
{
value: '江干区',
label: '江干区',
},
{
value: '余杭区',
label: '余杭区',
},
{
value: '上城区',
label: '上城区',
},
{
value: '拱墅区',
label: '拱墅区',
},
{
value: '滨江区',
label: '滨江区',
},
{
value: '下城区',
label: '下城区',
},
{
value: '萧山区',
label: '萧山区',
},
]
},
{
value: '深圳',
label: '深圳',
children: [{
value: '前海自贸区',
label: '前海自贸区',
},
{
value: '南山区',
label: '南山区',
},
{
value: '福田区',
label: '福田区',
},
{
value: '罗湖区',
label: '罗湖区',
},
{
value: '龙岗区',
label: '龙岗区',
},
]
},
{
label: '成都',
value: '成都',
children: [{
value: '锦江区',
label: '锦江区',
},
{
value: '高新区',
label: '高新区',
},
]
},
{
label: '广州',
value: '广州',
children: [{
value: '天河区',
label: '天河区',
},
{
value: '越秀区',
label: '越秀区',
},
]
},
],
regionValue: [],
baseType: ["内资小规模", "内资一般人", "外资小规模", "外资一般人", "合资小规模", "合资一般人"],
pullDownType: [],
typeValue: "",
baseForm: ["有限公司（除金融投资、教育培训、食品加工等限制行业）", "有限公司", "个人独资企业（除金融投资、教育培训、食品加工等限制行业）"],
pullDownForm: [],
formValue: "",
icbcIndentInfo: {
"channelServiceNo": "",
"deliveryOrderNo": "",
"itemCode": "",
"deliveryStatus": "",
"payStatus": "",
"tmName": "",
"name": "",
"startTime": "",
"entTime": "",
"pageIndex": 1,
"pageSize": 30
},
icbcChannelServiceNo: "",
icbcDeliveryOrderNo: "",
icbcItemName: "",
icbcDemonstration: "",
icbcName: "",
icbcCheckedStatus: "",
icbcCreateDate: null,
icbcDeliveryStatus: [
{
value: 'dsccl',
label: '待上传材料'
},
{
value: 'dqrfa',
label: '待确认方案'
},
{
value: 'fabtg',
label: '方案不通过'
},
{
value: 'dsh',
label: '待审核'
},
{
value: 'ddj',
label: '待递交'
},
{
value: 'ydj',
label: '已递交'
},
{
value: 'ywc',
label: '已完成'
},
],
hidePage:true,
} }
}, },
created: function() { created: function() {
if (this.$route.query.channelUserId != "") { if (this.$route.query.channelUserId != "") {
this.$root.channelUserId = this.$route.query.channelUserId; this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111"); console.log(this.$route.query.channelUserId, "11111111111");
console.log(this.$route.fullPath.split("/")[this.$route.fullPath.split("/").length - 1]);
} }
}, },
mounted: function() { mounted: function() {
...@@ -253,6 +459,24 @@ ...@@ -253,6 +459,24 @@
}, },
methods: { methods: {
checkedCity(e){
let city = this.regionValue[0];
let area = this.regionValue[1];
if (city == "杭州" || city == "广州" || area == '东城区' || area == '西城区' || area == "丰台区" || area == '石景山区' || area == "杨浦区" || area == "嘉定区") {
this.pullDownType = this.baseType.slice(0, 4);
} else if (city == "深圳") {
this.pullDownType = this.baseType.slice(0, 2);
} else if (area == '朝阳区' || area == '顺义区' || area == '海淀区' || city == "成都") {
this.pullDownType = this.baseType;
}
if (city == "北京") {
this.pullDownForm = this.baseForm.slice(1, 2);
} else if (city == "杭州" || city == "广州" || city == "成都" || city == "深圳" || area == "杨浦区" || area == "嘉定区") {
this.pullDownForm = this.baseForm.slice(0, 1);
} else if (area == "崇明区") {
this.pullDownForm = this.baseForm.slice(1);
}
},
toViewImg(src) { toViewImg(src) {
this.toViewImgSrc = src; this.toViewImgSrc = src;
this.toViewImgType = true this.toViewImgType = true
...@@ -272,8 +496,8 @@ ...@@ -272,8 +496,8 @@
this.floatBoxDemo = false; this.floatBoxDemo = false;
this.toViewImgKey = null this.toViewImgKey = null
}, },
navClick(tab,e){ navClick(tab, e){
console.log(tab,e,this.navActive); console.log(tab, e, this.navActive);
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) { if (rowIndex === 1) {
...@@ -350,11 +574,13 @@ ...@@ -350,11 +574,13 @@
}, },
goSelftmreg(index, row){ goSelftmreg(index, row){
this.$router.push({ this.$router.push({
path:`/${this.$root.channelName}/selftmreg`, path: `/${this.$root.channelName}/selftmreg`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelOrderNo: row.channelServiceNo, channelOrderNo: row.channelServiceNo,
dqPath: '/jdindentlist',
dqName: '订单列表'
} }
}); });
window.scrollTo(0, 0); window.scrollTo(0, 0);
...@@ -370,7 +596,9 @@ ...@@ -370,7 +596,9 @@
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.tableData = d.data; this.tableData = d.data;
/* 没有分页参数 需要重新改*/ /* 没有分页参数 需要重新改*/
this.countPage = 30 || d.data.length; this.countPage = d.dataCount;
this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
d.data.map((item, index) => { d.data.map((item, index) => {
if (item.submitTime) { if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
...@@ -384,12 +612,14 @@ ...@@ -384,12 +612,14 @@
} }
}); });
} else { } else {
this.hidePage = true;
console.log(d, "getTmOrderList..........."); console.log(d, "getTmOrderList...........");
} }
}); });
} }
}, },
reset(){ reset(){
this.channelServiceNo = null; this.channelServiceNo = null;
this.deliveryOrderNo = null; this.deliveryOrderNo = null;
...@@ -412,11 +642,37 @@ ...@@ -412,11 +642,37 @@
this.indentInfo.entTime = this.entTime || ""; this.indentInfo.entTime = this.entTime || "";
this.handleSizeChange(); this.handleSizeChange();
}, },
icbcReset(){
this.icbcChannelServiceNo = null;
this.icbcDeliveryOrderNo = null;
this.icbcItemName = null;
this.icbcCreateDate = null;
this.regionValue = null;
this.icbcName = null;
console.log(this.CreateDate);
this.icbcCheckedStatus = null;
},
icbcFind(){
this.icbcIndentInfo.channelServiceNo = this.channelServiceNo;
this.icbcIndentInfo.deliveryOrderNo = this.deliveryOrderNo;
this.icbcIndentInfo.name = this.name;
this.icbcIndentInfo.itemName = this.itemName;
this.icbcIndentInfo.tmName = this.tmName;
this.icbcIndentInfo.CreateDate = this.CreateDate;
this.icbcIndentInfo.deliveryStatus = this.deliveryStatus;
this.icbcIndentInfo.startTime = this.startTime || "";
this.icbcIndentInfo.entTime = this.entTime || "";
this.handleSizeChange();
},
dateChecked(v){ dateChecked(v){
this.startTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-'); this.startTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
this.entTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-'); this.entTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
console.log(this.startTime, this.entTime); console.log(this.startTime, this.entTime);
}, },
icbcDateChecked(v){
this.icbcStartTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
this.icbcEntTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
},
/**上传资料弹窗 */ /**上传资料弹窗 */
setKey(name, flag){ setKey(name, flag){
name = name.substring(name.length - 5); name = name.substring(name.length - 5);
...@@ -551,9 +807,12 @@ ...@@ -551,9 +807,12 @@
this.stuff.deliveryOrderNo = this.currentOrderNo; this.stuff.deliveryOrderNo = this.currentOrderNo;
this.stuff.name = this.currentName; this.stuff.name = this.currentName;
var obj = this.$root.copyParams(this.stuff, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.stuff, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
this.$root.loading = true;
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
this.$root.loading = false;
console.log(res); console.log(res);
if (res.status == 0) { if (res.status == 0) {
this.handleSizeChange();
this.showUploadStuff = false; this.showUploadStuff = false;
this.$message({ message: "上传成功", type: 'success' }); this.$message({ message: "上传成功", type: 'success' });
} }
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
} }
.jdindentlist-inquire>div:nth-child(2)>button { .jdindentlist-inquire>div:nth-child(2)>button {
background: rgba(255, 255, 255, 1); background: #3071fe;
color: #333333; color: #fff;
border: 1px solid #dee0eb; border: 1px solid #dee0eb;
border-radius: 100px; border-radius: 100px;
width: 58px; width: 58px;
...@@ -196,3 +196,8 @@ ...@@ -196,3 +196,8 @@
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
.jdindentlist-warpper .jdindentlist-list-header{
background: #f6f9ff;
}
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div> </div>
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list" v-else>
<el-table :header-cell-style="{background:\'#F5F5F5;\'}" :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="交付单号">
...@@ -123,11 +123,12 @@ ...@@ -123,11 +123,12 @@
</el-table-column> </el-table-column>
</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 :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :current-page.sync="currentPage" :page-size="10" background
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%" <el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
...@@ -365,14 +366,14 @@ ...@@ -365,14 +366,14 @@
<el-button @click="icbcReset()">重置</el-button> <el-button @click="icbcReset()">重置</el-button>
</div> </div>
</div> </div>
<div class="jdindentlist-null" v-if="!tableData"> <div class="jdindentlist-null" v-if="tableData.length == 0">
<div> <div>
<img src="/imgs/listnull.png" alt=""> <img src="/imgs/listnull.png" alt="">
</div> </div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p> <p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div> </div>
<div class="jdindentlist-list" v-else> <div class="jdindentlist-list" v-else>
<el-table :header-cell-style="{background:\'#F5F5F5;\'}" :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="交付单号">
...@@ -413,8 +414,9 @@ ...@@ -413,8 +414,9 @@
</el-table-column> </el-table-column>
</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 :hide-on-single-page="hidePage" @current-change="handleSizeChange()"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage"> :current-page.sync="currentPage" :page-size="10" background
layout="prev, pager, next,jumper" :total="countPage">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -428,6 +428,7 @@ ...@@ -428,6 +428,7 @@
label: '已完成' label: '已完成'
}, },
], ],
hidePage:true,
} }
}, },
...@@ -596,6 +597,8 @@ ...@@ -596,6 +597,8 @@
this.tableData = d.data; this.tableData = d.data;
/* 没有分页参数 需要重新改*/ /* 没有分页参数 需要重新改*/
this.countPage = d.dataCount; this.countPage = d.dataCount;
this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
d.data.map((item, index) => { d.data.map((item, index) => {
if (item.submitTime) { if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
...@@ -609,6 +612,7 @@ ...@@ -609,6 +612,7 @@
} }
}); });
} else { } else {
this.hidePage = true;
console.log(d, "getTmOrderList..........."); console.log(d, "getTmOrderList...........");
} }
}); });
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
totalPrices: null, totalPrices: null,
dataList: [], dataList: [],
options: [], options: [],
titleName:'' titleName: ''
} }
}, },
computed: { computed: {
...@@ -1277,11 +1277,12 @@ ...@@ -1277,11 +1277,12 @@
} }
if (formName == "order") { if (formName == "order") {
this.form.tmName = this.form.tmFormType == 5 ? this.form.tmName + '及图' : this.form.tmName; this.form.tmName = this.form.tmFormType == "5" ? this.form.tmName + '及图' : this.form.tmName;
this.savehistory(); this.savehistory();
console.log(this.$root.channelName, "///////////////"); console.log(this.$root.channelName, "///////////////");
if (this.$root.channelName == "jd" ||this.$root.channelName == "gsb") { if (this.$root.channelName == "jd" || this.$root.channelName == "gsb") {
/**提报接口 */ /**提报接口 */
var obj = { var obj = {
tm: that.form, tm: that.form,
apply: that.apply, apply: that.apply,
...@@ -1295,6 +1296,7 @@ ...@@ -1295,6 +1296,7 @@
payStatus: "dfk" payStatus: "dfk"
} }
}; };
obj.tm.tmFormType = that.form.tmFormType.toString();
this.$root.loading = true; this.$root.loading = true;
var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes"); var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) { that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
......
igirl-channel-jdweb/package-lock.json
...@@ -1028,6 +1028,11 @@ ...@@ -1028,6 +1028,11 @@
"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
"dev": true "dev": true
}, },
"buffer-equal-constant-time": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
"integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
},
"buffer-fill": { "buffer-fill": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
...@@ -2324,6 +2329,14 @@ ...@@ -2324,6 +2329,14 @@
"safer-buffer": "^2.1.0" "safer-buffer": "^2.1.0"
} }
}, },
"ecdsa-sig-formatter": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
"requires": {
"safe-buffer": "^5.0.1"
}
},
"editorconfig": { "editorconfig": {
"version": "0.15.3", "version": "0.15.3",
"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
...@@ -5754,6 +5767,35 @@ ...@@ -5754,6 +5767,35 @@
} }
} }
}, },
"jsonwebtoken": {
"version": "8.5.1",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
"integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
"requires": {
"jws": "^3.2.2",
"lodash.includes": "^4.3.0",
"lodash.isboolean": "^3.0.3",
"lodash.isinteger": "^4.0.4",
"lodash.isnumber": "^3.0.3",
"lodash.isplainobject": "^4.0.6",
"lodash.isstring": "^4.0.1",
"lodash.once": "^4.0.0",
"ms": "^2.1.1",
"semver": "^5.6.0"
},
"dependencies": {
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
}
}
},
"jsprim": { "jsprim": {
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
...@@ -5776,6 +5818,25 @@ ...@@ -5776,6 +5818,25 @@
"integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==", "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
"dev": true "dev": true
}, },
"jwa": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
"integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
"requires": {
"buffer-equal-constant-time": "1.0.1",
"ecdsa-sig-formatter": "1.0.11",
"safe-buffer": "^5.0.1"
}
},
"jws": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
"integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
"requires": {
"jwa": "^1.4.1",
"safe-buffer": "^5.0.1"
}
},
"keyv": { "keyv": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
...@@ -6018,6 +6079,11 @@ ...@@ -6018,6 +6079,11 @@
"lodash._root": "^3.0.0" "lodash._root": "^3.0.0"
} }
}, },
"lodash.includes": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
"integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
},
"lodash.isarguments": { "lodash.isarguments": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
...@@ -6028,6 +6094,21 @@ ...@@ -6028,6 +6094,21 @@
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
}, },
"lodash.isboolean": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
"integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
},
"lodash.isinteger": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
"integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
},
"lodash.isnumber": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
"integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
},
"lodash.isobject": { "lodash.isobject": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
...@@ -6037,6 +6118,16 @@ ...@@ -6037,6 +6118,16 @@
"lodash._objecttypes": "~2.4.1" "lodash._objecttypes": "~2.4.1"
} }
}, },
"lodash.isplainobject": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
},
"lodash.isstring": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
"integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
},
"lodash.keys": { "lodash.keys": {
"version": "3.1.2", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
...@@ -6047,6 +6138,11 @@ ...@@ -6047,6 +6138,11 @@
"lodash.isarray": "^3.0.0" "lodash.isarray": "^3.0.0"
} }
}, },
"lodash.once": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
"integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
},
"lodash.restparam": { "lodash.restparam": {
"version": "3.6.1", "version": "3.6.1",
"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
......
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