Skip to content

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

页面修改

parent cc4bc6e2
Expand all 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
This diff is collapsed.
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(() => {
......
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