Skip to content

C
confucius
Commit 94d7e325 authored by 黄奎's avatar 黄奎
Browse files
Options

合同修改

parent 03a10d15
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 69 deletions
src/components/sale/eduinfo-form.vue
View file @ 94d7e325
...@@ -19,16 +19,18 @@ ...@@ -19,16 +19,18 @@
height: 40px; height: 40px;
} }
.priceinput label{ .priceinput label {
height:30px !important; height: 30px !important;
} }
.priceinput div{
height:20px !important; .priceinput div {
} height: 20px !important;
}
.studentinput div {
height: 40px !important;
}
.studentinput div{
height:40px !important;
}
</style> </style>
<template> <template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale"> <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
...@@ -40,26 +42,35 @@ ...@@ -40,26 +42,35 @@
<div class="jobInfo_item"> <div class="jobInfo_item">
<span class="job_Line"></span>基础信息 <span class="job_Line"></span>基础信息
</div> </div>
<!-- <q-input class="priceinput" style="float:left;height:30px;width:80%;" v-model="objOption.CourseName" label="学生姓名" :dense="false" /> --> <!-- <q-input class="priceinput" style="float:left;height:30px;width:80%;" v-model="objOption.CourseName" label="学生姓名" :dense="false" /> -->
<div class="row wrap"> <div class="row wrap">
<q-input clearable v-model="objOption.LegalPerson" label="法定代表人" stack-label :dense="false" class="col-12 q-pr-lg q-pb-lg studentinput" /> <q-input clearable v-model="objOption.LegalPerson" label="法定代表人" stack-label :dense="false"
<q-input clearable v-model="objOption.StudentName" label="学生姓名" stack-label :dense="false" class="col-6 q-pr-lg studentinput" /> class="col-12 q-pr-lg q-pb-lg studentinput" />
<div class="col-6 q-pb-lg" style="color: rgba(0, 0, 0, 0.6); font-size: 12px;line-height: 20px; font-weight: 400; letter-spacing: 0.00937em; text-decoration: inherit; text-transform: inherit; transform-origin: left top;"> <q-input clearable v-model="objOption.StudentName" label="学生姓名" stack-label :dense="false"
class="col-6 q-pr-lg studentinput" />
<div class="col-6 q-pb-lg"
style="color: rgba(0, 0, 0, 0.6); font-size: 12px;line-height: 20px; font-weight: 400; letter-spacing: 0.00937em; text-decoration: inherit; text-transform: inherit; transform-origin: left top;">
学生性别： 学生性别：
<q-radio v-model="objOption.StuSex" size="xs" :val="0" label="男" /> <q-radio v-model="objOption.StuSex" size="xs" :val="0" label="男" />
<q-radio v-model="objOption.StuSex" size="xs" :val="1" label="女" /> <q-radio v-model="objOption.StuSex" size="xs" :val="1" label="女" />
</div> </div>
<q-input clearable v-model="objOption.StuIDCard" label="学生身份证号码" stack-label :dense="false" class="col-6 q-pr-lg studentinput" /> <q-input clearable v-model="objOption.StuIDCard" label="学生身份证号码" stack-label :dense="false"
class="col-6 q-pr-lg studentinput" />
<q-input clearable class="col-6 q-pb-lg studentinput" stack-label v-model="objOption.IDCardAddress" label="住所地（身份证地址）" :dense="false"/> <q-input clearable class="col-6 q-pb-lg studentinput" stack-label v-model="objOption.IDCardAddress"
<q-input clearable class="col-6 q-pr-lg q-pb-lg studentinput" stack-label v-model="objOption.StuAddress" label="联系地址（实际居住地）" :dense="false"/> label="住所地（身份证地址）" :dense="false" />
<q-input clearable class="col-6 q-pb-lg studentinput" stack-label v-model="objOption.StuTel" label="联系电话" :dense="false" /> <q-input clearable class="col-6 q-pr-lg q-pb-lg studentinput" stack-label v-model="objOption.StuAddress"
label="联系地址（实际居住地）" :dense="false" />
<q-input clearable class="col-6 q-pb-lg studentinput" stack-label v-model="objOption.StuTel" label="联系电话"
:dense="false" />
<!-- <q-input clearable filled class="col-6 q-pr-lg q-pb-lg" v-model="objOption.StuTel" label="学生电话" /> --> <!-- <q-input clearable filled class="col-6 q-pr-lg q-pb-lg" v-model="objOption.StuTel" label="学生电话" /> -->
<q-input clearable class="col-6 q-pr-lg q-pb-lg studentinput" stack-label label="紧急联系人" v-model="objOption.ParentName" :dense="false"/> <q-input clearable class="col-6 q-pr-lg q-pb-lg studentinput" stack-label label="紧急联系人"
<q-input clearable class="col-6 q-pr-lg studentinput" stack-label label="紧急联系电话" v-model="objOption.ParentTel" :dense="false"/> v-model="objOption.ParentName" :dense="false" />
<q-input clearable class="col-6 q-pr-lg studentinput" stack-label label="紧急联系电话" v-model="objOption.ParentTel"
:dense="false" />
<q-input filled v-if="false" v-model="objOption.StuBirth" class="col-6 q-pb-lg" mask="date" label="学生生日"> <q-input filled v-if="false" v-model="objOption.StuBirth" class="col-6 q-pb-lg" mask="date" label="学生生日">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
...@@ -70,43 +81,56 @@ ...@@ -70,43 +81,56 @@
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="jobInfo_item" style=""> <div class="jobInfo_item" style="">
<span class="job_Line"></span>培训课程内容 <span class="job_Line"></span>培训课程内容
</div> </div>
<div style="width:100%;display:inline-block;"> <div style="width:100%;display:inline-block;">
<q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;" label="培训课程信息" v-model="objOption.CourseName" :dense="false" /> <q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;" label="培训课程信息"
v-model="objOption.CourseName" :dense="false" />
</div> </div>
<div style="width:100%;display:inline-block;margin-top:10px;"> <div style="width:100%;display:inline-block;margin-top:10px;">
<q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;" label="培训课程内容" v-model="objOption.StartLevel" :dense="false" /> <q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;" label="培训课程内容"
v-model="objOption.StartLevel" :dense="false" />
</div> </div>
<div class="jobInfo_item" style="margin-top:20px;"> <div class="jobInfo_item" style="margin-top:20px;">
<span class="job_Line"></span>课程费用 <span class="job_Line"></span>课程费用
</div> </div>
<div> <div>
<div style="width:100%;display:inline-block;"><span style="float:left;">人民币（大写）：</span> <div style="width:100%;display:inline-block;"><span style="float:left;">人民币（大写）：</span>
<q-input class="priceinput" style="min-width:200px;float:left;height:30px;width:auto;padding:0 5px;" v-model="objOption.CNYCaps" disabled :dense="false" /> <q-input class="priceinput" style="min-width:200px;float:left;height:30px;width:auto;padding:0 5px;"
<span style="float:left;">圆（小写）：</span> v-model="objOption.CNYCaps" disabled :dense="false" />
<q-input class="priceinput" style="width:150px;float:left;height:30px;" v-model="objOption.Money" @keyup.native="checkPrice(objOption,'Money')" @input="mathMoney(objOption.Money)" :dense="false" /> 元。</div> <span style="float:left;">圆（小写）：</span>
<q-input class="priceinput" style="width:150px;float:left;height:30px;" v-model="objOption.Money"
@keyup.native="checkPrice(objOption,'Money')" @input="mathMoney(objOption.Money)" :dense="false" /> 元。
</div>
<div style="width:100%;display:inline-block;"> <div style="width:100%;display:inline-block;">
<span style="float:left;">课时费：共计</span> <span style="float:left;">课时费：共计</span>
<q-input class="priceinput" style="float:left;width:150px;height:30px;" v-model="objOption.FirstClassHours" @keyup.native="checkPrice(objOption,'FirstClassHours')" :dense="false" /> <q-input class="priceinput" style="float:left;width:150px;height:30px;" v-model="objOption.FirstClassHours"
@keyup.native="checkPrice(objOption,'FirstClassHours')" :dense="false" />
<span style="float:left;"> 元（</span> <span style="float:left;"> 元（</span>
<q-input class="priceinput" style="float:left;width:150px;height:30px;" v-model="objOption.ClassHours" @keyup.native="checkPrice(objOption,'ClassHours')" :dense="false" /> <q-input class="priceinput" style="float:left;width:150px;height:30px;" v-model="objOption.ClassHours"
<span > 元/节）</span> @keyup.native="checkPrice(objOption,'ClassHours')" :dense="false" />
</div> <span> 元/节）</span>
</div>
<div style="width:100%;display:inline-block;"> <div style="width:100%;display:inline-block;">
<span style="float:left;"> 课件费：</span> <span style="float:left;"> 课件费：</span>
<q-input class="priceinput" style="float:left;width:150px;height:30px;" @keyup.native="checkPrice(objOption,'FirstClassFee')" v-model="objOption.FirstClassFee" :dense="false" /> 元。</div> <q-input class="priceinput" style="float:left;width:150px;height:30px;"
@keyup.native="checkPrice(objOption,'FirstClassFee')" v-model="objOption.FirstClassFee" :dense="false" />
元。</div>
<div style="width:100%;display:inline-block;"> <div style="width:100%;display:inline-block;">
<span style="float:left;"> 教材：</span> <span style="float:left;"> 教材：</span>
<q-input class="priceinput" style="float:left;width:150px;height:30px;" @keyup.native="checkPrice(objOption,'FirstBookFee')" v-model="objOption.FirstBookFee" :dense="false" /> 元。</div> <q-input class="priceinput" style="float:left;width:150px;height:30px;"
<div style="width:100%;display:inline-block;"> @keyup.native="checkPrice(objOption,'FirstBookFee')" v-model="objOption.FirstBookFee" :dense="false" /> 元。
<q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;margin-bottom:30px;" label="教材包括" v-model="objOption.TextbookIncludes" :dense="false" /> </div>
</div> <div style="width:100%;display:inline-block;">
<q-input clearable class="studentinput" stack-label
style="float:left;height:30px;width:100%;margin-bottom:30px;" label="教材包括"
v-model="objOption.TextbookIncludes" :dense="false" />
</div>
</div> </div>
<div class="jobInfo_item" style=""> <div class="jobInfo_item" style="">
<span class="job_Line"></span>考试要求 <span class="job_Line"></span>考试要求
...@@ -114,12 +138,13 @@ ...@@ -114,12 +138,13 @@
<div class="row wrap"> <div class="row wrap">
<div> <div>
<p>乙方通过参加甲方提供的教学服务后，应主动参加相关国际考试。考试内容为：</p> <p>乙方通过参加甲方提供的教学服务后，应主动参加相关国际考试。考试内容为：</p>
<p>A 日语国际能力测试（JLPT）：初级（N5-N4）、中级（N3-N2）、高级（N1）；</p> <p>A 日语国际能力测试（JLPT）：初级（N5-N4）、中级（N3-N2）、高级（N1）；</p>
<p>B 实用日本语鉴定考试（J.TEST）：初级（E-F级）、中高级（A-D级）；</p> <p>B 实用日本语鉴定考试（J.TEST）：初级（E-F级）、中高级（A-D级）；</p>
<p>C 日本留学生考试（EJU）：文科（日语）、综合科目、数学。</p> <p>C 日本留学生考试（EJU）：文科（日语）、综合科目、数学。</p>
<div style="width:100%;display:inline-block;"> <div style="width:100%;display:inline-block;">
<q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;" label="乙方当前选择考试" v-model="objOption.Exam" :dense="false" /> <q-input clearable class="studentinput" stack-label style="float:left;height:30px;width:100%;"
</div> label="乙方当前选择考试" v-model="objOption.Exam" :dense="false" />
</div>
</div> </div>
<!-- <q-select class="col-6 q-pb-lg " clearable option-value="Id" option-label="Value" <!-- <q-select class="col-6 q-pb-lg " clearable option-value="Id" option-label="Value"
v-model="objOption.Exam" ref="ManagerId" :options="ExamArray" label="乙方当前选择考试"emit-value v-model="objOption.Exam" ref="ManagerId" :options="ExamArray" label="乙方当前选择考试"emit-value
...@@ -207,11 +232,11 @@ ...@@ -207,11 +232,11 @@
ThirdPayDate: '', //第三期-支付日期 ThirdPayDate: '', //第三期-支付日期
Exam: '', //乙方当前选择考试 Exam: '', //乙方当前选择考试
IsSupplement: 0, // 0无 1 有 是否有补充协议 IsSupplement: 0, // 0无 1 有 是否有补充协议
StuIDCard:"",//学员身份证号码 StuIDCard: "", //学员身份证号码
TextbookIncludes:"",//教材包括 TextbookIncludes: "", //教材包括
ClassHours:0,//课时单价 ClassHours: 0, //课时单价
LegalPerson:"丁嘉睿",//法人 LegalPerson: "丁嘉睿", //法人
IDCardAddress:"",//身份证地址 IDCardAddress: "", //身份证地址
Money: 0 Money: 0
}, },
totalHours: 0, //培训课时数总计 totalHours: 0, //培训课时数总计
...@@ -265,7 +290,6 @@ ...@@ -265,7 +290,6 @@
}, },
//保存合同 //保存合同
saveContract() { saveContract() {
//this.objOption.Money = this.totalMoney;
SetEducationContractInfo(this.objOption).then(res => { SetEducationContractInfo(this.objOption).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
...@@ -309,12 +333,15 @@ ...@@ -309,12 +333,15 @@
this.objOption.CourseName = tempData.CourseName; this.objOption.CourseName = tempData.CourseName;
this.objOption.CourseConsultant = tempData.CourseConsultant; this.objOption.CourseConsultant = tempData.CourseConsultant;
this.objOption.CNYCaps = tempData.CNYCaps; this.objOption.CNYCaps = tempData.CNYCaps;
this.objOption.ClassHours=tempData.ClassHours; this.objOption.ClassHours = tempData.ClassHours;
this.objOption.TextbookIncludes=tempData.TextbookIncludes;
this.objOption.IDCardAddress=tempData.IDCardAddress; if (this.objOption.TextbookIncludes == '') {
this.objOption.LegalPerson="丁嘉睿"; this.objOption.TextbookIncludes = "当级别教程默认教材";
this.objOption.StuIDCard=tempData.StuIDCard; }
this.objOption.Exam ="A"; this.objOption.IDCardAddress = tempData.IDCardAddress;
this.objOption.LegalPerson = "丁嘉睿";
this.objOption.StuIDCard = tempData.StuIDCard;
this.objOption.Exam = "A";
} }
}) })
}, },
...@@ -362,7 +389,7 @@ ...@@ -362,7 +389,7 @@
this.objOption.CourseName = tempData.CourseName; this.objOption.CourseName = tempData.CourseName;
this.objOption.CourseConsultant = tempData.CourseConsultant; this.objOption.CourseConsultant = tempData.CourseConsultant;
this.objOption.CNYCaps = tempData.CNYCaps; this.objOption.CNYCaps = tempData.CNYCaps;
this.objOption.Exam =tempData.Id==0?"A": tempData.Exam; this.objOption.Exam = tempData.Id == 0 ? "A" : tempData.Exam;
this.objOption.IsSupplement = tempData.IsSupplement; this.objOption.IsSupplement = tempData.IsSupplement;
this.objOption.ParentName = tempData.ParentName; this.objOption.ParentName = tempData.ParentName;
this.objOption.ParentRelation = tempData.ParentRelation; this.objOption.ParentRelation = tempData.ParentRelation;
...@@ -373,11 +400,11 @@ ...@@ -373,11 +400,11 @@
this.objOption.UrgentTel = tempData.UrgentTel; this.objOption.UrgentTel = tempData.UrgentTel;
this.objOption.ParentEmail = tempData.ParentEmail; this.objOption.ParentEmail = tempData.ParentEmail;
this.objOption.UrgentEmail = tempData.UrgentEmail; this.objOption.UrgentEmail = tempData.UrgentEmail;
this.objOption.ClassHours=tempData.ClassHours; this.objOption.ClassHours = tempData.ClassHours;
this.objOption.TextbookIncludes=tempData.TextbookIncludes; this.objOption.TextbookIncludes = tempData.TextbookIncludes;
this.objOption.IDCardAddress=tempData.IDCardAddress; this.objOption.IDCardAddress = tempData.IDCardAddress;
this.objOption.LegalPerson=tempData.Id==0?"丁嘉睿":tempData.LegalPerson; this.objOption.LegalPerson = tempData.Id == 0 ? "丁嘉睿" : tempData.LegalPerson;
this.objOption.StuIDCard=tempData.StuIDCard; this.objOption.StuIDCard = tempData.StuIDCard;
} }
}) })
} }
......
src/components/school/student/transfer-order/order-form.vue
View file @ 94d7e325
...@@ -289,11 +289,9 @@ ...@@ -289,11 +289,9 @@
if (this.OrderMsg.GuestNum && this.OrderMsg.GuestNum > 0) { if (this.OrderMsg.GuestNum && this.OrderMsg.GuestNum > 0) {
guestNum = Number(this.OrderMsg.GuestNum); guestNum = Number(this.OrderMsg.GuestNum);
} }
var preferPrice = 0; //应收 var preferPrice = 0; //应收
var coursewareFee = 0; //课件费 var coursewareFee = 0; //课件费
var textbookFee = 0; //教材费 var textbookFee = 0; //教材费
console.log("his.OrderMsg.OrderCourseList",this.OrderMsg.OrderCourseList);
if (this.OrderMsg.OrderCourseList && this.OrderMsg.OrderCourseList.length > 0) { if (this.OrderMsg.OrderCourseList && this.OrderMsg.OrderCourseList.length > 0) {
this.OrderMsg.OrderCourseList.forEach(item => { this.OrderMsg.OrderCourseList.forEach(item => {
if (this.OrderMsg.Unit_PriceType == 1) { if (this.OrderMsg.Unit_PriceType == 1) {
......
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