Skip to content

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

修改

parent 01fa779a
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 120 deletions
src/pages/financial/CashAccount.vue
View file @ ef317c6c
......@@ -209,57 +209,13 @@
<el-input v-model="addMsg.Initialbalance" class=""></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4" :gutter="35">
<el-form-item label="收款负责人：" prop="InCharge" class="_fuzeren">
<el-select
v-model="addMsg.InCharge"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="remoteMethod"
@focus="Charge=1"
:loading="loading2">
<el-option
v-for="item in showEmployeeList"
:key="item.empId"
:label="`${item.name}`"
:value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="支款负责人：" prop="OutCharge" class="_fuzeren">
<el-select
v-model="addMsg.OutCharge"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="remoteMethod2"
@focus="Charge=2"
:loading="loading2">
<el-option
v-for="item in showEmployeeList2"
:key="item.empId"
:label="`${item.name}`"
:value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'
:label='item.SName'
:value='item.SId'
:key='item.SId'
:disabled="item.disabled">
</el-option>
</el-select>
......@@ -349,6 +305,9 @@
</div>
</template>
<script>
import {
getSchoolPage
} from '../../api/school/index'
export default {
data(){
return{
......@@ -455,6 +414,13 @@
CostTypeID:''
},
costType:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},methods:{
goUrlNew (item) {
......@@ -570,15 +536,11 @@
},err=>{})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
let data = res.data.data;
data.forEach(x=>{
x.disabled = false;
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
this.CompanyList = data;
}else{}
},err=>{})
},
editCurency(id){ // 修改根据ID 获取信息
this.apipost('BankAccount_post_GetCashAccount',{ID:id}, res => {
......
src/pages/financial/accountingWork.vue
View file @ ef317c6c
......@@ -147,9 +147,9 @@
<el-form-item :label="$t('fnc.ssuogongsi')+'：'" prop="BranchId">
<el-select filterable v-model='addMsg.BranchId'>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'
:label='item.SName'
:value='item.SId'
:key='item.SId'
:disabled="item.disabled">
</el-option>
</el-select>
......@@ -206,19 +206,6 @@
<el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="适用费用" class="_treeselect">
<treeselect
class=""
v-model="CostIdS"
value-consists-of="LEAF_PRIORITY"
placeholder="请选择"
:multiple="true"
:options="CostTypeList"
noChildrenText=''
:normalizer="normalizer"/>
</el-form-item>
</el-col> -->
</el-row>
</el-form>
</div>
......@@ -228,6 +215,9 @@
<script>
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {
getSchoolPage
} from '../../api/school/index'
export default {
components: { Treeselect },
data(){
......@@ -300,6 +290,13 @@
Status:'0',
},
SingleList:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},created(){
let userInfo = this.getLocalStorage();
......@@ -520,12 +517,11 @@
this.$refs[formName].resetFields();
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
let data = res.data.data
this.CompanyList=res.data.data;
}else{}
},err=>{})
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
},mounted(){
this.getList();
......
src/pages/financial/financalDocument/CapitalAllocation.vue
View file @ ef317c6c
......@@ -73,9 +73,9 @@
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
:label='item.SName'
:value='item.SId'
:key='item.SId'>
</el-option>
</el-select>
</el-form-item>
......@@ -218,6 +218,9 @@
</div>
</template>
<script>
import {
getSchoolPage
} from '../../../api/school/index'
export default {
data(){
return {
......@@ -267,6 +270,13 @@
total: 0,
currentPage: 0,
btnShow:false,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},
created(){
......@@ -316,11 +326,11 @@
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
getDepartment: function () { //获取部门列表
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ ef317c6c
......@@ -500,7 +500,7 @@
@change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()"
class="">
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
</el-option>
</el-select>
</el-form-item>
......@@ -705,6 +705,9 @@
import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue";
import Vue from 'vue'
import {
getSchoolPage
} from '../../../api/school/index'
// 自定义列组件
Vue.component('table-BranchName', { //查看操作按钮
template: `<span>{{rowData.BranchName}}</span>`,
......@@ -1341,7 +1344,14 @@
],
pageSize: 5,
pageIndex: 1,
heightQueryBox: false
heightQueryBox: false,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},
created() {
......@@ -1726,11 +1736,11 @@
}, err => {})
},
getCompanyList() { //获取公司列表
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {}
}, err => {})
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
Financial_post_GetConditionList() { //获取财务单据枚举列表
this.apipost('Financial_post_GetConditionList', {}, res => {
......
src/pages/financial/financalDocument/invoicesManager.vue
View file @ ef317c6c
......@@ -130,7 +130,7 @@
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" filterable >
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></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>
......@@ -252,12 +252,15 @@
</div>
</template>
<script>
import {
getSchoolPage
} from '../../../api/school/index'
export default {
data() {
return {
active: 1,
RB_Group_Id:'',
companyList:[],
CompanyList:[],
msg: {
TCID: 0,
TCNUM: '',
......@@ -279,6 +282,13 @@
loading: false,
currentPage: 0,
total:0,
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
};
},
methods: {
......@@ -369,13 +379,11 @@
this.currentPage = 1;
},
getBranchList(){
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
this.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.apipost('admin_get_BranchGetList', {RB_Group_Id:this.RB_Group_Id}, res=>{
if (res.data.resultCode == 1) {
this.companyList=res.data.data;
}
}, null)
})
}
},
mounted() {
......
src/pages/financial/sellCommissionRules.vue
View file @ ef317c6c
......@@ -111,8 +111,8 @@
<el-option :label="$t('fnc.jttongyong')" value="-1"></el-option>
<el-option
v-for="(item, index) in CompanyList"
:label="item.BName"
:value="item.Id.toString()"
:label="item.SName"
:value="item.SId"
:key="index"
></el-option>
</el-select>
......@@ -255,6 +255,9 @@
</template>
<script>
import Vue from "vue";
import {
getSchoolPage
} from '../../api/school/index'
export default {
data() {
var checkVariable = (rule, value, callback) => {
......@@ -310,7 +313,14 @@
RB_Group_Id: 0
},
desctionsResources:[],
desctions:[]
desctions:[],
schoolMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
};
},
methods: {
......@@ -625,22 +635,11 @@
},
getCompanyList() {
//获取公司列表
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.disabled = false;
});
this.CompanyList = data;
this.getline();
} else {
}
},
err => {}
);
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
getline() {
let msg = { pageIndex: 0, pageSize: 100 };
......
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