1

src/components/sale/b2bcustomerinfo/baseInfo.vue

@@ -47,6 +47,36 @@
       <span>电话</span>
       <span>{{Data.ContactNumber}}</span>
     </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="flex justify-between items-center q-mb-sm">

src/components/sale/customerEdit-form.vue

@@ -112,8 +112,8 @@
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ContactNumber"
-              ref="ContactNumber" class="col-6 q-pr-lg q-pb-lg" label="联系电话" :rules="[val => !!val || '请输入联系电话']" />
+            <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 => validateTel(val) || '请输入正确的11位号码']" />
           </div>
           <div class="col-6">
             <q-input filled stack-label maxlength="40" v-model="objOption.EnterpriseName" :label="EnterpriseLabelName">
@@ -127,21 +127,25 @@
               class="col-6 q-pb-lg" label="传真" /> -->
           </div>
         </div>
-        <!-- <div class="row wrap">
+        <div class="row wrap">
           <div class="col-6">
             <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" />
           </div>
           <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"
               class="col-6 q-pb-lg" label="Email" />
-          </div>
-        </div> -->
+          </div> -->
+        </div>
         <div class="row wrap">
           <div class="col-6">
             <!-- <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="账号" /> -->
-                <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="详细地址" />
           </div>
           <div class="col-6">
@@ -191,6 +195,7 @@
     SetCustomer,
     GetCustomer
   } from "../../api/sale/peemanagement";
+  import {validateTel} from '../../utils/validate'
   export default {
     components: {},
     props: {
@@ -201,6 +206,7 @@
     },
     data() {
       return {
+        validateTel,
         persistent: true,
         objOption: {
           CustomerId: 0, //客户编号
@@ -209,6 +215,7 @@
           Sex: 1, //性别(1-男，2-女)
           Fax: "", //传真
           QQ: "",
+          WeChatNo:"",//微信
           Email: "", //邮箱
           Address: '', //详细地址
           Images: "", //营业照片
@@ -265,6 +272,7 @@
               this.objOption.Sex = tempData.Sex;
               this.objOption.Fax = tempData.Fax;
               this.objOption.QQ = tempData.QQ;
+              this.objOption.WeChatNo = tempData.WeChatNo
               this.objOption.Email = tempData.Email;
               this.objOption.Address = tempData.Address;
               this.objOption.Account = tempData.Account;
@@ -285,6 +293,7 @@
           this.objOption.Sex = 1;
           this.objOption.Fax = '';
           this.objOption.QQ = '';
+          this.objOption.WeChatNo = '';
           this.objOption.Email = '';
           this.objOption.Address = '';
           this.objOption.Account = '';

src/components/school/student/transfer-order.vue

@@ -409,4 +409,7 @@ export default {
   background-color: transparent;
   border: none;
 }
+/deep/.q-stepper__step-inner{
+  padding:0 24px;
+}
 </style>
\ No newline at end of file

src/components/school/student/transfer-order/order-form.vue

 <!--订单操作-->
 <template>
   <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="col-10 flex">
         <div v-for="(item, index) in stuData.StuList">
@@ -433,7 +437,6 @@ export default {
        const ids = this.stuData.StuList.map(e => e.StuId).toString();
         GetStudentAssistList({StuId: ids}).then(res => {
           if (res.Code == 1) {
-            console.log(422,res.Data)
             res.Data.map(e=>{
               if(e.AssistType==4){
                 this.OrderMsg.HelpEnterId=e.AssistId
@@ -709,7 +712,6 @@ export default {
     //修改订单
     saveOrderInfo() {
       //插班验证课程和生效时间
-      console.log("OrderMsg",this.OrderMsg)
       if (this.OrderMsg.IsChaBan == 1) {
         this.$refs.CourseId.validate();
         this.$refs.EffectTime.validate();

src/utils/validate.js

@@ -69,4 +69,10 @@ export function compareObject(objA, objB,ignoreArray, endLoop) {
     isSame = compareObject(objB, objA,ignoreArray, true)
     }
     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