Merge remote-tracking branch 'origin/master'

src/modules/customer/components/CreateFollow.vue

@@ -35,8 +35,8 @@
         <el-select v-model="form.communication_mode" placeholder="请选择跟进方式" size="small" style="width: 100%">
           <el-option label="上门拜访" :value="1"></el-option>
           <el-option label="电话" :value="2"></el-option>
-          <el-option label="短信" :value="2"></el-option>
-          <el-option label="微信" :value="2"></el-option>
+          <el-option label="短信" :value="3"></el-option>
+          <el-option label="微信" :value="4"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="下次联络时间" prop="next_contact_time">

src/modules/customer/components/Project.vue

@@ -5,12 +5,12 @@
     </div>
     <app-list v-bind="tableOptions" ref="list">
       <template v-slot:table-person="{ row }">
-        <p v-for="(item, index) in row.charge_persons" :key="index">{{ item.username }}</p>
+        <p v-for="(item, index) in row.charge_persons" :key="index">{{ item.nickname || item.realname || item.username }}</p>
       </template>
       <!-- 操作 -->
       <template v-slot:table-operate="{ row }">
         <template>
-          <el-button v-if="btnUpdate" type="text" @click="handleEdit(row)" size="mini">编辑</el-button>
+          <el-button v-if="btnUpdate || isChargePerson(row)" type="text" @click="handleEdit(row)" size="mini">编辑</el-button>
           <el-button v-if="btnDelete" type="text" @click="handleDelete(row)" size="mini">删除</el-button>
         </template>
       </template>
@@ -48,6 +48,9 @@ export default {
     }
   },
   computed: {
+    user() {
+      return this.$store.state.user
+    },
     btnPermissions() {
       return this.$store.state.permissions.filter(item => item.type === 4)
     },
@@ -126,6 +129,9 @@ export default {
     }
   },
   methods: {
+    isChargePerson(row) {
+      return !!row.charge_persons.find(item => item.id === this.user.id)
+    },
     success() {
       this.$refs.list.refetch()
     },