Merge branch 'dev-20210528' into 'release'

Dev 20210528，code review:bo.dang

See merge request !15

src/components/list/table-component.vue

@@ -79,8 +79,8 @@
                     <el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)" style="margin-top: 10px;">结束</el-button>
                 </div>
                 <div v-if="scope.row.operateUserID">
-                    <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1" type="primary" size="small" @click="callAll(scope.row)" style="margin-top: 10px;">呼叫双方</el-button>
-                    <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2" type="primary" size="small" @click="jionCommunicate(scope.row)" style="margin-top: 10px;">加入问诊</el-button>
+                    <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 1 && scope.row.diagnoseType != 3" type="primary" size="small" @click="callAll(scope.row)" style="margin-top: 10px;">呼叫双方</el-button>
+                    <el-button v-if="scope.row.status == 3 && scope.row.imStatus == 2 && scope.row.diagnoseType != 3" type="primary" size="small" @click="jionCommunicate(scope.row)" style="margin-top: 10px;">加入问诊</el-button>
                     <el-button type="primary" size="small" @click="sendMessage(scope.row)" style="margin-top: 10px;" v-if="!((scope.row.status==2 || scope.row.status==4) && scope.row.createType == 2)">发送消息</el-button>
                 </div>
                 <div v-if="!scope.row.operateUserID">

src/utils/env-config.js

@@ -15,7 +15,7 @@ export const envConfig = {
     qiniuImgUrl: "https://test1-file.yunqueyi.com",
     loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
     //innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html',
-    innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
+    innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://dev-phome.yunqueyi.com',
     picakfAccId: 'picaop_dev',
@@ -26,7 +26,7 @@ export const envConfig = {
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",
     loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
+    innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://dev-phome.yunqueyi.com',
     picakfAccId: 'picaop_dev',
@@ -37,7 +37,7 @@ export const envConfig = {
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",
     loginUrl: 'https://test1.yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
+    innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://test1-phome.yunqueyi.com',
     picakfAccId: 'picaop_test',
@@ -50,7 +50,7 @@ export const envConfig = {
     qiniuImgUrl: "https://test1-file.yunqueyi.com",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     loginUrl: 'https://uat.yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
+    innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://uat-phome.yunqueyi.com',
     picakfAccId: 'picaop_uat',
@@ -61,7 +61,7 @@ export const envConfig = {
     qiniuResourceUrl: "https://video.yunqueyi.com",
     qiniuImgUrl: "https://files.yunqueyi.com",
     loginUrl: 'https://yunqueyi.com/pica-login/work_station.html',
-    innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
+    innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_login.html',
     yuequeyiIndexUrl: 'https://www.yunqueyi.com/pica_index.html',
     phomeDemain: 'https://phome.yunqueyi.com',
     picakfAccId: 'picaop',

src/utils/index.js

@@ -174,8 +174,5 @@ export function getBirth(idCard) {
     birthday = birthday.replace(/(.{4})(.{2})/, "$1-$2-");
     //通过正则表达式来指定输出格式为:1990-01-01
   }
-  console.log('=============birthday=======================');
-  console.log(birthday);
-  console.log('====================================');
   return birthday;
 }

src/views/IM/diagnosis-admin/assist-list.vue

@@ -211,7 +211,7 @@
                   <el-radio-group v-model="model.audioCommissionType" size="small" style="line-height: 45px;">
                     <div>
                     <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
-                    <span style="float: right;width: 100px;"><el-input-number v-model="model.audioPrice1" size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
+                    <span style="float: right;width: 100px;"><el-input-number v-model="model.audioPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
                     </div>
                     <div>
                       <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
@@ -227,7 +227,7 @@
                     <el-radio-group v-model="model.videoCommissionType" size="small" style="line-height: 45px;">
                       <div>
                       <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
-                      <span style="float: right;width: 100px;"><el-input-number v-model="model.videoPrice1"  size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
+                      <span style="float: right;width: 100px;"><el-input-number v-model="model.videoPrice1"  size="small" :precision="2" :min="0"></el-input-number></span>
                       </div>
                       <div>
                         <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
@@ -242,7 +242,7 @@
                     <el-radio-group v-model="model.imgCommissionType" size="small" style="line-height: 45px;">
                       <div>
                       <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
-                      <span style="float: right;width: 100px;"><el-input-number v-model="model.imgPrice1"  size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
+                      <span style="float: right;width: 100px;"><el-input-number v-model="model.imgPrice1"  size="small" :precision="2" :min="0"></el-input-number></span>
                       </div>
                       <div>
                         <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
@@ -349,7 +349,7 @@ export default {
             },
             {
               value: 2,
-              label: "固定分佣金额"
+              label: "固定分佣"
             }],
             pickerOptions0: {
               disabledDate: time => {
@@ -382,7 +382,11 @@ export default {
             ],
             imgCommissionType: [
               {required: true, message: "请设置图文问诊分佣", trigger: 'blur'}
-            ]
+            ],
+            audioPrice1: [
+              {required: true, message: "请设置图文问诊分佣", trigger: 'blur'},
+              { pattern: /^(\d|[1-9]\d|100)(\.\d{1,2})?$/, message: '范围在0-100',trigger: 'blur'}
+            ],
           }
         }
     },
@@ -439,6 +443,13 @@ export default {
             });
             return;
           }
