回访信息 - 标签 新增、编辑、删除

回访信息 - 列表 展示、新增

src/App.vue

@@ -16,7 +16,7 @@
       // 权限验证 动态路由
       if (window.location.href.indexOf("login") < 0) {
         let permission = this.$store.state.progressList;
-        console.log(this.$store.state);
+        // console.log(this.$store.state);
         let menuList = [];
         this.$router.options.routes[0].children = [];
         let routerUserDetail = {

src/components/callBack/index.vue

 <!-- 回访信息 -->
 <template>
-  <div>
+  <div class="callback-container">
 
-    <el-form label-width="100px" inline>
-      <el-form-item label="ID：">
-        {{callbackObj.detail.user_id}}
-      </el-form-item>
-      <el-form-item label="用户昵称：">
-        {{callbackObj.detail.nickname}}
+    <div class="callback-item" style="margin-bottom: 15px;">
+      ID：{{callbackObj.detail.user_id}} &emsp;
+      用户昵称：{{callbackObj.detail.nickname}} &emsp;
+      宝宝名称：{{callbackObj.detail.baby_name ? callbackObj.detail.baby_name : '-'}} &emsp;
+      宝宝生日：{{(callbackObj.detail.birthday == '0000-00-00') ? '-' : callbackObj.detail.birthday}} &emsp;
+      手机号：{{callbackObj.detail.mobile ? callbackObj.detail.mobile : '-'}} &emsp;
+    </div>
+
+    <div class="callback-item" style="display: flex; margin-bottom: 15px; line-height: 32px;">
+      标签：
+      <span class="callback-tag-wrapper" v-if="tag.length">
+        <el-tag :key="item.id" :type="item.type==1 ? 'info' : ''" v-for="item in tag">{{item.label_name}}</el-tag>
+      </span>
+      <el-button type="warning" size="small" plain @click="dialogToggle">编辑标签</el-button>
+    </div>
+
+    <div class="callback-item callback-input" v-if="callbackObj.teacher_id && callbackAdd">
+      <el-form size="small" inline>
+        <el-form-item required>
+          <el-select v-model="add.method" placeholder="回访方式" style="width: 140px;">
+            <el-option v-for="item in CALLBACK_METHOD" :key="item.id" :label="item.label" :value="item.value"></el-option>
+          </el-select>
         </el-form-item>
-      <el-form-item label="宝宝名称：">
-        {{callbackObj.detail.baby_name ? callbackObj.detail.baby_name : '-'}}
+
+        <el-form-item required>
+          <el-select v-model="add.type" placeholder="回访类型" style="width: 140px;">
+            <el-option v-for="item in CALLBACK_TYPE" :key="item.id" :label="item.label" :value="item.value"></el-option>
+          </el-select>
         </el-form-item>
-      <el-form-item label="宝宝生日：">
-        {{(callbackObj.detail.birthday == '0000-00-00') ? '-' : callbackObj.detail.birthday}}
+
+        <el-form-item required>
+          <el-select v-model="add.intention" placeholder="意向度" style="width: 140px;">
+            <el-option v-for="item in CALLBACK_INTENTION" :key="item.id" :label="item.label" :value="item.value"></el-option>
+          </el-select>
         </el-form-item>
-      <el-form-item label="手机号：">
-        {{callbackObj.detail.mobile ? callbackObj.detail.mobile : '-'}}
+
+        <el-form-item>
+          <el-date-picker
+            type="date" placeholder="下次回访" clearable style="width: 140px;"
+            value-format="yyyy-MM-dd" v-model="add.next_visit_at"></el-date-picker>
         </el-form-item>
+
+        <el-button size="small" type="success" plain @click="addCallback">添加回访信息</el-button>
       </el-form>
 
-    <div>
-      标签：
-      <el-tag v-if="tag.length" v-for="item in tag">{{item.label_name}}</el-tag>
-      <el-button size="small" plain>编辑标签</el-button>
+      <el-input
+        type="textarea" :rows="3"
+        placeholder="请输入回访内容" v-model="add.desc"></el-input>
     </div>
 
+    <div class="callback-list callback-item">
+      <ol v-if="list.length">
+        <li :key="item.id" v-for="item in list">
+          <!--系统-->
+          <template v-if="item.flag == 0">
+            <span class="time">{{item.created_at}}</span>
+            <span class="grey">系统导入</span>
+            <span class="grey" v-if="item.first_key" :class="(item.desc.indexOf('支付')>-1) ? 'bold' : ''">{{item.first_key}}</span>
+            <span class="info" v-if="item.desc" :class="(item.desc.indexOf('支付')>-1) ? 'red' : ''">{{item.desc}}</span>
+          </template>
+          <template v-else-if="item.flag == 1">
+            <span class="time">{{item.created_at}}</span>
+            <span class="bold dark" v-if="item.staff_name">{{item.staff_name}}</span>
+            <span class="bold dark" v-if="item.teacher_name">{{item.teacher_name}}</span>
+            <span class="dark">{{filterName(item.method, 'CALLBACK_METHOD')}}</span>
+            <span class="dark">{{filterName(item.intention, 'CALLBACK_INTENTION')}}</span>
+            <span class="green" v-if="item.desc">{{item.desc}}</span>
+            <span class="info">下次回访：{{item.next_visit_at == '0000-00-00' ? '-' : item.next_visit_at}}</span>
+          </template>
+        </li>
+      </ol>
+      <p class="callback-list-text" v-else>暂无回访数据</p>
+      <page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
+    </div>
+
+    <el-dialog :title="dialog.title" append-to-body :visible.sync="dialog.show" width="800px">
+
+      <el-form label-width="120px">
+        <el-form-item label="已有标签：" class="callback-tag-wrapper">
+          <template v-if="tag.length">
+            <el-tag
+              :key="item.id" v-for="item in tag"
+              @close="tagDel(item)"
+              :closable="item.type==1 ? false : true"
+              :type="item.type==1 ? 'info' : ''">{{item.label_name}}</el-tag>
+          </template>
+          <template v-else>
+            暂无
+          </template>
+        </el-form-item>
+        <el-form-item label="添加标签：" required>
+          <el-cascader
+            ref="tree" v-model="tagSelectedTmp"
+            style="width: calc(100% - 90px)" placeholder="选择标签" clearable @change="tagChange" :disabled="!treeDataOrigin.length"
+            :options="treeDataOrigin" :props="{ value: 'objString', label: 'name', multiple: false, checkStrictly: false }"></el-cascader>
+        </el-form-item>
+        <el-form-item label="已选标签备注：">
+            <div v-if="!tagSelectedText" style="color: #999;">未选择标签</div>
+            <div v-else v-html="tagSelectedText"></div>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogToggle">取消</el-button>
+        <el-button type="primary" @click="dialogSave">保存，添加下一个</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-  import {getUserTagApi, getCallBackApi} from "@/service/api";
+  import {CALLBACK_METHOD, CALLBACK_TYPE, CALLBACK_INTENTION} from "@/util/wordbook";
+  import {getUserTagApi, getTagApi, getCallBackApi, postCallBackApi, postUserTagApi, delUserTagApi} from "@/service/api";
+  import page from '@/components/framework/page'
 
   export default {
     name: "CallBack",
+    components: { page },
     props: {
       callbackObj: {
         type: Object,
         default: () => {}
+      },
+      callbackAdd: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
       return {
-        tag: []
+        CALLBACK_METHOD: CALLBACK_METHOD,
+        CALLBACK_TYPE: CALLBACK_TYPE,
+        CALLBACK_INTENTION: CALLBACK_INTENTION,
+        tag: [],
+        treeDataOrigin: [],
+        tagSelected: [],
+        tagSelectedTmp: [],
+        tagSelectedText: '',
+        list: [],
+        total: 0,
+        nowPage: 1,
+        limit: 50,
+        textarea: '',
+        add: {
+          method: '',
+          type: '',
+          intention: '',
+          next_visit_at: '',
+          desc: ''
+        },
+        dialog: {
+          title: '',
+          show: false,
+          form: {
+            id: '',
+            name: '',
+            mobile: '',
+            id_card: '',
+            type: '',
+            in_at: '',
+            over_at: '',
+            rules: {
+              name: [{required: true, message: '请输入', trigger: 'blur'}],
+              mobile: [{required: true, message: '请输入', trigger: 'blur'}],
+              id_card: [{required: true, message: '请输入', trigger: 'blur'}],
+              type: [{required: true, message: '请选择', trigger: 'change'}],
+              in_at: [{required: true, message: '请选择', trigger: 'change'}],
+            },
+          }
+        },
       }
     },
     created() {
-
     },
     mounted() {
       this.getTag();
+      this.getData();
     },
     methods: {
+      filterName(string, type) {
+        return this[type].find(i => {return i.value == string}).label
+      },
+
+      tagDel(item) {
+        this.$confirm(`是否删除标签 <br> ${item.label_name}`, '提示', {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delUserTagApi(item.id).then(res => {
+            this.$message({ type: 'success', message: '标签删除成功!' });
+            this.getTag();
+          })
+        })
+      },
+      dialogToggle() {
+        this.dialog.show = !this.dialog.show;
+        if (!this.treeDataOrigin.length) {
+          this.getTagTree();
+        }
+        if (!this.dialog.show) {
+          this.dialogReset();
+        }
+      },
+      dialogReset() {
+        this.tagSelected = [];
+        this.tagSelectedTmp = [];
+        this.tagSelectedText = '';
+      },
+      dialogSave() {
+        if (!this.tagSelected.length) {
+          this.$message({ type: 'error', message: '请选择标签!' });
+          return
+        }
+        var json = {
+          user_id: this.callbackObj.id,
+          type: 0,
+          first_label_id: this.tagSelected[0]
+        };
+        this.tagSelected[1] ? json.second_label_id = this.tagSelected[1] : '';
+        this.tagSelected[2] ? json.third_label_id = this.tagSelected[2] : '';
+        postUserTagApi(json).then(res => {
+          this.$message({ type: 'success', message: '添加成功!' });
+          this.getTag();
+          this.dialogReset();
+        })
+      },
+
+      tagChange(val) {
+        if (val.length) {
+          let str = '', arr = [];
+          val.forEach((i, idx) => {
+            let o = JSON.parse(i);
+            arr.push(o.id);
+            str += `<p style="margin-top: 0;">${idx + 1}. ${o.name}：${o.cover || '-'} </p>`
+          })
+          this.tagSelectedText = str;
+          this.tagSelected = arr;
+        } else {
+          this.tagSelectedText = '';
+          this.tagSelected = [];
+        }
+      },
+      getTagTree() { // 获取标签
+        function recursion(arr) {
+          if (Array.isArray(arr) && arr.length) {
+            arr.forEach(val => {
+              val.objString = JSON.stringify({
+                name: val.name,
+                id: val.id,
+                cover: val.cover
+              });
+              recursion(val.children);
+            })
+          }
+        }
+        getTagApi().then(res => {
+          recursion(res);
+          this.treeDataOrigin = res;
+        });
+      },
       getTag() {
         if (this.callbackObj.id) {
           getUserTagApi(this.callbackObj.id).then(res => {
-            this.tag = res
+            this.tag = res;
           })
         }
-
+      },
+      getData() {
+        let json = {
+          limit: this.limit,
+          page: this.nowPage
+        };
+        this.teacher_num ? json.teacher_num = this.teacher_num : '';
+        this.callbackObj.id ? json.user_id = this.callbackObj.id : '';
+        console.log(json, 9000)
+        getCallBackApi(json).then(res => {
+          this.list = res.page_data;
+          this.total = res.total_page
+        })
+      },
+      callbackReset() {
+        this.add.method = '';
+        this.add.type = '';
+        this.add.intention = '';
+        this.add.next_visit_at = '';
+        this.add.desc = '';
+      },
+      addCallback() {
+        if (!this.add.method) {
+          this.$message({type: 'error', message: '请选择回访方式'});
+          return
+        }
+        if (!this.add.type) {
+          this.$message({type: 'error', message: '请选择回访类型'});
+          return
+        }
+        if (!this.add.intention) {
+          this.$message({type: 'error', message: '请选择意向度'});
+          return
         }
+        let json = {
+          user_id: this.callbackObj.id,
+          //teacher_id: this.callbackObj.teacher_id, // TODO
+          teacher_id: 84, // TODO
+          method: this.add.method,
+          type: this.add.type,
+          intention: this.add.intention,
+        }
+        this.add.next_visit_at ? json.next_visit_at = this.add.next_visit_at : '';
+        this.add.desc ? json.desc = this.add.desc : '';
+        postCallBackApi(json).then(res => {
+          this.$message({type: 'success', message: '回访添加成功'});
+          this.callbackReset();
+          this.getData();
+        })
+      },
+      onPageChange(val) {
+        this.nowPage = val;
+        this.getData()
+      },
+      onSizeChange(val) {
+        this.limit = val;
+        this.nowPage = 1;
+        this.getData()
+      },
     }
   }
 </script>
 
 <style lang="less">
+  .callback-container {
+    .el-divider--horizontal {
+      margin: 20px 0;
+    }
+  }
 
+  .callback-item {
+    margin-bottom: 15px;
+    padding: 15px;
+    background-color: rgba(245, 247, 250, 0.65);
+    border: solid 1px rgba(220, 223, 230, 0.5);
+    border-radius: 2px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .callback-tag-wrapper {
+    .el-tag {
+      margin-right: 10px;
+    }
+  }
+
+  .callback-list {
+    ol {
+      margin: 0 0 10px;
+      padding: 0;
+      list-style: none;
+    }
+
+    .callback-list-text {
+      text-align: center;
+      line-height: 32px;
+    }
+
+    li {
+      /*display: flex;*/
+      padding: 2px 0;
+      line-height: 24px;
+      font-size: 14px;
+      span {
+        /*display: inline-block;*/
+        margin-right: 12px;
+        &.time {
+          font-family: monospace;
+          font-size: 13px;
+        }
+        &.grey {
+          color: #555;
+        }
+        &.dark {
+          color: #333;
+        }
+        &.bold {
+          font-weight: bold;
+        }
+        &.info {
+          font-size: 13px;
+          color: #888;
+        }
+        &.green {
+          color: #33CC66;
+        }
+        &.red {
+          color: red;
+        }
+      }
+    }
+  }
+
+  .callback-input {
+    font-size: 0;
+    .el-form-item {
+      margin-right: 10px;
+      margin-bottom: 10px;
+    }
+    .is-required .el-select {
+      display: flex;
+      &:before {
+        content: '*';
+        color: #F56C6C;
+        margin-top: -6px;
+        margin-right: 4px;
+      }
+    }
+  }
 </style>

src/components/framework/leftMenu.vue

@@ -38,7 +38,7 @@ export default {
     };
   },
   mounted() {
-    console.log(this.menuList);
+    // console.log(this.menuList);
   },
   methods: {
     changeMenuType: function() {

src/components/framework/teacherDesc.vue

@@ -12,35 +12,29 @@
     <el-button size="mini" @click="editComment(row.id)">
       新增话术记录
     </el-button>
+
     <el-dialog append-to-body :visible.sync="descDialog.show" title="沟通情况列表" width="75%">
-      <el-form label-width="90px">
+
+      <call-back :callbackAdd="true" :callbackObj="callbackObj"></call-back>
+
+      <!--<el-form label-width="90px">
         <el-form-item>
           <el-button style="float: right" type="primary" plain @click="editComment(descDialog.id)">添加沟通情况</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        :data="descDialog.descList"
-        style="width: 100%">
-        <el-table-column
-          label="用户" className="f-c" width="150">
+      <el-table :data="descDialog.descList">
+        <el-table-column label="用户" className="f-c" width="150">
           <template slot-scope="scope" v-if="descDialog.user_info">
             <img :src="descDialog.user_info.avatar" style="width: 40px;height: 40px;border-radius: 50px"> {{descDialog.user_info.nickname}}(ID:{{descDialog.user_info.user_id}})
           </template>
         </el-table-column>
-        <el-table-column
-          prop="desc"
-          label="沟通情况">
-        </el-table-column>
-        <el-table-column
-          prop="type"
-          label="类型" width="80px">
+        <el-table-column prop="desc" label="沟通情况"></el-table-column>
+        <el-table-column prop="type" label="类型" width="80px">
           <template slot-scope="scope">
             {{scope.row.type === 0 ? '备注' : scope.row.type === 1 ? '沟通话术' : '召回话术'}}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="reply_content"
-          label="用户回复">
+        <el-table-column prop="reply_content" label="用户回复">
           <template slot-scope="scope">
             <div v-if="scope.row.reply_content">
               {{scope.row.reply_content}}
@@ -51,17 +45,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="operator"
-          label="联系人">
-        </el-table-column>
-        <el-table-column
-          prop="created_at"
-          label="记录事件">
-        </el-table-column>
-      </el-table>
+        <el-table-column prop="operator" label="联系人"></el-table-column>
+        <el-table-column prop="created_at" label="记录事件"></el-table-column>
+      </el-table>-->
+
     </el-dialog>
-    <el-dialog append-to-body :visible.sync="newDialog.show" center title="添加沟通情况">
+
+    <!--<el-dialog append-to-body :visible.sync="newDialog.show" center title="添加沟通情况">
       <el-form label-width="120px" size="mini">
         <el-form-item label="类型" v-if="typeFlag">
           <el-select v-model="newDialog.type" placeholder="类型">
@@ -87,22 +77,29 @@
         <el-button @click="newDialog.show = false">取 消</el-button>
         <el-button type="primary" @click="submitDesc()">确 定</el-button>
       </span>
-    </el-dialog>
+    </el-dialog>-->
+
   </div>
 </template>
 
 <script>
   import {addPeriodsClassUserDescApi,getUserDescListApi,editUserReplyApi} from "../../service/api";
+  import CallBack from '@/components/callBack/index';
 
   export default {
     name: "teacherDesc",
     props:[
       'row',
       'descType',
-      'typeFlag'
+      'typeFlag',
+      'teacherId'
     ],
     data(){
       return {
+        callbackObj: {
+          id: '',
+          detail: {}
+        },
         descDialog:{
           show:false,
           id:'',
@@ -119,6 +116,7 @@
         }
       }
     },
+    components: {CallBack},
     methods:{
       subReply(data){
         let json = {}
@@ -142,10 +140,17 @@
           nickname:data.nickname,
           user_id:data.user_id,
         };
-        this.getUserDescList()
+        // this.getUserDescList();
+        this.callbackObj.id = data.user_id;
+        this.callbackObj.teacher_id = this.teacherId;
+        this.callbackObj.detail.birthday = data.birthday;
+        this.callbackObj.detail.user_id = data.user_id;
+        this.callbackObj.detail.nickname = data.nickname;
+        this.callbackObj.detail.mobile = data.mobile;
+        this.callbackObj.detail.baby_name = data.baby_name;
       },
       getUserDescList(){
-        getUserDescListApi(this.row.id,{limit:1000}).then(res=>{
+        getUserDescListApi(this.row.id,{limit:1000}).then(res => {
           this.descDialog.descList = res.list
         })
       },

src/components/teacherDetail/task.vue

@@ -123,7 +123,7 @@
           min-width="260"
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="2" @onSuccess="refDesc3"></teacher-desc>
+            <teacher-desc :teacherId="id" :row="scope.row" :descType="2" @onSuccess="refDesc3"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column
@@ -244,7 +244,7 @@
           min-width="160"
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="1" @onSuccess="refDesc2"></teacher-desc>
+            <teacher-desc :teacherId="id" :row="scope.row" :descType="1" @onSuccess="refDesc2"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column
@@ -356,7 +356,7 @@
           <el-table-column
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="1" @onSuccess="searchPage"></teacher-desc>
+            <teacher-desc :teacherId="id" :row="scope.row" :descType="1" @onSuccess="searchPage"></teacher-desc>
           </template>
         </el-table-column>
         </el-table>
@@ -387,7 +387,7 @@
         <el-table-column
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="1" @onSuccess="getTask5"></teacher-desc>
+            <teacher-desc :teacherId="id" :row="scope.row" :descType="1" @onSuccess="getTask5"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column

src/components/teacherDetail/task1.vue

@@ -385,7 +385,7 @@
         </el-table-column>
         <el-table-column prop="desc" label="沟通情况" align="center">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="2" @onSuccess="refDesc1"></teacher-desc>
+            <teacher-desc :teacherId="teacherId" :row="scope.row" :descType="2" @onSuccess="refDesc1"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column prop="created_at" label="入课时间" min-width="140px" align="center" sortable></el-table-column>

src/components/teacherDetail/task2.vue

@@ -48,7 +48,7 @@
           min-width="160"
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="1" @onSuccess="refDesc2"></teacher-desc>
+            <teacher-desc :teacherId="teacherId" :row="scope.row" :descType="1" @onSuccess="refDesc2"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column

src/components/teacherDetail/task3.vue

@@ -108,7 +108,7 @@
           min-width="160"
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="2" @onSuccess="refDesc3"></teacher-desc>
+            <teacher-desc :teacherId="teacherId" :row="scope.row" :descType="2" @onSuccess="refDesc3"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column
@@ -165,7 +165,7 @@
           min-width="160"
           label="沟通情况">
           <template slot-scope="scope">
-            <teacher-desc :row="scope.row" :descType="2" @onSuccess="refDesc4"></teacher-desc>
+            <teacher-desc :teacherId="teacherId" :row="scope.row" :descType="2" @onSuccess="refDesc4"></teacher-desc>
           </template>
         </el-table-column>
         <el-table-column

src/components/user/index.vue

 <template>
-  <div class="user" v-loading="loading">
+  <div class="admin-refresh" v-loading="loading">
+    <div class="section-search">
       <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
-      <el-form-item label="ID">
-        <el-input v-model="searchFrom.userId"></el-input>
+        <el-form-item>
+          <el-input v-model="searchFrom.userId" placeholder="ID" clearable @change="getUser"></el-input>
         </el-form-item>
-      <el-form-item label="昵称">
-        <el-input v-model="searchFrom.nickName"></el-input>
+        <el-form-item>
+          <el-input v-model="searchFrom.nickName" placeholder="昵称" clearable @change="getUser"></el-input>
         </el-form-item>
-      <el-form-item label="电话">
-        <el-input v-model="searchFrom.mobile"></el-input>
+        <el-form-item>
+          <el-input v-model="searchFrom.mobile" placeholder="电话" clearable @change="getUser"></el-input>
         </el-form-item>
-      <el-form-item label="等级">
-        <el-input v-model="searchFrom.level"></el-input>
+        <el-form-item>
+          <el-input v-model="searchFrom.level" placeholder="等级" clearable @change="getUser"></el-input>
         </el-form-item>
         <!--<el-form-item label="标签">
           <el-cascader
@@ -25,6 +26,8 @@
           </div>
         </el-form-item>
       </el-form>
+    </div>
+
     <el-table
       :data="userList"
       style="width: 100%">
@@ -158,7 +161,8 @@
       teacherDialog
     },
     mounted() {
-      this.getUser()
+      this.$route.query.id ? this.searchFrom.userId = this.$route.query.id : '';
+      this.getUser();
     },
     methods: {
 

src/components/userDetail/addressdialog.vue

@@ -104,7 +104,7 @@ import AddressArray from '../framework/address-picker/addr'
       vueAddress
     },
     mounted(){
-      console.log(this.dialogObj)
+      // console.log(this.dialogObj)
     }
   }
 </script>

src/components/userDetail/index.vue

@@ -32,6 +32,7 @@
       </el-col>
       <el-col :span="12">
         <el-card class="user-card">
+          <div style="min-height: 150px">
             <div class="card-content" v-if="subDetail.nickname">
               <div class="text item">
                 <a :href="subDetail.avatar" target="_blank">
@@ -49,10 +50,12 @@
             </div>
             <p class="fl" v-if="!subDetail.nickname" style="clear:both;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;（暂无子账户）</p>
             <p class="fl" v-if="subDetail.nickname" style="clear:both;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;（子账户）</p>
+          </div>
         </el-card>
       </el-col>
     </el-row>
 
+    <!--<el-tabs type="border-card" v-model="tabs">-->
     <el-tabs type="border-card" v-model="tabs">
       <el-tab-pane label="回访信息" name="callback">
         <call-back :callbackObj="callbackObj"></call-back>
@@ -881,7 +884,7 @@
         if (!this.id) return;
         getUserDetailApi(this.id).then(res => {
           this.detail = res;
-          this.callbackObj.detail = res;
+          this.callbackObj.detail = res; // 用户的所有数据
           if (res.periods_list) {
             this.periodList = res.periods_list
           }

src/router/index.js

@@ -69,7 +69,7 @@ router.beforeEach((to,from,next)=> {
     }
   }
   store.state.nowTab = to.name;
-  console.log(to)
+  // console.log(to)
   if(to.matched.length > 1 && to.name !== 'first'){
     let thisMenu;
     for (let i = 0 ; i < store.state.menuList.length ; i ++ ){
@@ -101,7 +101,7 @@ router.beforeEach((to,from,next)=> {
   store.dispatch('classManageUnlimited',to.meta.classManageUnlimited)
   store.dispatch('classTakeUnlimited',to.meta.classTakeUnlimited)
   store.dispatch('exportFinish',to.meta.exportFinish)
-  console.log(to.meta)
+  // console.log(to.meta)
   if(to.name==='userDetail'){
     let list = JSON.parse(localStorage.getItem('permission'))
     let readonly = list.find(i=>{

src/service/api.js

@@ -64,7 +64,8 @@ export const postUserTransferApi = function (json) {
 };
 // 获取回访信息
 export const getCallBackApi = function (json) {
-  return Vue.prototype.$fetch(`${_baseUrl}/api/admin/user/visit/${json.user_id}/${json.periods_id}`, json)
+  console.log(json, 9001)
+  return Vue.prototype.$fetch(`${_baseUrl}api/admin/user/visit/${json.user_id}`, json)
 };
 // 添加回访信息
 export const postCallBackApi = function (json) {

src/service/index.js

@@ -79,8 +79,7 @@ axios.interceptors.request.use(
       if(process.env.NODE_ENV === 'development' ){
         config.data.special_token="changchangenglish";
       }
-      console.log(54)
-      console.log(JSON.stringify(json2))
+      // console.log(JSON.stringify(json2))
       config.data.param_token = md5(JSON.stringify(json2));
     }
     return config;
@@ -238,6 +237,7 @@ export function fetch(url,params={}){
       })
       .catch(err => {
         reject(err);
+        console.log(err);
         let message = '请求失败！请检查网络';
         if(err.response)message=err.response.data.message;
         Vue.prototype.$msgbox({

src/util/wordbook.js

@@ -220,3 +220,51 @@ export const LogisticsStatus = {
   2:'已签收',
   3:'异常'
 };
+
+export const CALLBACK_METHOD = [{
+  label: '电话接通',
+  value: 1
+}, {
+  label: '电话未接通',
+  value: 2
+}, {
+  label: '微信沟通',
+  value: 3
+}, {
+  label: '微信留言',
+  value: 4
+}, {
+  label: '备注',
+  value: 5
+}];
+
+export const CALLBACK_TYPE = [{
+  label: '开课回访',
+  value: 1
+}, {
+  label: '常规回访',
+  value: 2
+}, {
+  label: '通知',
+  value: 3
+}, {
+  label: '信息变更',
+  value: 4
+}, {
+  label: '服务评价',
+  value: 5
+}];
+
+export const CALLBACK_INTENTION = [{
+  label: '低意向',
+  value: 1
+}, {
+  label: '中意向',
+  value: 2
+}, {
+  label: '高意向',
+  value: 3
+}, {
+  label: '不跟踪',
+  value: 4
+}];