Skip to content

C
confucius
Commit cea4888c authored by zhengke's avatar zhengke
Browse files
Options

修改

parent aa35f038
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 119 deletions
src/App.vue
View file @ cea4888c
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
<style> <style>
@import url('~assets/css/font.css'); @import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_linnfuttjwb.css'); @import url('//at.alicdn.com/t/font_2077629_48r8joof2tp.css');
html, html,
body, body,
......
src/pages/financial/addFinancialProcess.vue
View file @ cea4888c
...@@ -349,16 +349,16 @@ ...@@ -349,16 +349,16 @@
<el-form-item v-show="addMsg.IsShow==2" label="可显示部门"> <el-form-item v-show="addMsg.IsShow==2" label="可显示部门">
<el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200" <el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200"
style="max-height:100px;overflow:hidden" size="small"> style="max-height:100px;overflow:hidden" size="small">
<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>
</el-form-item> </el-form-item>
<el-form-item v-show="addMsg.IsShow==2" label="可显示人"> <el-form-item v-show="addMsg.IsShow==2" label="可显示人">
<el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200" <el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200"
style="max-height:100px;overflow:hidden" size="small"> style="max-height:100px;overflow:hidden" size="small">
<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>
</el-form-item> </el-form-item>
...@@ -531,7 +531,9 @@ ...@@ -531,7 +531,9 @@
import { import {
getPostPage, getPostPage,
} from '../../api/system/post' } from '../../api/system/post'
import {
getDeptPage,
} from '../../api/system/dept'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { import {
...@@ -791,21 +793,21 @@ ...@@ -791,21 +793,21 @@
}, },
//根据多公司获取部门 //根据多公司获取部门
getDepartment() { getDepartment() {
let msg = { let msg={
RB_Group_Id: '0', pageIndex: 1,
RB_Branch_Id: '-1', pageSize: 999,
Status: '0', rowsPerPage: 12,
}; DeptName: "", //部门名称
this.apipost( DeptId: 0, //部门编号
"department_get_GetListByBranchIds", Status: "-1",
msg, School_Id: 0,
res => { DeptTier: 0,
if (res.data.resultCode == 1) { ParentId: 0,
this.DepartmentList = res.data.data; }
} getDeptPage(msg).then(res => {
}, this.DepartmentList=res.Data.PageData;
err => {} }).catch(() => {
); })
}, },
RadioShow(val) { RadioShow(val) {
if (val == 1) { if (val == 1) {
...@@ -815,15 +817,23 @@ ...@@ -815,15 +817,23 @@
} }
}, },
getEmployeeList() { getEmployeeList() {
this.apipost( queryEmployee({}).then(res => {
'admin_get_EmployeeGetList', {}, if(res.Code==1){
res => { this.EmployeeList = res.Data;
if (res.data.resultCode == 1) { }
this.EmployeeList = res.data.data }).catch(() => {
}
}, })
err => {}
) // this.apipost(
// 'admin_get_EmployeeGetList', {},
// res => {
// if (res.data.resultCode == 1) {
// this.EmployeeList = res.data.data
// }
// },
// err => {}
// )
}, },
AuditSort() { AuditSort() {
let sum = 0; let sum = 0;
...@@ -1470,7 +1480,6 @@ ...@@ -1470,7 +1480,6 @@
}).catch(() => { }).catch(() => {
}) })
// console.log(this.showMember,'this.showMember');
var arr=[]; var arr=[];
this.showMember.forEach(x=>{ this.showMember.forEach(x=>{
arr.push(x.Id); arr.push(x.Id);
......
src/pages/financial/financalDocument/CapitalAllocation.vue
View file @ cea4888c
...@@ -129,87 +129,6 @@ ...@@ -129,87 +129,6 @@
</li> </li>
</ul> </ul>
</div> </div>
<!-- <el-form label-width="100px" class="form">
<el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="$t('fnc.djbianhao')">
<el-input v-model="msg.FrID"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('system.table_company')">
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @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>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('admin.admin_Department')">
<el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @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>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.zhidanren')">
<el-select filterable v-model='msg.UpdateBy'>
<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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('fnc.zdriqi')">
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="$t('admin.admin_status')">
<el-select v-model="msg.Status" filterable>
<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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<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>
</el-form-item>
</el-col>
</el-row>
</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>
...@@ -405,16 +324,9 @@ ...@@ -405,16 +324,9 @@
} }
msg.School_Id = id; msg.School_Id = id;
getDeptPage(msg).then(res => { getDeptPage(msg).then(res => {
console.log(res,'数据');
this.DepartmentList=res.Data.PageData; this.DepartmentList=res.Data.PageData;
}).catch(() => { }).catch(() => {
}) })
// this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
// if(res.data.resultCode == 1) {
// this.DepartmentList = res.data.data;
// }
// }, err => {})
}, },
timeAdd: function (t) { // 日期格式 timeAdd: function (t) { // 日期格式
if (t===1) { if (t===1) {
......
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