Skip to content

C
confucius
Commit 93a95453 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent cc4bc6e2
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 709 deletions
src/pages/financial/CashAccount.vue
View file @ 93a95453
......@@ -79,11 +79,10 @@
<el-form-item :label="$t('fnc.suoshugs')">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<!-- <el-option label='通用' value='-1'></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>
......@@ -210,7 +209,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-form-item label="校区" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
:label='item.SName'
......
src/pages/financial/CashierWork.vue
View file @ 93a95453
......@@ -253,10 +253,10 @@
:loading="loading2">
<el-option
v-for="item in searchList"
:key="item.empId"
:label="item.name"
:value="item.empId">
<span style="float: left">{{ item.name }}</span>
:key="item.Id"
:label="item.EmployeeName"
:value="item.Id">
<span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
</el-option>
</el-select>
......@@ -330,6 +330,10 @@
</div>
</template>
<script>
import {
queryEmployee
} from '../../api/users/user'
export default {
data(){
return{
......@@ -432,7 +436,7 @@
this.$router.push({name:path,query:{Conditon:g,blank:'y'}})
},
goUrlDetail(path,type,name,id){
this.$router.push({name:path,query:{WindowType:type,name:name,id:id,blank:'y',tab:'出纳窗口单据信息'}})
this.$router.push({path:path,query:{WindowType:type,name:name,id:id,blank:'y',tab:'出纳窗口单据信息'}})
},
removeTag(id){
this.addMsg.emList.forEach((x,index)=>{
......@@ -473,18 +477,31 @@
}
}
if(!sub) return this.$message.error('请选择出纳类型!')
let emList = this.addMsg.listArr;
let arr = [];
this.addMsg.emList=[];
emList.forEach(x=>{
let obj = {
'EmId':x,
'ID':0,
'WindowId':0
}
arr.push(obj);
});
let list4 = this.mergeArray(arr,this.addMsg.emList);
this.addMsg.emList = list4;
this.searchList.forEach(y=>{
if(x==y.Id){
let obj={
EmId:y.Id,
EmIdName:y.EmployeeName
}
this.addMsg.emList.push(obj);
}
})
})
// let arr = [];
// emList.forEach(x=>{
// let obj = {
// 'EmId':x,
// 'ID':0,
// 'WindowId':0
// }
// arr.push(obj);
// });
// let list4 = this.mergeArray(arr,this.addMsg.emList);
// this.addMsg.emList = list4;
this.apipost('Window_post_Set',this.addMsg,r=>{
if(r.data.resultCode==1){
this.$message.success(r.data.message);
......@@ -635,18 +652,16 @@
this.addMsg.EmId = item.empId;
},
remoteMethod(query) {
if (query !== ''||this.addShow) {
this.loading2 = true;
this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
this.loading2 = false;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
var qMsg = {
EmployeeName: query
}
queryEmployee(qMsg).then(res => {
if(res.Code==1){
this.searchList = res.Data;
}
}).catch(() => {
})
},
getList(){
this.loading = true;
......@@ -691,7 +706,7 @@
this.addMsg.listArr = [];
if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{
this.remoteMethod(x.emName);
this.remoteMethod('');
this.addMsg.listArr.push(x.EmId)
})
}
......@@ -719,9 +734,20 @@
resetForm(formName) {//弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
},
getEmployee(){
queryEmployee({}).then(res => {
if(res.Code==1){
this.searchList = res.Data;
console.log(res,'数据');
}
}).catch(() => {
})
}
},mounted(){
this.getList();
this.getAccList();
this.getEmployee();
}
}
</script>
src/pages/financial/CompanyAccount.vue
View file @ 93a95453
......@@ -97,7 +97,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ssgongsi')">
<el-form-item label="校区">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> -->
......@@ -274,7 +274,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
<el-form-item label="校区" prop="BranchIdS">
<el-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList'
:label='item.SName'
......@@ -822,7 +822,7 @@ export default {
this.getList()
this.getAccountTypeList()
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id=userInfo.data.Group_Id; //集团ID
this.getCompanyMsg.RB_Group_Id=userInfo.Group_Id; //集团ID
this.getCompanyList()
this.getFinancialList()
this.getfinanceinfoList()
......
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @ 93a95453
......@@ -438,6 +438,7 @@
<script>
import moment from "moment"
import {getSchoolPage} from '../../../api/school/index'
import {UploadSelfFile} from '../../../api/common/common'
export default {
data(){
......@@ -1107,13 +1108,13 @@
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
UploadSelfFile('Temporary', file.file, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Content: x.data.FilePath,
Content: x.FileUrl,
ID:0,
Type:fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Url: x.FileUrl,
})
this.addMsg.vorcherInos = this.saveMsg;
this.Success('上传成功');
......
src/pages/financial/accountingWork.vue deleted 100644 → 0
View file @ cc4bc6e2
<style>
@import url('./css/accountingWork.css');
@import "./css/cssReset.css";
</style>
<template>
<div class="page_accountingWork">
<div class="query-box">
<ul>
<li>
<span>
<em>流程</em>
<el-select class="w200" filterable v-model="msg.TemplateId">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option v-for="(item,index) in SingleList" :label="item.Name" :value="item.Id" :key="index+50000">
</el-option>
</el-select>
</span>
</li>
<li>
<button class="normalBtn" @click="getList">查询</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
</el-tooltip>
</li>
</ul>
</div>
<div>
<p class="_cashierWorl_tit">{{$t('tips.accWorkTips')}}</p>
<div class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading="loading" v-if="transitionShow2">
<tr>
<th>{{$t('fnc.w_ckmingcheng')}}</th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.w_ywrenyuan')}}</th>
<th>流程</th>
<th>{{$t('fnc.w_fzfangxiang')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
<td>{{item.BName}}</td>
<td>
<span v-for="(i,ix) in item.emList">{{i.emName}} <span v-if="ix!=item.emList.length-1">,</span> </span>
</td>
<td>
<span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span
v-if="ix!=item.TemplateList.length-1">,</span> </span>
</td>
<td>
<span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
<span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
<span v-else>{{$t('fnc.shouzhi')}}</span>
</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle
@click="editCurency(item.ID),text='修改'"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.w_djxinxi')" placement="top-start">
<el-button type="danger" class="iconfont icon-img-rili" circle
@click="goUrlDetail('CashierWorkDetail',2,item.Name,item.ID,item.BranchId)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle
@click="financeinfoRemove(item.ID,item.ID)"></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<div v-if="transitionShow" class="clearfix">
<div class="po_content_list_item" v-for="(item,index) in dataList" :key="index">
<div class="po_content_list_item_top">
<span class="_item_top_name">{{item.Name}}</span>
<span class="_item_top_icon">
<i class="iconfont icon-rizhi1"
@click="goUrlDetail('CashierWorkDetail',1,item.Name,item.ID,item.BranchId)"></i>
<i class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></i>
<i class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID)"></i>
</span>
</div>
<div class="po_content_list_item_bottom">
<p>
<span>{{$t('fnc.w_ywrenyuan')}}</span>
<template v-if="item.emList.length>0">
<span v-if="item.emList.length==1">
{{item.emList[0].emName}}
</span>
<div v-else>
<el-popover placement="bottom" popper-class="CashierWork_tripDetails" trigger="click">
<div class="">
<span class="_all_name" v-for="(i,io) in item.emList">{{i.emName}}</span>
</div>
<span slot="reference" @click="" class="_underline">{{item.emList[0].emName}}
{{$t('fnc.w_gong')}}（{{item.emList.length}}）{{$t('hotel.hotel_people')}}</span>
</el-popover>
</div>
</template>
<template v-else>
<span>{{$t('fnc.no')}}</span>
</template>
</p>
</div>
</div>
</div>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</div>
</div>
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<el-row class="_margin_bottom_20">
<el-col :span="20">
<p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item :label="$t('system.query_airName')+'：'" prop="Name">
<el-input v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<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.SName' :value='item.SId' :key='item.SId'
:disabled="item.disabled">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('fnc.w_ywrenyuan')+'：'" prop="listArr">
<el-select v-model="addMsg.listArr" filterable remote multiple reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate()"
@remove-tag="removeTag" :loading="loading2">
<el-option v-for="(item,index) in searchList" :key="index+60000" :label="item.EmployeeName"
:value="item.Id">
<span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="流程">
<el-select v-model="addMsg.TemplateListArr" filterable multiple collapse-tags @change="$forceUpdate()"
:placeholder="$t('pub.pleaseImport')">
<el-option v-for="(item,index) in SingleList" :key="index+200" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
<el-radio v-model="addMsg.Direct" :label="2">{{$t('fnc.w_zhi')}}</el-radio>
<el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {
getSchoolPage
} from '../../api/school/index'
import {
queryEmployee
} from '../../api/users/user'
export default {
components: {
Treeselect
},
data() {
return {
msg: {
pageIndex: 1,
pageSize: 15,
TemplateId: '',
},
addMsg: {
ID: 0,
Name: '',
accountant_list: [],
emList: [],
TemplateList: [],
listArr: [],
BranchId: '',
Direct: '',
BranchIdName:''
},
type: -1,
addShow: false,
loading: false,
loading2: false,
noData: false,
zhiChe: false,
shouChe: false,
total: 0,
currentPage: 1,
text: '',
dataList: [],
searchList: [],
AccList: [],
CompanyList: [],
rules: { //表单必填验证
Name: [{
required: true,
message: this.$t('rule.qtxckmingcheng'),
trigger: 'blur'
}],
listArr: [{
type: 'array',
required: true,
editCurencymessage: this.$t('rule.qxzywuyuan'),
trigger: 'blur'
}],
BranchId: [{
required: true,
message: this.$t('rule.company'),
trigger: 'change'
}],
Direct: [{
required: true,
message: this.$t('rule.qxzsyfangxiang'),
trigger: 'change'
}]
},
AccListProps: {
value: 'Num',
label: 'Name',
children: 'children'
},
selectVal: [],
transitionShow: false,
transitionShow2: true,
contenWidth: 0,
contenHeight: 0,
tableSize: 0,
shouList: [],
shouListLoading: false,
CostTypeList: [],
normalizer(node) {
return {
id: node.ID,
label: node.Name,
children: node.ChildList,
}
},
CostIdS: [],
getCompanyMsg: {
RB_Group_Id: '0',
Status: '0',
},
SingleList: [],
schoolMsg: {
pageIndex: 1,
pageSize: 999,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}
},
created() {
let userInfo = this.getLocalStorage();
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
cW = allW - 90;
cH = allH - 187; //255 = 50 40 21 36 40
this.contenWidth = cW;
this.contenHeight = cH;
this.msg.pageSize = parseInt(cH / 40) - 1;
this.tableSize = this.msg.pageSize = parseInt(cH / 45);
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getSingleList();
},
methods: {
getSingleList() { // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList', {}, res => {
if (res.data.resultCode == 1) {
this.SingleList = res.data.data;
} else {}
}, err => {})
},
switchMethod(t) {
this.msg.pageIndex = 1;
if (t === 1) {
this.transitionShow = false;
this.transitionShow2 = true;
this.msg.pageSize = this.tableSize;
this.getList();
} else if (t === 2) {
this.transitionShow = true;
this.transitionShow2 = false;
// 宽 235 高 206
let cont = parseInt(this.contenWidth / 235) * parseInt(this.contenHeight / 120);
this.msg.pageSize = cont;
this.getList();
}
},
getCostTypeList() { // 获取费用类型
this.apipost('Financial_post_GetTreeList', {
Type: 3
}, res => {
if (res.data.resultCode == 1) {
this.CostTypeList = res.data.data;
} else {}
}, err => {})
},
goUrlDetail(path, type, name, id, bid) {
this.$router.push({
name: path,
query: {
WindowType: type,
name: name,
id: id,
bid: bid,
blank: 'y',
tab: '会计窗口单据信息'
}
})
},
removeTag(id) {
this.addMsg.emList.forEach((x, index) => {
if (x.EmId === id) {
this.addMsg.emList.splice(index, 1)
}
})
},
mergeArray(list3, list1) {
for (var i = 0; i < list3.length; i++) {
for (var j = 0; j < list1.length; j++) {
if (list3[i].EmId === list1[j].EmId) {
list3.splice(i, 1);
}
}
}
for (var i = 0; i < list1.length; i++) {
list3.push(list1[i]);
}
return list3;
},
addCashierWork() { // 提交保存
let emList = this.addMsg.listArr;
let arr = [];
emList.forEach(x => {
let obj = {
'EmId': x,
'ID': 0,
'WindowId': 0
}
arr.push(obj);
})
let list4 = this.mergeArray(arr, this.addMsg.emList);
let TemplateListArr = this.addMsg.TemplateListArr;
let newArr = [];
TemplateListArr.forEach(item => {
this.SingleList.forEach(val => {
let obj = {};
if (item == val.Id) {
obj.Id = val.Id;
obj.Name = val.Name;
newArr.push(obj);
}
})
})
this.addMsg.emList = list4;
this.addMsg.TemplateList = newArr;
let obj = {};
obj = this.CompanyList.find(item => {
return item.SId === this.addMsg.BranchId; //筛选出匹配数据
});
this.addMsg.BranchIdName = obj.SName;
this.apipost('Window_post_SetAccountant', this.addMsg, r => {
if (r.data.resultCode == 1) {
this.$message.success(r.data.message);
this.getList();
this.addShow = false;
this.cancelEdit();
// this.CostIdS = [];
} else {
this.$message.error(r.data.message);
}
}, null)
},
submitForm(addMsg) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addCashierWork();
} else {
return false;
}
});
},
financeinfoRemove(id) { // 删除
this.$confirm(this.$t('tips.qrscchuangkou'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('Window_post_RemoveAccountant', {
ID: id
}, res => {
if (res.data.resultCode == 1) {
this.getList()
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('hotel.hotel_HasBeenCancelled')
});
});
},
remoteMethod(query) {
let msg = {
EmployeeName:query
}
queryEmployee(msg).then(res => {
if(res.Code==1){
this.searchList = res.Data;
}
}).catch(() => {
})
},
getList() {
this.loading = true;
this.apipost('Window_post_GetAccountantPageList', this.msg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
if (this.total > 0) {
this.noData = false;
} else {
this.noData = true;
}
} else {
this.$message.error(res.data.message);
}
this.loading = false;
}, err => {
this.loading = false;
})
},
editCurency(id) { // 修改 根据id 获取信息
this.apipost('Window_post_GetAccountant', {
ID: id
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
// data.CostList.forEach(x=>{
// this.CostIdS.push(x.CostTypeId);
// })
this.addMsg = data;
this.addMsg.listArr = [];
this.addMsg.TemplateListArr = [];
if (data.emList && data.emList.length > 0) {
data.emList.forEach(x => {
this.remoteMethod(x.emName);
this.addMsg.listArr.push(x.EmId)
})
}
if (data.TemplateList && data.TemplateList.length > 0) {
data.TemplateList.forEach(x => {
this.addMsg.TemplateListArr.push(x.Id)
})
}
this.addMsg.accountant_list = [];
this.addShow = true;
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
cancelEdit() { // 取消修改、新增
this.addMsg = {
ID: 0,
Name: '',
accountant_list: [],
emList: [],
listArr: [],
TemplateListArr: [],
TemplateList: [],
BranchId: '',
Direct: ''
}
this.CostIdS = [];
this.searchList = [];
},
resetForm(formName) { //弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
},
getCompanyList() { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
},
},
mounted() {
this.getList();
this.getCostTypeList();
this.getCompanyList();
}
}
</script>
src/pages/financial/financalDocument/WorkEntrustmentMy.vue
View file @ 93a95453
......@@ -21,7 +21,7 @@
.page_WorkEntrustmentMy .border_left_dashed{border-left: 1px dashed #DCDFE6}
.page_WorkEntrustmentMy ._edHeight{height:430px;}
.page_WorkEntrustmentMy .edHeight{display: block !important;height: 290px;}
.page_WorkEntrustmentMy ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px;width: 100%;}
.page_WorkEntrustmentMy ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px;width: 100%;}
.page_WorkEntrustmentMy ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.page_WorkEntrustmentMy ._vMG_edit ._tit span{color: #666666}
.page_WorkEntrustmentMy ._vMG_edit form{padding: 25px 0}
......@@ -48,7 +48,7 @@
<span v-if="son=='2'">单据审批</span>
<span v-if="son=='3'">客户审批</span>
</template>
</p>
</el-col>
<el-col :span="4" class="border_left_dashed">
......@@ -76,12 +76,12 @@
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
<el-pagination
background
@current-change="handleCurrentChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
......@@ -104,14 +104,14 @@
<el-col :span="12" :offset="1">
<el-form-item label="受委托人：">
<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'
:value='item.empId'
:key='item.empId'>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.departmentName }}</span>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -119,19 +119,19 @@
<el-col :span="12">
<el-form-item label="受委内容：">
<el-checkbox-group v-model="delegateContent">
<el-checkbox label="1" name="1" key="1">工作审批</el-checkbox>
<!-- <el-checkbox label="1" name="1" key="1">工作审批</el-checkbox>-->
<el-checkbox label="2" name="2" key="2">财务审批</el-checkbox>
<el-checkbox label="3" name="3" key="3">客户审批</el-checkbox>
<!-- <el-checkbox label="3" name="3" key="3">客户审批</el-checkbox>-->
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="12" class="we_btn">
<button type="button" class="normalBtn" @click="user_delegate_AddAuditDelegate()">{{$t('pub.saveBtn')}}</button>
<button type="button" class="normalBtn" @click="user_delegate_AddAuditDelegate()">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button" @click="cancelEdit(),addShow=false">{{$t('pub.cancelBtn')}}</button>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
......@@ -152,12 +152,12 @@ export default {
delegateContent:'',
InitiatorEmpId: 0
},
delegateContent:[],
delegateContent:['2'],
transactionDate:[],
loading:false,
searchList:[],
noData:false,
total:0,
total:0,
currentPage:1,
userId:0,
defaultImg: 'this.src="' + require("../image/default_head_img.jpg") + '"'
......@@ -182,12 +182,12 @@ export default {
this.delegateContent = [];
this.transactionDate = [];
},
timeAdd(){ // 日期格式
timeAdd(){ // 日期格式
if(!this.transactionDate){
this.msg.startDate = '';
this.msg.endDate = '';
return
}
return
}
this.addMsg.startDate = this.transactionDate[0];
this.addMsg.endDate = this.transactionDate[1];
},
......@@ -221,13 +221,13 @@ export default {
}else{
this.$message.error(res.data.message);
}
}, err => {})
}, err => {})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
});
},
user_delegate_AddAuditDelegate(){ // 新增委托
if(this.delegateContent.length<=0){
......@@ -245,7 +245,7 @@ export default {
}
if(this.addMsg.startDate==''){
return this.$message.error('请选择时间范围！');
}
}
this.apipost('user_delegate_AddAuditDelegate',this.addMsg, res => {
if(res.data.resultCode == 1) {
this.addShow = false;
......@@ -255,7 +255,7 @@ export default {
this.$message.error(res.data.message);
}
this.getList();
}, err => {})
}, err => {})
},
remoteMethod(query) { // 远程搜索
if (query !== '') {
......@@ -265,7 +265,7 @@ export default {
if (res.data.data.length > 1) {
this.searchList = [];
}
this.searchList = res.data.data;
this.searchList = res.data.data;
this.searchList.forEach((x, index) => {
this.$set(this.searchList, index, x);
});
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ 93a95453
......@@ -670,7 +670,7 @@
</p>
</template>
<p>
{{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page">{{emplyeeName}}</span>
集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
</p>
</div>
<div class="_explain">
......@@ -830,7 +830,9 @@
PayDate: '',
CallType: 0,
Type: 0,
GuestInfoList: []
GuestInfoList: [],
RB_BranchName:'',
RB_DepartName:'',
},
detailList: {
ID: 0,
......@@ -1713,6 +1715,7 @@
this.CompanyList.forEach(x=>{//给msg传校区的名字
if(x.SId==Bid){
this.msg.RB_BranchName = x.SName;
console.log( this.msg)
}
})
// this.msg.RB_Depart_Id = '';
......@@ -1726,7 +1729,10 @@
} else {
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().DeptId;
this.msg.RB_DepartName =this.msg.RB_DepartName?this.msg.RB_DepartName: this.getLocalStorage().DeptName;
}
console.log(this.msg)
}
}).catch(() => {
......@@ -1746,6 +1752,11 @@
getCompany() { //公司
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
this.CompanyList.forEach(x=>{//给msg传校区的名字
if(x.SId==this.msg.RB_Branch_Id){
this.msg.RB_BranchName = x.SName;
}
})
}).catch(() => {
})
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ 93a95453
......@@ -572,7 +572,7 @@
</p>
</template>
<p>
{{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page">{{emplyeeName}}</span>
集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
</p>
</div>
<div class="_explain">
......@@ -713,7 +713,9 @@
SourceID: 0,
TCIDAndTCNUMList: [],
CallType: 0,
Type: 0
Type: 0,
RB_BranchName:'',
RB_DepartName:'',
},
AccountNumber: '',
queryAccMsg: {
......@@ -1328,7 +1330,7 @@
});
}).catch(() => {
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
path: '/financial/financalDocument/FinancialDocuments',
query: {
'Type': this.$route.query.Type,
'InPay': this.$route.query.InPay
......@@ -1719,7 +1721,7 @@
} else {
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().DeptId;
this.msg.RB_DepartName =this.msg.RB_DepartName?this.msg.RB_DepartName: this.getLocalStorage().RB_DepartName;
this.msg.RB_DepartName =this.msg.RB_DepartName?this.msg.RB_DepartName: this.getLocalStorage().DeptName;
}
}
......@@ -1781,6 +1783,11 @@
}
}, err => {})
}
this.companyList.forEach(x=>{//给msg传校区的名字
if(x.SId==this.msg.RB_Branch_Id){
this.msg.RB_BranchName = x.SName;
}
})
}).catch(() => {
......
src/pages/financial/financalDocument/refundQuery.vue
View file @ 93a95453
......@@ -7,94 +7,96 @@
<div class="query-box">
<ul>
<li>
<span>
<em>订单号</em>
<el-input type="text" v-model="msg.OrderId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>订单号</em>
<el-input type="text" v-model="msg.OrderId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单来源</em>
<el-select v-model="msg.OrderSource" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in orderList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
<span>
<em>订单来源</em>
<el-select v-model="msg.OrderSource" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in orderList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商务订单</em>
<el-input type="text" v-model="msg.Pay_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span><em>商务订单</em>
<el-input type="text" v-model="msg.Pay_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span><em>平台订单</em>
<el-input type="text" v-model="msg.Trade_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span><em>平台订单</em>
<el-input type="text" v-model="msg.Trade_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>支付方式</em>
<el-select v-model="msg.Pay_Way" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option>
<el-option label="QQ" :value="2"></el-option>
<el-option label="支付宝" :value="3"></el-option>
<el-option label="银联" :value="4"></el-option>
</el-select>
</span>
<span>
<em>支付方式</em>
<el-select v-model="msg.Pay_Way" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option>
<el-option label="QQ" :value="2"></el-option>
<el-option label="支付宝" :value="3"></el-option>
<el-option label="银联" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商户号</em>
<el-input type="text" v-model="msg.Mch_Id" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span><em>商户号</em>
<el-input type="text" v-model="msg.Mch_Id" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>类型</em>
<el-select v-model="msg.Type" filterable clearable>
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</span>
<span>
<em>类型</em>
<el-select v-model="msg.Type" filterable clearable>
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>退款状态</em>
<el-select v-model="msg.RefundStatus" filterable clearable>
<el-option label="不限" :value="0"></el-option>
<el-option label="收款中" :value="1"></el-option>
<el-option label="退款成功" :value="2"></el-option>
<el-option label="退款失败" :value="3"></el-option>
<el-option label="转入代发" :value="4"></el-option>
</el-select>
</span>
<span>
<em>退款状态</em>
<el-select v-model="msg.RefundStatus" filterable clearable>
<el-option label="不限" :value="0"></el-option>
<el-option label="收款中" :value="1"></el-option>
<el-option label="退款成功" :value="2"></el-option>
<el-option label="退款失败" :value="3"></el-option>
<el-option label="转入代发" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>财务单据</em>
<el-input type="text" v-model="msg.FinanceId" @keyup.native="checkInteger(msg,'FinanceId')" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>财务单据</em>
<el-input type="text" v-model="msg.FinanceId" @keyup.native="checkInteger(msg,'FinanceId')"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>日期</em>
<el-date-picker type="date" v-model="msg.StartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker type="date" v-model="msg.EndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
<span>
<em>日期</em>
<el-date-picker type="date" v-model="msg.StartTime" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.EndTime" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>退款日期</em>
<el-date-picker type="date" v-model="msg.RefundStartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.RefundEndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
<span>
<em>退款日期</em>
<el-date-picker type="date" v-model="msg.RefundStartTime" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.RefundEndTime" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="handleCurrentChange(),getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="handleCurrentChange(),getList()" />
</li>
</ul>
</div>
......@@ -122,36 +124,36 @@
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" :page-size="msg.pageSize"
layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
pageIndex:1,
pageSize:10,
OrderId:'',
OrderSource:0,
Pay_Order:'',
Trade_Order:'',
Pay_Way:0,
Mch_Id:'',
StartTime:'',
EndTime:'',
RefundStartTime:'',
RefundEndTime:'',
Type:2,
RefundStatus:0,
FinanceId:'',
currentPage:1,
data() {
return {
msg: {
pageIndex: 1,
pageSize: 10,
OrderId: '',
OrderSource: 0,
Pay_Order: '',
Trade_Order: '',
Pay_Way: 0,
Mch_Id: '',
StartTime: '',
EndTime: '',
RefundStartTime: '',
RefundEndTime: '',
Type: 2,
RefundStatus: 0,
FinanceId: '',
currentPage: 1,
total: 0,
},
loading:false,
orderList:[],
dataList:[],
loading: false,
orderList: [],
dataList: [],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.EndTime)
......@@ -166,22 +168,22 @@
}
}
},
methods:{
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){ //获取列表
this.loading =true;
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.msg,res=>{
getList() { //获取列表
this.loading = true;
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.msg.total = res.data.data.count;
}else{
} else {
this.Error(res.data.message);
}
},err=>{})
}, err => {})
},
//订单来源
getOrderlist() {
......@@ -191,14 +193,13 @@
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
},null);
}, null);
},
},
mounted(){
mounted() {
this.getOrderlist();
this.getList();
}
}
</script>
</script>
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