Commit 7da1b269 authored by 罗超's avatar 罗超

1

parent 00dbc742
...@@ -47,6 +47,36 @@ ...@@ -47,6 +47,36 @@
<span>电话</span> <span>电话</span>
<span>{{Data.ContactNumber}}</span> <span>{{Data.ContactNumber}}</span>
</div> </div>
<!-- QQ -->
<div class="q-my-sm" v-if="editField=='QQ'">
<div class="flex justify-between items-center q-mb-sm">
<span>QQ</span>
<div>
<q-btn size="sm" text-color="primary" label="取消" @click="showEdit('')"></q-btn>
<q-btn size="sm" color="primary" label="确定" class="q-ml-sm" @click="save('QQ',Data.QQ,)"></q-btn>
</div>
</div>
<q-input outlined dense v-model="Data.QQ" ref="QQ"></q-input>
</div>
<div class="flex justify-between items-center q-my-lg" v-else @click="showEdit('QQ')">
<span>QQ</span>
<span>{{Data.QQ}}</span>
</div>
<!-- 微信 -->
<div class="q-my-sm" v-if="editField=='WeChatNo'">
<div class="flex justify-between items-center q-mb-sm">
<span>微信</span>
<div>
<q-btn size="sm" text-color="primary" label="取消" @click="showEdit('')"></q-btn>
<q-btn size="sm" color="primary" label="确定" class="q-ml-sm" @click="save('WeChatNo',Data.WeChatNo,)"></q-btn>
</div>
</div>
<q-input outlined dense v-model="Data.WeChatNo" ref="WeChatNo"></q-input>
</div>
<div class="flex justify-between items-center q-my-lg" v-else @click="showEdit('WeChatNo')">
<span>微信</span>
<span>{{Data.WeChatNo}}</span>
</div>
<!-- 类型 --> <!-- 类型 -->
<div class="q-my-sm" v-if="editField=='CustomerType'"> <div class="q-my-sm" v-if="editField=='CustomerType'">
<div class="flex justify-between items-center q-mb-sm"> <div class="flex justify-between items-center q-mb-sm">
......
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ContactNumber" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ContactNumber" lazy-rules
ref="ContactNumber" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请输入联系电话']" /> ref="ContactNumber" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[ val => validateTel(val) || '请输入正确的11位号码']" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="40" v-model="objOption.EnterpriseName" :label="EnterpriseLabelName"> <q-input filled stack-label maxlength="40" v-model="objOption.EnterpriseName" :label="EnterpriseLabelName">
...@@ -127,21 +127,25 @@ ...@@ -127,21 +127,25 @@
class="col-6 q-pb-lg" label="传真" /> --> class="col-6 q-pb-lg" label="传真" /> -->
</div> </div>
</div> </div>
<!-- <div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.QQ" ref="QQ" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.QQ" ref="QQ"
class="col-6 q-pr-lg q-pb-lg" label="QQ" /> class="col-6 q-pr-lg q-pb-lg" label="QQ" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.WeChatNo" ref="wechat"
class="col-6 q-pr-lg q-pb-lg" label="微信" />
</div>
<!-- <div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Email" ref="Email" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Email" ref="Email"
class="col-6 q-pb-lg" label="Email" /> class="col-6 q-pb-lg" label="Email" />
</div> </div> -->
</div> --> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<!-- <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="Account" <!-- <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="Account"
class="col-6 q-pr-lg q-pb-lg" label="账号" /> --> class="col-6 q-pr-lg q-pb-lg" label="账号" /> -->
<q-input filled stack-label :dense="false" v-model="objOption.Address" ref="Address" class="col-6 q-pb-lg" <q-input filled stack-label :dense="false" v-model="objOption.Address" ref="Address" class="col-6 q-pr-lg q-pb-lg"
label="详细地址" /> label="详细地址" />
</div> </div>
<div class="col-6"> <div class="col-6">
...@@ -191,6 +195,7 @@ ...@@ -191,6 +195,7 @@
SetCustomer, SetCustomer,
GetCustomer GetCustomer
} from "../../api/sale/peemanagement"; } from "../../api/sale/peemanagement";
import {validateTel} from '../../utils/validate'
export default { export default {
components: {}, components: {},
props: { props: {
...@@ -201,6 +206,7 @@ ...@@ -201,6 +206,7 @@
}, },
data() { data() {
return { return {
validateTel,
persistent: true, persistent: true,
objOption: { objOption: {
CustomerId: 0, //客户编号 CustomerId: 0, //客户编号
...@@ -209,6 +215,7 @@ ...@@ -209,6 +215,7 @@
Sex: 1, //性别(1-男,2-女) Sex: 1, //性别(1-男,2-女)
Fax: "", //传真 Fax: "", //传真
QQ: "", QQ: "",
WeChatNo:"",//微信
Email: "", //邮箱 Email: "", //邮箱
Address: '', //详细地址 Address: '', //详细地址
Images: "", //营业照片 Images: "", //营业照片
...@@ -265,6 +272,7 @@ ...@@ -265,6 +272,7 @@
this.objOption.Sex = tempData.Sex; this.objOption.Sex = tempData.Sex;
this.objOption.Fax = tempData.Fax; this.objOption.Fax = tempData.Fax;
this.objOption.QQ = tempData.QQ; this.objOption.QQ = tempData.QQ;
this.objOption.WeChatNo = tempData.WeChatNo
this.objOption.Email = tempData.Email; this.objOption.Email = tempData.Email;
this.objOption.Address = tempData.Address; this.objOption.Address = tempData.Address;
this.objOption.Account = tempData.Account; this.objOption.Account = tempData.Account;
...@@ -285,6 +293,7 @@ ...@@ -285,6 +293,7 @@
this.objOption.Sex = 1; this.objOption.Sex = 1;
this.objOption.Fax = ''; this.objOption.Fax = '';
this.objOption.QQ = ''; this.objOption.QQ = '';
this.objOption.WeChatNo = '';
this.objOption.Email = ''; this.objOption.Email = '';
this.objOption.Address = ''; this.objOption.Address = '';
this.objOption.Account = ''; this.objOption.Account = '';
......
...@@ -409,4 +409,7 @@ export default { ...@@ -409,4 +409,7 @@ export default {
background-color: transparent; background-color: transparent;
border: none; border: none;
} }
/deep/.q-stepper__step-inner{
padding:0 24px;
}
</style> </style>
\ No newline at end of file
<!--订单操作--> <!--订单操作-->
<template> <template>
<div> <div>
<div class="q-mb-sm text-accent">
<span class="text-primary">班级:</span>{{saveObj.ClassName}}
<span class="q-ml-md text-primary">课程:</span>{{saveObj.CourseName}}
</div>
<div class="row q-mb-md"> <div class="row q-mb-md">
<div class="col-10 flex"> <div class="col-10 flex">
<div v-for="(item, index) in stuData.StuList"> <div v-for="(item, index) in stuData.StuList">
...@@ -433,7 +437,6 @@ export default { ...@@ -433,7 +437,6 @@ export default {
const ids = this.stuData.StuList.map(e => e.StuId).toString(); const ids = this.stuData.StuList.map(e => e.StuId).toString();
GetStudentAssistList({StuId: ids}).then(res => { GetStudentAssistList({StuId: ids}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(422,res.Data)
res.Data.map(e=>{ res.Data.map(e=>{
if(e.AssistType==4){ if(e.AssistType==4){
this.OrderMsg.HelpEnterId=e.AssistId this.OrderMsg.HelpEnterId=e.AssistId
...@@ -709,7 +712,6 @@ export default { ...@@ -709,7 +712,6 @@ export default {
//修改订单 //修改订单
saveOrderInfo() { saveOrderInfo() {
//插班验证课程和生效时间 //插班验证课程和生效时间
console.log("OrderMsg",this.OrderMsg)
if (this.OrderMsg.IsChaBan == 1) { if (this.OrderMsg.IsChaBan == 1) {
this.$refs.CourseId.validate(); this.$refs.CourseId.validate();
this.$refs.EffectTime.validate(); this.$refs.EffectTime.validate();
......
...@@ -69,4 +69,10 @@ export function compareObject(objA, objB,ignoreArray, endLoop) { ...@@ -69,4 +69,10 @@ export function compareObject(objA, objB,ignoreArray, endLoop) {
isSame = compareObject(objB, objA,ignoreArray, true) isSame = compareObject(objB, objA,ignoreArray, true)
} }
return isSame return isSame
}
//验证11位的号码
export function validateTel(tel) {
const reg = /^1[3|4|5|7|8]\d{9}$/
return reg.test(tel)
} }
\ No newline at end of file
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