Skip to content

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

页面修改

parent cc4bc6e2
Expand all Show 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 @@ ...@@ -79,11 +79,10 @@
<el-form-item :label="$t('fnc.suoshugs')"> <el-form-item :label="$t('fnc.suoshugs')">
<el-select filterable v-model='msg.RB_Branch_Id' > <el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option> <el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> -->
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.SName'
:value='item.Id' :value='item.SId'
:key='item.Id'> :key='item.SId'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -210,7 +209,7 @@ ...@@ -210,7 +209,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS"> <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-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.SName' :label='item.SName'
......
src/pages/financial/CashierWork.vue
View file @ 93a95453
...@@ -253,10 +253,10 @@ ...@@ -253,10 +253,10 @@
:loading="loading2"> :loading="loading2">
<el-option <el-option
v-for="item in searchList" v-for="item in searchList"
:key="item.empId" :key="item.Id"
:label="item.name" :label="item.EmployeeName"
:value="item.empId"> :value="item.Id">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
</el-option> </el-option>
</el-select> </el-select>
...@@ -330,6 +330,10 @@ ...@@ -330,6 +330,10 @@
</div> </div>
</template> </template>
<script> <script>
import {
queryEmployee
} from '../../api/users/user'
export default { export default {
data(){ data(){
return{ return{
...@@ -432,7 +436,7 @@ ...@@ -432,7 +436,7 @@
this.$router.push({name:path,query:{Conditon:g,blank:'y'}}) this.$router.push({name:path,query:{Conditon:g,blank:'y'}})
}, },
goUrlDetail(path,type,name,id){ 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){ removeTag(id){
this.addMsg.emList.forEach((x,index)=>{ this.addMsg.emList.forEach((x,index)=>{
...@@ -473,18 +477,31 @@ ...@@ -473,18 +477,31 @@
} }
} }
if(!sub) return this.$message.error('请选择出纳类型!') if(!sub) return this.$message.error('请选择出纳类型!')
let emList = this.addMsg.listArr; let emList = this.addMsg.listArr;
let arr = []; this.addMsg.emList=[];
emList.forEach(x=>{ emList.forEach(x=>{
let obj = { this.searchList.forEach(y=>{
'EmId':x, if(x==y.Id){
'ID':0, let obj={
'WindowId':0 EmId:y.Id,
EmIdName:y.EmployeeName
} }
arr.push(obj); this.addMsg.emList.push(obj);
}); }
let list4 = this.mergeArray(arr,this.addMsg.emList); })
this.addMsg.emList = list4; })
// 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=>{ this.apipost('Window_post_Set',this.addMsg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.$message.success(r.data.message); this.$message.success(r.data.message);
...@@ -635,18 +652,16 @@ ...@@ -635,18 +652,16 @@
this.addMsg.EmId = item.empId; this.addMsg.EmId = item.empId;
}, },
remoteMethod(query) { remoteMethod(query) {
if (query !== ''||this.addShow) { var qMsg = {
this.loading2 = true; EmployeeName: query
this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => { }
if (res.data.resultCode == 1) { queryEmployee(qMsg).then(res => {
this.searchList = res.data.data; if(res.Code==1){
this.loading2 = false; this.searchList = res.Data;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
} }
}).catch(() => {
})
}, },
getList(){ getList(){
this.loading = true; this.loading = true;
...@@ -691,7 +706,7 @@ ...@@ -691,7 +706,7 @@
this.addMsg.listArr = []; this.addMsg.listArr = [];
if(data.emList&&data.emList.length>0){ if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{ data.emList.forEach(x=>{
this.remoteMethod(x.emName); this.remoteMethod('');
this.addMsg.listArr.push(x.EmId) this.addMsg.listArr.push(x.EmId)
}) })
} }
...@@ -719,9 +734,20 @@ ...@@ -719,9 +734,20 @@
resetForm(formName) {//弹出框取消 初始化谈框内表单 resetForm(formName) {//弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
getEmployee(){
queryEmployee({}).then(res => {
if(res.Code==1){
this.searchList = res.Data;
console.log(res,'数据');
}
}).catch(() => {
})
}
},mounted(){ },mounted(){
this.getList(); this.getList();
this.getAccList(); this.getAccList();
this.getEmployee();
} }
} }
</script> </script>
src/pages/financial/CompanyAccount.vue
View file @ 93a95453
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <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-select filterable v-model='msg.RB_Branch_Id' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option> <el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<!-- <el-option label='通用' value='-1'></el-option> --> <!-- <el-option label='通用' value='-1'></el-option> -->
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS"> <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-select filterable v-model='addMsg.BranchIdS'>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.SName' :label='item.SName'
...@@ -822,7 +822,7 @@ export default { ...@@ -822,7 +822,7 @@ export default {
this.getList() this.getList()
this.getAccountTypeList() this.getAccountTypeList()
let userInfo=this.getLocalStorage(); 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.getCompanyList()
this.getFinancialList() this.getFinancialList()
this.getfinanceinfoList() this.getfinanceinfoList()
......
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @ 93a95453
...@@ -438,6 +438,7 @@ ...@@ -438,6 +438,7 @@
<script> <script>
import moment from "moment" import moment from "moment"
import {getSchoolPage} from '../../../api/school/index' import {getSchoolPage} from '../../../api/school/index'
import {UploadSelfFile} from '../../../api/common/common'
export default { export default {
data(){ data(){
...@@ -1107,13 +1108,13 @@ ...@@ -1107,13 +1108,13 @@
newArr.push(file.file) newArr.push(file.file)
let path = "/Upload/Temporary/" let path = "/Upload/Temporary/"
this.$message.info('上传中...') 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); let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({ this.saveMsg.push({
Content: x.data.FilePath, Content: x.FileUrl,
ID:0, ID:0,
Type:fileTypeNumber, Type:fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath, Url: x.FileUrl,
}) })
this.addMsg.vorcherInos = this.saveMsg; this.addMsg.vorcherInos = this.saveMsg;
this.Success('上传成功'); 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
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="受委内容："> <el-form-item label="受委内容：">
<el-checkbox-group v-model="delegateContent"> <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="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-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
delegateContent:'', delegateContent:'',
InitiatorEmpId: 0 InitiatorEmpId: 0
}, },
delegateContent:[], delegateContent:['2'],
transactionDate:[], transactionDate:[],
loading:false, loading:false,
searchList:[], searchList:[],
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ 93a95453
...@@ -670,7 +670,7 @@ ...@@ -670,7 +670,7 @@
</p> </p>
</template> </template>
<p> <p>
{{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page">{{emplyeeName}}</span> 集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
</p> </p>
</div> </div>
<div class="_explain"> <div class="_explain">
...@@ -830,7 +830,9 @@ ...@@ -830,7 +830,9 @@
PayDate: '', PayDate: '',
CallType: 0, CallType: 0,
Type: 0, Type: 0,
GuestInfoList: [] GuestInfoList: [],
RB_BranchName:'',
RB_DepartName:'',
}, },
detailList: { detailList: {
ID: 0, ID: 0,
...@@ -1713,6 +1715,7 @@ ...@@ -1713,6 +1715,7 @@
this.CompanyList.forEach(x=>{//给msg传校区的名字 this.CompanyList.forEach(x=>{//给msg传校区的名字
if(x.SId==Bid){ if(x.SId==Bid){
this.msg.RB_BranchName = x.SName; this.msg.RB_BranchName = x.SName;
console.log( this.msg)
} }
}) })
// this.msg.RB_Depart_Id = ''; // this.msg.RB_Depart_Id = '';
...@@ -1726,7 +1729,10 @@ ...@@ -1726,7 +1729,10 @@
} else { } else {
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().DeptId; 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(() => { }).catch(() => {
...@@ -1746,6 +1752,11 @@ ...@@ -1746,6 +1752,11 @@
getCompany() { //公司 getCompany() { //公司
getSchoolPage(this.schoolMsg).then(res => { getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData; 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(() => { }).catch(() => {
}) })
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ 93a95453
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
</p> </p>
</template> </template>
<p> <p>
{{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page">{{emplyeeName}}</span> 集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
</p> </p>
</div> </div>
<div class="_explain"> <div class="_explain">
...@@ -713,7 +713,9 @@ ...@@ -713,7 +713,9 @@
SourceID: 0, SourceID: 0,
TCIDAndTCNUMList: [], TCIDAndTCNUMList: [],
CallType: 0, CallType: 0,
Type: 0 Type: 0,
RB_BranchName:'',
RB_DepartName:'',
}, },
AccountNumber: '', AccountNumber: '',
queryAccMsg: { queryAccMsg: {
...@@ -1328,7 +1330,7 @@ ...@@ -1328,7 +1330,7 @@
}); });
}).catch(() => { }).catch(() => {
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments', path: '/financial/financalDocument/FinancialDocuments',
query: { query: {
'Type': this.$route.query.Type, 'Type': this.$route.query.Type,
'InPay': this.$route.query.InPay 'InPay': this.$route.query.InPay
...@@ -1719,7 +1721,7 @@ ...@@ -1719,7 +1721,7 @@
} else { } else {
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().DeptId; 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 @@ ...@@ -1781,6 +1783,11 @@
} }
}, err => {}) }, err => {})
} }
this.companyList.forEach(x=>{//给msg传校区的名字
if(x.SId==this.msg.RB_Branch_Id){
this.msg.RB_BranchName = x.SName;
}
})
}).catch(() => { }).catch(() => {
......
src/pages/financial/financalDocument/refundQuery.vue
View file @ 93a95453
...@@ -72,29 +72,31 @@ ...@@ -72,29 +72,31 @@
<li> <li>
<span> <span>
<em>财务单据</em> <em>财务单据</em>
<el-input type="text" v-model="msg.FinanceId" @keyup.native="checkInteger(msg,'FinanceId')" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input type="text" v-model="msg.FinanceId" @keyup.native="checkInteger(msg,'FinanceId')"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>日期</em> <em>日期</em>
<el-date-picker type="date" v-model="msg.StartTime" <el-date-picker type="date" v-model="msg.StartTime" :picker-options="pickerBeginDateBefore"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.EndTime" <el-date-picker type="date" v-model="msg.EndTime" :picker-options="pickerBeginDateAfter"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>退款日期</em> <em>退款日期</em>
<el-date-picker type="date" v-model="msg.RefundStartTime" <el-date-picker type="date" v-model="msg.RefundStartTime" :picker-options="pickerBeginDateBefore"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> - value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.RefundEndTime" <el-date-picker type="date" v-model="msg.RefundEndTime" :picker-options="pickerBeginDateAfter"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<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> </li>
</ul> </ul>
</div> </div>
...@@ -122,36 +124,36 @@ ...@@ -122,36 +124,36 @@
<p>{{$t("active.ld_noData")}}</p> <p>{{$t("active.ld_noData")}}</p>
</div> </div>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" :page-size="msg.pageSize" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination> :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data(){ data() {
return{ return {
msg:{ msg: {
pageIndex:1, pageIndex: 1,
pageSize:10, pageSize: 10,
OrderId:'', OrderId: '',
OrderSource:0, OrderSource: 0,
Pay_Order:'', Pay_Order: '',
Trade_Order:'', Trade_Order: '',
Pay_Way:0, Pay_Way: 0,
Mch_Id:'', Mch_Id: '',
StartTime:'', StartTime: '',
EndTime:'', EndTime: '',
RefundStartTime:'', RefundStartTime: '',
RefundEndTime:'', RefundEndTime: '',
Type:2, Type: 2,
RefundStatus:0, RefundStatus: 0,
FinanceId:'', FinanceId: '',
currentPage:1, currentPage: 1,
total: 0, total: 0,
}, },
loading:false, loading: false,
orderList:[], orderList: [],
dataList:[], dataList: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
let endTime = new Date(this.msg.EndTime) let endTime = new Date(this.msg.EndTime)
...@@ -166,22 +168,22 @@ ...@@ -166,22 +168,22 @@
} }
} }
}, },
methods:{ methods: {
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
getList(){ //获取列表 getList() { //获取列表
this.loading =true; this.loading = true;
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.msg,res=>{ this.apipost('OnlinePay_get_GetOrderPayMoneyInfo', this.msg, res => {
this.loading = false; this.loading = false;
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.msg.total = res.data.data.count; this.msg.total = res.data.data.count;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},err=>{}) }, err => {})
}, },
//订单来源 //订单来源
getOrderlist() { getOrderlist() {
...@@ -191,14 +193,13 @@ ...@@ -191,14 +193,13 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.orderList = res.data.data; this.orderList = res.data.data;
} }
},null); }, null);
}, },
}, },
mounted(){ mounted() {
this.getOrderlist(); this.getOrderlist();
this.getList(); 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