Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

package.json

@@ -11,6 +11,7 @@
     "build": "node build/build.js",
     "build:dev": "cross-env BUILD_ENV=dev node build/build.js",
     "build:test": "cross-env BUILD_ENV=test node build/build.js",
+    "build:test2": "cross-env BUILD_ENV=test node build/build.js",
     "build:uat": "cross-env BUILD_ENV=uat node build/build.js",
     "build:pro": "cross-env BUILD_ENV=pro node build/build.js"
   },

src/utils/env-config.js

@@ -42,6 +42,17 @@ export const envConfig = {
     yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
     saasDomainUrl: 'https://test1.yunqueyi.com/',
   },
+  test2: {
+    baseUrl: 'https://test1-sc.yunqueyi.com/',
+    qiniuFileUrl: "https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1",
+    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',
+    followUpSC: 'https://test2-work.yunqueyi.com/sc',
+    yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
+    saasDomainUrl: 'https://test1.yunqueyi.com/',
+  },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/',
     qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",

src/views/followup/plan-manage/dialog/select-cartoon.vue

@@ -37,11 +37,10 @@
         </el-select>
       </div>
       <div class="scroll-section">
-        <el-radio-group v-model="sendObj.hasSelected" size="small">
+        <el-radio-group v-model="sendObj" size="small">
           <el-radio
             v-for="(item, index) in cartoonList"
             :key="index"
-            @change="changeComent(item)"
             :label="item" class="radio-item">{{item.header_name}}</el-radio>
         </el-radio-group>
       </div>
@@ -60,10 +59,7 @@
     components: {},
     data() {
       return {
-        sendObj: {
-          hasSelected: '',
-          closeStatus: false,
-        },
+        sendObj: {},
         saasDisease: '', // 高血压标识
         showSecond: false,//是否显示分类
         showCartoonDialog: true,
@@ -158,15 +154,11 @@
         return array[id]
       },
       clickClose() {
-        this.$emit('closeSelectCartoon', this.sendObj)
+        this.$emit('closeSelectCartoon')
       },
       sureSelect() {
-        console.log(this.sendObj)
-        this.$emit('closeSelectCartoon', this.sendObj);
+        this.$emit('confirmSelectComent', this.sendObj);
       },
-      changeComent(item){
-        this.$emit('pushConmentMsg',item)
-      }
     },
   }
 </script>

src/views/followup/plan-manage/new-plan.vue

@@ -60,7 +60,6 @@
               clearable
               style="width:380px;">
             </el-date-picker>
-
           </el-form-item>
           <el-form-item label="备注">
             <el-select
@@ -78,12 +77,11 @@
         </el-form>
       </div>
 
-      <div class="edit-plan-content" v-if="activeTab === 'second'">
+      <div class="edit-plan-content" v-show="activeTab === 'second'">
         <set-time-node
           ref="getTimeNodeList"
           :standedTimeNodeList="standedTimeNodeList"
           :isStandedTemplate="isStandedTemplate"
-          @setTimeNodeListOnCom="setTimeNodeListOnCom"
           :patientIdList="baseInfo.patientIdList"
           :checkForm="checkForm"
           @addListenSave="addListenSave"
@@ -134,6 +132,7 @@
         curmbThird: '新建随访计划',
         jumPathThird: '/followUp/plan-manage',
         activeTab: 'first',
+        resourceId: '',//当前选择的随访模板id
         noName: false,
         noResourceId: false,
         noTime: false,
@@ -175,7 +174,6 @@
     },
     computed: {
       ...mapState('planManage',{
-//        setTimeNodeList: state => state.setTimeNodeList,
         remarkOption: state => state.remarkOption,
         templateOptions: state => state.templateOptions,
       })
@@ -219,9 +217,6 @@
            })
          }
       },
-      setTimeNodeListOnCom(val){
-        this.getTimeNodeList(val)
-      },
       selectPatientHandler() {
         this.isShowSelectPatient = true;
       },
