Commit 1e851de6 authored by zhengke's avatar zhengke

修改

parent 844447fd
...@@ -96,7 +96,11 @@ ...@@ -96,7 +96,11 @@
</template> </template>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-CustomerName="props">
<q-td>
<span v-if="props.row.BelongType!=3">{{props.row.CustomerName}}</span>
</q-td>
</template>
</q-table> </q-table>
<student-form v-if="isShowStuForm" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList"> <student-form v-if="isShowStuForm" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
</student-form> </student-form>
...@@ -123,10 +127,6 @@ ...@@ -123,10 +127,6 @@
type: Number, type: Number,
default: null default: null
}, },
BelongType:{
type: Number,
default: null
}
}, },
components: { components: {
studentForm, studentForm,
...@@ -274,7 +274,8 @@ ...@@ -274,7 +274,8 @@
stuOption: null, stuOption: null,
isShowAdd: false, isShowAdd: false,
selection: [], selection: [],
isShowTransfer: false isShowTransfer: false,
BelongType:1
}; };
}, },
watch:{ watch:{
...@@ -420,6 +421,7 @@ ...@@ -420,6 +421,7 @@
getStuRight(obj) { getStuRight(obj) {
if (obj) { if (obj) {
this.stuOption = obj; this.stuOption = obj;
this.BelongType = obj.BelongType;
} else { } else {
this.stuOption = null; this.stuOption = null;
} }
......
...@@ -381,6 +381,8 @@ ...@@ -381,6 +381,8 @@
<p>5、本合同正本一式两份,甲乙双方各持一份,具有同等法律效力。</p> <p>5、本合同正本一式两份,甲乙双方各持一份,具有同等法律效力。</p>
<p>6、本合同自乙方缴纳全额课程学费及签订协议之日起正式生效。</p> <p>6、本合同自乙方缴纳全额课程学费及签订协议之日起正式生效。</p>
<p>7、本合同协议部分到此为止,以下为空白。</p> <p>7、本合同协议部分到此为止,以下为空白。</p>
<div class="contractTitle comTop">十、合同补充协议</div>
<p>{{dataList.CourseContracrInfo}}</p>
<div style="margin:50px 0;position:relative;"> <div style="margin:50px 0;position:relative;">
甲方签字(盖章):<img v-if="dataList.IsCompanySeal==1&&dataList.GroupSealImg" :src="dataList.GroupSealImg" style="width:100px;position:absolute;top:-30px;" /> 甲方签字(盖章):<img v-if="dataList.IsCompanySeal==1&&dataList.GroupSealImg" :src="dataList.GroupSealImg" style="width:100px;position:absolute;top:-30px;" />
</div> </div>
...@@ -436,6 +438,15 @@ ...@@ -436,6 +438,15 @@
<el-col :span="12">{{dataList.StuAddress}}</el-col> <el-col :span="12">{{dataList.StuAddress}}</el-col>
</el-row> </el-row>
</li> </li>
<li>
<el-row>
<el-col :span="12">身份证号</el-col>
<el-col :span="12">
<span v-if="dataList.StuIDCard">{{dataList.StuIDCard}}</span>
<el-input v-else></el-input>
</el-col>
</el-row>
</li>
</ul> </ul>
</div> </div>
<div style="padding:100px 0 80px 0;" v-if="ActiveTab==3"> <div style="padding:100px 0 80px 0;" v-if="ActiveTab==3">
......
...@@ -149,8 +149,13 @@ ...@@ -149,8 +149,13 @@
<div class="contractCompany"> <div class="contractCompany">
甲方:成都市锦江区甲鹤外语培训学校有限公司 甲方:成都市锦江区甲鹤外语培训学校有限公司
</div> </div>
<div class="contractCompany"> <div class="contractCompany" style="display:flex;justify-content:space-between;">
乙方:<div class="contractInput" style="width:360px;text-align:left;text-indent:10px;font-size:20px;">{{dataList.StudentName}}</div> <div>
乙方:<div class="contractInput" style="width:360px;text-align:left;text-indent:10px;font-size:20px;">{{dataList.StudentName}}</div>
</div>
<div>
身份证号:<div class="contractInput" style="width:360px;text-align:left;text-indent:10px;font-size:20px;">{{dataList.StuIDCard}}</div>
</div>
</div> </div>
<div class="operationAgree">甲鹤日语课程协议</div> <div class="operationAgree">甲鹤日语课程协议</div>
<div class="operationDate"> <div class="operationDate">
...@@ -187,7 +192,7 @@ ...@@ -187,7 +192,7 @@
<div class="contractInput">{{dataList.StuAddress}}</div> <div class="contractInput">{{dataList.StuAddress}}</div>
</div> </div>
<div> <div>
<span class="comLeftTile">电话</span> <span class="comLeftTile" style="margin-left:30px;display:inline-block;text-align-last: justify;width:80px;">电话</span>
<div class="contractInput">{{dataList.StuTel}}</div> <div class="contractInput">{{dataList.StuTel}}</div>
</div> </div>
<div> <div>
...@@ -673,7 +678,11 @@ ...@@ -673,7 +678,11 @@
<div class="contractContent">6、本合同自乙方缴纳全额课程学费及签订协议之日起正式生效。</div> <div class="contractContent">6、本合同自乙方缴纳全额课程学费及签订协议之日起正式生效。</div>
</div> </div>
<div class="conTractInner ConTract_Line" style="margin-left:5px;"> <div class="conTractInner ConTract_Line" style="margin-left:5px;">
<div class="contractContent" style="margin:20px 0 100px 0;">7、本合同协议部分到此为止,以下为空白。</div> <div class="contractContent" style="margin:20px 0 20px 0;">7、本合同协议部分到此为止,以下为空白。</div>
<div class="comFirstTitle">十、合同补充信息</div>
<div class="contractContent" style="margin-bottom:100px;">
{{dataList.CourseContracrInfo}}
</div>
<div class="contractContent" style="position:relative;"> <div class="contractContent" style="position:relative;">
甲方签字(盖章):<img v-if="dataList.IsCompanySeal==1&&dataList.GroupSealImg" style="width:100px;position:absolute;top:-40px;" :src="dataList.GroupSealImg" /> 甲方签字(盖章):<img v-if="dataList.IsCompanySeal==1&&dataList.GroupSealImg" style="width:100px;position:absolute;top:-40px;" :src="dataList.GroupSealImg" />
</div> </div>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<stulist :dataList="data" @success="refreshPage" ref="stuList" :BelongType="msg.BelongType" :isJudgeTrans="isJudgeTrans"> </stulist> <stulist :dataList="data" @success="refreshPage" ref="stuList" :isJudgeTrans="isJudgeTrans"> </stulist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
color="primary" :input="true"> color="primary" :input="true">
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
import { import {
getMyCustomerList getMyCustomerList
} from "../../api/sale/sale"; } from "../../api/sale/sale";
import { mapGetters } from "vuex";
export default { export default {
meta: { meta: {
title: "客户管理" title: "客户管理"
...@@ -109,7 +110,6 @@ ...@@ -109,7 +110,6 @@
StartTime: "", //开始时间 StartTime: "", //开始时间
EndTime: "", //结束时间 EndTime: "", //结束时间
CustomerId: 0, CustomerId: 0,
BelongType: 1, //归属类型
QQ:'', QQ:'',
WechatNo:'', WechatNo:'',
StuType:'', StuType:'',
...@@ -156,6 +156,10 @@ ...@@ -156,6 +156,10 @@
this.getStudent(); this.getStudent();
this.getCustomerList(); this.getCustomerList();
}, },
computed: {
...mapGetters(["userInfo"])
},
methods: { methods: {
//获取我下属的下拉数据 //获取我下属的下拉数据
GetSubordList(){ GetSubordList(){
...@@ -221,6 +225,13 @@ ...@@ -221,6 +225,13 @@
this.loading = false; this.loading = false;
this.data = res.Data.PageData; this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
this.data.forEach(x=>{
if(x.CreateBy!=this.userInfo.Id){
x.BelongType=3
}else{
x.BelongType=1
}
})
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
......
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