Skip to content

S
SuperMan
Commit 2cdcec06 authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 751b50ed
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 52 deletions
src/components/SalesModule/customerTransfer.vue
View file @ 2cdcec06
......@@ -39,7 +39,7 @@
<span>
<em>{{$t('objFill.v101.Rest.guanlianztai')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus '
<el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option :label="$t('pub.normalSel')" :value="1"></el-option>
......@@ -50,7 +50,8 @@
<span>
<em>{{$t('salesModule.CustomerStatus')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus' :placeholder="$t('pub.pleaseSel')">
<el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option :label="$t('fnc.a_wshenhe')" :value="1"></el-option>
<el-option :label="$t('fnc.a_yshenhe')" :value="2"></el-option>
......@@ -62,19 +63,18 @@
<span>
<em>{{$t('objFill.v101.Rest.shifouyichan')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount' :placeholder="$t('pub.pleaseSel')">
<el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount'
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option :label="$t('pub.yes')" :value="1"></el-option>
<el-option :label="$t('pub.no')" :value="2"></el-option>
</el-select>
</li>
<li >
<span >
<li>
<span>
<em class="fl" style="margin-top: 10px !important">{{$t('admin.admin_Department')}}</em>
<treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList"
v-model="DepartmentId"
style="height: 25px;"
:placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
<treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList" v-model="DepartmentId"
style="height: 25px;" :placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
</span>
</li>
<li>
......@@ -96,8 +96,8 @@
</em>
</span>
<el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li>
<span>
......@@ -106,16 +106,14 @@
</em>
</span>
<el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd(2)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li style="margin-left: 10px">
<span>
<em>{{$t('objFill.v102.appjihuozhuant')}}：</em>
<el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable
v-model="msg.OpenIdStatus">
<el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id"
:key="item.Id"></el-option>
<em>{{$t('objFill.v102.appjihuozhuant')}}</em>
<el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="msg.OpenIdStatus">
<el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
......@@ -126,8 +124,8 @@
</em>
</span>
<el-date-picker class="h34 w220" v-model="activationTime" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
......@@ -164,7 +162,9 @@
</li>
</ul>
</div>
<ul style="overflow: initial!important"><li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li></ul>
<ul style="overflow: initial!important">
<li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
</ul>
<div class="clearfix"></div>
<div class="_customerTransferTable" :class="addShow==true?'_edHeight':''">
<table class="customerTransferTable customerTransferTable2 mt20" border="0" cellspacing="0" cellpadding="0"
......@@ -237,7 +237,8 @@
</el-popover>
</td>
<td>
<span :style="{'color':item.OpenIdStatus==1?'red':''}">{{item.OpenIdStatus==1?'已激活':item.OpenIdStatus==2?'未激活':'' }}</span>
<span
:style="{'color':item.OpenIdStatus==1?'red':''}">{{item.OpenIdStatus==1?'已激活':item.OpenIdStatus==2?'未激活':'' }}</span>
<p v-if="item.ActivationTime">时间：{{ item.ActivationTime }}</p>
</td>
<td>{{item.Contact}}</td>
......@@ -646,40 +647,45 @@
employeeList2: [],
HightUnitPrice: '2',
departState: false,
OpenStatusList:[
{ Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
{ Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
OpenStatusList: [{
Name: this.$t('objFill.v102.yijihuo'),
Id: 1
},
{
Name: this.$t('objFill.v102.weijihuo'),
Id: 2
},
],
activationTime:[]
activationTime: []
};
},
watch: {
'$route': {
handler (val, oldVal) {
console.log(this.$route.query,'-------')
if (this.$route.query.EnterTime) {
this.EnterTime = this.$route.query.EnterTime
this.msg.StartCreate = this.EnterTime[0];
this.msg.EndCreate = this.EnterTime[1];
}
if (this.$route.query.activationTime) {
this.activationTime = this.$route.query.activationTime
this.msg.ActivateStartDate = this.activationTime[0];
this.msg.ActivateEndDate = this.activationTime[1];
}
if (this.$route.query.activation) {
this.msg.OpenIdStatus = this.$route.query.activation
}
this.getList();
},
deep: true,
immediate: true
handler(val, oldVal) {
console.log(this.$route.query, '-------')
if (this.$route.query.EnterTime) {
this.EnterTime = this.$route.query.EnterTime
this.msg.StartCreate = this.EnterTime[0];
this.msg.EndCreate = this.EnterTime[1];
}
if (this.$route.query.activationTime) {
this.activationTime = this.$route.query.activationTime
this.msg.ActivateStartDate = this.activationTime[0];
this.msg.ActivateEndDate = this.activationTime[1];
}
if (this.$route.query.activation) {
this.msg.OpenIdStatus = this.$route.query.activation
}
this.getList();
},
deep: true,
immediate: true
},
},
methods: {
timeAdd(t) { // 日期格式
if(t==2){
if (t == 2) {
if (!this.EnterTime) {
this.msg.StartCreate = '';
this.msg.EndCreate = '';
......@@ -687,7 +693,7 @@
}
this.msg.StartCreate = this.EnterTime[0];
this.msg.EndCreate = this.EnterTime[1];
}else if(t==3){
} else if (t == 3) {
if (!this.activationTime) {
this.msg.ActivateStartDate = '';
this.msg.ActivateEndDate = '';
......@@ -695,7 +701,7 @@
}
this.msg.ActivateStartDate = this.activationTime[0];
this.msg.ActivateEndDate = this.activationTime[1];
}else{
} else {
if (!this.missionDate) {
this.msg.STime = '';
this.msg.ETime = '';
......@@ -1407,9 +1413,10 @@
</script>
<style>
/deep/.customerTransfer .vue-treeselect__control{
height: 24px;
}
/deep/.customerTransfer .vue-treeselect__control {
height: 24px;
}
.customerTransferTable {
width: 100%;
font-size: 14px;
......
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