Browse Source

学生家长字段管理

ct 3 ngày trước cách đây
mục cha
commit
5b41b705a7

+ 2 - 2
.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE =良苗互联网管理系统
+VUE_APP_TITLE =良苗教育管理系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 良苗互联网管理系统/开发环境
+# 良苗教育管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

+ 2 - 2
.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 良苗互联网管理系统
+VUE_APP_TITLE = 良苗教育管理系统
 
 # 生产环境配置
 ENV = 'production'
 
-#良苗互联网管理系统/生产环境
+#良苗教育管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

+ 2 - 2
.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE =良苗互联网管理系统
+VUE_APP_TITLE =良苗教育管理系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-#良苗互联网管理系统/测试环境
+#良苗教育管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

BIN
src/assets/logo/logo.png


+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '良苗互联网',
+      title: '良苗教育',
       logo: logoImg
     }
   }

+ 7 - 97
src/views/components/his/panelGroup.vue

@@ -16,97 +16,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :xs="12" :sm="12" :lg="4" class="ivu-mb">
-          <el-card :bordered="false" dis-hover :padding="12">
-            <div slot="header" class="acea-row row-between-wrapper">
-              <span>问诊订单总数</span>
-            </div>
-            <div class="contentA" v-if="count">
-              <span class="content-number spBlock mb15"><count-to :start-val="0" :end-val="count.allInquiryOrderNum" :duration="3000" class="card-panel-num" /></span>
-              <div class="acea-row row-between-wrapper" style="margin-top: 15px;">
-                <span class="content-time">今日新增问诊订单</span>
-                <span style="float: right">{{ count.todayInquiryOrderNum }} 单</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :xs="12" :sm="12" :lg="4" class="ivu-mb">
-          <el-card :bordered="false" dis-hover :padding="12">
-            <div slot="header" class="acea-row row-between-wrapper">
-              <span>药品订单总数</span>
-            </div>
-            <div class="contentA" v-if="count">
-              <span class="content-number spBlock mb15"><count-to :start-val="0" :end-val="count.allOrderNum" :duration="3200" class="card-panel-num" /></span>
-              <div class="acea-row row-between-wrapper" style="margin-top: 15px;">
-                <span class="content-time">今日新增药品订单</span>
-                <span style="float: right">{{ count.todayOrderNum }} 单</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :xs="12" :sm="12" :lg="4" class="ivu-mb">
-          <el-card :bordered="false" dis-hover :padding="12">
-            <div slot="header" class="acea-row row-between-wrapper">
-              <span>商品总数</span>
-            </div>
-            <div class="contentA" v-if="count">
-              <span class="content-number spBlock mb15"><count-to :start-val="0" :end-val="count.storeProdNum" :duration="3200" class="card-panel-num" /></span>
-              <div class="acea-row row-between-wrapper" style="margin-top: 15px;">
-                <span class="content-time">今日新增商品</span>
-                <span style="float: right">{{ count.todayStoreProdNum }} 个</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :xs="12" :sm="12" :lg="4" class="ivu-mb">
-          <el-card :bordered="false" dis-hover :padding="12">
-            <div slot="header" class="acea-row row-between-wrapper">
-              <span>医生总数</span>
-            </div>
-            <div class="contentA" v-if="count">
-              <span class="content-number spBlock mb15"><count-to :start-val="0" :end-val="count.doctor" :duration="3200" class="card-panel-num" /></span>
-              <div class="acea-row row-between-wrapper" style="margin-top: 15px;">
-                <span class="content-time">今日新增医生</span>
-                <span style="float: right">{{ count.todayDoctor }} 人</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :xs="12" :sm="12" :lg="4" class="ivu-mb">
-          <el-card :bordered="false" dis-hover :padding="12">
-            <div slot="header" class="acea-row row-between-wrapper">
-              <span>药师总数</span>
-            </div>
-            <div class="contentA" v-if="count">
-              <span class="content-number spBlock mb15"><count-to :start-val="0" :end-val="count.medicinePe" :duration="3200" class="card-panel-num" /></span>
-              <div class="acea-row row-between-wrapper" style="margin-top: 15px;">
-                <span class="content-time">今日新增药师</span>
-                <span style="float: right">{{ count.todayMedicinePe }} 人</span>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
-        <!-- <el-col :xs="12" :sm="12" :lg="4" class="ivu-mb">
-          <el-card :bordered="false" dis-hover :padding="12">
-            <div slot="header" class="acea-row row-between-wrapper" >
-              <span>总人数:{{count.pe}}</span>
-            </div>
-            <div class="content" v-if="count">
-            <div class="acea-row row-between-wrapper" style="margin-top: 4px; ">
-                <span class="content-time">医生人数:</span>
-                <span>{{ count.doctor }} </span>
-              </div>
-              <div class="acea-row row-between-wrapper" style="margin-top: 4px;">
-                <span class="content-time">患者人数:</span>
-                <span>{{ count.patient }} </span>
-              </div>
-              <div class="acea-row row-between-wrapper" style="margin-top: 4px;">
-                <span class="content-time">药师人数:</span>
-                <span>{{ count.medicinePe }} </span>
-              </div>
-            </div>
-          </el-card>
-        </el-col> -->
+        
       </el-row>
     </div>
   </div>
