Skip to content

C
confucius
Commit f4965de2 authored by Mac's avatar Mac
Browse files
Options

修改样式

parent 72c300d0
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 48 deletions
src/pages/course/baseSet.vue
View file @ f4965de2
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
<q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数" <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数"
ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')" ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')"
:rules="[val => !!val || '请填写默认班级人数']" /> :rules="[val => !!val || '请填写默认班级人数']" />
<q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.ClassNoPrefix" label="班级编码" <q-input filled stack-label maxlength="8" v-model="addMsg.ClassNoPrefix" label="班级编码"
ref="ClassNoPrefix" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'ClassNoPrefix')" class="q-pb-lg" @input="this.value=this.value.replace(/[^a-zA-Z]/g,'')"
/> />
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
......
src/pages/course/classManage.vue
View file @ f4965de2
...@@ -65,10 +65,17 @@ ...@@ -65,10 +65,17 @@
</template> </template>
<template v-slot:body-cell-ClassName="props"> <template v-slot:body-cell-ClassName="props">
<q-td auto-width :props="props"> <q-td auto-width :props="props">
<q-avatar size="md" style="background:#d4dfff;color:#2961FE;font-weight:bold;" v-if="props.row.ClassName"> <div style="display: flex;align-items: center;">
{{GetFirst(props.row.ClassName)}}</q-avatar> <q-avatar size="md" style="background:#d4dfff;color:#2961FE;font-weight:bold;" v-if="props.row.ClassName">
<span style="color:#2961FE;margin-left:10px;cursor:pointer;" @click="getClassInfo(props.row)" {{GetFirst(props.row.ClassName)}}</q-avatar>
title="点击查看详情">{{props.row.ClassName}}</span> <div >
<span style="color:#2961FE;margin-left:10px;cursor:pointer;" @click="getClassInfo(props.row)"
title="点击查看详情">{{props.row.ClassName}}</span>
<div style="margin-left: 10px;">{{props.row.ClassNo}}</div>
</div>
</div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-OtherCourseName="props"> <template v-slot:body-cell-OtherCourseName="props">
......
src/pages/financial/TeamRevenueReport.vue
View file @ f4965de2
...@@ -1069,7 +1069,6 @@ ...@@ -1069,7 +1069,6 @@
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
isFrozen: true,
}, },
{ {
field: "ClassState", field: "ClassState",
...@@ -1080,7 +1079,6 @@ ...@@ -1080,7 +1079,6 @@
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: true,
formatter: function (rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
let state = rowData.ClassState let state = rowData.ClassState
let text = '' let text = ''
...@@ -1104,7 +1102,6 @@ ...@@ -1104,7 +1102,6 @@
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: true
}, },
{ {
field: "TeacherName", field: "TeacherName",
...@@ -1113,7 +1110,6 @@ ...@@ -1113,7 +1110,6 @@
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
isFrozen: true,
}, },
{ {
field: "YingShou", field: "YingShou",
......
src/pages/financial/orderCompleteStatistics.vue
View file @ f4965de2
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
<th :width='200'>签订时间</th> <th :width='200'>签订时间</th>
<th :width='220'>合同编号</th> <th :width='220'>合同编号</th>
<th :width='400'>产品名称</th> <th :width='400'>产品名称</th>
<th :width='200'>班号</th>
<th :width='400'>班级</th> <th :width='400'>班级</th>
<th :width='150'>学员名称</th> <th :width='150'>学员名称</th>
<th :width='120'>业务员</th> <th :width='120'>业务员</th>
...@@ -223,7 +224,8 @@ ...@@ -223,7 +224,8 @@
<td>{{item.CreateTime}}</td> <td>{{item.CreateTime}}</td>
<td @click="goUrl('/sale/contractManage',item.ContractNo)"><span style="cursor: pointer;text-decoration: underline;" >{{item.ContractNo}}</span></td> <td @click="goUrl('/sale/contractManage',item.ContractNo)"><span style="cursor: pointer;text-decoration: underline;" >{{item.ContractNo}}</span></td>
<td @click="goUrl('/course/course',item.CourseName)"><span style="cursor: pointer;text-decoration: underline;" >{{item.CourseName}}</span></td> <td @click="goUrl('/course/course',item.CourseName)"><span style="cursor: pointer;text-decoration: underline;" >{{item.CourseName}}</span></td>
<td @click="goUrl2('/course/classManage',item.ClassName)"><span style="cursor: pointer;text-decoration: underline;" >{{item.ClassName}}</span></td> <td >{{item.ClassNo}}</td>
<td @click="goUrl2('/course/classManage',item.ClassName)"><div style="cursor: pointer;text-decoration: underline;" >{{item.ClassName}}</div></td>
<td>{{item.StudentName}}</td> <td>{{item.StudentName}}</td>
<td>{{item.CreateByName}}</td> <td>{{item.CreateByName}}</td>
<td>{{item.TotalClassHours}}</td> <td>{{item.TotalClassHours}}</td>
......
src/pages/financial/studentsClassfee.vue
View file @ f4965de2
...@@ -139,6 +139,7 @@ ...@@ -139,6 +139,7 @@
<el-table-column prop="ClassDate" label="上课日期"></el-table-column> <el-table-column prop="ClassDate" label="上课日期"></el-table-column>
<el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column> <el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column>
<el-table-column prop="GuestName" label="学生名称"> </el-table-column> <el-table-column prop="GuestName" label="学生名称"> </el-table-column>
<el-table-column prop="ClassNo" width='120' label="班号"></el-table-column>
<el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column> <el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column>
<el-table-column prop="CourseName" label="课程" width='200'></el-table-column> <el-table-column prop="CourseName" label="课程" width='200'></el-table-column>
<el-table-column prop="TeacherName" label="老师名称"></el-table-column> <el-table-column prop="TeacherName" label="老师名称"></el-table-column>
......
src/pages/financial/teacherclassfee.vue
View file @ f4965de2
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
<el-table-column prop="Date" label="上课日期"></el-table-column> <el-table-column prop="Date" label="上课日期"></el-table-column>
<el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column> <el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column>
<el-table-column prop="TeacherName" label="老师名称"></el-table-column> <el-table-column prop="TeacherName" label="老师名称"></el-table-column>
<el-table-column prop="ClassNo" label="班号"></el-table-column>
<el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column> <el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column>
<el-table-column prop="CourseName" label="课程" width='230'></el-table-column> <el-table-column prop="CourseName" label="课程" width='230'></el-table-column>
<el-table-column prop="UnitPrice" label="课时单价"></el-table-column> <el-table-column prop="UnitPrice" label="课时单价"></el-table-column>
......
src/pages/user/personalData.vue
View file @ f4965de2
...@@ -43,9 +43,11 @@ ...@@ -43,9 +43,11 @@
font-weight: bold; font-weight: bold;
color: #FFFFFF; color: #FFFFFF;
padding-left: 39px; padding-left: 39px;
margin-top: 55px; /* margin-top: 55px; */
margin-top: 8px;
} }
.personalData .box_l_cen{
.personalData .box_l_cen {
width: 100%; width: 100%;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
...@@ -57,22 +59,39 @@ ...@@ -57,22 +59,39 @@
margin-top: 8px; margin-top: 8px;
justify-content: space-between; justify-content: space-between;
} }
.personalData .headportrait{
.personalData .headportrait {
width: 120px; width: 120px;
height: 120px; height: 120px;
border-radius: 20px; border-radius: 20px;
position: relative; position: relative;
margin-top: 20px; margin-top: 20px;
} }
.personalData .box_r_title{
font-size: 12px;font-weight: bold;color: #000000;margin-top: 27px .personalData .editbianji {
position: absolute;
right: -10px;
top: -10px;
width: 26px;
height: 26px;
background: #FFFFFF;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 0px 10px 0px rgba(2, 44, 66, 0.15);
}
.personalData .box_r_title {
font-size: 12px;
font-weight: bold;
color: #000000;
margin-top: 27px
} }
.personalData .box_r_input{
.personalData .box_r_input {
width: 55%; width: 55%;
height: 54px;
padding: 10px 22px;
border-radius: 4px;
background: #F0F5FB;
margin-top: 20px; margin-top: 20px;
} }
</style> </style>
...@@ -102,41 +121,67 @@ ...@@ -102,41 +121,67 @@
<span class="box_l_t_l">电话：</span> <span class="box_l_t_l">电话：</span>
<span>{{showObj.UserMobile}}</span> <span>{{showObj.UserMobile}}</span>
</div> </div>
<div class="box_l_t"> <div class="box_l_t" style="margin-bottom: 55px;">
<span class="box_l_t_l">部门：</span> <span class="box_l_t_l">部门：</span>
<span>{{showObj.DeptName}}</span> <span>{{showObj.DeptName}}</span>
</div> </div>
<div class="box_l_title">概要信息</div> <!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> -->
<div class="box_l_cen">预警信息</div> <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div>
<div class="box_l_cen">账户资料</div> <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
<div class="box_l_cen">密码修改</div> <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
</div> </div>
<div class="box_r"> <div class="box_r">
<template v-if='rightType == 1'> <template v-if='rightType == 1'>
<div style="font-size: 16px;font-weight: bold;color: #000000;">账户资料</div> <div style="font-size: 16px;font-weight: bold;color: #000000;">账户资料</div>
<div class="box_r_title" >账户资料</div> <div class="box_r_title">账户资料</div>
<div class="headportrait"> <div class="headportrait">
<q-avatar size="120px" font-size="36px" rounded style="background:#C9F7F5" text-color="white"> <q-avatar size="120px" font-size="36px" rounded style="background:#C9F7F5" text-color="white">
<img :src="showObj.UserIcon" v-if="showObj.UserIcon"> <img :src="datamodify.UserIcon" v-if="datamodify.UserIcon">
<span v-else>{{showObj.AccountName.substring(0,1)}}</span>
</q-avatar> </q-avatar>
<el-upload class="editbianji" :http-request="uploadFileBtn" :multiple="false" action=''
accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :show-file-list="false">
<q-icon name="edit" />
</el-upload>
</div> </div>
<div style="font-size: 12px;color: #999999;margin-top: 12px;">图片格式：png、jpg、jpeg</div> <div style="font-size: 12px;color: #999999;margin-top: 12px;">图片格式：png、jpg、jpeg</div>
<div class="box_r_title" >基础资料</div> <div class="box_r_title">基础资料</div>
<div class="box_r_input"> <div class="box_r_input">
<q-input standout="bg-primary text-white" v-model="datamodify.EmployeeName" label="姓名"
:rules="[val => !!val || '姓名不能为空']" lazy-rules filled maxlength="20" />
</div> </div>
<div class="box_r_input"></div> <div class="box_r_input">
<div class="box_r_title" >联系方式</div> <q-select filled stack-label option-value="SId" option-label="SName" v-model="datamodify.School_Id"
ref="SId" :options="CompanyList" label="校区" :dense="false" emit-value map-options />
</div>
<div class="box_r_title">联系方式</div>
<div class="box_r_input">
<q-input standout="bg-primary text-white" v-model="datamodify.EmployeeTel" label="电话" type='number'
:rules="[val => !!val || '电话不能为空']" lazy-rules filled maxlength="11" />
</div>
<div class="box_r_input">
<q-input standout="bg-primary text-white" v-model="datamodify.Email" label="邮箱"
:rules="[val => !!val || '邮箱不能为空']" lazy-rules filled maxlength="20" />
</div>
<q-btn color="primary" style="width: 300px;margin-top: 50px;" :loading="loading1" @click='dataSubmit'>
<div class="ellipsis">
提交
</div>
</q-btn>
</template> </template>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import {
queryStudentBackClassPage, setEmployeeBaseInfo
} from '../../api/sale/bill' } from '../../api/users/user'
import {
getSchoolDropdown,
} from '../../api/school/index'
import {
UploadSelfFile
} from '../../api/common/common'
export default { export default {
meta: { meta: {
title: "个人资料" title: "个人资料"
...@@ -146,30 +191,50 @@ ...@@ -146,30 +191,50 @@
}, },
data() { data() {
return { return {
loading1: false,
showObj: {}, showObj: {},
rightType:1,//右边显示类型 rightType: 1,//右边显示类型
datamodify: {},
CompanyList: [],
} }
}, },
created() { created() {
this.showObj = this.getLocalStorage(); this.showObj = this.getLocalStorage();
this.datamodify = {
EmployeeName: this.showObj.AccountName,
UserIcon: this.showObj.UserIcon,
EmployeeTel: this.showObj.UserMobile,
Email: this.showObj.Email,
School_Id: this.showObj.School_Id,
}
}, },
mounted() { mounted() {
// this.getStuBackBill(); this.getBranchList()
}, },
methods: { methods: {
getBranchList() {//获取校区
//获取退课单据分页列表 getSchoolDropdown({}).then(res => {
getStuBackBill() { this.CompanyList = res.Data;
var obj = {
queryStudentBackClassPage(this.msg).then(res => { SName: '全部',
this.loading = false; SId: 0
this.data = res.Data.PageData; }
this.pageCount = res.Data.PageCount; this.CompanyList.unshift(obj);
}).catch(() => { }).catch(() => {
this.loading = false;
}) })
}, },
logout() {
uploadFileBtn(file) { //上传
UploadSelfFile('studentIcon', file.file, x => {
if (x.Code == 1) {
this.datamodify.UserIcon = x.FileUrl
}
}, 1);
},
logout() {//退出登录
this.$store this.$store
.dispatch('LogOut') .dispatch('LogOut')
.then(() => { .then(() => {
...@@ -179,6 +244,66 @@ ...@@ -179,6 +244,66 @@
}) })
}, },
dataSubmit() {//资料提交
if (this.datamodify.UserIcon == null || this.datamodify.UserIcon == '') {
this.$q.notify({
type: 'negative',
position: "top",
message: `照片不能为空`
})
return
}
if (this.datamodify.EmployeeName == null || this.datamodify.EmployeeName == '') {
this.$q.notify({
type: 'negative',
position: "top",
message: `姓名不能为空`
})
return
}
if (this.datamodify.EmployeeTel == null || this.datamodify.EmployeeTel == '') {
this.$q.notify({
type: 'negative',
position: "top",
message: `电话不能为空`
})
return
}
if (this.datamodify.Email == null || this.datamodify.Email == '') {
this.$q.notify({
type: 'negative',
position: "top",
message: `邮箱不能为空`
})
return
}
setEmployeeBaseInfo(this.datamodify).then(res => {
console.log(res)
if (res.Code == 1) {
this.$q.notify({
type: 'iconfont icon-chenggong',
color: 'accent',
position: "top",
message: res.Message
})
this.showObj.AccountName = this.datamodify.EmployeeName
this.showObj.UserIcon = this.datamodify.UserIcon
this.showObj.UserMobile = this.datamodify.EmployeeTel
this.showObj.Email = this.datamodify.Email
this.showObj.School_Id = this.datamodify.School_Id
let localStorageobj={
data:this.showObj
}
localStorage.setItem("loginUserInfo", JSON.stringify(localStorageobj) );
location.reload();
}
}).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