Skip to content

C
confucius
Commit 31f962d6 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent c5ea0cad
Show whitespace changes
Inline Side-by-side
Showing with 670 additions and 865 deletions
src/components/sale/backclass-form.vue
View file @ 31f962d6
......@@ -500,7 +500,7 @@ export default {
});
//调用父页面成功方法
this.$emit("success");
this.IsShowBackClassDialog = false;
this.$emit('close');
}
});
},
......
src/components/sale/continueclass-form.vue
View file @ 31f962d6
......@@ -440,7 +440,7 @@
})
//调用父页面成功方法
this.$emit('success');
this.IsShowContinueClassDialog = false
this.$emit('close');
}
})
},
......
src/components/sale/transferclass-form.vue
View file @ 31f962d6
<style>
.Title_remark {
.Title_remark {
font-size: 12px;
color: #999999;
margin-left: 20px;
}
}
.conTinuCheckdTable {
.conTinuCheckdTable {
width: 100%;
height: auto;
text-align: left;
margin-top: 20px;
font-size: 12px;
}
}
.conTinuCheckdTable th {
.conTinuCheckdTable th {
color: #888888;
}
}
.enrollTotalSearchTable {
.enrollTotalSearchTable {
width: 100%;
}
}
.backContius {
.backContius {
color: #2961fe;
cursor: pointer;
}
}
.contiue_Top {
.contiue_Top {
width: 100%;
padding: 10px;
border-bottom: 1px solid #d1d1d1;
}
}
.continus_ClassChoice {
.continus_ClassChoice {
padding: 20px;
max-height: 460px;
overflow: auto;
}
}
.el-picker-panel {
.el-picker-panel {
z-index: 9999 !important;
}
}
.Sysuser_Date .el-range-editor .el-range-input {
.Sysuser_Date .el-range-editor .el-range-input {
background-color: transparent;
}
}
.Sysuser_Date .el-range-editor.el-input__inner {
.Sysuser_Date .el-range-editor.el-input__inner {
background-color: transparent;
}
}
.conChoiceTeacherTable {
.conChoiceTeacherTable {
width: 100%;
border: 1px solid #d1d1d1;
}
}
.continus_ClassChoice::-webkit-scrollbar {
.continus_ClassChoice::-webkit-scrollbar {
width: 4px;
height: 8px;
}
}
.continus_ClassChoice::-webkit-scrollbar-thumb {
.continus_ClassChoice::-webkit-scrollbar-thumb {
border-radius: 4px;
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
}
.continus_ClassChoice::-webkit-scrollbar-track {
.continus_ClassChoice::-webkit-scrollbar-track {
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
}
.contius_List {
.contius_List {
width: 100%;
height: 130px;
border: 1px solid #d1d1d1;
......@@ -80,40 +80,41 @@
margin-bottom: 15px;
font-size: 12px;
box-shadow: 5px 5px 5px #d4d0d0;
}
}
.continu_Div {
.continu_Div {
display: inline-block;
min-height: 90px;
border-right: 1px dashed #d1d1d1;
padding: 10px;
color: #000;
}
}
.continu_Div:last-child {
.continu_Div:last-child {
border-right: 0;
}
}
.continu_Btm {
.continu_Btm {
width: 100%;
height: 30px;
padding: 10px;
border-top: 1px solid #d1d1d1;
}
._font_size12 {
}
._font_size12 {
font-size: 12px !important;
}
}
._addUpload_box {
._addUpload_box {
display: block;
margin-top: 15px;
}
}
._addUpload_box img {
._addUpload_box img {
width: 100%;
}
}
._addUpload_box > div {
._addUpload_box>div {
float: left;
width: 138px;
height: 92px;
......@@ -124,21 +125,21 @@
padding: 5px;
margin-right: 10px;
position: relative;
}
}
._addUpload_box > div:hover {
._addUpload_box>div:hover {
background-color: #f5f5f5;
}
}
._addFile_name {
._addFile_name {
padding-left: 15px;
max-width: 450px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
._addUpload_box .icon-guanbi1 {
._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
......@@ -152,29 +153,31 @@
width: 20px;
text-align: center;
line-height: 20px;
}
}
._addUpload_box .icon-guanbi1:hover {
._addUpload_box .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
}
._addUpload_box .icon-excel,
._addUpload_box .icon-pdf,
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
._addUpload_box .icon-excel,
._addUpload_box .icon-pdf,
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
._addUpload_box .icon-yasuobao {
}
._addUpload_box .icon-yasuobao {
color: gray;
}
._show_img_box {
}
._show_img_box {
position: fixed;
background: rgba(0, 0, 0, 0.6);
left: 0;
......@@ -183,63 +186,52 @@
height: 100vh;
z-index: 999;
text-align: center;
}
}
._addUpload_tips {
._addUpload_tips {
font-size: 12px;
color: #999999;
}
}
._jump_page {
._jump_page {
cursor: pointer;
text-decoration: underline;
}
}
._jump_page:hover {
._jump_page:hover {
color: #c94052;
}
.stop .el-upload-dragger {
}
.stop .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
}
</style>
<!--续课-->
<template>
<q-dialog
v-model="IsShowContinueClassDialog"
content-class="bg-grey-1"
persistent
transition-show="scale"
transition-hide="scale"
>
<q-dialog v-model="IsShowContinueClassDialog" content-class="bg-grey-1" persistent transition-show="scale"
transition-hide="scale">
<q-card style="width: 850px; max-width: 900px" class="stop">
<template v-if="isShowTuike">
<q-card-section>
<div class="text-h6">
{{ transMsg.ChangeType == 1 ? "转班申请" : "分拆" }}
<span class="Title_remark"
>注：找不到学员？请确认学员是否已退课或已续班</span
>
<span class="Title_remark">注：找不到学员？请确认学员是否已退课或已续班</span>
</div>
</q-card-section>
<div style="margin: 20px; border-bottom: 1px solid #e2e2e2">
<div
class="apply_List"
v-for="(item, index) in studentList"
v-if="item.IsShow"
>
<div class="apply_List" v-for="(item, index) in studentList" v-if="item.IsShow">
<span style="width: 15%">{{ item.GuestName }}</span>
<span style="width: 7%">{{ item.SexStr }}</span>
<span style="width: 8%">{{ item.Age }}</span>
<span style="width: 20%">{{ item.Mobile }}</span>
<span style="width: 20%">
<template v-if="item.ClassHours"
>已学：{{ item.ClassHours }}课时</template
>
<template v-if="item.ClassHours">已学：{{ item.ClassHours }}课时</template>
</span>
<span style="width: 10%">{{ item.GuestStateStr }}</span>
<span style="width: 20%" class="guest_Status">
......@@ -253,10 +245,7 @@
</template>
</span>
</div>
<table
class="conTinuCheckdTable"
v-if="classItem.ClassId > 0 && studentList.length > 0 && isShowAdd"
>
<table class="conTinuCheckdTable" v-if="classItem.ClassId > 0 && studentList.length > 0 && isShowAdd">
<tr>
<th>续费班级</th>
<th>续费班级</th>
......@@ -267,11 +256,7 @@
</tr>
<tr>
<td>
<span
style="color: #2961fe; cursor: pointer"
@click="getRenewClassList()"
>+点击选择班级</span
>
<span style="color: #2961fe; cursor: pointer" @click="getRenewClassList()">+点击选择班级</span>
</td>
<td>{{ classItem.ClassName }}</td>
<td>¥{{ classItem.SellPrice }}</td>
......@@ -280,15 +265,10 @@
<td>{{ classItem.OpenTime }}</td>
</tr>
</table>
<table
class="conTinuCheckdTable"
v-else-if="studentList.length > 0 && isShowAdd"
>
<table class="conTinuCheckdTable" v-else-if="studentList.length > 0 && isShowAdd">
<tr>
<td>
<span class="backContius" @click="getRenewClassList()"
>+点击选择班级</span
>
<span class="backContius" @click="getRenewClassList()">+点击选择班级</span>
</td>
<td></td>
<td></td>
......@@ -299,71 +279,31 @@
</table>
<div class="row" style="margin-top: 20px">
<template v-if="transMsg.ChangeType == 1">
<q-input
filled
v-model="transMsg.OutTime"
class="col-6 q-pr-lg"
mask="date"
label="转出日期"
>
<q-input filled v-model="transMsg.OutTime" class="col-6 q-pr-lg" mask="date" label="转出日期">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy
ref="qDateProxy1"
transition-show="scale"
transition-hide="scale"
>
<q-date
v-model="transMsg.OutTime"
:options="optionsFn2"
@input="getOutTime"
/>
<q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale">
<q-date v-model="transMsg.OutTime" :options="optionsFn2" @input="getOutTime" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</template>
<q-input
filled
v-model="transMsg.EffectiveDate"
class="col-6"
mask="date"
label="生效日期"
>
<q-input filled v-model="transMsg.EffectiveDate" class="col-6" mask="date" label="生效日期">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy
ref="qDateProxy2"
transition-show="scale"
transition-hide="scale"
>
<q-date
v-model="transMsg.EffectiveDate"
:options="optionsFn"
@input="checkEffectDate()"
/>
<q-popup-proxy ref="qDateProxy2" transition-show="scale" transition-hide="scale">
<q-date v-model="transMsg.EffectiveDate" :options="optionsFn" @input="checkEffectDate()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<q-input
filled
stack-label
:dense="false"
v-model="transMsg.Remarks"
style="margin-top: 20px"
type="textarea"
class="col-12"
:label="transMsg.ChangeType == 1 ? '转班原因' : '分拆原因'"
/>
<q-input filled stack-label :dense="false" v-model="transMsg.Remarks" style="margin-top: 20px" type="textarea"
class="col-12" :label="transMsg.ChangeType == 1 ? '转班原因' : '分拆原因'" />
<div class="row">
<div class="col-12 q-mt-md text-grey-6">
上传附件：<span
class="fj-tip"
style="font-size: 10px; color: #f00"
>*单文件限制5M内</span
>
上传附件：<span class="fj-tip" style="font-size: 10px; color: #f00">*单文件限制5M内</span>
</div>
<div>
<!-- <p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p> -->
......@@ -371,20 +311,12 @@
<template v-for="(file, fIndex) in saveMsg">
<div v-if="file.Type == 3">
<div style="width: 100%; height: 100%; overflow: hidden">
<img
:src="file.Url ? file.Url : file.Content"
@click="showUpLoadFile(file)"
/>
<img :src="file.Url ? file.Url : file.Content" @click="showUpLoadFile(file)" />
</div>
<span
class="iconfont icon-guanbi1"
@click="deleteUploadFile(fIndex)"
></span>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type == 1">
<div
class="iconfont"
:class="
<div class="iconfont" :class="
file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
......@@ -405,53 +337,24 @@
).toUpperCase() == 'DOC'
? 'icon-word'
: 'icon-excel'
"
@click="showUpLoadFile(file)"
></div>
<span
class="iconfont icon-guanbi1"
@click="deleteUploadFile(fIndex)"
></span>
" @click="showUpLoadFile(file)"></div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type == 2">
<div
class="iconfont icon-wenjian"
@click="showUpLoadFile(file)"
></div>
<span
class="iconfont icon-guanbi1"
@click="deleteUploadFile(fIndex)"
></span>
<div class="iconfont icon-wenjian" @click="showUpLoadFile(file)"></div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type == 4">
<div
class="iconfont icon-yasuobao"
@click="showUpLoadFile(file)"
></div>
<span
class="iconfont icon-guanbi1"
@click="deleteUploadFile(fIndex)"
></span>
<div class="iconfont icon-yasuobao" @click="showUpLoadFile(file)"></div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type == 5">
<div
class="iconfont icon-shipin"
@click="showUpLoadFile(file)"
></div>
<span
class="iconfont icon-guanbi1"
@click="deleteUploadFile(fIndex)"
></span>
<div class="iconfont icon-shipin" @click="showUpLoadFile(file)"></div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true"
:show-file-list="false"
action=""
>
<el-upload drag :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">
{{ $t("active.ld_djscwj") }}
......@@ -464,107 +367,44 @@
<q-separator />
</div>
<q-card-actions align="right" class="bg-white">
<q-btn
label="取消"
flat
color="grey-10"
style="font-weight: 400 !important"
@click="closeContinueClassForm"
/>
<q-btn
:label="transMsg.ChangeType == 1 ? '确认转班' : '确认分拆'"
color="accent"
class="q-px-md"
style="font-weight: 400 !important"
@click="setRenewOrder"
/>
<q-btn label="取消" flat color="grey-10" style="font-weight: 400 !important" @click="closeContinueClassForm" />
<q-btn :label="transMsg.ChangeType == 1 ? '确认转班' : '确认分拆'" color="accent" class="q-px-md"
style="font-weight: 400 !important" @click="setRenewOrder" />
</q-card-actions>
</template>
<template v-else>
<div class="contiue_Top">
<span class="backContius" @click="isShowTuike = true">
<i
style="font-size: 18px; margin-left: 15px"
title="返回"
class="iconfont icon-fanhui"
></i
></span>
<i style="font-size: 18px; margin-left: 15px" title="返回" class="iconfont icon-fanhui"></i></span>
<span style="margin-left: 20px">班级选择 </span>
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md" style="margin: 10px">
<div class="col-3">
<q-select
@input="getRenewClassList"
filled
option-value="SId"
option-label="SName"
v-model="classMsg.School_Id"
:options="schoolList"
emit-value
map-options
label="关联校区"
/>
<q-select @input="getRenewClassList" filled option-value="SId" option-label="SName"
v-model="classMsg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
</div>
<div class="col-3">
<q-select
filled
stack-label
option-value="CTypeId"
option-label="CTypeName"
v-model="classMsg.ClassType"
ref="CouseId"
:options="classTypeList"
label="班级类型"
:dense="false"
emit-value
map-options
/>
<q-select filled stack-label option-value="CTypeId" option-label="CTypeName" v-model="classMsg.ClassType"
ref="CouseId" :options="classTypeList" label="班级类型" :dense="false" emit-value map-options />
</div>
<div class="col-5 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<el-date-picker
v-model="dateList"
@change="getRenewClassList()"
value-format="yyyy-MM-dd"
type="daterange"
style="border: none"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
>
  </el-date-picker
>       
<el-date-picker v-model="dateList" @change="getRenewClassList()" value-format="yyyy-MM-dd"
type="daterange" style="border: none" range-separator="至" start-placeholder="开始时间"
end-placeholder="结束时间">
  </el-date-picker>       
</template>
</q-field>
</div>
<div class="col-3">
<q-input
@change="getRenewClassList"
clearable
filled
v-model="classMsg.TeacherName"
label="带班老师"
@clear="getRenewClassList"
maxlength="20"
/>
<q-input @change="getRenewClassList" clearable filled v-model="classMsg.TeacherName" label="带班老师"
@clear="getRenewClassList" maxlength="20" />
</div>
<div class="col-3">
<q-select
filled
stack-label
use-input
option-value="CourseId"
option-label="CourseName"
v-model="classMsg.CouseId"
:options="ClassList"
label="学习课程"
:dense="false"
emit-value
map-options
@filter="filterFn"
@input="getRenewClassList"
>
<q-select filled stack-label use-input option-value="CourseId" option-label="CourseName"
v-model="classMsg.CouseId" :options="ClassList" label="学习课程" :dense="false" emit-value map-options
@filter="filterFn" @input="getRenewClassList">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
......@@ -595,32 +435,19 @@
<div class="continu_Div" style="width: 20%">
<div>价格</div>
<div style="margin: 5px 0">售价：{{ cItem.NewSellPrice }}</div>
<template
v-if="
<template v-if="
cItem.ClassStepPriceList &&
cItem.ClassStepPriceList.length > 0
"
>
">
更多优惠价格
<span
class="iconfont icon-xiangxia"
style="color: #2961fe; font-size: 10px"
></span>
<span class="iconfont icon-xiangxia" style="color: #2961fe; font-size: 10px"></span>
<q-popup-proxy>
<q-banner>
<div class="price-popup">
<div
class="price-popup-item"
v-for="(x, index2) in cItem.ClassStepPriceList"
:key="index2"
style="margin: 5px 0"
>
<span style="color: #2d2d2d; font-weight: bold"
>{{ x.PersionNum }}人报名<span
style="color: #2860fb; margin-left: 15px"
>{{ x.PersionPrice.toFixed(2) }}</span
></span
>
<div class="price-popup-item" v-for="(x, index2) in cItem.ClassStepPriceList" :key="index2"
style="margin: 5px 0">
<span style="color: #2d2d2d; font-weight: bold">{{ x.PersionNum }}人报名<span
style="color: #2860fb; margin-left: 15px">{{ x.PersionPrice.toFixed(2) }}</span></span>
</div>
</div>
</q-banner>
......@@ -634,44 +461,26 @@
</div>
<div>
已招收
<span style="color: blue">{{ cItem.OrderStudentCount }}</span
>人
<span style="color: blue">{{ cItem.OrderStudentCount }}</span>人
</div>
</div>
<div class="continu_Div" style="width: 15%">
<q-btn
label="选择此班"
size="sm"
@click="clickClassItem(cItem)"
color="accent q-px-md"
style="
<q-btn label="选择此班" size="sm" @click="clickClassItem(cItem)" color="accent q-px-md" style="
font-weight: 400 !important;
display: block;
margin: 25px 0 0 10px;
padding: 0;
"
/>
" />
</div>
</div>
<div class="continu_Btm">OP备注 {{ cItem.InnerRemark }}</div>
</div>
<q-pagination
class="full-width justify-end"
v-model="classMsg.pageIndex"
color="primary"
:max="classPageCount"
:input="true"
@input="changePage"
/>
<q-pagination class="full-width justify-end" v-model="classMsg.pageIndex" color="primary"
:max="classPageCount" :input="true" @input="changePage" />
</div>
</template>
<div
v-if="picIsShow"
class="_show_img_box"
@click="(picIsShow = false), (picObj = [])"
>
<div
style="
<div v-if="picIsShow" class="_show_img_box" @click="(picIsShow = false), (picObj = [])">
<div style="
position: absolute;
width: 800px;
height: 600px;
......@@ -679,19 +488,9 @@
top: 50%;
margin-left: -400px;
margin-top: -300px;
"
>
<el-carousel
:initial-index="initialIndex"
height="600px"
:interval="5000"
trigger="click"
>
<el-carousel-item
style="height: 600px; overflow: auto"
v-for="(item, index) in picObj"
:key="index"
>
">
<el-carousel :initial-index="initialIndex" height="600px" :interval="5000" trigger="click">
<el-carousel-item style="height: 600px; overflow: auto" v-for="(item, index) in picObj" :key="index">
<img :src="item" style="" />
</el-carousel-item>
</el-carousel>
......@@ -701,20 +500,26 @@
</q-dialog>
</template>
<script>
import {
import {
getSchoolDropdown,
SetOrderChange,
SetOrderSplit,
} from "../../api/school/index";
import { GetClassTypeList } from "../../api/system/index";
import { queryCourseDropdownList } from "../../api/course/index";
import {
} from "../../api/school/index";
import {
GetClassTypeList
} from "../../api/system/index";
import {
queryCourseDropdownList
} from "../../api/course/index";
import {
getOrderGuestPageList,
saveRenewOrder,
queryRenewClass,
} from "../../api/sale/sale";
import { UploadSelfFile } from "../../api/common/common";
export default {
} from "../../api/sale/sale";
import {
UploadSelfFile
} from "../../api/common/common";
export default {
name: "backclass-form",
props: {
saveObj: {
......@@ -942,7 +747,7 @@ export default {
});
//调用父页面成功方法
this.$emit("success");
this.IsShowContinueClassDialog = false;
this.$emit("close");
}
});
} else {
......@@ -957,7 +762,7 @@ export default {
});
//调用父页面成功方法
this.$emit("success");
this.IsShowContinueClassDialog = false;
this.$emit("close");
}
});
}
......@@ -1074,8 +879,7 @@ export default {
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [
{
let typeArr = [{
stringArr: "GIF|JPG|JPEG|PNG|BMP|WEBP",
type: 3,
},
......@@ -1123,5 +927,6 @@ export default {
);
},
},
};
};
</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