Commit 66872202 authored by zhangjianguo's avatar zhangjianguo

搜索的修改

parent aaa18271
......@@ -48,7 +48,7 @@
</style>
<template>
<div class="weixinappmsg">
<el-button class="weixinTopBtn" type="primary" size="small">一键添加订阅信息</el-button>
<!--<el-button class="weixinTopBtn" type="primary" size="small">一键添加订阅信息</el-button>-->
<div class="wexin_Header">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="商城订阅信息" name="1"></el-tab-pane>
......@@ -94,7 +94,7 @@
</div>
</div>
<el-button size="small" type="primary" @click="UpdateMallSubscribeMsg()">保 存</el-button>
<el-button size="small" type="primary">生成测试二维码</el-button>
<!--<el-button size="small" type="primary">生成测试二维码</el-button>-->
</template>
<template v-else>
<div class="mimitBody">
......
......@@ -53,7 +53,7 @@
label="时间">
<template slot-scope="scope">
<p v-if="scope.row.CreateDate && scope.row.CreateDate!=''">申请时间:{{scope.row.CreateDate}}</p>
<p v-if="scope.row.AuditDate && scope.row.AuditDate!=''">审核时间:{{scope.row.AuditDate}}</p>
<p v-if="scope.row.AuditDate && scope.row.AuditDate!='' && scope.row.AuditStatus!=1">审核时间:{{scope.row.AuditDate}}</p>
</template>
</el-table-column>
<el-table-column
......
......@@ -27,7 +27,7 @@
:value="item.Id">
</el-option>
</el-select>
<el-input @clear="getList" clearable style="margin-left:15px;width:300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal" size="small">
<el-input @clear="getList" clearable style="margin-left:15px;width:300px" @keyup.enter.native="getList()" class="input-with-select" placeholder="请输入内容" v-model="msgVal" size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option
v-for="item in option"
......@@ -514,6 +514,7 @@ export default {
}
},
created(){
this.getList();
this.getplat();
this.getDown();
......@@ -736,6 +737,7 @@ export default {
this.getArea(item.City);
},
ChangeId(val){
let msgVal=this.msgVal;
if(val==1){
this.msg.ReOrderNo=msgVal;
......@@ -800,7 +802,7 @@ export default {
this.msg.Consignee='';
this.msg.Mobile=msgVal;
}
this.getList();
// this.getList();
},
Export(){
......@@ -839,6 +841,7 @@ export default {
},
getList(){
this.ChangeId(this.msgId)
if(!this.msgVal || this.msgVal==''){
this.msg.ReOrderNo='';
this.msg.OrderNo='';
......@@ -848,7 +851,8 @@ export default {
this.msg.Consignee='';
this.msg.Mobile='';
}
if(this.dateList && this.dateList.length>0){
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}else{
......
......@@ -451,7 +451,7 @@
if (this.msgId == 3) {
this.msg.UserName = '';
this.msg.GoodsName = '';
this.msg.Content = '';
this.msg.Content = msgVal;
}
if (!this.msgVal || this.msgVal == '') {
this.msg.UserName = '';
......
......@@ -291,8 +291,8 @@
TotalNum:-1,
Sort:100,
Describe:'',
OnlyMember:1,
PickupCenter:2,
OnlyMember:0,
PickupCenter:0,
MemberLevelList:[],
ProductList:[],//指定商品类型的数组
StartDate:'',
......
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