Skip to content

Z
zhichan
Commit a1a0d9c6 by 刘泽奇
Options

123

parent 7d4b3c5c
Showing with 298 additions and 77 deletions
igirl-channel-jdweb/app/front/entry/index.ejs
......@@ -54,48 +54,11 @@
<div id="app" v-loading.fullscreen.lock="loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="app-main"
style="visibility:hidden">
<div class="jc_hd"></div>
<div id="admin-warpper" v-if="0">
<div></div>
<div class="admin-menu">
<el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
<el-submenu index="1">
<template slot="title">
<i class="el-icon-location"></i>
<span>导航一</span>
</template>
<el-menu-item-group>
<template slot="title">分组一</template>
<el-menu-item index="1-1">选项1</el-menu-item>
<el-menu-item index="1-2">选项2</el-menu-item>
</el-menu-item-group>
<el-menu-item-group title="分组2">
<el-menu-item index="1-3">选项3</el-menu-item>
</el-menu-item-group>
<el-submenu index="1-4">
<template slot="title">选项4</template>
<el-menu-item index="1-4-1">选项1</el-menu-item>
</el-submenu>
</el-submenu>
<el-menu-item index="2">
<i class="el-icon-menu"></i>
<span slot="title">导航二</span>
</el-menu-item>
</el-menu>
</div>
<div class="admin-content">
<transition name="slide-fade">
<router-view>
</router-view>
</transition>
</div>
</div>
<transition name="slide-fade" v-else>
<div class="jc_hd" v-if="headerHidden"></div>
<transition name="slide-fade">
<router-view></router-view>
</transition>
<div class="jdc-footer"></div>
<div class="jdc-footer" v-if="headerHidden"></div>
</div>
......
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
......@@ -156,10 +156,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
showPhoneNum: false,
rsData: [],
channelPath: "",
channelUserId:"",
channelUserId: "",
headerHidden: true,
};
},
created() {
$(window).resize(() => {
$("#app").css("min-height", $(window).height());
});
......@@ -170,6 +172,17 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
},
mounted() {
this.$nextTick(() => {
if (location.hash.split('/')[1] == "jd") {
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
this.headerHidden = true;
} else {
this.headerHidden = false;
console.log("zzzzzzzzzzzzzzz", location.hash.split('/')[1], this.headerHidden);
}
})
var self = this;
if (!this.currentUser) {
this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true });
......@@ -184,13 +197,12 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
getChannelPath() {
var from = this.$route.path;
var path = from.split('/')[1];
console.log(path);
this.$root.channelPath = path;
return path;
},
// 处理参数方法
copyParams(actionBody, actionType, url, isUser = "no",isDecryptUser = "no") {
copyParams(actionBody, actionType, url, isUser = "no", isDecryptUser = "no") {
var data = this.commonParams;
data.actionProcess = this.$root.getChannelPath();
data.actionType = actionType;
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.css
.jdindentlist-header {
width: 100%;
height: 50px;
height: 0px;
display: flex;
justify-content: space-between;
align-items: center;
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.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>
......@@ -127,6 +127,7 @@
: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><span>注册地区：</span>
<el-cascader v-model="regionValue" :options="region" @change="checkedCity">
</el-cascader>
</div>
<div><span>申请人：</span>
<el-input v-model="name" placeholder="请输入内容"></el-input>
<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"
:value="item.value">
</el-option>
</el-select>
</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">
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -109,7 +109,9 @@
inputDate: null,
startTime: null,
entTime: null,
deliveryStatus: null,
icbcStartTime:null,
icbcEntTime:null,
checkedStatus: null,
/**$ */
CreateDate: null,
tableData: [],
......@@ -225,7 +227,209 @@
toViewImgType: false,
toViewImgSrc: null,
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: '已完成'
},
],
}
},
created: function() {
if (this.$route.query.channelUserId != "") {
......@@ -254,6 +458,24 @@
},
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) {
this.toViewImgSrc = src;
this.toViewImgType = true
......@@ -391,6 +613,7 @@
}
},
reset(){
this.channelServiceNo = null;
this.deliveryOrderNo = null;
......@@ -413,11 +636,37 @@
this.indentInfo.entTime = this.entTime || "";
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){
this.startTime = new Date(v[0]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
this.entTime = new Date(v[1]).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-');
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){
name = name.substring(name.length - 5);
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.js
......@@ -185,7 +185,7 @@
},
goSearch(){
this.$router.push({
path: "jdbycquerytm",
path: "/jd/jdbycquerytm",
query: {
checkedNcl: JSON.stringify(this.checkedType),
tminput: this.searchValue,
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/index.css
......@@ -513,7 +513,7 @@
}
.pointsRule ul li {
width: 32%;
width: 24%;
display: list-item;
text-align: center;
float: left;
......@@ -674,6 +674,7 @@
height: 4px;
width: 4px;
color: #0F8EE9;
transform: translateY(-3px);
}
.step3-submit button {
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.html
......@@ -26,8 +26,8 @@
:style="pointsRuleColor(2)">填写申请人信息</span><i :style="pointsRuleBackColor(2)"></i></a></li>
<li :style="pointsRuleBackColor(3)"><a><em class="before"></em><span
:style="pointsRuleColor(3)">确认订单</span><i :style="pointsRuleBackColor(3)"></i></a></li>
<!-- <li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">提交订单</span></a></li> -->
<li :style="pointsRuleBackColor(4)"><a><em class="before"></em><span
:style="pointsRuleColor(4)">提交订单</span></a></li>
</ul>
</div>
</div>
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -64,7 +64,7 @@
};
return {
listPath: {
path: '/1688/jdtrademark',
path: '/jd/jdtrademark',
query: {
channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo,
......@@ -318,9 +318,9 @@
var that = this;
var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
var orderParams = this.$router.history.current.query.orderParams;
if (this.$route.query.channelUserId != "") {
if (this.$route.query.channelUserId) {
this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111");
console.log(this.$route.query.channelUserId, "11111111111ddd",);
}
if (orderParams) {
this.form = orderParams.tm;
......
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