@@ -276,6 +271,8 @@
           }
           if (valid) {
             console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
+            this.resourceId = this.baseInfo.resourceId
+            console.log( this.baseInfo.resourceId)
             if(this.baseInfo.resourceId){
               this.isStandedTemplate = true
               getFollowupTableTemplate(this.baseInfo.resourceId).then(res=>{
@@ -284,6 +281,7 @@
               })
             }else{
               this.isStandedTemplate = false
+              this.standedTimeNodeList = [];
               this.activeTab = 'second';
             }
 

src/views/followup/plan-manage/plan-list.vue

@@ -31,14 +31,33 @@
         <div class="content-group-btn"><el-button type="primary" size="small" @click="addNewPlan">新建随访计划</el-button></div>
         <div>
           <el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;">
-            <el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true">
+            <el-table-column
+              prop="name"
+              label="随访计划名称"
+              min-width="180"
+              align="left"
+              :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <el-button class="btn-right-class" type="text" @click="visitDetail(scope.row)">{{scope.row.name}}</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="startYear" label="开始年份" min-width="100" align="center"></el-table-column>
-            <el-table-column prop="num" label="总人数" min-width="150" align="center"></el-table-column>
-            <el-table-column label="操作" fixed="right" align="center" min-width="240">
+            <el-table-column
+              prop="startYear"
+              label="开始年份"
+              width="150"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="num"
+              label="总人数"
+              width="150"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              fixed="right"
+              align="center"
+              width="250">
               <template slot-scope="scope">
                 <el-button class="btn-right-class" type="text" @click="visitRow(scope.row)">查看居民</el-button>|
                 <el-button class="btn-right-class" type="text" @click="changeRow(scope.row)"> 修改</el-button>|
@@ -203,7 +222,7 @@
         this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:row.id}})
       },
       deleteRow(row){
-        this.$confirm('此操作将删除该条计划, 是否继续?', '提示', {
+        this.$confirm(`是否确定删除${row.name}, 删除后计划将无法恢复!`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
         }).then(() => {
@@ -215,10 +234,10 @@
             message: '删除成功!'
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消删除'
+          // });
         });
       },
 

src/views/followup/plan-manage/plan-modify.vue

 <template>
   <div class="plan-modify">
     <div class="bread-crumb">
-      <el-breadcrumb separator-class="el-icon-arrow-right" >
+      <el-breadcrumb separator="/" >
         <el-breadcrumb-item v-for="item in planModifyCrumb">
           <a v-if="item.href" :href="item.href">{{item.name}}</a>
           <span v-else >{{item.name}}</span>
@@ -54,7 +54,6 @@
           :isStandedTemplate="isStandedTemplate"
           :standedTimeNodeList="setTimeNodeList"
           :patientIdList="planDetailData.patientIdList"
-          @setTimeNodeListOnCom="setTimeNodeListOnCom"
           :checkForm="checkForm"
           :planId="planId"
           @addListenSave="addListenSave"
@@ -289,9 +288,6 @@
       closeFollowTime(isShow) {
         this.showFollowTime = isShow
       },
-      setTimeNodeListOnCom(val){
-        this.getTimeNodeList(val)
-      },
       closeAddPatientTime(isShow) {
         this.showAddPatientTime = isShow
       },

src/views/followup/plan-manage/resident-detail.vue

 <template>
   <div class="resident-detail">
     <div class="bread-crumb">
-      <el-breadcrumb separator-class="el-icon-arrow-right" >
+      <el-breadcrumb separator="/">
         <el-breadcrumb-item v-for="item in residentCrumb">
           <a v-if="item.href" :href="item.href">{{item.name}}</a>
           <span v-else >{{item.name}}</span>

src/views/followup/plan-manage/resident-list.vue

 <template>
   <div class="resident-list">
     <div class="bread-crumb">
-      <el-breadcrumb separator-class="el-icon-arrow-right" >
+      <el-breadcrumb separator="/" >
         <el-breadcrumb-item v-for="item in residentCrumb">
           <a v-if="item.href" :href="item.href">{{item.name}}</a>
           <span v-else >{{item.name}}</span>

src/views/followup/reservation-manage/dialog/send-reservation.vue

@@ -192,22 +192,27 @@
               //校验额度是否不够
               getCheckReservation({
                 content: '',
-                validContents: this.validContents
+                validContents: _self.validContents
               }).then(({data}) => {
                 const sendFlagLast = data.sendFlag;
+                const inServiceTimeFlag = data.inServiceTimeFlag;
                 if(sendFlagLast){ //额度还可用
                   sendReservation({
                     ...this.reservationForm,
-                    patientAppointList: this.selectList
+                    patientAppointList: _self.selectList
                   }).then(({data}) => {
-                    this.$refs['reservationForm'].resetFields();
-                    this.$emit('closeSendReserve',false);
+                    _self.$refs['reservationForm'].resetFields();
+                    _self.$emit('closeSendReserve',false);
                   })
                 }else {
-                  console.log('余额不足')
-                  //  额度不足
-                  this.isNoEnoughShow = true;
-                  return;
+                  if(!inServiceTimeFlag) {
+                    _self.$message.warning('已超过发送时间范围!');
+                    return;
+                  }else {
+                    //  额度不足
+                    _self.isNoEnoughShow = true;
+                    return;
+                  }
                 }
               })
             } else {

src/views/followup/reservation-manage/reservation-list.vue

@@ -61,10 +61,13 @@
           :data="reservationList.enteringDtos"
           center
           style="width: 100%;margin-top: 20px;"
-          @selection-change="handleSelectionChange">
+          @selection-change="handleSelectionChange"
+          :row-key="getRowKeys"
+          ref="multipleReservation">
           <el-table-column
             type="selection"
-            align="center">
+            align="center"
+            :reserve-selection="true">
           </el-table-column>
           <el-table-column
             prop="nickname"
@@ -190,6 +193,9 @@
         needPara: {},
         dialogDetailShow: false,
         validContents: [],
+        getRowKeys(row) {
+          return row.fuPlanPatientTimesId;
+        },
       }
     },
     created() {
@@ -281,26 +287,32 @@
           content: '',
           validContents:this.validContents
         })
