Skip to content

Z
zhichan
Commit 7c4370ea by 刘泽奇
Options

123

parent 89ae61e5
Showing with 159 additions and 53 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
......@@ -177,8 +177,11 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
mounted() {
setTimeout(() => {
if (location.hash.split('/')[1] == "jd") {
var find = location.hash.indexOf('/selftmreg');
if (find != -1) {
var selftmreg = location.hash.includes('/selftmreg');
var OAjdlist = location.hash.includes('/OAjdlist');
var jdindentlist = location.hash.includes('/jdindentlist');
console.log(find, "lllllllllllllllllllllllllllllll")
if (OAjdlist || selftmreg || jdindentlist) {
$('.jdc-footer').hide();
}
} else {
......
igirl-channel-jdweb/app/front/vues/pages/OAjdcompany/OAjdcompany.html
......@@ -229,8 +229,6 @@
</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-column prop="address" label="收件人邮箱">
</el-table-column>
</el-table>
......
igirl-channel-jdweb/app/front/vues/pages/OAjddetails/OAjddetails.html
......@@ -30,7 +30,7 @@
<div class="jdindentdetail">
<div class="jdindentdetail-nav">
<span>当前位置：</span>
<!-- <span>当前位置：</span> -->
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item>
......@@ -69,7 +69,7 @@
<div class="jdindentdetail-info">
<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>
<p>
......@@ -95,7 +95,7 @@
{{item.nclOneCodes}}
<span>{{item.tmRegistNum}}</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 class="jdindentdetail-main-type-services">
<p>商品服务项目：</p>
......@@ -116,7 +116,7 @@
<div class="jdindentdetail-main-official">
<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 class="jdindentdetail-main-official-img">
<div>
......@@ -165,7 +165,7 @@
<div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-applicant">
<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>
</div>
<ul>
......@@ -178,7 +178,7 @@
<div class="jdindentdetail-main-infohr"></div>
<div class="jdindentdetail-main-contact">
<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>
<ul>
<li><span>联系人：</span><span>{{applyInfo.contacts?applyInfo.contacts:\'-\'}}</span></li>
......
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.html
......@@ -57,7 +57,7 @@
<el-input v-model="name" placeholder="请输入内容"></el-input>
</div>
<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"
:value="item.value">
</el-option>
......@@ -82,7 +82,7 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<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>
<el-table-column prop="deliveryOrderNo" label="交付单号">
......@@ -105,7 +105,7 @@
</el-table-column>
<el-table-column prop="submitTime" label="递交时间" class-name="subtime">
</el-table-column>
<el-table-column prop="address" label="操作">
<!-- <el-table-column prop="address" label="操作">
<template slot-scope="scope">
<el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini"
......@@ -120,13 +120,14 @@
style="border:0;width:100%;color: #0F8EE9;margin:0;" size="mini"
@click="goSelftmreg(scope.$index, scope.row)">去注册</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<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">
</el-pagination>
</div>
</div>
</div>
<el-drawer title="上传材料" custom-class="jdindentdetail-drawer" size="58.3333%"
......@@ -315,13 +316,13 @@
<div class="jdindentlist-inquire">
<div class="jdindentlist-inquire-form">
<div><span>订单编号：</span>
<el-input v-model="channelServiceNo" placeholder="请输入内容"></el-input>
<el-input v-model="icbcChannelServiceNo" placeholder="请输入内容"></el-input>
</div>
<div><span>交付单号：</span>
<el-input v-model="deliveryOrderNo" placeholder="请输入内容"></el-input>
<div><span>业务单号：</span>
<el-input v-model="icbcDeliveryOrderNo" placeholder="请输入内容"></el-input>
</div>
<div><span>业务类型：</span>
<el-select v-model="itemName" placeholder="请选择">
<div><span>支付状态：</span>
<el-select v-model="icbcItemName" placeholder="请选择">
<el-option v-for="item in businessType" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
......@@ -329,33 +330,28 @@
</div>
<div><span>下单时间：</span>
<div class="block">
<span class="demonstration"></span>
<el-date-picker v-model="CreateDate" @change="dateChecked(CreateDate)" type="daterange"
align="right" start-placeholder="起始" end-placeholder="结束"
<span class="Demonstration"></span>
<el-date-picker v-model="icbcCreateDate" @change="icbcDateChecked(icbcCreateDate)"
type="daterange" align="right" start-placeholder="起始" end-placeholder="结束"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</div>
<div><span>商标名称：</span>
<el-input v-model="tmName" placeholder="请输入内容"></el-input>
</div>
<div><span>申请人：</span>
<el-input v-model="name" placeholder="请输入内容"></el-input>
<div><span>注册地区：</span>
<el-cascader v-model="regionValue" :options="region" @change="checkedCity">
</el-cascader>
</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><span>公司类型：</span>
<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"
<div><span>流程状态：</span>
<el-select v-model="icbcCheckedStatus" placeholder="请选择">
<el-option v-for="item in icbcDeliveryStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<!-- <div><span>付款状态：</span>
<el-select v-model="paymentStatus" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label"
......@@ -365,8 +361,8 @@
</div> -->
</div>
<div>
<el-button @click="find()">查询</el-button>
<el-button @click="reset()">重置</el-button>
<el-button @click="icbcFind()">查询</el-button>
<el-button @click="icbcReset()">重置</el-button>
</div>
</div>
<div class="jdindentlist-null" v-if="!tableData">
......@@ -376,7 +372,7 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<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>
<el-table-column prop="deliveryOrderNo" label="交付单号">
......@@ -417,7 +413,7 @@
</el-table-column>
</el-table>
<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">
</el-pagination>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
......@@ -92,8 +92,8 @@
}
.jdindentlist-inquire>div:nth-child(2)>button {
background: rgba(255, 255, 255, 1);
color: #333333;
background: #3071fe;
color: #fff;
border: 1px solid #dee0eb;
border-radius: 100px;
width: 58px;
......@@ -196,3 +196,8 @@
display: flex;
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 @@
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<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>
<el-table-column prop="deliveryOrderNo" label="交付单号">
......@@ -123,8 +123,9 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage">
<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">
</el-pagination>
</div>
......@@ -365,14 +366,14 @@
<el-button @click="icbcReset()">重置</el-button>
</div>
</div>
<div class="jdindentlist-null" v-if="!tableData">
<div class="jdindentlist-null" v-if="tableData.length == 0">
<div>
<img src="/imgs/listnull.png" alt="">
</div>
<p>很抱歉，没有查询到您要搜索的内容！您也可以减少筛选范围再尝试~</p>
</div>
<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>
<el-table-column prop="deliveryOrderNo" label="交付单号">
......@@ -413,8 +414,9 @@
</el-table-column>
</el-table>
<div class="jdindentlist-list-page">
<el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
:page-size="10" background layout="prev, pager, next,jumper" :total="countPage">
<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">
</el-pagination>
</div>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -428,6 +428,7 @@
label: '已完成'
},
],
hidePage:true,
}
},
......@@ -596,6 +597,8 @@
this.tableData = d.data;
/* 没有分页参数 需要重新改*/
this.countPage = d.dataCount;
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 });
......@@ -609,6 +612,7 @@
}
});
} else {
this.hidePage = true;
console.log(d, "getTmOrderList...........");
}
});
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -317,7 +317,7 @@
totalPrices: null,
dataList: [],
options: [],
titleName:''
titleName: ''
}
},
computed: {
......@@ -1277,11 +1277,12 @@
}
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();
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 = {
tm: that.form,
apply: that.apply,
......@@ -1295,6 +1296,7 @@
payStatus: "dfk"
}
};
obj.tm.tmFormType = that.form.tmFormType.toString();
this.$root.loading = true;
var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
......
igirl-channel-jdweb/package-lock.json
......@@ -1028,6 +1028,11 @@
"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
"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": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
......@@ -2324,6 +2329,14 @@
"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": {
"version": "0.15.3",
"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
......@@ -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": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
......@@ -5776,6 +5818,25 @@
"integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
"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": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
......@@ -6018,6 +6079,11 @@
"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": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
......@@ -6028,6 +6094,21 @@
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
"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": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
......@@ -6037,6 +6118,16 @@
"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": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
......@@ -6047,6 +6138,11 @@
"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": {
"version": "3.6.1",
"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