回访信息 修复 权限问题

src/components/callBack/index.vue

@@ -5,13 +5,17 @@
     <div class="callback-info callback-item" style="margin-bottom: 15px;">
       ID：{{callbackObj.user_id}} &emsp;
       用户昵称：{{callbackObj.detail.nickname}} &emsp;
-      宝宝名称：{{callbackObj.detail.baby_name ? callbackObj.detail.baby_name : '-'}} &emsp;
+      宝宝名称：{{callbackObj.detail.baby_name || '-'}} &emsp;
       宝宝生日：{{(callbackObj.detail.birthday == '0000-00-00') ? '-' : callbackObj.detail.birthday}} &emsp;
-      手机号：{{callbackObj.detail.mobile ? callbackObj.detail.mobile : '--'}} &emsp;
+      手机号：{{callbackObj.detail.mobile || '-'}} &emsp;
       关联手机号：
       <span class="callback-edit">
         <!--<i v-if="!callbackEdit.mobile.show" @click="editCallback('mobile')">{{callbackObj.detail.relation_mobile ? callbackObj.detail.relation_mobile : '&#45;&#45;'}}</i>-->
+        <template v-if="$store.state.readonly">
+          {{callbackEdit.mobile.value || '-'}}
+        </template>
         <el-input
+          v-else
           ref="mobileEdit"
           v-model="callbackEdit.mobile.value"
           style="width: 130px;" size="small"></el-input>
@@ -20,17 +24,22 @@
       微信号：
       <span class="callback-edit">
         <!--<i v-if="!callbackEdit.wechat.show" @click="editCallback('wechat')">{{callbackObj.detail.wx_number ? callbackObj.detail.wx_number : '&#45;&#45;'}}</i>-->
+        <template v-if="$store.state.readonly">
+          {{callbackEdit.wechat.value || '-'}}
+        </template>
         <el-input
+          v-else
           ref="wechatEdit"
           v-model="callbackEdit.wechat.value"
           style="width: 100px;" size="small"></el-input>
           <!--v-else  @blur="callbackEdit.wechat.show = !callbackEdit.wechat.show"-->
       </span> &emsp;
       <el-button
+        v-if="!$store.state.readonly"
         @click="editCallbackSave"
         :disabled="(callbackEdit.wechat.value == callbackEdit.wechat.origin) && (callbackEdit.mobile.value == callbackEdit.mobile.origin)"
         type="primary" plain size="small">更新用户信息</el-button>&emsp;
-      <span style="font-size: 12px; color: #999999; white-space: nowrap">最后更新：{{callbackObj.detail.updated_at}}</span>
+      <span style="font-size: 12px; color: #999999; white-space: nowrap">最后更新：{{callbackObj.detail.updated_at || '-'}}</span>
     </div>
 
     <div class="callback-item" style="display: flex; align-items: flex-start; margin-bottom: 15px; line-height: 32px;">
@@ -38,10 +47,11 @@
       <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>
+      <el-button v-if="!$store.state.readonly" type="warning" size="small" plain @click="dialogToggle">编辑标签</el-button>
     </div>
 
-    <div class="callback-item callback-input" v-if="callbackObj.teacher_id && callbackAdd">
+    <!--添加回访信息-->
+    <div v-if="callbackObj.teacher_id && callbackAdd && !$store.state.readonly" class="callback-item callback-input">
       <el-form size="small" inline>
         <el-form-item required>
           <el-select v-model="add.method" placeholder="回访方式" style="width: 140px;">

src/components/user/index.vue

 <template>
   <div class="admin-refresh" v-loading="loading">
+
+    <!--为了共享user权限-->
+    <user-detail v-if="inDetail"></user-detail>
+
+    <div v-else>
       <div class="section-search">
         <el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline>
           <el-form-item>
@@ -27,7 +32,6 @@
           </el-form-item>
         </el-form>
       </div>
-
       <el-table
         :data="userList"
         style="width: 100%">
@@ -46,7 +50,7 @@
         <el-table-column label="操作" width="200px">
           <template slot-scope="scope">
             <!--<el-button size="mini" plain type="primary" @click="goToDetail(scope.row.user_id)">查看详情</el-button>-->
-          <router-link :to="{path:'/userDetail', query:{userid: scope.row.user_id}}" target="_blank"><el-button size="mini" plain type="primary">查看详情</el-button></router-link>
+            <router-link :to="{path:'/user', query:{type: 'detail', userid: scope.row.user_id}}" target="_blank"><el-button size="mini" plain type="primary">查看详情</el-button></router-link>
             <el-button size="mini" v-if="!$store.state.readonly" plain type="warning" @click="userTransfer(scope.row)">用户转移</el-button>
           </template>
         </el-table-column>
@@ -91,6 +95,8 @@
       </span>
       </el-dialog>
     </div>
+
+  </div>
 </template>
 
 <script>
@@ -104,6 +110,7 @@
     name: "index",
     data() {
       return {
+        inDetail: false,
         addShow: false,
         userTransferList: [],
         userObj: {
@@ -161,8 +168,13 @@
       teacherDialog
     },
     mounted() {
-      this.$route.query.id ? this.searchFrom.userId = this.$route.query.id : '';
+      if (this.$route.query.type && this.$route.query.type == 'detail') { // 详情页
+        this.inDetail = true
+      } else { // 列表页
+        this.inDetail = false;
         this.getUser();
+      }
+      this.$route.query.id ? this.searchFrom.userId = this.$route.query.id : '';
     },
     methods: {
       userTransfer(row) {

src/service/api.js

@@ -71,6 +71,10 @@ export const getCallBackApi = function (json) {
   // console.log(json, 9001)
   return Vue.prototype.$fetch(`${_baseUrl}api/admin/user/visit/${json.user_id}`, json)
 };
+// 获取上次回访信息
+export const getCallBackPrevApi = function (json) {
+  return Vue.prototype.$fetch(`${_baseUrl}user/last/visit/${json.user_id}`, json)
+};
 // 添加回访信息
 export const postCallBackApi = function (json) {
   return Vue.prototype.$post(`${_baseUrl}api/admin/user/visit/${json.user_id}/${json.teacher_id}`, json)