Commit 46ab1f9c authored by zhengke's avatar zhengke

修改

parent 52c0334a
...@@ -51,8 +51,76 @@ ...@@ -51,8 +51,76 @@
</style> </style>
<template> <template>
<div class="page_CapitalAllocation"> <div class="page_CapitalAllocation">
<div class="query-box"> <div class="query-box" style="margin-bottom:20px;">
<ul> <ul>
<li>
<em>{{$t('fnc.djbianhao')}}</em>&nbsp;
<el-input v-model="msg.FrID"></el-input>
</li>
<li>
<em>{{$t('system.table_company')}}</em>&nbsp;
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" class="w220" @change="getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2">
<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>
</el-select>
</li>
<li>
<em>{{$t('admin.admin_Department')}}</em>&nbsp;
<el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" class="w220" @change="getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DeptName'
:value='item.DeptId'
:key='item.DeptId'>
</el-option>
</el-select>
</li>
<li>
<em>{{$t('fnc.zhidanren')}}</em>&nbsp;
<el-select filterable v-model='msg.UpdateBy' class="w220">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmployeeName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</li>
<li>
<em>{{$t('fnc.zdriqi')}}</em>&nbsp;
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
</el-date-picker>
</li>
<li>
<em>{{$t('fnc.jiaoyiriqi')}}</em>&nbsp;
<el-date-picker
@change="timeAdd(2)"
v-model="productionDate2"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</li>
<li>
<em>{{$t('admin.admin_status')}}</em>&nbsp;
<el-select v-model="msg.Status" filterable class="w220">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in StatusList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</li>
<li> <li>
<input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/> <input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/> <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
...@@ -61,7 +129,7 @@ ...@@ -61,7 +129,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<el-form label-width="100px" class="form"> <!-- <el-form label-width="100px" class="form">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('fnc.djbianhao')"> <el-form-item :label="$t('fnc.djbianhao')">
...@@ -141,7 +209,7 @@ ...@@ -141,7 +209,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form> -->
<div class="page_CapitalAllocation_list"> <div class="page_CapitalAllocation_list">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
...@@ -378,20 +446,14 @@ ...@@ -378,20 +446,14 @@
var qMsg = { var qMsg = {
Dept_Id: 0 Dept_Id: 0
} }
qMsg.Dept_Id=id;
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
if(res.Code==1){ if(res.Code==1){
console.log(res,'数据1111');
this.EmployeeList = res.Data; this.EmployeeList = res.Data;
} }
}).catch(() => { }).catch(() => {
}) })
// this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
// if(res.data.resultCode == 1) {
// this.EmployeeList = res.data.data;
// }
// }, err => {})
}, },
goAddurl(url){ goAddurl(url){
// this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}}) // this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
......
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