Commit 1b210808 authored by Mac's avatar Mac

1

parent 9973ea45
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
<span> <span>
&nbsp;<em>{{$t('system.query_company')}}</em> &nbsp;<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model='msg.RB_Branch_Id' <el-select filterable v-model='msg.RB_Branch_Id'
@change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()" @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment(msg.RB_Branch_Id)"
class="w150"> class="w150">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'> <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
...@@ -690,10 +690,10 @@ ...@@ -690,10 +690,10 @@
<span> <span>
<em>{{$t('fnc.fybumen')}}</em> <em>{{$t('fnc.fybumen')}}</em>
&nbsp;<el-select filterable v-model='msg.RB_Depart_Id' &nbsp;<el-select filterable v-model='msg.RB_Depart_Id'
@change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="w150"> @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''" class="w150">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList' :label='item.DepartmentName' :value='item.DepartmentID' <el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId'
:key='item.DepartmentID'> :key='item.DeptId'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -703,8 +703,8 @@ ...@@ -703,8 +703,8 @@
<em>{{$t('fnc.zdrenyuan')}}</em> <em>{{$t('fnc.zdrenyuan')}}</em>
&nbsp;<el-select filterable v-model='msg.UpdateBy' class="w150"> &nbsp;<el-select filterable v-model='msg.UpdateBy' class="w150">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId' <el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id'
:key='item.EmployeeId'> :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -1053,9 +1053,9 @@ ...@@ -1053,9 +1053,9 @@
<el-select v-model="zhuanMsg.AuditEmId" filterable remote reserve-keyword <el-select v-model="zhuanMsg.AuditEmId" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate()" :placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate()"
:loading="loading2"> :loading="loading2">
<el-option v-for="item in searchList" :key="item.empId" :label="item.name" :value="item.empId"> <el-option v-for="item in searchList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.DeptName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -1230,9 +1230,16 @@ ...@@ -1230,9 +1230,16 @@
import myrbvBill from "../components/ReceivablesModule.vue"; import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue"; import myhrBill from "../components/MergeBillModule.vue";
import myGZBill from "../components/GZBillModule.vue"; import myGZBill from "../components/GZBillModule.vue";
import {
queryEmployee
} from '../../../api/users/user'
import {
getDeptPage,
} from '../../../api/system/dept'
import { import {
getSchoolPage getSchoolPage
} from '../../../api/school/index' } from '../../../api/school/index'
export default { export default {
data() { data() {
return { return {
...@@ -1470,8 +1477,8 @@ ...@@ -1470,8 +1477,8 @@
this.FinancialFlowTemplate_post_GetList(); this.FinancialFlowTemplate_post_GetList();
this.getCompanyList(); this.getCompanyList();
this.Financial_post_GetConditionList(); this.Financial_post_GetConditionList();
this.getEmployee(); this.getEmployee(0);
this.getDepartment(); this.getDepartment(0);
this.Financial_post_GetBranchAccountList(); this.Financial_post_GetBranchAccountList();
this.financeinfo_post_GetClientTypeList(); this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList(); this.FinancialFlowTemplate_post_GetStatusList();
...@@ -1809,14 +1816,22 @@ ...@@ -1809,14 +1816,22 @@
remoteMethod(query) { // 转交人模糊查询 remoteMethod(query) { // 转交人模糊查询
if (query !== '' || this.addShow) { if (query !== '' || this.addShow) {
this.loading2 = true; this.loading2 = true;
this.apipost("admin_Get_Chat_All_SelectEmpName", { this.loading = true;
EmName: query var qMsg = {
}, res => { EmployeeName: 0
if (res.data.resultCode == 1) { }
this.searchList = res.data.data; qMsg.EmployeeName=query;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
this.searchList = res.Data;
this.loading2 = false; this.loading2 = false;
this.loading = false;
} }
}, err => {}); }).catch(() => {
})
} else { } else {
this.searchList = []; this.searchList = [];
this.loading2 = false; this.loading2 = false;
...@@ -2142,19 +2157,36 @@ ...@@ -2142,19 +2157,36 @@
this.msg.EmployeeId = this.userId; this.msg.EmployeeId = this.userId;
this.GetLocalFile("Financial_get_OutToFinanceList", this.msg, this.$t('fnc.cwbaobiao') + ".xls"); this.GetLocalFile("Financial_get_OutToFinanceList", this.msg, this.$t('fnc.cwbaobiao') + ".xls");
}, },
getDepartment() { //部门 getDepartment(id) { //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => { let msg={
if (res.data.resultCode == 1) { pageIndex: 1,
this.DepartmentList = res.data.data; pageSize: 999,
} rowsPerPage: 12,
}, err => {}) DeptName: "", //部门名称
DeptId: 0, //部门编号
Status: "-1",
School_Id: 0,
DeptTier: 0,
ParentId: 0,
}
msg.School_Id = id;
getDeptPage(msg).then(res => {
this.DepartmentList=res.Data.PageData;
}).catch(() => {
})
}, },
getEmployee() { //员工 getEmployee(id) { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { var qMsg = {
if (res.data.resultCode == 1) { Dept_Id: 0
this.EmployeeList = res.data.data;
} }
}, err => {}) qMsg.Dept_Id=id;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
this.EmployeeList = res.Data;
}
}).catch(() => {
})
}, },
getCompanyList() { //获取公司列表 getCompanyList() { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => { getSchoolPage(this.schoolMsg).then(res => {
......
...@@ -105,11 +105,11 @@ ...@@ -105,11 +105,11 @@
<el-form-item label="受委托人:"> <el-form-item label="受委托人:">
<el-select v-model='addMsg.reciveEmpId' filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading"> <el-select v-model='addMsg.reciveEmpId' filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
<el-option v-for='item in searchList' <el-option v-for='item in searchList'
:label='item.name' :label='item.EmployeeName'
:value='item.empId' :value='item.Id'
:key='item.empId'> :key='item.Id'>
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.departmentName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.DeptName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -135,6 +135,9 @@ ...@@ -135,6 +135,9 @@
</div> </div>
</template> </template>
<script> <script>
import {
queryEmployee
} from '../../../api/users/user'
export default { export default {
data(){ data(){
return{ return{
...@@ -260,18 +263,25 @@ export default { ...@@ -260,18 +263,25 @@ export default {
remoteMethod(query) { // 远程搜索 remoteMethod(query) { // 远程搜索
if (query !== '') { if (query !== '') {
this.loading = true; this.loading = true;
this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName: query },res => { var qMsg = {
if (res.data.resultCode == 1) { EmployeeName: 0
if (res.data.data.length > 1) { }
qMsg.EmployeeName=query;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
if (res.Data.length > 1) {
this.searchList = []; this.searchList = [];
} }
this.searchList = res.data.data; this.searchList = res.Data;
this.searchList.forEach((x, index) => { this.searchList.forEach((x, index) => {
this.$set(this.searchList, index, x); this.$set(this.searchList, index, x);
}); });
this.loading = false; this.loading = false;
} }
},err => {}) }).catch(() => {
})
} }
} }
}, },
......
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