Merge branch 'master' of https://gitlab.ezijing.com/webapp/customer-admin

src/modules/customer/components/CreateContact.vue

 <template>
-  <el-dialog v-bind="$attrs" v-on="$listeners" top="20vh" :title="title" width="60%">
+  <el-dialog :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" top="20vh" :title="title" width="60%">
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-row>
         <el-col :span="12">
@@ -75,8 +75,8 @@ export default {
         qq: ''
       },
       rules: {
-        name: [{ required: true, message: '', trigger: 'blur' }],
-        mobile: [{ required: true, message: '', trigger: 'blur' }]
+        name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        mobile: [{ required: true, message: '请输入电话', trigger: 'blur' }]
       }
     }
   },

src/modules/customer/components/CreateCoopProject.vue

 <template>
-  <el-dialog v-bind="$attrs" v-on="$listeners" top="20vh" :title="title" width="60%">
+  <el-dialog  :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" top="20vh" :title="title" width="60%">
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-row>
         <el-col :span="12">
@@ -12,7 +12,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目进度" prop="status">
-            <el-select v-model="form.status" placeholder="请选择进度" size="small" style="width: 100%">
+            <el-select v-model="form.status" placeholder="请选择项目进度" size="small" style="width: 100%">
               <el-option label="待跟进" :value="1"></el-option>
               <el-option label="跟进中" :value="2"></el-option>
               <el-option label="待签约" :value="3"></el-option>
@@ -84,10 +84,10 @@ export default {
         project_sso_ids: []
       },
       rules: {
-        tag: [{ required: true, message: '', trigger: 'change' }],
-        status: [{ required: true, message: '', trigger: 'change' }],
-        project_sso_ids: [{ required: true, message: '', trigger: 'change' }],
-        cooperation_intention: [{ required: true, message: '', trigger: 'change' }]
+        tag: [{ required: true, message: '请选择项目', trigger: 'change' }],
+        status: [{ required: true, message: '请选择项目进度', trigger: 'change' }],
+        project_sso_ids: [{ required: true, message: '负责人', trigger: 'change' }],
+        cooperation_intention: [{ required: true, message: '请选择合作意向度', trigger: 'change' }]
       }
     }
   },

src/modules/customer/components/Project.vue

@@ -4,6 +4,10 @@
       <el-button v-if="btnCreate" type="primary" size="small" @click="handleAdd">添加合作项目</el-button>
     </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>
+        <!-- {{row.charge_persons}} -->
+      </template>
       <!-- 操作 -->
       <template v-slot:table-operate="{ row }">
         <template>
