Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 032b1f9a 976caa71
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 9 deletions
src/components/SalesVisa/components/VisaProductOrder.vue
View file @ a4e806a7
......@@ -306,25 +306,25 @@
<li>
<span>
<em>{{$t('fnc.danhao')}}</em>
<el-input class='w220' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
<el-input class='w200' v-model='msg.VisaTCNUM' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单ID</em>
<el-input class='w220' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
<el-input class='w200' v-model='msg.OrderId' placeholder="请输入订单ID"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('hotel.product_name')}}</em>
<el-input class='w220' v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
<el-input class='w200' v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单状态</em>
<el-select v-model='msg.VisaOrderStatus'>
<el-select class='w200' v-model='msg.VisaOrderStatus'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="正常" value="1" key='1'></el-option>
<el-option label="取消" value="2" key='2'></el-option>
......@@ -334,7 +334,7 @@
<li>
<span>
<em>完结状态</em>
<el-select v-model='msg.IsFinish'>
<el-select class='w200' v-model='msg.IsFinish'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="已完结" value="1" key='1'></el-option>
<el-option label="未完结" value="2" key='2'></el-option>
......@@ -343,7 +343,7 @@
<li v-if="pagesTitle!='销售'">
<span>
<em>业务员</em>
<el-select filterable v-model='msg.CreateBy'>
<el-select class='w200' filterable v-model='msg.CreateBy'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
......@@ -354,7 +354,7 @@
<li>
<span>
<em>OP</em>
<el-select filterable v-model='msg.OpEmpId'>
<el-select class='w200' filterable v-model='msg.OpEmpId'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
......@@ -365,7 +365,7 @@
<li v-if="pagesTitle!='销售'">
<span>
<em>公司</em>
<el-select filterable class="w217" v-model="msg.RB_Branch_Id" :placeholder="$t('pub.pleaseSel')">
<el-select class='w200' filterable v-model="msg.RB_Branch_Id" :placeholder="$t('pub.pleaseSel')">
<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>
......@@ -379,6 +379,13 @@
-<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<span>
<em>完结日期</em>
<el-date-picker v-model='msg.FinishSDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-<el-date-picker v-model='msg.FinishEDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
</li>
......@@ -528,6 +535,8 @@
pageSize: 12,
StartDate: '',
EndDate: '',
FinishSDate: '',
FinishEDate: '',
SendStartDate: '',
SendEndDate: '',
Name: '',
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ a4e806a7
......@@ -823,6 +823,11 @@
v-loading="scope.row.loading">
<span class="c059FF6">完结</span>
</div>
<div v-if="IsSupperOrderEdit&&pagesTitle!='销售'&&scope.row.isFinish==1"
class="row-c cursor-pointer radius5 change py5" @click='setOPEmpId(scope.row)'
v-loading="scope.row.loading">
<span class="c059FF6">修改OP</span>
</div>
<div class="row-c cursor-pointer radius5 change py5"
v-if="IsSupperOrderEdit&&!scope.row.commissionMoney&&!scope.row.opCommission&&pagesTitle!='销售'"
@click="queryObj=scope.row,showTransferOrder=true">
......@@ -960,6 +965,18 @@
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
<el-dialog title="修改OP" :visible.sync="EditOPVisible" width="400px">
<div>
<el-select v-model="OPEmpId" filterable size=mini>
<el-option v-for="item in OPEmpList" :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditOPVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="sureOPEmp">确 定</el-button>
</span>
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
<TransferOrder v-if="showTransferOrder" :isShow="showTransferOrder" :obj="queryObj"
@success="showTransferOrder=false,$emit('success')" @close="showTransferOrder=false"></TransferOrder>
......@@ -1067,7 +1084,11 @@
TotalPrice: 0,
PeopleNum: 0
},
IsSupperOrderEdit: false
IsSupperOrderEdit: false,
EditOPVisible: false,
OPEmpId: 0,
OPOrderId: 0,
OPEmpList: []
};
},
watch: {
......@@ -1556,6 +1577,33 @@
this.copyId = 0;
}, 2000);
},
GetOPEmpList() {
let userInfo = this.getLocalStorage();
this.apipost('admin_get_EmployeeGetList', {GroupId: userInfo.RB_Group_id,DepartmentId:232}, res => {
if (res.data.resultCode == 1) {
this.OPEmpList = res.data.data;
}
}, err => {})
},
setOPEmpId(item) {
this.EditOPVisible = true;
this.OPOrderId = item.id;
},
sureOPEmp() {
if(this.OPEmpId <=0){
this.Info('请选择OP！')
return
}
this.apipost('dmc_post_SetVisaOrderFinishEmp', {VisaOrderIds:this.OPOrderId,EmpId:this.OPEmpId}, res => {
if (res.data.resultCode == 1) {
this.EditOPVisible = false;
this.Success(res.data.message)
this.$emit('success');
} else {
this.Error(res.data.message)
}
}, err => {})
},
},
mounted() {
this.qjGroupId = this.QjGroupId();
......@@ -1567,6 +1615,7 @@
if (ActionMenuCode.indexOf('isEditAmount') != -1) {
this.IsSupperOrderEdit = true
}
this.GetOPEmpList()
}
};
......
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