Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/api/users/user.js

@@ -32,6 +32,15 @@ export function checkStuTel(data) {
   })
 }
 
+export function queryStudentByTel(data) {
+  return request({
+    url: '/User/GetStudentByTel',
+    method: 'post',
+    data
+  })
+}
+
+
 /**
  * 修改离职信息
  * @param {查询参数} data

src/components/schedul/schedul-visit.vue

@@ -124,8 +124,16 @@
         </q-input>
       </div>
       <div v-if="tabCheck == 'second'">
-        <q-btn outline dense icon="add" class="q-px-sm" color="primary" @click="showAddForm=true" label="新增客户"></q-btn>
-      </div> 
+        <q-btn
+          outline
+          dense
+          icon="add"
+          class="q-px-sm"
+          color="primary"
+          @click="showAddForm = true"
+          label="新增客户"
+        ></q-btn>
+      </div>
     </div>
     <div class="page-content">
       <q-table
@@ -503,20 +511,65 @@
       @close="closeDetail"
       :save-obj="sendObj"
     ></schedulFanke>
-    <q-dialog v-model="showAddForm" persistent content-class="bg-grey-1 big-dialog">
-      <student-add-form @success="addFinishHandler" @close="showAddForm=false"></student-add-form>
+    <q-dialog
+      v-model="showAddForm"
+      persistent
+      content-class="bg-grey-1 big-dialog"
+    >
+      <student-add-form
+        @success="addFinishHandler"
+        @close="showAddForm = false"
+      ></student-add-form>
+    </q-dialog>
+    <q-dialog persistent v-model="isShowModelInfo" v-if="visitModel">
+      <q-card flat class="q-pa-md" style="width:300px">
+        <div class="text-h6">客户已存在</div>
+        <div class="text-center q-my-md">
+          <q-avatar
+            size="40px"
+            rounded
+            style="background:#C7C7C7"
+            text-color="white"
+          >
+            <span>{{ visitModel.StuName.substring(0, 1) }}</span>
+          </q-avatar>
+        </div>
+        <div class="text-center text-dark" style="font-size:12px">
+          <span class="text-primary">{{ visitModel.StuName }}</span>
+          <span class="q-mx-xs" style="font-size:20px;font-weight:bold">·</span>
+          <span>{{ visitModel.StuTel }}</span>
+        </div>
+        <div style="font-size:12px" class="q-mt-xs text-center q-mb-md text-grey-6">
+          该客户已于{{ visitModel.CreateTimeStr }}，由{{
+            visitModel.CreateByName
+          }}加入会员库
+        </div>
+        <q-separator class="q-mb-md" />
+        <div class="text-center q-py-xs">
+          <q-btn
+            outline
+            color="primary"
+            class="q-px-md"
+            label="打卡到访"
+            @click="createVisitHandler(visitModel)"
+          ></q-btn>
+        </div>
+      </q-card>
     </q-dialog>
   </div>
 </template>
 <script>
 import { getTodayVisitList } from "../../api/stuMan/index";
 import { getStudentPage, saveStudent, getStudentInfo } from "../../api/school";
-import { saveStudentVisitFeedback } from "../../api/customerstudent/customerstudent";
+import {
+  saveStudentVisitFeedback,
+  saveStudentVisit
+} from "../../api/customerstudent/customerstudent";
 import { getGuestBasicsEnumList } from "../../api/sale/sale";
 import schedulFanke from "../schedul/schedul-fanke";
 import { queryDutyTrialLesson } from "../../api/duty/index";
-import studentAddForm from '../../components/school/student/studentAddForm'
-
+import studentAddForm from "../../components/school/student/studentAddForm";
+import { mapGetters } from "vuex";
 export default {
   props: {
     saveObj: {
@@ -532,8 +585,13 @@ export default {
     schedulFanke,
     studentAddForm
   },
+  computed: {
+    ...mapGetters(["userInfo"])
+  },
   data() {
     return {
+      isShowModelInfo: true,
+      visitModel: null,
       tabCheck: "first",
       columns: [
         {
@@ -584,7 +642,7 @@ export default {
           label: "操作"
         }
       ],
-      showAddForm:false,
+      showAddForm: false,
       visitColumns: [
         {
           name: "StuName",
@@ -821,6 +879,46 @@ export default {
     this.initDutyTrialLessonList();
   },
   methods: {
+    addFinishHandler(m, t) {
+      console.log(m, t);
+      if (m && m.StuId) {
+        if (t == 1) {
+          this.visitModel = m;
+        } else {
+          this.visitModel = null;
+          this.createVisitHandler(m);
+          this.getVisitoryPage();
+        }
+      }
+      this.showAddForm = false;
+    },
+    createVisitHandler(m) {
+      let d = new Date();
+      let msg = {
+        Id: 0,
+        Date: d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(),
+        ReceptionPersion: this.userInfo.Id,
+        Remark:
+          "客户临时到访门店，由" + this.userInfo.AccountName + "记录到访信息",
+        School_Id: this.userInfo.School_Id,
+        StuId: m.StuId,
+        VisitTime: d.getHours() + ":" + d.getMinutes()
+      };
+      console.log("进来了呀", msg);
+      saveStudentVisit(msg).then(r => {
+        this.visitModel=null
+        if (r.Data) {
+          let msg2 = {
+            Id: r.Data.Id,
+            IsVisit: 1,
+            Feedback: msg.remark
+          };
+          saveStudentVisitFeedback(msg2).then(r2 => {
+            this.initTodayVistList();
+          });
+        }
+      });
+    },
     submitForm(addMsg1) {
       //提交创建、修改表单
       this.$refs[addMsg1].validate(valid => {
@@ -1012,4 +1110,4 @@ export default {
 </script>
 <style lang="sass">
 @import url('~assets/css/table.sass')
-</style>
\ No newline at end of file
+</style>

src/components/school/student/studentAddForm.vue

@@ -19,6 +19,7 @@
           full-mask
           mask="###########"
           label="客户电话"
+          @input="checkStuTel"
         ></q-input>
       </div>
       <div class="q-mt-xs row q-col-gutter-md">
@@ -170,39 +171,6 @@
         ></q-btn>
       </div>
     </q-card>
-    <div style="display:none">
-      <div class="info_content" style="margin-bottom:0;">
-        <div class="info_content">
-          <div class="info_item">
-            <div class="item_label">创建人</div>
-            <div class="item_value">
-              <q-select
-                filled
-                v-model="customObj.CreateBy"
-                dense
-                disable
-                @filter="filterEmployee"
-                use-input
-                :options="myEmployeeList"
-                option-label="EmployeeName"
-                option-value="Id"
-                emit-value
-                map-options
-              />
-            </div>
-          </div>
-
-          <div class="info_item">
-            <q-btn
-              color="accent"
-              class="q-mr-md"
-              label="保存"
-              @click="saveStu()"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 <script>
@@ -217,7 +185,7 @@ import {
   getGuestLearningGoalsEnumList,
   GetStuChannelList
 } from "../../../api/sale/sale";
-import { queryEmployee,checkStuTel } from "../../../api/users/user";
+import { queryEmployee,queryStudentByTel } from "../../../api/users/user";
 export default {
   meta: {
     title: "学员管理"
@@ -287,24 +255,29 @@ export default {
   methods: {
     checkStuTel(){
       if (this.customObj.StuTel && this.customObj.StuTel.length == 11){
-        this.customObj
+        queryStudentByTel({StuTel:this.customObj.StuTel}).then(r=>{
+          if(r.Data){
+            this.$emit("success",r.Data,1);
+          }
+        })
       }
     },
     validate() {
       let msg = "";
+      console.log(this.customObj)
       if (!this.customObj.StuName) {
         msg = "请输入客户名称";
       } else if (!this.customObj.StuTel || this.customObj.StuTel.length != 11) {
         msg = "请输入正确的客户手机号";
-      } else if (!customObj.cusfrom) {
+      } else if (!this.customObj.cusfrom) {
         msg = "请选择客户来源";
-      } else if (!customObj.StuChannelList) {
+      } else if (!this.customObj.StuChannel) {
         msg = "请选择客户获客渠道";
       } else if (
-        customObj.StuChannelList == 6 ||
-        customObj.StuChannelList == 7
+        this.customObj.StuChannel == 6 ||
+        this.customObj.StuChannel == 7
       ) {
-        if (!customObj.PlatformName) {
+        if (!this.customObj.PlatformName) {
           msg = "请填写具体渠道信息";
         }
       }
@@ -330,7 +303,7 @@ export default {
             message: "数据保存成功！",
             position: "top"
           });
-          this.$emit("success");
+          this.$emit("success",res.Data,0);
         }
       });
     },