Skip to content

C
confucius
Commit 517cae99 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent dd0fda81
Show whitespace changes
Inline Side-by-side
Showing with 221 additions and 120 deletions
src/api/sale/contract.js
View file @ 517cae99
...@@ -177,3 +177,16 @@ export function GetBackClassProtocol(data) { ...@@ -177,3 +177,16 @@ export function GetBackClassProtocol(data) {
data data
}) })
} }
/**
* 获取签字
*
*/
export function SetBackClassProtocolSign(data) {
return request({
url: '/EducationContract/SetBackClassProtocolSign',
method: 'post',
data
})
}
src/components/course/courserefund-form.vue
View file @ 517cae99
...@@ -46,10 +46,12 @@ ...@@ -46,10 +46,12 @@
<q-btn flat size="xs" v-if="props.row.Status == 0 || props.row.Status == 3" icon="edit" color="accent" <q-btn flat size="xs" v-if="props.row.Status == 0 || props.row.Status == 3" icon="edit" color="accent"
style="font-weight: 400" @click="EditContract(props.row)" label="编辑" /> style="font-weight: 400" @click="EditContract(props.row)" label="编辑" />
<el-tooltip content="复制链接发送给客人签字" placement="top" effect="light"> <el-tooltip content="复制链接发送给客人签字" placement="top" effect="light">
<q-btn flat size="xs" v-if=" <!-- <q-btn flat size="xs" v-if="
props.row.AuditStatus == 2 && props.row.AuditStatus == 2 &&
(props.row.Sign == '' || props.row.Sign == null) (props.row.Sign == '' || props.row.Sign == null)
" icon="iconfont icon-qianming" color="accent" style="font-weight: 400" @click="CopyUrl(props.row)" " icon="iconfont icon-qianming" color="accent" style="font-weight: 400" @click="CopyUrl(props.row)"
label="获取合同链接" /> -->
<q-btn flat size="xs" icon="iconfont icon-qianming" color="accent" style="font-weight: 400" @click="CopyUrl(props.row)"
label="获取合同链接" /> label="获取合同链接" />
</el-tooltip> </el-tooltip>
<q-btn flat size="xs" icon="iconfont icon-View" color="accent" @click="goContract(props.row.Id)" <q-btn flat size="xs" icon="iconfont icon-View" color="accent" @click="goContract(props.row.Id)"
...@@ -143,6 +145,18 @@ ...@@ -143,6 +145,18 @@
this.OpenNewUrl('/courseRefund',{ this.OpenNewUrl('/courseRefund',{
Id:Id Id:Id
}) })
},
//复制URL
CopyUrl(item) {
var oInput = document.createElement("input");
var url = window.location.host;
oInput.value = url + "/#/courseRefundH5" + `?Id=${item.Id}`;
document.body.appendChild(oInput);
oInput.select(); // 选择对象
document.execCommand("Copy"); // 执行浏览器复制命令
oInput.className = "oInput";
oInput.style.display = "none";
this.Info("复制成功!");
} }
} }
} }
......
src/pages/administration/dropSchoolManage.vue
View file @ 517cae99
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
console.log(this.dataList ,"this.dataList ");
} }
}); });
}, },
...@@ -101,7 +100,7 @@ ...@@ -101,7 +100,7 @@
changePage(val) { changePage(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, }
}, },
}; };
......
src/pages/contractSign.vue
View file @ 517cae99
...@@ -28,18 +28,21 @@ ...@@ -28,18 +28,21 @@
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
} }
.signature .icoDicv{
width:40px; .signature .icoDicv {
height:40px; width: 40px;
height: 40px;
background: gray; background: gray;
border-radius: 50%; border-radius: 50%;
color:#fff; color: #fff;
text-align: center; text-align: center;
line-height: 40px; line-height: 40px;
} }
.signature .icoDicv i{
font-size:25px; .signature .icoDicv i {
font-size: 25px;
} }
</style> </style>
<template> <template>
<div class="signature" @touchmove.prevent> <div class="signature" @touchmove.prevent>
...@@ -70,7 +73,8 @@ ...@@ -70,7 +73,8 @@
</template> </template>
<script> <script>
import { import {
SetEducationContractSign SetEducationContractSign,
SetBackClassProtocolSign
} from '../api/sale/contract' } from '../api/sale/contract'
export default { export default {
data() { data() {
...@@ -83,11 +87,15 @@ ...@@ -83,11 +87,15 @@
y: 0, y: 0,
}, },
moving: false, // 是否正在绘制中且移动 moving: false, // 是否正在绘制中且移动
msg:{ msg: {
ContractId: 0, ContractId: 0,
Sign:'' Sign: ''
}, },
Money:0 Money: 0,
Type: 1, //1为电子合同签字 2为退课协议签字
BackMsg: {
Id: 0
}
}; };
}, },
mounted() { mounted() {
...@@ -100,10 +108,15 @@ ...@@ -100,10 +108,15 @@
if (this.$route.query.ContractId) { if (this.$route.query.ContractId) {
this.msg.ContractId = this.$route.query.ContractId; this.msg.ContractId = this.$route.query.ContractId;
} }
if (this.$route.query.Money){ if (this.$route.query.Money) {
this.Money = this.$route.query.Money; this.Money = this.$route.query.Money;
} }
if (this.$route.query.Id) {
this.BackMsg.Id = this.$route.query.Id;
}
if (this.$route.query.Type) {
this.Type = this.$route.query.Type;
}
}, },
methods: { methods: {
// 触摸(开始) // 触摸(开始)
...@@ -214,6 +227,7 @@ ...@@ -214,6 +227,7 @@
}, },
//提交数据 //提交数据
SaveMsg() { SaveMsg() {
if (this.Type == 1) {
SetEducationContractSign(this.msg).then(res => { SetEducationContractSign(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
...@@ -232,6 +246,26 @@ ...@@ -232,6 +246,26 @@
}); });
} }
}) })
}
if(this.Type == 2){
SetBackClassProtocolSign(this.BackMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
this.$router.push({
path: '/courseRefundH5',
query: {
Id: this.BackMsg.Id,
}
});
}
})
}
}, },
//base64转Blob //base64转Blob
...@@ -258,12 +292,21 @@ ...@@ -258,12 +292,21 @@
}, },
//返回上一级 //返回上一级
goback() { goback() {
if(this.Type==1){
this.$router.push({ this.$router.push({
path: '/contractConfirm', path: '/contractConfirm',
query: { query: {
ContractId: this.msg.ContractId ContractId: this.msg.ContractId
} }
}); });
}else{
this.$router.push({
path: '/courseRefundH5',
query: {
Id: this.BackMsg.Id
}
});
}
}, },
}, },
}; };
......
src/pages/courseRefundH5.vue
View file @ 517cae99
...@@ -116,10 +116,10 @@ ...@@ -116,10 +116,10 @@
.conReFund_Suojin { .conReFund_Suojin {
text-indent: 20px; text-indent: 20px;
display: flex; display: flex;
font-size:1rem; font-size: 1rem;
flex-wrap:wrap; flex-wrap: wrap;
line-height: 26px; line-height: 26px;
margin-bottom:10px; margin-bottom: 10px;
} }
.comTop { .comTop {
...@@ -151,54 +151,32 @@ ...@@ -151,54 +151,32 @@
height: 100%; height: 100%;
} }
.ContractName { .TCdiv_content .gzqzUl {
width: 100%; margin: 0;
font-size: 1.3rem; padding: 0;
text-align: center;
}
.contractTitleTwo {
font-size: 1rem;
margin-bottom: 10px;
} }
.comConInput { .TCdiv_content .gzqzUl li {
width: 100%;
border-bottom: 1px solid #c0c0c0;
text-align: left;
padding-bottom: 5px;
}
.TCdiv_content .gzqzUl{
margin:0;
padding:0;
}
.TCdiv_content .gzqzUl li{
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
padding:14px; padding: 14px;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
list-style-type: none; list-style-type: none;
} }
.feeTable{
width:100%; .TCdiv_content .gzqzUl .bgli {
}
.feeTable th, .feeTable td{
border:1px solid #d1d1d1;
text-align: center;
height:35px;
}
.TCdiv_content .gzqzUl .bgli{
background: #eee; background: #eee;
width: 100%; width: 100%;
padding: 0!important; padding: 0 !important;
height:20px; height: 20px;
} }
.CourseBackSign{ .CourseBackSign {
display:flex; display: flex;
font-size:1rem; font-size: 1rem;
margin-bottom:1rem; margin-bottom: 1rem;
} }
.TuitractInput { .TuitractInput {
border: 0; border: 0;
display: inline-block; display: inline-block;
...@@ -217,67 +195,104 @@ ...@@ -217,67 +195,104 @@
<div class="signSpan"> <div class="signSpan">
<div @click="goSign()" class="sign"> <div @click="goSign()" class="sign">
<span style="padding:0;"><i style="font-size:1.2rem" class="iconfont icon-qianming"></i></span> <span style="padding:0;"><i style="font-size:1.2rem" class="iconfont icon-qianming"></i></span>
<span style="font-size:1.2rem;margin-left:0.2rem;" v-if="dataList.Sign==''||dataList.Sign==null">签字</span> <span style="font-size:1.2rem;margin-left:0.2rem;">签字</span>
<span style="font-size:1.2rem;margin-left:0.2rem;" v-else>重新签字</span> <!-- <span style="font-size:1.2rem;margin-left:0.2rem;">重新签字</span> -->
</div> </div>
</div> </div>
<div class="NavFixed"> <div class="NavFixed">
<p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:1rem;margin-bottom:0;">培训课程退款协议</p> <p style="background:#24ade5;text-align:center;color:#fff;padding:6px 0;font-size:1rem;margin-bottom:0;">
培训课程退款协议</p>
</div> </div>
<div class="ContractMain"> <div class="ContractMain">
<div style="padding:60px 15px 80px 15px;"> <div style="padding:60px 15px 80px 15px;">
<div class="CourseBackSign"> <div class="CourseBackSign">
<div> <div>
甲方： 甲方：{{dataList.PartyAName}}
</div> </div>
<div style="margin-left:3rem;">（家长/监护人）：</div> <div style="margin-left:3rem;">（家长/监护人）：{{dataList.PartyAGuardian}}</div>
</div> </div>
<div class="CourseBackSign"> <div class="CourseBackSign">
<div> <div>
乙方： 乙方：{{dataList.PartyBName}}
</div> </div>
<div style="margin-left:3rem;">法定代表人：</div> <div style="margin-left:3rem;">法定代表人：{{dataList.PartyBLegal}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
甲乙双方经平等友好协商就<div class="TuitractInput" style="width:4rem">1988</div>年 甲乙双方经平等友好协商就<div class="TuitractInput" style="width:4rem">{{getData(dataList.CreateTimeStr,1)}}</div>年
<div class="TuitractInput" style="width:2rem">12</div>月<div class="TuitractInput" style="width:2rem">12</div>日签订的《培训课程协议》 <div class="TuitractInput" style="width:2rem">{{getData(dataList.CreateTimeStr,2)}}</div>月<div
class="TuitractInput" style="width:2rem">
{{getData(dataList.CreateTimeStr,3)}}
</div>日签订的《培训课程协议》
解除合作关系。 解除合作关系。
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
第一条：原协议内容 第一条：原协议内容
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
原协议报名人员：<div class="TuitractInput" style="width:14rem;text-align:left;"></div> 原协议报名人员：<div class="TuitractInput" style="width:14rem;text-align:left;">{{dataList.OldSaleMan}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
原报名项目：<div class="TuitractInput" style="width:16rem;text-align:left;"></div> 原报名项目：<div class="TuitractInput" style="width:16rem;text-align:left;">{{dataList.CNMoneyStr}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
原报名项目原价：<div class="TuitractInput" style="width:14rem;text-align:left;">4564</div> 原报名项目原价：<div class="TuitractInput" style="width:14rem;text-align:left;">{{dataList.OldSellPrice}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
折后（优惠）价：<div class="TuitractInput" style="width:14rem;text-align:left;">1234</div> 折后（优惠）价：<div class="TuitractInput" style="width:14rem;text-align:left;">{{dataList.OldDiscountMoney}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
原协议已收学费：<div class="TuitractInput" style="width:14rem;text-align:left;"> 原协议已收学费：<div class="TuitractInput" style="width:14rem;text-align:left;">
大写： 大写：{{dataList.OldIncomeStr}}
</div> </div>
（¥<div class="TuitractInput" style="width:4rem;"></div>元整） （¥<div class="TuitractInput" style="width:4rem;">{{dataList.OldIncome}}</div>元整）
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
原收据编号：<div class="TuitractInput" style="width:16rem;text-align:left;">1234</div> 原收据编号：<div class="TuitractInput" style="width:16rem;text-align:left;">{{dataList.OldFinaceNum}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
原收款人：<div class="TuitractInput" style="width:17rem;text-align:left;">1234</div> 原收款人：<div class="TuitractInput" style="width:17rem;text-align:left;">{{dataList.OldReceiveMan}}</div>
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
第二条：乙方共计课时<div class="TuitractInput" style="width:3rem;"></div>节；已销课时 第二条：乙方共计课时<div class="TuitractInput" style="width:3rem;">{{dataList.TotalClassHours}}</div>节；已销课时
<div class="TuitractInput" style="width:3rem;"></div>节：剩余课时<div class="TuitractInput" style="width:3rem;"></div>节； <div class="TuitractInput" style="width:3rem;">{{dataList.CompleteHours}}</div>节：剩余课时<div
class="TuitractInput" style="width:3rem;">
{{dataList.SurplusHours}}</div>节；
</div> </div>
<div class="conReFund_Suojin"> <div class="conReFund_Suojin">
甲方应退还乙方未上课时费用<div class="TuitractInput" style="width:17rem;text-align:left;"> 甲方应退还乙方未上课时费用
<div class="TuitractInput" style="width:9rem;text-align:left;">{{dataList.CNMoneyStr}}</div>
（¥<div class="TuitractInput" style="width:4rem;text-align:left;">{{dataList.BackMoney}}</div>
元整），原协议自动终、收据自动失效。
</div> </div>
<div class="conReFund_Suojin" style="text-indent:0;">
退还帐户名：<div class="TuitractInput" style="width:17rem;text-align:left;">{{dataList.BackAccountName}}</div>
</div>
<div class="conReFund_Suojin" style="text-indent:0;">
退还账号：<div class="TuitractInput" style="width:18rem;text-align:left;">{{dataList.BackAccount}}</div>
</div>
<div class="conReFund_Suojin" style="text-indent:0;">
退还学费=乙方已缴总学费-已上课程学费-（乙方已缴学费-已上课程学费）*10%，其中“（乙方已缴课程学费）*10%”为违约金。
</div>
<div class="conReFund_Suojin">
第三条：乙方应将原协议和收据原件交还甲方，若原件无法交还，请乙方
</div>
<div class="conReFund_Suojin" style="text-indent:0;">
在此声明：<div class="TuitractInput" style="width:18rem;text-align:left;">{{dataList.StateMent}}</div>
</div>
<div class="conReFund_Suojin">
第四条：本协议自签订之日起正式生效。
</div>
<div class="conReFund_Suojin">
甲方(家长/监护人)签字（盖章）：{{dataList.PartyASign}}
</div>
<div class="conReFund_Suojin">
签署日期：{{dataList.PartyASignDate}}
</div>
<div class="conReFund_Suojin">
乙方签字（盖章）：{{dataList.PartyBSign}}
</div>
<div class="conReFund_Suojin">
签署日期：{{dataList.PartyBSignDate}}
</div> </div>
</div> </div>
</div> </div>
...@@ -286,7 +301,7 @@ ...@@ -286,7 +301,7 @@
</template> </template>
<script> <script>
import { import {
GetEducationContractInfo GetBackClassProtocol
} from '../api/sale/contract' } from '../api/sale/contract'
export default { export default {
...@@ -295,43 +310,60 @@ ...@@ -295,43 +310,60 @@
dataList: [], dataList: [],
dialogVisible: false, dialogVisible: false,
gmsg: { gmsg: {
ContractId: 0 Id: 1
}, },
dataList: {}, dataList: {},
ActiveTab: 1, ActiveTab: 1,
}; };
}, },
created() { created() {
if (this.$route.query.ContractId) { if (this.$route.query.Id) {
this.gmsg.ContractId = this.$route.query.ContractId; this.gmsg.Id = this.$route.query.Id;
this.gmsg.Id = 1;
this.getList(); this.getList();
} }
this.getList();
}, },
methods: { methods: {
//获取数据 //获取数据
getList() { getList() {
GetEducationContractInfo(this.gmsg).then(res => { GetBackClassProtocol(this.gmsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data; this.dataList = res.Data;
console.log(res, '数据');
} }
}) })
}, },
ChangeTab(num) { //获取日期
this.ActiveTab = num; getData(dateStr, type) {
if (dateStr) {
let timeOne = dateStr.split(' ')[0];
let Year = timeOne.split('-')[0];
let Month = timeOne.split('-')[1];
let day = timeOne.split('-')[2];
if (type == 1) {
return Year
}
if (type == 2) {
return Month
}
if (type == 3) {
return day
}
}
}, },
//跳转至合同签名 //跳转至合同签名
goSign(){ goSign() {
this.$router.push({ this.$router.push({
path: '/contractSign', path: '/contractSign',
query: { query: {
ContractId: this.gmsg.ContractId, Id: this.gmsg.Id,
Money:this.dataList.Money Type: 2
} }
}); });
} }
}, },
mounted() { mounted() {}
}
}; };
</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