Commit ae729689 authored by 黄奎's avatar 黄奎

页面修改

parent 62ec1e3b
...@@ -298,8 +298,8 @@ ...@@ -298,8 +298,8 @@
color: red; color: red;
} }
</style> </style>
<template> <template>
<div class="page_MyCustomer"> <div class="page_MyCustomer">
<div class="query-box" style="border:none"> <div class="query-box" style="border:none">
<ul> <ul>
...@@ -345,9 +345,7 @@ ...@@ -345,9 +345,7 @@
<em>业务员</em> <em>业务员</em>
<el-select filterable v-model='msg.CreateBy'> <el-select filterable v-model='msg.CreateBy'>
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -358,9 +356,7 @@ ...@@ -358,9 +356,7 @@
<em>OP</em> <em>OP</em>
<el-select filterable v-model='msg.OpEmpId'> <el-select filterable v-model='msg.OpEmpId'>
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -369,8 +365,7 @@ ...@@ -369,8 +365,7 @@
<li v-if="pagesTitle!='销售'"> <li v-if="pagesTitle!='销售'">
<span> <span>
<em>公司</em> <em>公司</em>
<el-select filterable class="w217" v-model="msg.RB_Branch_Id" <el-select filterable class="w217" v-model="msg.RB_Branch_Id" :placeholder="$t('pub.pleaseSel')">
:placeholder="$t('pub.pleaseSel')">
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for="item in layerCompanyList" :label="item.BName" :value="item.Id" :key="item.Id"> <el-option v-for="item in layerCompanyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option> </el-option>
...@@ -386,16 +381,19 @@ ...@@ -386,16 +381,19 @@
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="normalBtn" @click="addShow=true">添加</button> -->
</li> </li>
</ul> </ul>
</div> </div>
<div style="display: flex;justify-content: end;margin-bottom: 10px;"> <div style="display: flex;justify-content: end;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span> <p><span class="groupTourOrderByTuan_ico"><i
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span> style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p> <span class="groupTourOrderByTuan_ico"><i
style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i
style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div> </div>
<visaOrderList :pagesTitle="pagesTitle" :OrderList="dataList" v-loading="loading" @success="getList"> </visaOrderList> <visaOrderList :pagesTitle="pagesTitle" :OrderList="dataList" v-loading="loading" @success="getList">
</visaOrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination> </el-pagination>
...@@ -510,12 +508,14 @@ ...@@ -510,12 +508,14 @@
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import visaOrderList from './visaOrderList.vue'; import visaOrderList from './visaOrderList.vue';
export default { export default {
props:['pagesTitle'], props: ['pagesTitle'],
components: { visaOrderList }, components: {
visaOrderList
},
data() { data() {
return { return {
// pagesTitle: 'OP', // pagesTitle: 'OP',
...@@ -594,15 +594,15 @@ ...@@ -594,15 +594,15 @@
total: 0, total: 0,
addShow: false, addShow: false,
currentPage: 1, currentPage: 1,
EmployeeList:[], EmployeeList: [],
employeeMsg:{ // 员工 employeeMsg: { // 员工
GroupId:'', GroupId: '',
BranchId:-1, BranchId: -1,
DepartmentId:0, DepartmentId: 0,
PostId:0, PostId: 0,
IsLeave:0, IsLeave: 0,
}, },
layerCompanyList:[] layerCompanyList: []
} }
}, },
methods: { methods: {
...@@ -619,10 +619,10 @@ ...@@ -619,10 +619,10 @@
); );
}, },
getEmployee() { //员工 getEmployee() { //员工
let userInfo=this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
} }
}, err => {}) }, err => {})
...@@ -802,9 +802,9 @@ ...@@ -802,9 +802,9 @@
getList() { // 获取列表数据 getList() { // 获取列表数据
this.loading = true; this.loading = true;
let url let url
if(this.pagesTitle=='销售'){ if (this.pagesTitle == '销售') {
url = 'dmc_get_visa_GetOrderVisaOrderList' url = 'dmc_get_visa_GetOrderVisaOrderList'
}else{ } else {
url = 'dmc_get_visa_GetAdminVisaOrderList' url = 'dmc_get_visa_GetAdminVisaOrderList'
} }
this.apipost(url, this.msg, res => { this.apipost(url, this.msg, res => {
...@@ -813,7 +813,7 @@ ...@@ -813,7 +813,7 @@
this.dataList = [] this.dataList = []
} else { } else {
let arrList = function(list){ let arrList = function (list) {
list.forEach(x => { list.forEach(x => {
x.loading = false x.loading = false
}); });
...@@ -916,10 +916,10 @@ ...@@ -916,10 +916,10 @@
}, },
mounted() { mounted() {
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){ if (this.$route.query.crmOrderObj) {
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj) let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.OrderId = crmOrderObj.OrderId this.msg.OrderId = crmOrderObj.OrderId
}else if(this.$route.query.OrderId){ } else if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId this.msg.OrderId = this.$route.query.OrderId
} }
this.qjGroupId = this.QjGroupId(); this.qjGroupId = this.QjGroupId();
...@@ -933,4 +933,4 @@ ...@@ -933,4 +933,4 @@
} }
} }
</script> </script>
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