@@ -139,12 +49,12 @@ export default {
       },
     };
   },
-  mounted() {
-      getPeData().then(response => {
-        this.count = response.data;
-          console.log(this.count)
-      });
-  },
+  // mounted() {
+  //     getPeData().then(response => {
+  //       this.count = response.data;
+  //         console.log(this.count)
+  //     });
+  // },
 };
 </script>
 

+ 39 - 39
src/views/crm/customer/index.vue

@@ -11,19 +11,19 @@
               />
         </el-select>
       </el-form-item>
-      <el-form-item label="客户编码" prop="customerCode">
+      <el-form-item label="家长编码" prop="customerCode">
         <el-input
           v-model="queryParams.customerCode"
-          placeholder="请输入客户编码"
+          placeholder="请输入家长编码"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户名称" prop="customerName">
+      <el-form-item label="家长名称" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
-          placeholder="请输入客户名称"
+          placeholder="请输入家长名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -38,8 +38,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
+      <el-form-item label="家长状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择家长状态" clearable size="small">
            <el-option
                 v-for="item in statusOptions"
                 :key="'status'+item.dictValue"
@@ -48,8 +48,8 @@
               />
         </el-select>
       </el-form-item>
-      <el-form-item label="客户类型" prop="customerType">
-        <el-select multiple v-model="ctsTypeArr" placeholder="请选择客户类型" clearable size="small">
+      <el-form-item label="家长类型" prop="customerType">
+        <el-select multiple v-model="ctsTypeArr" placeholder="请选择家长类型" clearable size="small">
            <el-option
                 v-for="item in typeOptions"
                 :key="'type'+item.dictValue"
@@ -67,8 +67,8 @@
            >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="客户来源" prop="source">
-        <el-select multiple v-model="sourceArr" placeholder="请选择客户来源" clearable size="small">
+      <el-form-item label="家长来源" prop="source">
+        <el-select multiple v-model="sourceArr" placeholder="请选择家长来源" clearable size="small">
            <el-option
                 v-for="item in sourceOptions"
                 :key="'source'+item.dictValue"
@@ -77,8 +77,8 @@
               />
         </el-select>
       </el-form-item>
-      <el-form-item label="客户标签" prop="tags">
-        <el-select multiple v-model="tagIds" placeholder="请选择客户标签" clearable size="small">
+      <el-form-item label="家长标签" prop="tags">
+        <el-select multiple v-model="tagIds" placeholder="请选择家长标签" clearable size="small">
            <el-option
                 v-for="item in tagsOptions"
                 :key="'tags'+item.dictValue"
