Merge branch 'dev-fixbug-20191023' into release

src/utils/env-config.js

@@ -10,9 +10,9 @@ export const envConfig = {
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     // baseUrl: 'http://10.177.15.150:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
-    // baseUrl: 'https://dev-sc.yunqueyi.com/',
+    baseUrl: 'https://dev-sc.yunqueyi.com/',
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
-    baseUrl: 'https://uat-sc.yunqueyi.com/',
+    // baseUrl: 'https://uat-sc.yunqueyi.com/',
     apiUrl: 'https://uat-api.yunqueyi.com/',
     qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
@@ -21,7 +21,8 @@ export const envConfig = {
     innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://uat-saas.yunqueyi.com/pica_index.html',
     followUpSCSoSo: 'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73',
-    followUpSC: 'https://uat-sc.yunqueyi.com',
+    // followUpSC: 'https://uat-sc.yunqueyi.com',
+    followUpSC: 'https://dev-sc.yunqueyi.com',
     saasDomainUrl: 'https://uat-saas.yunqueyi.com/',
     workApiUrl: 'https://uat-work.yunqueyi.com/web',
     workApiSrc: 'https://uat-work.yunqueyi.com',

src/views/followup/plan-manage/dialog/add-patient-time.vue

 <template>
-  <div class="finish-followup" v-if="showThisPage">
+  <!--<div class="finish-followup" v-if="showThisPage">-->
+  <div class="finish-followup">
+    <div v-if="showThisPage && !isShowProtocolDialog">
       <el-dialog
         title="选择履约开始时间"
         :visible.sync="showAddPatientTime"
@@ -34,8 +36,11 @@
         <el-button class="button-green" @click="addPatient" size="small" type="primary">确 定</el-button>
       </span>
       </el-dialog>
+    </div>
+
     <!-- 敏感词及协议校验 -->
-    <el-dialog class="prot-dialog" title="" :visible.sync="isShowProtocolDialog" width="30%" center :show-close=false>
+    <div v-if="!showThisPage && isShowProtocolDialog">
+      <el-dialog class="prot-dialog" title="" :visible.sync="isShowProtocolDialog" width="30%" center :show-close=false :close-on-click-modal="false" :close-on-press-escape="false">
         <p class="prot-dialog-tips-1">您选择的居民中有部分居民尚未同意《云鹊平台隐私协议》，将导致履约量表部分信息无法录入，为了方便您的工作开展，请您发送短信提醒未授权居民完成授权</p>
         <p v-show="!isSentedProt" class="prot-dialog-tips-2">若您选择暂不发送，您只能录入量表的非敏感信息</p>
         <p v-show="isSentedProt" class="prot-dialog-tips-3">为避免打扰居民，7天内只能发送1次，您已发送过短信，请尽快联系居民同意授权</p>
@@ -48,6 +53,8 @@
       </span>
       </el-dialog>
     </div>
+
+  </div>
 </template>
 
 <script>
@@ -82,6 +89,7 @@
         isSentedProt: false,
         patientIds: [],
         sendMsgPatientIds: [],
+        // noShowProtocolDialog: true,
       }
     },
     mounted() {
@@ -105,43 +113,46 @@
         this.$refs['addPatientData'].validate(valid => {
           if (valid) {
             console.log(this.addPatientData)
-            // 4、校验居民/医生是否签署协议
-
-            // if(this.$route.name == 'planModify') {
-            //   this.$emit('sendJoinTime',this.addPatientData.joinTime)
-            //   this.$emit('closeAddPatientTime',false)
-            // } else {
-            //   const { id, patientIdList, joinTime } = this.addPatientData;
-            //   createFollowPlan({
-            //     id,
-            //     addPatients: true,
-            //     patientIdList,
-            //     joinTime
-            //   }).then((data) => {
-            //     if(data.code == '000000') {
-            //       this.$message({
-            //         message: '添加成功！',
-            //         type: 'success'
-            //       });
-            //       this.getResidentList({
-            //         planId: this.addPatientData.id,
-            //         status: this.addPatientData.status
-            //       })
-            //       this.$emit('closeAddPatientTime',false)
-            //     } else {
-            //       this.$message({
-            //         message: `${data.message}`,
-            //         type: 'error'
-            //       });
-            //     }
-            //   }).catch((err) => {
-            //     this.$message({
-            //       message: `${err.message}`,
-            //       type: 'error'
-            //     });
-            //   });
-            // }
+            if(this.$route.name == 'planModify') {
+              this.$emit('sendJoinTime',this.addPatientData.joinTime)
+              this.$emit('closeAddPatientTime',false)
+            } else {
+              const { id, patientIdList, joinTime } = this.addPatientData;
+              createFollowPlan({
+                id,
+                addPatients: true,
+                patientIdList,
+                joinTime
+              }).then((data) => {
+                if(data.code == '000000') {
+                  this.$message({
+                    message: '添加成功！',
+                    type: 'success'
+                  });
+                  this.getResidentList({
+                    planId: this.addPatientData.id,
+                    status: this.addPatientData.status
+                  })
+                  this.$emit('closeAddPatientTime',false)
+                  // this.noShowProtocolDialog = false;
+                  setTimeout(()=>{
                     this.uniteValidateAction()
+                  },1000)
+
+                } else {
+                  this.$message({
+                    message: `${data.message}`,
+                    type: 'error'
+                  });
+                }
+              }).catch((err) => {
+                this.$message({
+                  message: `${err.message}`,
+                  type: 'error'
+                });
+              });
+            }
+            // this.uniteValidateAction()
           } else {
             return false;
           }
@@ -171,7 +182,9 @@
             let levelType = result.data.levelType;
             // 没有敏感字段或者居民已经签订过协议，则直接返回
             if (levelType === 1 || levelType === 2) {
-              this.jumpToAddOrModifyPlan();
+              // this.$emit('closeAddPatientTime',false)
+              // this.isShowProtocolDialog = false;
+              // this.jumpToAddOrModifyPlan();
             } else if (levelType === 3) {
               this.isShowProtocolDialog = true;
               this.isSentedProt = true;
@@ -192,6 +205,7 @@
               message: '已发送，请尽快联系居民同意授权',
               type: 'success'
             });
+            this.$emit('closeAddPatientTime',false)
           }
         });
         this.isShowProtocolDialog = false;
@@ -238,7 +252,8 @@
       // 关闭协议确认窗口
       closeProtocolDialog() {
         this.isShowProtocolDialog = false
-        this.jumpToAddOrModifyPlan()
+        this.$emit('closeAddPatientTime',false)
+        // this.jumpToAddOrModifyPlan()
       },
 
       // 发送短信通知