ct 1 day ago
parent
commit
c225f14559
3 changed files with 52 additions and 49 deletions
  1. 2 2
      .env.prod-fcky
  2. 14 12
      src/views/his/doctor/type1.vue
  3. 36 35
      src/views/his/user/index.vue

+ 2 - 2
.env.prod-fcky

@@ -1,7 +1,7 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE =蜂巢快药客户管理系统
+VUE_APP_TITLE =CRM客户管理系统
 # 首页菜单标题
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =蜂巢快药客户管理系统
+VUE_APP_TITLE_INDEX =CRM客户管理系统
 # 公司名称
 # 公司名称
 VUE_APP_COMPANY_NAME =蜂巢快药(北京)医药连锁有限公司
 VUE_APP_COMPANY_NAME =蜂巢快药(北京)医药连锁有限公司
 # ICP备案号
 # ICP备案号

+ 14 - 12
src/views/his/doctor/type1.vue

@@ -315,7 +315,7 @@
         <el-row>
         <el-row>
               <el-col :span="12">
               <el-col :span="12">
                 <el-form-item label="科室" prop="deptId">
                 <el-form-item label="科室" prop="deptId">
-                <el-select v-model="form.deptId" multiple  placeholder="请选择所属科室">
+                <el-select v-model="form.deptId"  placeholder="请选择所属科室">
                       <el-option
                       <el-option
                           v-for="dict in depList"
                           v-for="dict in depList"
                           :key="dict.dictValue"
                           :key="dict.dictValue"
@@ -950,9 +950,9 @@ export default {
       this.sexOptions = response.data;
       this.sexOptions = response.data;
     });
     });
     this.getdeplist();
     this.getdeplist();
-	listStore().then(response => {
-	  this.storeOPtions = response.rows;
-	});
+    listStore().then(response => {
+      this.storeOPtions = response.rows;
+    });
     this.getHospitaldeplist();
     this.getHospitaldeplist();
     getAllFollowDoctorList().then(response => {
     getAllFollowDoctorList().then(response => {
 
 
@@ -1298,9 +1298,9 @@ export default {
         if(this.form.packageIds!=null){
         if(this.form.packageIds!=null){
            this.form.packageIds= ((this.form.packageIds).split(",")).map(Number)
            this.form.packageIds= ((this.form.packageIds).split(",")).map(Number)
         }
         }
-		if(this.form.storeIds!=null){
-		   this.form.storeIds= ((this.form.storeIds).split(",")).map(Number)
-		}
+        if(this.form.storeIds!=null){
+          this.form.storeIds= ((this.form.storeIds).split(",")).map(Number)
+        }
         if(this.form.isSelf!=null){
         if(this.form.isSelf!=null){
           this.form.isSelf = String(this.form.isSelf)
           this.form.isSelf = String(this.form.isSelf)
         }
         }
@@ -1316,7 +1316,10 @@ export default {
         if(this.form.isPrescribeDoctor!=null){
         if(this.form.isPrescribeDoctor!=null){
           this.form.isPrescribeDoctor = String(this.form.isPrescribeDoctor)
           this.form.isPrescribeDoctor = String(this.form.isPrescribeDoctor)
         }
         }
-        this.form.cityIds=((this.form.cityIds).split(",")).map(Number)
+        if(this.form.cityIds){
+          this.form.cityIds=((this.form.cityIds).split(",")).map(Number)
+        }
+        
         if(this.form.prescribeDoctorName!=null){
         if(this.form.prescribeDoctorName!=null){
               this.doctorName.name=this.form.prescribeDoctorName;
               this.doctorName.name=this.form.prescribeDoctorName;
               this.getlistdocuser();
               this.getlistdocuser();
@@ -1366,6 +1369,9 @@ export default {
     },
     },
     /** 提交按钮 */
     /** 提交按钮 */
     submitForm() {
     submitForm() {
+      if(this.form.isPrescribeDoctor!=null){
+          this.form.isPrescribeDoctor = String(this.form.isPrescribeDoctor)
+        }
       this.$refs["form"].validate(valid => {
       this.$refs["form"].validate(valid => {
         if (valid) {
         if (valid) {
           if(this.form.packageIds!=null){
           if(this.form.packageIds!=null){
@@ -1374,10 +1380,6 @@ export default {
           if(this.form.storeIds!=null){
           if(this.form.storeIds!=null){
             this.form.storeIds=(this.form.storeIds).toString()
             this.form.storeIds=(this.form.storeIds).toString()
           }
           }
-          if(this.form.deptId!=null){
-            this.form.deptId=this.form.deptId.join(",");
-            console.log(this.form.deptId)
-          }
           this.form.cityIds=(this.form.cityIds).toString()
           this.form.cityIds=(this.form.cityIds).toString()
           if (this.form.doctorId != null) {
           if (this.form.doctorId != null) {
             this.form.doctorType=1;
             this.form.doctorType=1;

+ 36 - 35
src/views/his/user/index.vue

@@ -1,6 +1,40 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="所属公司" prop="companyName">
+        <el-select
+          v-model="queryCompanyId"
+          placeholder="请选择所属公司"
+          clearable
+          filterable 
+          size="small"
+          @change="handleQueryCompanyChange"
+        >
+          <el-option
+            v-for="item in companyQueryOptions"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属销售" prop="companyUserId">
+        
+        <el-select
+          v-model="queryCompanyUserId"
+          placeholder="请选择所属销售"
+          clearable
+          filterable 
+          size="small"
+        >
+          <el-option
+            v-for="item in companyQueryUserOptions"
+            :key="item.userId"
+            :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>    
       <el-form-item label="会员ID" prop="userId">
       <el-form-item label="会员ID" prop="userId">
         <el-input
         <el-input
           v-model="queryParams.userId"
           v-model="queryParams.userId"
@@ -67,42 +101,9 @@
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item label="注册时间" prop="createTime">
       <el-form-item label="注册时间" prop="createTime">
-                <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
+                <el-date-picker v-model="createTime" size="small" style="width: 230px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="所属公司" prop="companyName">
-        <el-select
-          v-model="queryCompanyId"
-          placeholder="请选择所属公司"
-          clearable
-          filterable 
-          size="small"
-          @change="handleQueryCompanyChange"
-        >
-          <el-option
-            v-for="item in companyQueryOptions"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属销售" prop="companyUserId">
-        
-        <el-select
-          v-model="queryCompanyUserId"
-          placeholder="请选择所属销售"
-          clearable
-          filterable 
-          size="small"
-        >
-          <el-option
-            v-for="item in companyQueryUserOptions"
-            :key="item.userId"
-            :label="item.nickName"
-            :value="item.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>        
+          
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>