Skip to content

Z
zhichan
Commit 0d48eece by 刘泽奇
Options

123

parent f9e56a9b
Showing with 60 additions and 23 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/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
} }
.jdindentdetail-flow { .jdindentdetail-flow {
padding: 10px; padding: 10px;
margin-top: 12px; margin-top: 20px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #E3E3E3; border: 1px solid #E3E3E3;
} }
...@@ -141,14 +141,34 @@ ...@@ -141,14 +141,34 @@
/* 导航条2 */ /* 导航条2 */
.jdindentdetail-main-step-row { .jdindentdetail-main-step-row {
margin-bottom: 42px; margin-bottom: 22px;
} }
.jdindentdetail-main-step-row>div { .jdindentdetail-main-step-row>div {
min-height: 72px; min-height: 72px;
max-height: 120px;
margin-top: 26px; margin-top: 26px;
box-sizing: border-box;
padding-left: 25px;
overflow: scroll;
}
.jdindentdetail-main-step-row>div::-webkit-scrollbar {
width: 8px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 8px;
}
.jdindentdetail-main-step-row>div::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
border-radius: 5px;
background: #CDD2E5;
} }
.jdindentdetail-main-step-row>div::-webkit-scrollbar-track {
/*滚动条里面轨道*/
border-radius: 0;
background: none;
}
.jdindentdetail-main-step-row .el-step__icon.is-text { .jdindentdetail-main-step-row .el-step__icon.is-text {
width: 20px; width: 20px;
...@@ -204,7 +224,7 @@ ...@@ -204,7 +224,7 @@
} }
.jdindentdetail-main-hr { .jdindentdetail-main-hr {
height: 1px; height: 0px;
background: #E1E1E1; background: #E1E1E1;
width: 100%; width: 100%;
position: relative; position: relative;
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
<div class="jdindentdetail-main-step-col"> <div class="jdindentdetail-main-step-col">
<el-steps :active="currentStep" align-center process-status="process"> <el-steps :active="currentStep" align-center process-status="process">
<el-step v-if="itemName" title="待上传材料" description=""></el-step> <el-step v-show="itemName" title="待上传材料" description=""></el-step>
<el-step v-if="!itemName" title="待确认方案"></el-step> <el-step v-if="!itemName" title="待确认方案"></el-step>
<!-- <el-step v-if="itemName" title="方案不通过"></el-step> --> <!-- <el-step v-show="itemName" title="方案不通过"></el-step> -->
<el-step title="待审核"></el-step> <el-step title="待审核"></el-step>
<el-step title="待递交"></el-step> <el-step title="待递交"></el-step>
<el-step title="已递交"></el-step> <el-step title="已递交"></el-step>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<div class="jdindentdetail-info"> <div class="jdindentdetail-info">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
商标信息 <span v-if="itemName" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span> 商标信息 <span v-show="itemName" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<div> <div>
<p> <p>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
{{item.nclOneCodes}} {{item.nclOneCodes}}
<span>{{item.tmRegistNum}}</span> <span>{{item.tmRegistNum}}</span>
<span>{{item.officialTypeName}}</span> <span>{{item.officialTypeName}}</span>
<span v-if="itemName" @click="showDialog(2,index)"><i class="el-icon-edit"></i> 修改</span> <span v-show="itemName" @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>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div class="jdindentdetail-main-official"> <div class="jdindentdetail-main-official">
<div class="jdindentdetail-main-title"> <div class="jdindentdetail-main-title">
交官文件 <span v-if="itemName" @click="showDialog(3)"><i class="el-icon-edit"></i> 修改</span> 交官文件 <span v-show="itemName" @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>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,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-if="itemName" 申请人信息-（中国大陆-{{applyInfo.customerType == \"person\"?\"个体户\":\"企业"}}） <span v-show="itemName"
@click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span> @click="showDialog(4)"><i class="el-icon-edit"></i> 修改</span>
</div> </div>
<ul> <ul>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,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-if="itemName" @click="showDialog(5)"><i class="el-icon-edit"></i> 修改</span> 订单联系人 <span v-show="itemName" @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-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -390,16 +390,17 @@ ...@@ -390,16 +390,17 @@
handler(newVal, oldVal){ handler(newVal, oldVal){
if (newVal.length > 0) { if (newVal.length > 0) {
if (newVal.length > 1) { if (newVal.length > 1) {
this.$refs.tree.setChecked(newVal[1], false); if(this.$refs.tree){
this.$refs.tree.setChecked(newVal[1].nclThree[0], false); this.$refs.tree.setChecked(newVal[1], false);
newVal.pop(); this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop();
this.message.show = !this.message.show; this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别"; this.message.info = "只能选择同一个类别";
var timer = setTimeout(() => { var timer = setTimeout(() => {
this.message.show = false; this.message.show = false;
clearTimeout(timer); clearTimeout(timer);
}, 2000); }, 2000);
}
}; };
if (newVal[0].nclThree.length > 10) { if (newVal[0].nclThree.length > 10) {
this.$refs.tree.setChecked(newVal[0].nclThree[10], false); this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
<div id="selftmreg" style="background-color:white;"> <div id="selftmreg" style="background-color:white;">
<div class="jdindentdetail-nav" style="width:1200px;margin:0 auto;">
<span>当前位置：</span>
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item>
<el-breadcrumb-item>自主注册</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div style="background-color:white;width:1200px;margin:0 auto;padding:20px 0;padding-bottom: 90px; "> <div style="background-color:white;width:1200px;margin:0 auto;padding:20px 0;padding-bottom: 90px; ">
<div style="text-align:left;border:1px solid rgba(220,223,230,1);position: relative;padding-bottom: 50px;"> <div style="text-align:left;border:1px solid rgba(220,223,230,1);position: relative;padding-bottom: 50px;">
<div class="selftmreg_main"> <div class="selftmreg_main">
...@@ -780,7 +788,8 @@ ...@@ -780,7 +788,8 @@
</div> </div>
</transition> </transition>
<el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;"> <el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;">
<span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span> <span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span
style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="closeConfrim()">取 消</el-button> <el-button @click="closeConfrim()">取 消</el-button>
<el-button type="primary" @click="submitForm(\'form\',true)">确 定</el-button> <el-button type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -63,6 +63,13 @@ ...@@ -63,6 +63,13 @@
} }
}; };
return { return {
listPath: {
path: '/1688/jdindentlist',
query: {
channelUserId: this.$root.channelUserId,
deliveryOrderNo: this.deliveryOrderNo,
}
},
announcementsImgType: false, announcementsImgType: false,
announcementsType: false, announcementsType: false,
nclSearchLoading: false, nclSearchLoading: false,
...@@ -1214,13 +1221,13 @@ ...@@ -1214,13 +1221,13 @@
} }
}); });
that.$message.warning("订单提交成功"); that.$message.warning("订单提交成功");
} else { } else {
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
}).catch(function (e) { }).catch(function (e) {
that.$message.warning("操作失败",e); that.$message.warning("操作失败", e);
console.log(e); console.log(e);
}); });
}) })
......
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