Skip to content

S
SuperMan
Commit 800392e6 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

1、修复填写意见调查表提交不成功； 

2、考勤打卡设置新增可选 部门、员工项；
3、修复消息跳转财务单据审核页面显示出错问题。
4、修改旅客名单上传成功后弹窗不关闭
parent 37a90b8f
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 44 deletions
src/assets/css/login.css
View file @ 800392e6
input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
.login-box{
position:absolute;
/* position:absolute; */
/*background-repeat: no-repeat;*/
width:100%;
height:100%;
font-family:MicrosoftYaHei;
overflow: hidden;
/* width:100%;
height:100%; */
/* font-family:MicrosoftYaHei;
overflow: hidden; */
/*background-size: cover;*/
/*background-position: center center;*/
background-color: white;
/* background-color: white; */
}
.login-Div{
width:380px;
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 800392e6
......@@ -571,7 +571,7 @@
</div>
</div>
</div>
<div class="_right_content" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2">
<div class="_right_content" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2 && MsgUrl">
<span class="_sm" >
<p class="_name">
<span class="_n">{{son.AuditName}}</span>
......@@ -880,7 +880,7 @@
</ul>
</div>
</div>
<div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2" >
<div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2 && MsgUrl" >
<div class="_left_radius _left_radius_sus" v-if="item.Status==1">待审</div>
<p class="_name"> <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian" v-if="item.AuditWay==3">（{{item.AuditWayName}}）</span></p>
<div class="_right_content _padd_left_10">
......@@ -1250,7 +1250,7 @@
</div>
</template>
</div>
<div class="_submit" v-if="GetDetail.Is_Self!=1">
<div class="_submit" v-if="GetDetail.Is_Self!=1 && MsgUrl">
<div class="chosenNextBox" v-if="(GetDetail.IsHave==0||resultCode==11019)&&AuditOrRefundMsg.Status=='5'">
<template>
<div>
......@@ -1278,7 +1278,7 @@
</template>
</div>
</div>
<div class="_submit" v-if="GetDetail.Is_Self==1">
<div class="_submit" v-if="GetDetail.Is_Self==1" && MsgUrl>
<div>
<label>转交人：</label>
<el-select size="mini" style="width:300px" v-model="zhuanMsg.AuditEmId" filterable remote reserve-keyword placeholder="请选择转交人" :remote-method="remoteMethod" :loading="loadingPeople">
......@@ -1466,6 +1466,7 @@ export default {
isChongDi: false,
danjuType: '',
showModel: false,
MsgUrl: true,
}
},components:{
"my-FlowChartModule": myFlowChartModule,
......@@ -2242,6 +2243,7 @@ export default {
}
},
Financial_post_GetDetail(id,t){ //获取单据详情
let userInfo=this.getLocalStorage();
this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
......@@ -2276,6 +2278,7 @@ export default {
}
let AuditSteps=this.GetDetail.AuditSteps;
let ChuNaShenHe = false
let MsgUrl = false;
for(let i = 0; i < AuditSteps.length; i++) {
if(AuditSteps[i].NextStep==1 && AuditSteps[i].SpecialNode==2 && AuditSteps[i].Status==1){
ChuNaShenHe = true
......@@ -2286,9 +2289,18 @@ export default {
return
}
})
}
if(AuditSteps[i].NextStep==1){
AuditSteps[i].AuditRecordList.forEach(audit=>{
if(audit.AuditName==userInfo.emName){
MsgUrl = true
return
}
})
}
}
this.MsgUrl = MsgUrl
// AuditSteps.forEach(item=>{
// if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
// ChuNaShenHe = true
......
src/components/FinancialModule/Qzcommissions.vue
View file @ 800392e6
......@@ -18,6 +18,14 @@
<th>占比</th>
<th>设置</th>
</tr>
<tr>
<td>地接账户基金</td>
<td>{{allzb}}%</td>
<td>
<!-- <el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button> -->
</td>
</tr>
<tbody v-for="(item,i) in dataList" :key="i">
<tr>
<td>{{item.EmployeeName}}</td>
......
src/components/Login2019.vue
View file @ 800392e6
......@@ -170,7 +170,7 @@ export default {
speed: 3000,
imgList: [
{
src: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/20190920032221373.jpg',
src: 'http://imgfile.oytour.com/New/Upload/Cloud/2019-09/20190923020945469.jpg',
text: '京都独旅之秋',
text1: '旅宿权威柏井寿的私房赏枫秘境',
url: 'http://www.oytour.com/#/JuanDetails?id=70'
......
src/components/SalesModule/groupTourOrder.vue
View file @ 800392e6
......@@ -2926,7 +2926,7 @@
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate) {
// 该团目前已是结团状态，不能随意修改备注信息，若强行修改备注，将会计入个人考核，是否确定修改备注信息？
this.$confirm("该团目前已是结团状态，无法修改备注？", "提示", {
this.$confirm("该团目前已是结团状态，无法修改备注", "提示", {
confirmButtonText: "确定",
showCancelButton: false,
type: "warning"
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 800392e6
......@@ -3430,8 +3430,8 @@
if (res.resultCode == 1) {
this.Success(res.message);
this.outerVisible = false;
this.isShow = false;
this.fillShow = true;
this.importNameFile = false;
this.importData = res.data;
this.getList()
} else{
......
src/components/administrative/AttendanceRules.vue
View file @ 800392e6
......@@ -36,11 +36,15 @@
<table v-if='this.signInDates.length>=1' class="att_table" cellspacing="0" cellpadding="0">
<tr>
<th>日期</th>
<th>部门</th>
<th>员工</th>
<th>考勤时间</th>
<th width="80">操作</th>
</tr>
<tr v-for="(item,index) in signInDates">
<td>{{item.Date}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.EmployeeName}}</td>
<td>{{item.BeOnDutyTime}}~{{item.OffDutyTime}}</td>
<td>
<el-row>
......@@ -180,8 +184,31 @@
</el-time-select>
</td>
</tr>
<tr>
<td>
<span>部门</span>
<el-select filterable v-model='newSignIn.RB_Department_Id' @change='getEmployee(newSignIn.RB_Department_Id)'>
<el-option v-for='item in departmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</td>
</tr>
<tr>
<td>
<span>员工</span>
<el-select filterable v-model='newSignIn.EmployeeId' @change="getEmployeeName(newSignIn.EmployeeId)">
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
:key='item.empId'>
</el-option>
</el-select>
</td>
</tr>
</table>
<table class="layerTable" v-if='this.signDateType==2'>
<tr>
<td>
......@@ -384,9 +411,51 @@
awList: [], //Name，Address，TargetAddress，Scope awList：[{'Name'：'xxx',Address:'xxx',TargetAddress:'xxx',Scope：'xxx'},{}]
awWifiList: [] //awWifiList:[{'Name':'xxxx',TargetAddress:'12.51.42.32'}]
},
departmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id:'0',
Status:'0',
ParentId:'-1',
Tier:'0',
},
employeeMsg: {
RB_Group_id:'0',
RB_Branch_id:'-1',
departmentId:'0',
IsLeave:'-1',
},
departmentList: [],
employeeList: [],
}
},
methods: {
getEmployeeName(id){
this.employeeList.map(x=>{
if (id == x.empId) {
this.newSignIn.EmployeeName = x.name
}
})
},
getEmployee(id) {
this.employeeMsg.departmentId = id
this.apipost('app_get_company_employee', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
}, err => {})
this.departmentList.map(x=>{
if (id == x.DepartmentID) {
this.newSignIn.DepartmentName = x.DepartmentName
}
})
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
}
}, err => {})
},
getDateArr() {
if (this.fwStartTime != '' && this.fwEndTime != '') {
this.apipost('User_get_AttendanceGetTimeSpanValue', {
......@@ -462,7 +531,9 @@
this.newSignIn = {
'Date': '',
'BeOnDutyTime': '',
'OffDutyTime': ''
'OffDutyTime': '',
RB_Department_Id: '',
EmployeeId: '',
};
this.outerVisible = true;
this.signDateType = 1;
......@@ -499,10 +570,20 @@
},
saveSignIn() {
let list = [...this.signInDates, ...this.signOutDates]
if (this.newSignIn.RB_Department_Id == '') {
this.newSignIn.RB_Department_Id = 0
}
if (this.newSignIn.EmployeeId == '') {
this.newSignIn.EmployeeId = 0
}
if (this.picked == 'one') { // 单天设置
this.isRepetition = false;
this.SpecialDates.forEach(item => {
if (this.newSignIn.Date == item) {
list.forEach(item => {
if (this.newSignIn.Date == item.Date && (this.newSignIn.RB_Department_Id == item.RB_Department_Id || this.newSignIn.RB_Department_Id == 0) &&
(this.newSignIn.EmployeeId == item.EmployeeId || this.newSignIn.EmployeeId == 0)) {
this.isRepetition = true;
} else if (this.newSignIn.Date == item.Date) {
this.isRepetition = true;
}
})
......@@ -561,10 +642,14 @@
this.outerVisible = true;
},
saveSignOut() {
let list = [...this.signInDates, ...this.signOutDates]
if (this.picked1 == 'one') { // 单天设置
this.isRepetition = false;
this.SpecialDates.forEach(item => {
if (this.newSignOut.Date == item) {
list.forEach(item => {
if (this.newSignIn.Date == item.Date && (this.newSignIn.RB_Department_Id == item.RB_Department_Id || this.newSignIn.RB_Department_Id == 0) &&
(this.newSignIn.EmployeeId == item.EmployeeId || this.newSignIn.EmployeeId == 0)) {
this.isRepetition = true;
} else if (this.newSignIn.Date == item.Date) {
this.isRepetition = true;
}
})
......@@ -784,7 +869,10 @@
},
},
mounted() {
this.addMsg.RB_BranchId = this.$route.query.bId;
let userInfo = this.getLocalStorage();
this.departmentMsg.RB_Group_Id = this.employeeMsg.RB_Group_id = userInfo.RB_Group_id; //集团
this.addMsg.RB_BranchId = this.departmentMsg.RB_Branch_Id = this.$route.query.bId;
this.getDepartment()
if (this.$route.query.id != undefined) {
this.addMsg.attendanceId = this.$route.query.id;
this.getUpdateList();
......
src/components/administrative/Survey.vue
View file @ 800392e6
......@@ -111,7 +111,7 @@
center
:before-close="closeDialog">
<div class="main NewSurveyList">
<el-select filterable v-model="GuestId" value-key="LineID" >
<el-select filterable v-model="GuestId" value-key="LineID" @change="getOrderID(GuestId)">
<el-option v-for="item in ppList" :label='item.GuestName' :value='item.GuestId' :key='item.GuestId'></el-option>
</el-select>
<div class="">
......@@ -235,10 +235,16 @@ export default {
this.GetSurveyShowList();
},
methods:{
getOrderID(id){
this.ppList.map(x=>{
if (id === x.GuestId){
this.OrderID = x.OrderID;
}
})
},
setInfo(obj){
console.log(obj)
this.TCID = obj.tcid;
this.OrderID = obj.orderId;
this.DiaoChaShow = true;
this.getppList();
},
......
src/components/index.vue
View file @ 800392e6
......@@ -1698,12 +1698,13 @@ export default {
}
},
LogSetReadStatus(s) {
console.log(s)
this.apipost(
"SystemLog_post_LogSetReadStatus",
{ LogId: s.ID },
r => {
if (s.Link) {
this.goUrl(s.Link);
this.goUrl(s.Link + '&MsgUrl=1');
}
this.IM_bodyIsShow = false;
this.refreshSysNoteDate();
......
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