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

src/components/base/AppUniversityLevel/Index.vue

@@ -28,4 +28,4 @@ export default {
     this._props = Object.assign(this.defaultProps, this.props)
   }
 }
-</script>
\ No newline at end of file
+</script>

src/components/base/AppUniversityLevel/options.js

 const options = [
   {
-    name: '本科', id: 1,
+    name: '本科',
+    id: 1,
     children: [
       {
         name: '985/211',
@@ -35,7 +36,7 @@ const options = [
       {
         name: '双高',
         id: 201
-      }, 
+      },
       {
         name: '非双高',
         id: 202

src/components/base/AppUserSearch.vue

@@ -9,7 +9,12 @@
     :loading="searchUsersloading"
     @change="handleChange"
   >
-    <el-option :label="user.realname || user.nickname || user.username" :value="user.id" v-for="user in userList" :key="user.id">
+    <el-option
+      :label="user.realname || user.nickname || user.username"
+      :value="user.id"
+      v-for="user in userList"
+      :key="user.id"
+    >
       <span style="float: left">
         {{ user.realname || user.nickname || user.username }}
         <template v-if="user.mobile">(手机号：{{ user.mobile }})</template>

src/modules/customer/views/Index.vue

@@ -149,10 +149,6 @@ export default {
             project_tag: '',
             project_status: '',
             project_sso_id: '',
-            // last_record_start_time: '',
-            // last_record_end_time: '',
-            // created_start_time: '',
-            // created_end_time: '',
             create_date: '',
             follow_date: '',
             college_type: '',
@@ -218,7 +214,6 @@ export default {
           { prop: 'group_id', slots: 'filter-customerGroup', label: '所属分组：' }
         ],
         columns: [
-          // { type: 'selection', minWidth: '40px' },
           { prop: 'name', label: '客户名称', minWidth: '140px' },
           {
             prop: 'source',
@@ -257,7 +252,6 @@ export default {
           { prop: 'last_record_time', label: '最近跟进时间', minWidth: '150px' },
           { prop: 'project_count', label: '合作项目', minWidth: '80px' },
           { prop: 'contact_count', label: '联系人', minWidth: '80px' },
-          // { prop: 'created_by.realname', label: '创建员工', minWidth: '100px' },
           {
             prop: 'created_by',
             label: '创建员工',

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

@@ -79,11 +79,9 @@ export default {
     },
     // 添加员工
     submit() {
-      const param = this.multipleSelection
-      const arr = param.map(item => item.id)
-      const params = { group_id: this.id, customer_ids: arr }
       this.btnDisabled = true
-      createCustomer(params)
+      const arr = this.multipleSelection.map(item => item.id)
+      createCustomer({ group_id: this.id, customer_ids: arr })
         .then(res => {
           if (res.code === 0) {
             this.$message.success('添加客户成功')

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

@@ -60,8 +60,8 @@ export default {
     },
     // 编辑/更新客户组
     edit() {
-      const params = Object.assign({ id: this.data.id }, this.form)
       this.btnDisabled = true
+      const params = Object.assign({ id: this.data.id }, this.form)
       editCustomerGroup(params)
         .then(res => {
           this.$message.success('客户组更新成功')

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

@@ -98,8 +98,8 @@ export default {
       this.$refs.form
         .validate()
         .then(() => {
-          const params = Object.assign({ group_id: this.id, staff_ids: this.form.id })
           this.btnDisabled = true
+          const params = Object.assign({ group_id: this.id, staff_ids: this.form.id })
           createEmployee(params).then(res => {
             if (res.code === 0) {
               this.$message.success('添加员工成功')

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

 <template>
-  <app-card>
-    <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" v-if="btnCreate"
-            >添加客户</el-button
-          >
-        </el-row>
-      </template>
-      <template v-slot:table-x="{ row }">
-        <el-button type="text" @click="onRemove(row)" v-if="btnDelete">删除</el-button>
-      </template>
-    </app-list>
+  <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" v-if="btnCreate"
+          >添加客户</el-button
+        >
+      </el-row>
+    </template>
+    <template v-slot:table-x="{ row }">
+      <el-button type="text" @click="onRemove(row)" v-if="btnDelete">删除</el-button>
+    </template>
     <AddCustomer :visible.sync="isShowDialog" @success="success" :id="id" />
-  </app-card>
+  </app-list>
 </template>
 
 <script>
@@ -96,5 +94,3 @@ export default {
   }
 }
 </script>
-
-<style></style>

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

 <template>
-  <app-card>
-    <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" v-if="btnCreate"
-            >添加员工</el-button
-          >
-        </el-row>
-      </template>
-      <template v-slot:table-x="{ row }">
-        <el-button type="text" @click="onRemove(row)" v-if="btnDelete">删除</el-button>
-      </template>
-    </app-list>
+  <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" v-if="btnCreate"
+          >添加员工</el-button
+        >
+      </el-row>
+    </template>
+    <template v-slot:table-x="{ row }">
+      <el-button type="text" @click="onRemove(row)" v-if="btnDelete">删除</el-button>
+    </template>
     <AddEmployees :visible.sync="isShowDialog" @success="success" :id="id" v-if="isShowDialog" />
-  </app-card>
+  </app-list>
 </template>
 
 <script>
-import AppList from '@/components/base/AppList.vue'
-import AppCard from '@/components/base/AppCard.vue'
 import AddEmployees from '../components/AddEmployees.vue'
 import { employeeDetail, delEmployee } from '../api'
 export default {
@@ -27,7 +23,7 @@ export default {
       isShowDialog: false
     }
   },
-  components: { AppList, AppCard, AddEmployees },
+  components: { AddEmployees },
   props: {
     id: {
       type: String,
@@ -47,7 +43,6 @@ export default {
     // 列表配置
     tableOptions() {
       return {
-        // data: this.detail,
         remote: {
           httpRequest: employeeDetail,
           params: {
@@ -105,5 +100,3 @@ export default {
   }
 }
 </script>
-
-<style></style>

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

 <template>
-  <div>
-    <el-card>
-      <h4 class="title" style="margin-bottom: 20px">{{ title || '' }}</h4>
-      <el-tabs v-model="tabsActive">
-        <el-tab-pane label="客户" name="customer"> <Customer :id="id" /> </el-tab-pane>
-        <el-tab-pane label="员工" name="employees" lazy><Employees :id="id" /> </el-tab-pane>
-      </el-tabs>
-    </el-card>
-  </div>
+  <app-card>
+    <h4 class="title" style="margin-bottom: 20px">{{ title || '' }}</h4>
+    <el-tabs v-model="tabsActive">
+      <el-tab-pane label="客户" name="customer"> <Customer :id="id" /> </el-tab-pane>
+      <el-tab-pane label="员工" name="employees" lazy><Employees :id="id" /> </el-tab-pane>
+    </el-tabs>
+  </app-card>
 </template>
 
 <script>
@@ -33,5 +31,3 @@ export default {
   }
 }
 </script>
-
-<style></style>