+          else if(this.model.audioCommissionType == 1 && this.model.audioPrice1 > 100){
+            this.$message({
+              message: '请输入语音问诊分佣中的按比例分佣0-100',
+              type: "warning"
+            });
+            return;
+          }
           if(this.model.audioCommissionType == 2 && this.model.audioPrice2 == undefined){
             this.$message({
               message: '请输入语音问诊分佣中的固定分佣金额',
@@ -453,6 +464,13 @@ export default {
             });
             return;
           }
+          else if(this.model.videoCommissionType == 1 && this.model.videoPrice1 > 100){
+            this.$message({
+              message: '请输入视频问诊分佣中的按比例分佣0-100',
+              type: "warning"
+            });
+            return;
+          }
           if(this.model.videoCommissionType == 2 && this.model.videoPrice2 == undefined){
             this.$message({
               message: '请输入视频问诊分佣中的固定分佣金额',
@@ -467,6 +485,13 @@ export default {
             });
             return;
           }
+          else if(this.model.imgCommissionType == 1 && this.model.imgPrice1 > 100){
+            this.$message({
+              message: '请输入图文问诊分佣中的按比例分佣0-100',
+              type: "warning"
+            });
+            return;
+          }
           if(this.model.imgCommissionType == 2 && this.model.imgPrice2 == undefined){
             this.$message({
               message: '请输入图文问诊分佣中的固定分佣金额',

src/views/IM/diagnosis-admin/diagnosis-list.vue

@@ -404,7 +404,8 @@ export default {
         changeBeginTime(val) {
             this.beginFlag = false
             this.endFlag = false
-            let b = new Date(val).getTime(), e
+            let b = new Date(val).getTime(),
+                e
             if(this.timeForm.endTime) {
                 e = new Date(this.timeForm.endTime).getTime()
             }
@@ -414,7 +415,8 @@ export default {
         changeEndTime(val) {
             this.beginFlag = false
             this.endFlag = false
-            let b = new Date(val).getTime(), e
+            let b = new Date(val).getTime(),
+                e
             if(this.timeForm.beginTime) {
                 e = new Date(this.timeForm.beginTime).getTime()
             }
@@ -446,6 +448,7 @@ export default {
             this.loading = true
             let url = `/diagnose/admin/diagnose/list`
             this.searchParam.bizType = 1
+            this.searchParam.searchVal = this.searchParam.searchVal.trim()
             let params = this.searchParam
             this.POST(url, params).then(res => {
                 this.loading = false
@@ -533,6 +536,7 @@ export default {
             this.timeForm.endTime = row.appointEndTime
         },
         confirmTime() {
+            if (this.beginFlag || this.endFlag) return
             let timeoutId = null
             if(this.timeClickFlag) {
                 this.timeClickFlag = false

src/views/IM/diagnosis-admin/service-list.vue

@@ -156,7 +156,7 @@
                     </div>
 
 
-            <!-- 预约时间 -->
+            <!-- 设置价格 -->
             <el-dialog
             title="设置价格"
             :visible.sync="setPriceVisible"
@@ -183,7 +183,7 @@
                     <el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">
                       <div>
                       <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣（%）</el-radio>
-                      <span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commissionPrice1" size="small" :precision="2" :min="0" :max="100"></el-input-number></span>
+                      <span style="float: right;width: 100px;"><el-input-number v-model="setPriceForm.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>
                       </div>
                       <div>
                         <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额（元）</el-radio>
@@ -273,7 +273,7 @@ export default {
             },
             {
               value: 2,
-              label: "固定分佣金额"
+              label: "固定分佣"
             }],
             profit: 0,
             selectedList:[],
@@ -367,6 +367,13 @@ export default {
             });
             return;
           }
+          else if(this.setPriceForm.commissionType == 1 && this.setPriceForm.commissionPrice1 > 100){
+            this.$message({
+              message: '请输入按比例分佣0-100',
+              type: "warning"
+            });
+            return;
+          }
           if(this.setPriceForm.commissionType == 2 && this.setPriceForm.commissionPrice2 == undefined ){
             this.$message({
               message: '请输入固定分佣金额',

src/views/layout/slidebar.vue

@@ -34,6 +34,7 @@
 import { mapGetters } from "vuex";
 import { setTimeout } from "timers";
 import { isNotEmptyUtils } from "../../utils/utils";
+import { getInnerLoginUrl } from "../../utils";
 let vm = null;
 export default {
   props: {
@@ -83,6 +84,8 @@ export default {
           );
           // 做当前路由无权限时处理
           // this.checkAuth(this.$route.path.split("/")[1], vueMenuDtos);
+        } else {
+          window.location.href = getInnerLoginUrl(); // 返回登录页面
         }
       });
     },