Skip to content

Z
zhichan
Commit cfb3d32e by 刘泽奇
Options

213

parent a62a4304
Showing with 56 additions and 43 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
......@@ -146,10 +146,9 @@
.jdindentdetail-main-step-row>div {
min-height: 72px;
max-height: 120px;
margin-top: 26px;
box-sizing: border-box;
padding-left: 25px;
overflow: scroll;
overflow-y: scroll;
}
.jdindentdetail-main-step-row>div::-webkit-scrollbar {
width: 8px;
......@@ -215,6 +214,7 @@
.jdindentdetail-main-step-row .el-step.is-vertical .el-step__title {
padding-top: 8px;
font-size: 14px;
}
.jdindentdetail-main-step-row .el-step.is-vertical .el-step__line {
......@@ -223,11 +223,11 @@
}
.jdindentdetail-main-hr {
height: 0px;
background: #E1E1E1;
border-top: 1px solid #e1e1e1;
margin-top: 20px;
margin-bottom: 25px;
width: 100%;
position: relative;
left: 153px;
}
.jdindentdetail-main-infohr {
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
......@@ -33,6 +33,9 @@
<el-step title="已完成"></el-step>
</el-steps>
</div>
<div class="jdindentdetail-main-hr">
</div>
<div class="jdindentdetail-main-step-row">
<div>
<el-steps direction="vertical" :active="currentStep">
......@@ -42,9 +45,7 @@
</div>
</div>
</div>
<div class="jdindentdetail-main-hr">
</div>
<div class="jdindentdetail-info">
<div class="jdindentdetail-main-title">
商标信息 <span v-show="itemCode" @click="showDialog(1)"><i class="el-icon-edit"></i> 修改</span>
......@@ -830,8 +831,8 @@
<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">
<el-button @click="closeConfrim()">取 消</el-button>
<el-button type="primary" @click="submitEdit(\'商标类别\',true)">确 定</el-button>
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" @click="submitEdit(\'商标类别\',true)">确 定</el-button>
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css
......@@ -133,12 +133,14 @@
width: 100%;
text-align: center;
}
.jdindentlist-list .el-table .el-table_1_column_11{
.jdindentlist-list .subtime{
padding-right: 25px;
}
.jdindentlist-list .el-table .el-table_1_column_9{
.jdindentlist-list .dsqcl{
color: red;
}
.jdindentlist-null{
width: 34.57%;
height: 333px;
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
......@@ -26,7 +26,7 @@
<div><span>下单时间：</span>
<div class="block">
<span class="demonstration"></span>
<el-date-picker v-model="inputDate" @change="dateChecked(inputDate)" type="daterange"
<el-date-picker v-model="CreateDate" @change="dateChecked(CreateDate)" type="daterange"
align="right" start-placeholder="起始" end-placeholder="结束" :picker-options="pickerOptions">
</el-date-picker>
</div>
......@@ -80,24 +80,27 @@
</el-table-column>
<el-table-column prop="totalSum" label="订单金额">
</el-table-column>
<el-table-column prop="deliveryStatusName" label="交付状态">
<el-table-column prop="deliveryStatusName" label="交付状态"
class-name="dsqcl">
</el-table-column>
<el-table-column prop="CreateDate" label="下单时间">
</el-table-column>
<el-table-column prop="submitTime" label="递交时间">
<el-table-column prop="submitTime" label="递交时间" class-name="subtime">
</el-table-column>
<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" @click="viewDetails(scope.$index, scope.row)">
详情
</el-button>
<el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;width:100%;margin:0;"
size="mini" @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;width:100%;margin:0;"
size="mini" @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
<el-button v-show="showReg(scope.$index, scope.row)" style="border:0;width:100%;color: #0F8EE9;margin:0;"
size="mini" @click="goSelftmreg(scope.$index, scope.row)">去注册</el-button>
<el-button v-show="showDetails(scope.$index, scope.row)"
style="border:0;width:100%;color: #0F8EE9;" size="mini"
@click="viewDetails(scope.$index, scope.row)">详情</el-button>
<el-button v-show="showSelf(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
<el-button v-show="showSup(scope.$index, scope.row)"
style="border:0;color: #0F8EE9;width:100%;margin:0;" size="mini"
@click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
<el-button v-show="showReg(scope.$index, scope.row)"
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>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
......@@ -361,6 +361,7 @@
this.itemName = null;
this.tmName = null;
this.CreateDate = null;
console.log(this.CreateDate);
this.deliveryStatusName = null;
},
find(){
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
......@@ -44,7 +44,7 @@
<div class="categoryFrom-jieshao" @click="announcementsType = true">如何选择商标类型？</div>
</el-form-item>
<div style="clear:both;"></div>
<el-form-item label="商标名称" style="width:860px;float:left" prop="name" v-if="form.tmFormType != 4">
<el-form-item label="商标名称" style="width:860px;float:left" prop="tmName" v-if="form.tmFormType != 4">
<el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称"></el-input><span
v-if="form.tmFormType == 5"
style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span>
......@@ -460,8 +460,8 @@
</div>
<div class="upload-box" v-loading="loading2" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')">
<img @click="window.open(apply.sealAuthorizeStuff)" class="upload-applyimg"
v-if="apply.sealAuthorizeStuff" :src="apply.sealAuthorizeStuff" />
<img @click="window.open(apply.gzwtsUrl)" class="upload-applyimg"
v-if="apply.gzwtsUrl" :src="apply.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 2">
......@@ -469,8 +469,8 @@
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog" v-show="apply.sealAuthorizeStuff && toViewImgKey == \'b\'">
<div @click="window.open(apply.sealAuthorizeStuff)">查看大图</div>
<div class="upload-dialog" v-show="apply.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(apply.gzwtsUrl)">查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<div @click="loadingKey = 2">重新上传</div>
......@@ -494,8 +494,8 @@
</div>
<div class="upload-box" v-loading="loading3" @mouseover="mouseOverDemo(3,\'c\')"
@mouseleave="mouseLeaveDemo(3,\'c\')">
<img @click="window.open(apply.descUrl)" class="upload-applyimg" v-if="apply.descUrl"
:src="apply.descUrl" />
<img @click="window.open(apply.smwjUrl)" class="upload-applyimg" v-if="apply.smwjUrl"
:src="apply.smwjUrl" />
<gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<div class="upload-button" @click="loadingKey = 3">
......@@ -503,8 +503,8 @@
<div>(需盖公章)</div>
</div>
</gsb-upload>
<div class="upload-dialog" v-show="apply.descUrl && toViewImgKey == \'c\'">
<div @click="window.open(apply.descUrl)">查看大图</div>
<div class="upload-dialog" v-show="apply.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(apply.smwjUrl)">查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" :action="action" filetype="image/jpeg"
:ifshowlist="false" @uploadsuccess="uploadsuccess" @error="error">
<div @click="loadingKey = 3">重新上传</div>
......@@ -643,15 +643,15 @@
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>身份证明</div>
</div>
<div v-if="apply.sealAuthorizeStuff"
<div v-if="apply.gzwtsUrl"
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"
<img @click="window.open(apply.gzwtsUrl)" :src="apply.gzwtsUrl"
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>代理委托书</div>
</div>
<div v-if="apply.descUrl"
<div v-if="apply.smwjUrl"
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"
<img @click="window.open(apply.smwjUrl)" :src="apply.smwjUrl"
style="height:118px;width:98px;border: 2px dashed rgb(233, 233, 233);">
<div>优先权证明</div>
</div>
......@@ -791,8 +791,8 @@
<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">
<el-button @click="closeConfrim()">取 消</el-button>
<el-button type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
<el-button style="background:#66b1ff;border-color: #66b1ff;color: #FFF;" @click="closeConfrim()">修 改</el-button>
<el-button style="background:#fff;border-color: #DCDFE6;color: #606266;" type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
</span>
</el-dialog>
</div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
......@@ -33,7 +33,7 @@
}
};
var validateIdCard = (rule, value, callback) => {
if (this.form.type == "person") {
if (this.apply.customerType == "person") {
if (value == "") {
callback(new Error('请输入身份证号码'));
} else {
......@@ -209,6 +209,8 @@
sealAuthorizeStuff: "",
descUrl: "",
notes: "",
gzwtsUrl:"",
smwjUrl:"",
},
rules: {
tmName: [
......@@ -630,7 +632,7 @@
that.loading3 = false;
that.loading = false;
if (d.status == 0) {
that.apply["sealAuthorizeStuff"] = d.data.url;
that.apply["gzwtsUrl"] = d.data.url;
return;
} else {
that.$refs[obj.flag][0].result = "";
......@@ -649,7 +651,7 @@
});
}
if (obj.flag == "yxq") {
that.apply["descUrl"] = obj.result;
that.apply["smwjUrl"] = obj.result;
setTimeout(() => {
that.loading1 = false;
that.loading2 = false;
......@@ -1214,12 +1216,15 @@
if (d.status == 0) {
var order = d.data;
that.toTop();
console.log(that.orderSubInfo,",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,");
that.$router.push({
path: "/1688/jdindentlist",
query: {
channelUserId: that.$route.query.channelUserId,
}
});
that.$message.warning("订单提交成功");
} else {
......
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