@@ -85,13 +89,7 @@ export default {
             prop: 'charge_persons',
             label: '负责人',
             align: 'center',
-            computed({ row }) {
-              const userName = []
-              row.charge_persons.forEach(item => {
-                userName.push(item.username)
-              })
-              return userName.join('\n')
-            }
+            slots: 'table-person'
           },
           {
             prop: 'status',

src/modules/system/customergroup/components/AddCustomer.vue

 <template>
-  <el-dialog v-bind="$attrs" v-on="$listeners" width="70%" title="添加客户">
+  <el-dialog :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" width="70%" title="添加客户">
     <app-card>
       <app-list v-bind="tableOptions" ref="list" @selection-change="handleSelectionChange">
         <template v-slot:filter-userSearch="{ params }">

src/modules/system/customergroup/components/AddCustomerGroup.vue

 <template>
-  <el-dialog v-bind="$attrs" v-on="$listeners" width="40%" top="30vh" :title="title">
+  <el-dialog :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" width="40%" top="30vh" :title="title">
     <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="top">
       <el-form-item label="客户组名称" prop="name" label-width="100px">
         <el-input v-model="form.name" />
@@ -59,10 +59,10 @@ export default {
     },
     // 编辑/更新客户组
     edit() {
-      const params = Object.assign({ id: this.row.id }, this.form)
+      const params = Object.assign({ id: this.data.id }, this.form)
       editCustomerGroup(params)
         .then(res => {
-          this.$message.success('客户组创建成功')
+          this.$message.success('客户组更新成功')
           this.$emit('update:visible', false)
           this.$emit('success', res.data)
         })

src/modules/system/customergroup/components/AddEmployees.vue

 <template>
-  <el-dialog v-bind="$attrs" v-on="$listeners" width="40%" top="30vh" title="添加员工">
+  <el-dialog :close-on-click-modal="false" v-bind="$attrs" v-on="$listeners" width="40%" top="30vh" title="添加员工">
     <el-form ref="form" :model="form" :rules="rules" label-position="top">
       <el-form-item label="员工名称" prop="id" size="medium" label-width="100px">
         <el-select
@@ -58,6 +58,17 @@ export default {
       employeeList: []
     }
   },
+  computed: {
+    btnPermissions() {
+      return this.$store.state.permissions.filter(item => item.type === 4)
+    },
+    btnCreate() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_addStaff')
+    },
+    btnDelete() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_removeStaff')
+    }
+  },
 
   mounted() {
     console.log(this.id)

src/modules/system/customergroup/components/Customer.vue

@@ -3,11 +3,13 @@
     <app-list v-bind="tableOptions" ref="list">
       <template>
         <el-row style="margin-bottom: 20px">
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="isShowDialog = true">添加客户</el-button>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="isShowDialog = true" v-if="btnCreate"
+            >添加客户</el-button
+          >
         </el-row>
       </template>
       <template v-slot:table-x="{ row }">
-        <el-button type="text" @click="onRemove(row)">删除</el-button>
+        <el-button type="text" @click="onRemove(row)" v-if="btnDelete">删除</el-button>
       </template>
     </app-list>
     <AddCustomer :visible.sync="isShowDialog" @success="success" :id="id" />
@@ -32,6 +34,15 @@ export default {
   },
 
   computed: {
+    btnPermissions() {
+      return this.$store.state.permissions.filter(item => item.type === 4)
+    },
+    btnCreate() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_addCustomer')
+    },
+    btnDelete() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_removeCustomer')
+    },
     // 列表配置
     tableOptions() {
       return {

src/modules/system/customergroup/index.js

@@ -3,6 +3,9 @@ const routes = [
     path: '/system',
     component: () => import('@/components/layout/Index.vue'),
     meta: { title: '系统设置' },
+    redirect: {
+      path: '/system/customergroup'
+    },
     children: [
       {
         path: 'customergroup',

src/modules/system/customergroup/views/List.vue

@@ -3,13 +3,15 @@
     <app-list v-bind="tableOptions" ref="list">
       <template>
         <el-row style="margin-bottom: 20px">
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="addGroup">新建客户组</el-button>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="addGroup" v-if="btnCreate"
+            >新建客户组</el-button
+          >
         </el-row>
       </template>
       <template v-slot:table-x="{ row }">
-        <el-button type="text" style="margin-left: 10px" @click="toDetail(row)">查看</el-button>
-        <el-button type="text" style="margin-left: 10px" @click="edit(row)">编辑</el-button>
-        <el-button type="text" @click="onRemove(row)" style="margin-left: 10px">删除</el-button>
+        <el-button type="text" style="margin-left: 10px" @click="toDetail(row)" v-if="btnDetail">查看</el-button>
+        <el-button type="text" style="margin-left: 10px" @click="edit(row)" v-if="btnEdit">编辑</el-button>
+        <el-button type="text" @click="onRemove(row)" style="margin-left: 10px" v-if="btnDelete">删除</el-button>
       </template>
     </app-list>
     <!-- 新建客户组弹框 -->
@@ -40,6 +42,18 @@ export default {
     btnPermissions() {
       return this.$store.state.permissions.filter(item => item.type === 4)
     },
+    btnCreate() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_create')
+    },
+    btnDetail() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_details')
+    },
+    btnDelete() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_delete')
+    },
+    btnEdit() {
+      return !!this.btnPermissions.find(item => item.tag === 'btn_customerGroup_edit')
+    },
     // 列表配置
     tableOptions() {
       return {
@@ -72,13 +86,13 @@ export default {
     },
     // 新建
     addGroup() {
-      this.Edit = false
+      this.isEdit = false
       this.data = {}
       this.isShowDialog = true
     },
     // 编辑
     edit(row) {
-      this.Edit = true
+      this.isEdit = true
       this.data = row
       this.isShowDialog = true
     },