-        const { sendFlag } = this.checkRevervationData
+        const { sendFlag, inServiceTimeFlag } = this.checkRevervationData
         //判断短信余额是否不足
         if(sendFlag){
           this.isDialogShow = true;
         }else {
-          this.isNoEnoughShow = true;
+          if(!inServiceTimeFlag) {
+            this.$message.warning('已超过发送时间范围!');
+            return;
+          }else {
+            this.isNoEnoughShow = true;
+          }
         }
       },
        sendReservation() {
-        if(this.selectionData.length > 0){
-          this.selectList = this.selectionData;
-          // 发送预约校验
-          this.initCheck();
-        }else if(this.selectionData.length > 100){
-          this.$message.warning('每次最多选择100条单条随访进行预约!');
-          return false;
-        } else {
-          this.$message.warning('请选择要发送预约的居民!');
-          return false;
-        }
+        // console.log('选择人员长度',this.selectionData.length)
+         if(this.selectionData.length > 100) {
+           this.$message.warning('每次最多选择100条单条随访进行预约!');
+           return;
+         }else if(this.selectionData.length <= 0){
+           this.$message.warning('请选择要发送预约的居民!');
+           return;
+         }else{
+           this.selectList = this.selectionData;
+           // 发送预约校验
+           this.initCheck();
+         }
       },
       sendReservationRow(row){
         let newList = [];
@@ -340,6 +352,7 @@
           ...this.setSearchData(),
           status: this.status,
         })
+        this.$refs.multipleReservation.clearSelection();
       },
       closeTipsDialog(val){
         this.isNoEnoughShow = val;