Skip to content

Z
zhichan
Commit 386e7525 by 刘泽奇
Options

123

parent 96ca0a3d
Showing with 190 additions and 46 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/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png

937 Bytes | W: | H:

igirl-channel-web/app/front/entry/public/imgs/zwtp.png

2.54 KB | W: | H:

igirl-channel-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
igirl-channel-web/app/front/entry/public/imgs/zwtp.png
  • 2-up
  • Swipe
  • Onion skin
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -378,7 +378,7 @@
<div v-else
style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;text-align: center;">
<img src="/imgs/kong-2.png" style="margin-top: 124px;" alt="">
<div style="color: #828282;margin-top: 10px;">请点击左侧选择商标类别</div>
<div style="color: #828282;margin-top: 330px;text-align: center;">请点击左侧选择商标类别</div>
</div>
</el-main>
......@@ -832,4 +832,12 @@
</span>
</el-dialog>
</div>
<!-- -->
<transition name="message">
<div class="selftmreg-message" v-if="message.show">
<i class="el-icon-warning"></i>
{{message.info}}
</div>
</transition>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
......@@ -312,6 +312,10 @@
editNcl: {},
editDeliveryInfo: {},
editApply: {},
message: {
info: "",
show: false,
},
}
},
mounted: function() {
......@@ -371,6 +375,42 @@
computed: {
},
watch: {
nclOne: {
handler(newVal, oldVal){
if (newVal.length > 0) {
if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
var tiemr = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr);
};
if (newVal[0].nclThree.length > 10) {
this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
newVal[0].nclThree.pop();
console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show;
this.message.info = "最多只能选择10项";
var tiemr2 = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr2);
}
}
},
deep: true
}
},
methods: {
/*初始化订单数据 */
......@@ -421,7 +461,7 @@
item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
console.log(item, item.nclSmallCodes, "////////////////////////////////");
item.code = item.nclOneCodes;
item.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi,"")-1].name;
item.name = this.ncldata[item.nclOneCodes.replace(/\b(0+)/gi, "") - 1].name;
item.nclThree = item.nclSmallCodes;
this.nclOne.push(item);
});
......@@ -888,7 +928,7 @@
}
},
nodeClick(obj, e, a){
console.log(obj,e,a);
console.log(obj, e, a);
if (e.level == 1) {
this.ppnclArr = obj;
}
......
igirl-channel-web/app/front/vues/pages/selftmreg/index.css
......@@ -29,8 +29,8 @@
height: 34px !important;
line-height: 34px !important;
}
#selftmreg
#selftmreg .el-step__head.is-success {
#selftmreg #selftmreg .el-step__head.is-success {
color: #409EFF;
border-color: #409EFF;
}
......@@ -475,6 +475,10 @@
left: 100%;
}
.categoryFrom .el-form-item__error {
left: 45% !important;
}
#selftmreg h4 {
font-size: 16px;
font-family: PingFangSC;
......@@ -676,4 +680,34 @@
height: 40px;
border-radius: 0;
background: #0989C5;
}
.selftmreg-message {
position: fixed;
transform: translateX(-50%);
left: 50%;
top: 20px;
box-sizing: border-box;
min-width: 380px;
border-radius: 5px;
border: 1px solid #faecd8;
background-color: #fdf6ec;
color: #e6A23c;
padding: 15px 15px 15px 20px;
z-index: 8888;
}
.message-enter-active,
.message-leave-active {
transition: opacity .5s;
}
.message-enter,
.message-leave-to
/* .fade-leave-active below version 2.1.8 */
{
opacity: 0;
}
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
......@@ -33,7 +33,6 @@
<el-radio :label="4">图形</el-radio>
<el-radio :label="5">文字及图形</el-radio>
</el-radio-group>
<div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？</div>
</el-form-item>
<div style="clear:both;"></div>
......@@ -158,11 +157,8 @@
<el-button type="text" style="padding: 0 10px;color:#828282;" @click="checkConfirm">确定</el-button>
</div>
<div style="clear:both">
</div>
</div>
<el-checkbox-group v-model="checkedNcl" @change="handleCheckedNclChange">
<ul style="list-style:none; padding:0;margin:0;text-align:left;">
<li v-for="n in ncl" :key="n" style="float:left;width:33.33%">
......@@ -216,11 +212,12 @@
</div>
</div>
<div v-else style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;position: relative;">
<img src="/imgs/kong-2.png" style="position: absolute;margin: auto;top: 0;left: 0;bottom: 0;right: 0;" alt="">
<div style="color: #828282;margin-top: 10px;">请点击左侧选择商标类别</div>
<div v-else
style="overflow: auto;height: 100%;padding: 60px 20px 0px;box-sizing: border-box;position: relative;">
<img src="/imgs/kong-2.png"
style="position: absolute;margin: auto;top: 0;left: 0;bottom: 0;right: 0;" alt="">
<div style="color: #828282;margin-top: 330px;text-align: center;">请点击左侧选择商标类别</div>
</div>
</el-main>
</el-container>
</el-container>
......@@ -293,29 +290,29 @@
<div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false"
@change="applierChange" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
<gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false" @change="applierChange"
size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
<gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true" showhistory="false"
@change="applierChange" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
@change="applierChange" size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
</el-form-item>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
style="width:493px;float:left;padding-right:50px;" prop="name">
<!-- <el-input placeHolder="请输入身份证姓名" v-model="apply.name"></el-input> -->
<gsb-selectpersonCJT v-if="currentUser" @input="selectpersoninput" allowcreate="true" showhistory="false"
size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
</gsb-selectpersonCJT>
<gsb-selectperson v-if="!currentUser" frombrowser="true" @input="selectpersoninput" allowcreate="true"
showhistory="false" size="medium" v-model="apply.name"
refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true" refModel="tool"
labelField="entName" valueField="entName" style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
showhistory="false" size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入身份证姓名">
</gsb-selectperson>
</el-form-item>
<div style="clear:both;"></div>
......@@ -517,7 +514,7 @@
<img :src="toViewImgSrc" style="max-width:100%;display: block;margin: 0 auto;" alt="">
</el-dialog>
</div>
</div>
<div style="text-align:center;padding-bottom:50px;" class="step2-footer">
<el-button @click="tobefore">上一步</el-button>
......@@ -590,10 +587,12 @@
<div style="display:inline-block;padding-left:10px;">{{apply.zipCode}}</div>
</div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
<div v-if="apply.customerType==\'ent\'" style="width:120px;display:inline-block;text-align: right;color:#636569;">公司地址:</div>
<div v-if="apply.customerType==\'person\'" style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人地址:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.applyAddr}}</div>
<div v-if="apply.customerType==\'ent\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">公司地址:</div>
<div v-if="apply.customerType==\'person\'"
style="width:120px;display:inline-block;text-align: right;color:#636569;">申请人地址:</div>
<div style="display:inline-block;padding-left:10px;">{{apply.applyAddr}}</div>
</div>
<div style="clear:both"></div>
<div style="min-width: 35%;margin-bottom: 23px;display:inline-block;">
......@@ -623,23 +622,28 @@
<h4><i class="selftmreg_shuxian"></i>材料信息</h4>
<div style="font-size:14px;font-family:PingFangSC-Regular; font-weight:400;">
<div style="width: 100%;margin-bottom: 23px;padding-left: 40px;box-sizing: border-box;">
<div v-if="apply.businessLicensePic" style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<div v-if="apply.businessLicensePic"
style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.businessLicensePic)" v-if="apply.businessLicensePic"
src="/imgs/sbzc/yyzzD.png" style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>营业执照</div>
<div>营业执照</div>
</div>
<div v-if="apply.identityCardPic" style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<div v-if="apply.identityCardPic"
style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.identityCardPic)" v-if="apply.identityCardPic" src="/imgs/sbzc/wtsD.png"
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>身份证明</div>
<div>身份证明</div>
</div>
<div v-if="apply.sealAuthorizeStuff" style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<div v-if="apply.sealAuthorizeStuff"
style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.sealAuthorizeStuff)" :src="apply.sealAuthorizeStuff"
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>代理委托书</div>
<div>代理委托书</div>
</div>
<div v-if="apply.descUrl" style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.descUrl)" :src="apply.descUrl" style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div v-if="apply.descUrl"
style="display:inline-block;padding-left:10px;cursor: pointer;text-align: center;color: rgb(99, 101, 105);">
<img @click="window.open(apply.descUrl)" :src="apply.descUrl"
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>优先权证明</div>
</div>
</div>
......@@ -654,7 +658,7 @@
</div>
<div style="clear:both"></div>
</div>
</div>
<br />
<div class="step3-submit">
......@@ -768,4 +772,11 @@
</div>
</div>
<transition name="message">
<div class="selftmreg-message" v-if="message.show">
<i class="el-icon-warning"></i>
{{message.info}}
</div>
</transition>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -287,6 +287,11 @@
channelOrder: null,
channelParams: null,
channelUser: null,
nclTime: null,
message: {
info: "",
show: false,
},
}
},
computed: Vuex.mapState({
......@@ -331,6 +336,42 @@
}
},
watch: {
nclOne: {
handler(newVal, oldVal){
if (newVal.length > 0) {
if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别";
var tiemr = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr);
};
if (newVal[0].nclThree.length > 10) {
this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
newVal[0].nclThree.pop();
console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show;
this.message.info = "最多只能选择10项";
var tiemr2 = setTimeout(() => {
this.message.show = false;
}, 2000);
clearTimeout(tiemr2);
}
}
},
deep: true
}
},
mounted: function() {
this.$root.getChannelPath();
var that = this;
......@@ -748,11 +789,12 @@
return false;
}
var publicExpense = this.serviceitem.publicExpense || 0;
console.log(this.serviceitem.publicExpense,'????????????????????');
console.log(this.serviceitem.publicExpense, '????????????????????', nclThree);
publicExpense = Number(publicExpense);
var nclSmallPrice = publicExpense / 10;
nclSmallPrice = Number(nclSmallPrice.toFixed(2));
this.$refs.tree.setChecked(nclThree, false);
this.nclOne[index].nclThree.splice(index2, 1);
if (this.nclOne[index].nclThree.length > 10) {
this.nclOne[index].price = Number(publicExpense + (this.nclOne[index].nclThree.length - 10) * nclSmallPrice);
......@@ -820,7 +862,7 @@
})
},
handleCheckChange(obj, a, b) {
console.log(obj, a, b, '1233333333333333333333344444444444444444444');
console.log(obj, a, b, this.nclOne, '1233333333333333333333344444444444444444444');
let dataRecieve = this.$refs.tree.getCheckedNodes();
if (obj.type) {
return
......@@ -838,7 +880,7 @@
}
var nclThree = [eData];
var publicExpense = this.publicExpense || 0;
console.log(this.publicExpense,'/////////////////////');
console.log(this.publicExpense, '/////////////////////');
publicExpense = Number(publicExpense);
var nclSmallPrice = publicExpense / 10;
nclSmallPrice = Number(nclSmallPrice.toFixed(2));
......@@ -884,6 +926,8 @@
}
})
}
},
nodeClick(obj, e, a){
if (e.level == 1) {
......@@ -894,6 +938,7 @@
this.$message.warning("已生成订单，不可修改");
return false;
}
/*节点层级 */
if (e.level < 3 && e.childNodes.length == 0) {
this.nclSearchLoading = true;
var getNcl = {
......@@ -910,6 +955,7 @@
that.nclSearchLoading = false;
}
}
/*节点层级 */
if (e.level == 2) {
that.nclSearchLoading = false;
that.nclOne.forEach((item, index) => {
......@@ -923,7 +969,7 @@
});
}
/*节点层级 */
if (e.level == 3) {
this.$refs.tree.setChecked(e.data, true);
return;
......@@ -957,6 +1003,8 @@
this.nclOne.push(data);
}
}
},
nclThreeIsExist(name, nclThree){
if (nclThree.length < 1) {
......@@ -1062,9 +1110,9 @@
if (formName == "form" || formName == "apply") {
if (formName == "apply") {
console.log(this.apply);
if (this.apply.customerType != 'person' && this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '' ) {
if (this.apply.customerType != 'person' && this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
return that.$message.warning(`请按要求上传资料`);
}else if ( this.apply.customerType == 'person' && this.apply.identityCardPic == '' || this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
} else if (this.apply.customerType == 'person' && this.apply.identityCardPic == '' || this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
return that.$message.warning(`请按要求上传资料`);
}
};
......
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