@@ -108,7 +108,7 @@
           :disabled="multiple"
           @click="handleEditSource"
           v-hasPermi="['crm:customer:editSource']"
-        >修改客户来源</el-button>
+        >修改家长来源</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -146,8 +146,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="customerId" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
-      <el-table-column label="客户编码" align="center" prop="customerCode" />
-      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="家长编码" align="center" prop="customerCode" />
+      <el-table-column label="家长名称" align="center" prop="customerName" />
       <el-table-column label="手机" align="center" prop="mobile" />
       <el-table-column  label="性别" align="center" prop="sex">
         <template slot-scope="scope">
@@ -157,19 +157,19 @@
       <el-table-column label="微信号" align="center" prop="weixin" />
       <el-table-column label="所在地" align="center" prop="address" />
       <el-table-column label="标签" align="center" prop="tags" />
-      <el-table-column  label="客户来源" align="center" prop="source">
+      <el-table-column  label="家长来源" align="center" prop="source">
         <template slot-scope="scope">
             <el-tag prop="source" v-for="(item, index) in sourceOptions"  :key="'source'+index"    v-if="scope.row.source==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column  label="客户类型" align="center" prop="customerType">
+      <el-table-column  label="家长类型" align="center" prop="customerType">
         <template slot-scope="scope">
             <el-tag prop="customerType" v-for="(item, index) in typeOptions" :key="'customerType'+index"   v-if="scope.row.customerType==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column  label="客户状态" align="center" prop="status">
+      <el-table-column  label="家长状态" align="center" prop="status">
         <template slot-scope="scope">
             <el-tag prop="status" v-for="(item, index) in statusOptions"  :key="'status'+index"  v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
@@ -217,14 +217,14 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改客户对话框 -->
+    <!-- 添加或修改家长对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="客户编码" prop="customerCode">
-          <el-input v-model="form.customerCode" :disabled="form.customerId!=null" placeholder="请输入客户编码" />
+        <el-form-item label="家长编码" prop="customerCode">
+          <el-input v-model="form.customerCode" :disabled="form.customerId!=null" placeholder="请输入家长编码" />
         </el-form-item>
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        <el-form-item label="家长名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入家长名称" />
         </el-form-item>
         <el-form-item label="手机" prop="mobile">
           <el-input  maxlength="11" v-model="form.mobile" placeholder="请输入手机" />
@@ -247,8 +247,8 @@
         <el-form-item label="详细地址" prop="detailAddress">
           <el-input v-model="form.detailAddress" placeholder="请输入详细地址" />
         </el-form-item>
-        <el-form-item label="客户来源" prop="source">
-          <el-select v-model="form.source" placeholder="请选择客户来源" clearable size="small">
+        <el-form-item label="家长来源" prop="source">
+          <el-select v-model="form.source" placeholder="请选择家长来源" clearable size="small">
             <el-option
                   v-for="item in sourceOptions"
                   :key="item.dictValue"
@@ -257,8 +257,8 @@
                 />
           </el-select>
         </el-form-item>
-        <el-form-item label="客户类型" prop="customerType">
-          <el-select v-model="form.customerType" placeholder="请选择客户类型" clearable size="small">
+        <el-form-item label="家长类型" prop="customerType">
+          <el-select v-model="form.customerType" placeholder="请选择家长类型" clearable size="small">
             <el-option
                   v-for="item in typeOptions"
                   :key="item.dictValue"
@@ -267,7 +267,7 @@
                 />
           </el-select>
       </el-form-item>
-        <el-form-item label="客户状态">
+        <el-form-item label="家长状态">
           <el-radio-group v-model="form.status">
             <el-radio :label="item.dictValue" v-for="item in statusOptions">{{item.dictLabel}}</el-radio>
           </el-radio-group>
@@ -292,7 +292,7 @@
           >
           </el-input>
           <el-button v-else class="button-new-tag" size="small" @click="showInput">添加标签+</el-button>
-          <el-select @change="tagsChange"  v-model="tagId" placeholder="选择客户来源" style="width:140px;margin-left: 5px;" clearable size="small">
+          <el-select @change="tagsChange"  v-model="tagId" placeholder="选择家长来源" style="width:140px;margin-left: 5px;" clearable size="small">
             <el-option
                   v-for="item in tagsOptions"
                   :key="item.dictValue"
@@ -335,7 +335,7 @@ export default {
   data() {
     return {
       source:{
-        title:"修改客户来源",
+        title:"修改家长来源",
         open:false,
       },
       tagId:null,
@@ -355,7 +355,7 @@ export default {
       sexOptions:[],
       pageSizes: [10, 20, 30, 50,100,500 ],
       show:{
-        title:"客户详情",
+        title:"家长详情",
         open:false,
       },
       companys:[],
@@ -371,7 +371,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户表格数据
+      // 家长表格数据
       customerList: [],
       // 弹出层标题
       title: "",
@@ -412,7 +412,7 @@ export default {
       // 表单校验
       rules: {
         // customerName: [
-        //   { required: true, message: "客户名称不能为空", trigger: "blur" }
+        //   { required: true, message: "家长名称不能为空", trigger: "blur" }
         // ],
         mobile: [
           { required: true, message: "手机号不能为空", trigger: "blur" }
@@ -421,7 +421,7 @@ export default {
         //   { required: true, message: "性别不能为空", trigger: "blur" }
         // ],
         source: [
-          { required: true, message: "客户来源不能为空", trigger: "blur" }
+          { required: true, message: "家长来源不能为空", trigger: "blur" }
         ],
       }
     };
@@ -524,7 +524,7 @@ export default {
           that.$refs.customerDetails.getDetails(row.customerId);
       }, 200);
     },
-    /** 查询客户列表 */
+    /** 查询家长列表 */
     getList() {
       this.loading = true;
       if(this.ctsTypeArr.length>0){
@@ -615,7 +615,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加客户";
+      this.title = "添加家长";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -648,7 +648,7 @@ export default {
           });
         }
         this.open = true;
-        this.title = "修改客户";
+        this.title = "修改家长";
       });
     },
     /** 提交按钮 */
@@ -678,7 +678,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const customerIds = row.customerId || this.ids;
-      this.$confirm('是否确认删除客户编号为"' + customerIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除家长编号为"' + customerIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -693,7 +693,7 @@ export default {
     handleExport() {
       //const queryParams = this.queryParams;
       const queryParams=this.addDateRange(this.queryParams, this.dateRange)
-      this.$confirm('是否确认导出客户数据项?', "警告", {
+      this.$confirm('是否确认导出家长数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 30 - 30
src/views/crm/customer/line.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="客户编号" prop="customerCode">
+      <el-form-item label="家长编号" prop="customerCode">
         <el-input
           v-model="queryParams.customerCode"
-          placeholder="请输入客户编号"
+          placeholder="请输入家长编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户名称" prop="customerName">
+      <el-form-item label="家长名称" prop="customerName">
         <el-input
           v-model="queryParams.customerName"
-          placeholder="请输入客户名称"
+          placeholder="请输入家长名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -28,8 +28,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户来源" prop="source">
-        <el-select v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
+      <el-form-item label="家长来源" prop="source">
+        <el-select v-model="queryParams.source" placeholder="请选择家长来源" clearable size="small">
            <el-option
                 v-for="item in sourceOptions"
                 :key="item.dictValue"
@@ -92,7 +92,7 @@
           :disabled="multiple"
           @click="handleAssign"
           v-hasPermi="['crm:customer:assign']"
-        >分配线索客户</el-button>
+        >分配线索家长</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -109,7 +109,7 @@
           size="mini"
           @click="handleImport"
           v-hasPermi="['crm:customer:importLine']"
-        >导入线索客户</el-button>
+        >导入线索家长</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -130,8 +130,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="customerId" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
-      <el-table-column label="客户编号" width="120"  align="center" prop="customerCode" />
-      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="家长编号" width="120"  align="center" prop="customerCode" />
+      <el-table-column label="家长名称" align="center" prop="customerName" />
       <el-table-column label="手机" align="center" prop="mobile" />
       <el-table-column  label="性别" align="center" prop="sex">
         <template slot-scope="scope">
@@ -141,7 +141,7 @@
       <el-table-column label="微信号" align="center" prop="weixin" />
       <el-table-column label="所在地" align="center" prop="address" />
       <el-table-column width="105" label="创建时间" align="center" prop="createTime" />
-      <el-table-column  label="客户来源" align="center" prop="source">
+      <el-table-column  label="家长来源" align="center" prop="source">
         <template slot-scope="scope">
             <el-tag prop="source" v-for="(item, index) in sourceOptions"   v-if="scope.row.source==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
@@ -184,11 +184,11 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改客户对话框 -->
+    <!-- 添加或修改家长对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="客户名称" prop="customerName">
-          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        <el-form-item label="家长名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入家长名称" />
         </el-form-item>
         <el-form-item label="手机" prop="mobile">
           <el-input maxlength="11"  v-model="form.mobile" placeholder="请输入手机" />
@@ -211,8 +211,8 @@
         <el-form-item label="详细地址" prop="detailAddress">
           <el-input v-model="form.detailAddress" placeholder="请输入详细地址" />
         </el-form-item>
-        <el-form-item label="客户来源" prop="source">
-          <el-select v-model="form.source" placeholder="请选择客户来源" clearable size="small">
+        <el-form-item label="家长来源" prop="source">
+          <el-select v-model="form.source" placeholder="请选择家长来源" clearable size="small">
             <el-option
                   v-for="item in sourceOptions"
                   :key="item.dictValue"
@@ -241,7 +241,7 @@
           >
           </el-input>
           <el-button v-else class="button-new-tag" size="small" @click="showInput">添加标签+</el-button>
-          <el-select @change="tagsChange"  v-model="tagId" placeholder="选择客户来源" style="width:140px;margin-left: 5px;" clearable size="small">
+          <el-select @change="tagsChange"  v-model="tagId" placeholder="选择家长来源" style="width:140px;margin-left: 5px;" clearable size="small">
             <el-option
                   v-for="item in tagsOptions"
                   :key="item.dictValue"
@@ -261,8 +261,8 @@
         <el-form-item label="进线链接" prop="registerLinkUrl">
           <el-input v-model="form.registerLinkUrl" placeholder="请输入进线链接" />
         </el-form-item>
-        <el-form-item label="进线客户详情" prop="registerDesc">
-          <el-input v-model="form.registerDesc" placeholder="请输入进线客户详情" />
+        <el-form-item label="进线家长详情" prop="registerDesc">
+          <el-input v-model="form.registerDesc" placeholder="请输入进线家长详情" />
         </el-form-item>
         <el-form-item label="进线填写时间" prop="registerSubmitTime">
           <el-date-picker
@@ -341,7 +341,7 @@ export default {
       noAssignCount:0,
       assignCount:0,
       assign:{
-        title:"分配客户",
+        title:"分配家长",
         open:false,
       },
       companySelect:{
@@ -390,7 +390,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户表格数据
+      // 家长表格数据
       customerList: [],
       dateRange:[],
       // 弹出层标题
@@ -440,7 +440,7 @@ export default {
           { required: true, message: "手机号不能为空", trigger: "blur" }
         ],
         source: [
-          { required: true, message: "客户来源不能为空", trigger: "blur" }
+          { required: true, message: "家长来源不能为空", trigger: "blur" }
         ],
       }
     };
@@ -525,7 +525,7 @@ export default {
       this.inputValue = '';
       this.form.tags=this.tags.toString();
     },
-    /** 查询客户列表 */
+    /** 查询家长列表 */
     getList() {
       this.loading = true;
       listLineCustomer(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
@@ -596,7 +596,7 @@ export default {
     //if(this.isAdmin){
            var that=this
            this.assign.open = true;
-           this.assign.title = "分配线索客户";
+           this.assign.title = "分配线索家长";
            setTimeout(() => {
             that.$refs.assignCompany.init(this.ids);
            }, 200);
@@ -619,7 +619,7 @@ export default {
     },
     submitAssignForm() {
       if(this.assignForm.customers.length==0){
-        this.msgError("请选择客户");
+        this.msgError("请选择家长");
         return;
       }
       this.$refs["assignForm"].validate(valid => {
@@ -643,7 +643,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加线索客户";
+      this.title = "添加线索家长";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -666,7 +666,7 @@ export default {
           });
         }
         this.open = true;
-        this.title = "修改线索客户";
+        this.title = "修改线索家长";
       });
     },
     /** 提交按钮 */
@@ -696,7 +696,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const customerIds = row.customerId || this.ids;
-      this.$confirm('是否确认删除客户编号为"' + customerIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除家长编号为"' + customerIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -710,7 +710,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有客户数据项?', "警告", {
+      this.$confirm('是否确认导出所有家长数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -722,7 +722,7 @@ export default {
     },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "线索客户导入";
+      this.upload.title = "线索家长导入";
       this.upload.open = true;
     },
     /** 下载模板操作 */

+ 12 - 12
src/views/crm/customerAssign/index.vue

@@ -19,10 +19,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户ID" prop="customerIds">
+      <el-form-item label="家长ID" prop="customerIds">
         <el-input
           v-model="queryParams.customerIds"
-          placeholder="请输入客户ID"
+          placeholder="请输入家长ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -95,7 +95,7 @@
       <el-table-column label="ID" align="center" prop="assignId" />
       <el-table-column label="企业ID" align="center" prop="companyId" />
       <el-table-column label="分配用户ID" align="center" prop="companyUserId" />
-      <el-table-column label="客户ID" align="center" prop="customerIds" />
+      <el-table-column label="家长ID" align="center" prop="customerIds" />
       <el-table-column label="系统用户ID" align="center" prop="sysUserId" />
       <el-table-column label="分配类型 1分配给公司 2分配给员工" align="center" prop="assignType" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -127,7 +127,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改客户分配记录对话框 -->
+    <!-- 添加或修改家长分配记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业ID" prop="companyId">
@@ -136,8 +136,8 @@
         <el-form-item label="分配用户ID" prop="companyUserId">
           <el-input v-model="form.companyUserId" placeholder="请输入分配用户ID" />
         </el-form-item>
-        <el-form-item label="客户ID" prop="customerIds">
-          <el-input v-model="form.customerIds" placeholder="请输入客户ID" />
+        <el-form-item label="家长ID" prop="customerIds">
+          <el-input v-model="form.customerIds" placeholder="请输入家长ID" />
         </el-form-item>
         <el-form-item label="系统用户ID" prop="sysUserId">
           <el-input v-model="form.sysUserId" placeholder="请输入系统用户ID" />
@@ -178,7 +178,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户分配记录表格数据
+      // 家长分配记录表格数据
       customerAssignList: [],
       // 弹出层标题
       title: "",
@@ -205,7 +205,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询客户分配记录列表 */
+    /** 查询家长分配记录列表 */
     getList() {
       this.loading = true;
       listCustomerAssign(this.queryParams).then(response => {
@@ -253,7 +253,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加客户分配记录";
+      this.title = "添加家长分配记录";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -262,7 +262,7 @@ export default {
       getCustomerAssign(assignId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改客户分配记录";
+        this.title = "修改家长分配记录";
       });
     },
     /** 提交按钮 */
@@ -292,7 +292,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const assignIds = row.assignId || this.ids;
-      this.$confirm('是否确认删除客户分配记录编号为"' + assignIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除家长分配记录编号为"' + assignIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -306,7 +306,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有客户分配记录数据项?', "警告", {
+      this.$confirm('是否确认导出所有家长分配记录数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 12 - 12
src/views/crm/customerLogs/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="客户ID" prop="customerId">
+      <el-form-item label="家长ID" prop="customerId">
         <el-input
           v-model="queryParams.customerId"
-          placeholder="请输入客户ID"
+          placeholder="请输入家长ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -84,7 +84,7 @@
     <el-table v-loading="loading" :data="customerLogsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="logsId" />
-      <el-table-column label="客户ID" align="center" prop="customerId" />
+      <el-table-column label="家长ID" align="center" prop="customerId" />
       <el-table-column label="销售ID" align="center" prop="companyUserId" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -117,11 +117,11 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改客户日志对话框 -->
+    <!-- 添加或修改家长日志对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="客户ID" prop="customerId">
-          <el-input v-model="form.customerId" placeholder="请输入客户ID" />
+        <el-form-item label="家长ID" prop="customerId">
+          <el-input v-model="form.customerId" placeholder="请输入家长ID" />
         </el-form-item>
         <el-form-item label="销售ID" prop="companyUserId">
           <el-input v-model="form.companyUserId" placeholder="请输入销售ID" />
@@ -165,7 +165,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户日志表格数据
+      // 家长日志表格数据
       customerLogsList: [],
       // 弹出层标题
       title: "",
@@ -191,7 +191,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询客户日志列表 */
+    /** 查询家长日志列表 */
     getList() {
       this.loading = true;
       listCustomerLogs(this.queryParams).then(response => {
@@ -238,7 +238,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加客户日志";
+      this.title = "添加家长日志";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -247,7 +247,7 @@ export default {
       getCustomerLogs(logsId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改客户日志";
+        this.title = "修改家长日志";
       });
     },
     /** 提交按钮 */
@@ -277,7 +277,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const logsIds = row.logsId || this.ids;
-      this.$confirm('是否确认删除客户日志编号为"' + logsIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除家长日志编号为"' + logsIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -291,7 +291,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有客户日志数据项?', "警告", {
+      this.$confirm('是否确认导出所有家长日志数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 7 - 7
src/views/crm/customerUser/index.vue

@@ -181,7 +181,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改客户员工认领对话框 -->
+    <!-- 添加或修改家长员工认领对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="销售ID" prop="companyUserId">
@@ -266,7 +266,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户员工认领表格数据
+      // 家长员工认领表格数据
       customerUserList: [],
       // 弹出层标题
       title: "",
@@ -297,7 +297,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询客户员工认领列表 */
+    /** 查询家长员工认领列表 */
     getList() {
       this.loading = true;
       listCustomerUser(this.queryParams).then(response => {
@@ -348,7 +348,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加客户员工认领";
+      this.title = "添加家长员工认领";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -357,7 +357,7 @@ export default {
       getCustomerUser(customerUserId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改客户员工认领";
+        this.title = "修改家长员工认领";
       });
     },
     /** 提交按钮 */
@@ -387,7 +387,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const customerUserIds = row.customerUserId || this.ids;
-      this.$confirm('是否确认删除客户员工认领编号为"' + customerUserIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除家长员工认领编号为"' + customerUserIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -401,7 +401,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有客户员工认领数据项?', "警告", {
+      this.$confirm('是否确认导出所有家长员工认领数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 3 - 3
src/views/crm/customerVisit/index.vue

@@ -74,8 +74,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="visitId" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
-      <el-table-column label="客户编码" align="center" prop="customerCode" />
-      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="家长编码" align="center" prop="customerCode" />
+      <el-table-column label="家长名称" align="center" prop="customerName" />
       <el-table-column label="跟进类型" width="150" align="center" prop="visitType" >
         <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in typeOptions"    v-if="scope.row.visitType==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -152,7 +152,7 @@ export default {
       customerUserStatusOptions:[],
       typeOptions:[],
       show:{
-        title:"客户详情",
+        title:"家长详情",
         open:false,
       },
       companys:[],

+ 5 - 5
src/views/crm/msg/index.vue

@@ -10,8 +10,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="消息类型 1客户消息 " prop="msgType">
-        <el-select v-model="queryParams.msgType" placeholder="请选择消息类型 1客户消息 " clearable size="small">
+      <el-form-item label="消息类型 1家长消息 " prop="msgType">
+        <el-select v-model="queryParams.msgType" placeholder="请选择消息类型 1家长消息 " clearable size="small">
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -103,7 +103,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="msgId" />
       <el-table-column label="销售ID" align="center" prop="companyUserId" />
-      <el-table-column label="消息类型 1客户消息 " align="center" prop="msgType" />
+      <el-table-column label="消息类型 1家长消息 " align="center" prop="msgType" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="内容" align="center" prop="content" />
       <el-table-column label="对象ID 多个用,分隔" align="center" prop="objId" />
@@ -143,8 +143,8 @@
         <el-form-item label="销售ID" prop="companyUserId">
           <el-input v-model="form.companyUserId" placeholder="请输入销售ID" />
         </el-form-item>
-        <el-form-item label="消息类型 1客户消息 " prop="msgType">
-          <el-select v-model="form.msgType" placeholder="请选择消息类型 1客户消息 ">
+        <el-form-item label="消息类型 1家长消息 " prop="msgType">
+          <el-select v-model="form.msgType" placeholder="请选择消息类型 1家长消息 ">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>

+ 1 - 8
src/views/his/company/index.vue

@@ -330,8 +330,6 @@
 
 <script>
 import { listCompany, getCompany, delCompany, addCompany, updateCompany, recharge,deduct, exportCompany,resetPwd } from "@/api/his/company";
-import {getFollowDoctorList} from "@/api/his/doctor";
-import {docList} from "@/api/his/doctor";
 import {getVoiceApiList } from "@/api/company/companyVoiceApi";
 import {getCitysArea} from "../../../api/company/company";
 export default {
@@ -462,12 +460,7 @@ export default {
     getVoiceApiList().then((response) => {
       this.voiceApis = response.data;
     });
-    getFollowDoctorList().then((response) => {
-      this.followDoctorList = response.rows;
-    });
-	docList().then(response => {
-	    this.doctor=response.rows;
-	});
+
   },
   methods: {
     handleRecharge(row) {

+ 2 - 2
src/views/his/user/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="会员ID" prop="userId">
+      <el-form-item label="学生ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
-          placeholder="请输入会员ID"
+          placeholder="请输入学生ID"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"

+ 2 - 2
src/views/index.vue

@@ -3,7 +3,7 @@
       <div class="dashboard-editor-container" v-hasPermi="['his:index']">
         <panel-group />
 
-        <div class="divBox">
+        <!-- <div class="divBox">
             <el-card :bordered="false" dis-hover>
               <div slot="header">
                 <div class="acea-row row-middle">
@@ -49,7 +49,7 @@
                 </el-col>
               </el-row>
             </el-card>
-        </div>
+        </div> -->
       </div>
       <div class="dashboard-editor-container">
         {{greeting}}:{{user.nickName}}

+ 1 - 1
src/views/login.vue

@@ -5,7 +5,7 @@
         <img src="../assets/images/login_left.png" alt="">
       </div>
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-        <h3 class="title">良苗互联网管理系统</h3>
+        <h3 class="title">良苗教育管理系统</h3>
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
             <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

+ 1 - 1
vue.config.js

@@ -5,7 +5,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = process.env.VUE_APP_TITLE || '良苗互联网管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '良苗教育管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口