Merge branch 'dev-patients-20190513' of...

Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513

src/components/opinionDialog.vue

@@ -32,7 +32,7 @@
           </el-form-item>
 
           <el-form-item label="联系方式：" :label-width="formLabelWidth" prop="contact">
-            <el-input v-model="form.contact" autocomplete="off" placeholder="请输入您的联系方式，如有需要我们会尽快联系您" class="contact-info"></el-input>
+            <el-input v-model="form.contact" maxlength="50" autocomplete="off" placeholder="请输入您的联系方式，如有需要我们会尽快联系您" class="contact-info"></el-input>
           </el-form-item>
 
         </el-form>
@@ -174,10 +174,15 @@
         });
       },
       getImgParam(file) {
-        const isLt2M = file.size / 1024 / 1024 < 5;
+        let isAllowed = /^image\/(jpg|jpeg|png|bmp)$/.test(file.type);
+        if( !isAllowed ){
+          this.$message.error('仅支持jpg、png、bmp格式图片文件');
+          return false;
+        }
+        const isLt2M = (file.size / 1024 / 1024) < 5;
         if (!isLt2M) {
           this.$message.error('上传图片大小不能超过 5MB!');
-          return isLt2M;
+          return false;
         }
         const date = new Date();
         const year = date.getFullYear();
@@ -238,15 +243,23 @@
       margin-left: 10px;
     }
     .el-upload-list--picture .el-upload-list__item-thumbnail{
-      margin-left: -74px;
+      margin-left: -75px;
     }
     .el-upload-list__item{
       width: 92px;
+      height: 102px !important;
+      padding-top: 15px !important;
       display: inline-block;
       margin-right: 5px;
       .el-upload-list__item-name{
         display: none;
       }
+      .el-icon-close-tip{
+        display: none;
+      }
+      &.is-success:focus:not(:hover) .el-icon-close-tip {
+          display: none;
+      }
     }
     .el-upload-list--picture .el-upload-list__item-status-label{
       background: #449284;

src/style/patient-manager/new-patient/new-patient-wrap.less

@@ -41,5 +41,15 @@
         }
       }
     }
+    .el-table__body-wrapper{
+      .el-table_1_column_1 .cell{
+        width: 100%;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        overflow: hidden; 
+      }
+    }
   }
 }
\ No newline at end of file

src/style/patient-manager/new-patient/new-patient.less

@@ -66,10 +66,41 @@
         margin-top: 10px;
         padding: 10px;
         border-radius: 4px;
+        overflow: hidden;
+        overflow-y: scroll; 
+        &::-webkit-scrollbar
+        {
+            width: 5px;
+            height: 5px;
+            background-color: #fff;
+        }
+        &::-webkit-scrollbar-thumb
+        {
+            border-radius: 10px;
+            -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+            background-color: #bbb;
+        }
         .el-checkbox{
           margin-right: 10px;
           margin-left: 0;
           margin-bottom: 10px;
+          .el-checkbox__input{
+            &.is-focus{
+              .el-checkbox__inner{
+                border-color: #DCDFE6;
+              }
+            }
+          }
+          &.is-checked{
+            border-color: #449284;
+            .el-checkbox__inner{
+              background-color: #449284;
+              border-color: #449284;
+            }
+            .el-checkbox__label{
+              color: #449284;
+            }
+          }
         }
       }
     }
@@ -126,7 +157,7 @@
       .el-tab-pane{
         width: 100%;
         height: 100%;
-        background: #F0F2F5;
+        background: #fff;
         overflow: hidden;
         display: flex;
         flex-direction: column;
@@ -267,7 +298,7 @@
           color: #449284;
           background:rgba(236,244,242,1);
           border:1px solid rgba(150,195,193,1);
-          margin-left: 10px;
+          margin: 0 0 10px 10px;
           &.choose-group{
             color: #666666;
             background:rgba(255,255,255,1);

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'D34A213A354849A0B08A241771F7A675';
+      config.headers['token'] = '5E2F79D96DD144A0B23E7607E2169A68';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/patients/labels-manage/labels-detail.vue

@@ -18,7 +18,7 @@
         <p class="member-number">{{searchData.totalRows}}人</p>
         <div class="right">
           <el-button type="primary" size="small" class="create-new-label" v-if="!isUngrouped" @click="addPatientsHandler">添加居民</el-button>
-          <el-button type="default" size="small" class="create-new-label" v-if="!isUngrouped" @click="handleDeletePatients">批量删除</el-button>
+          <el-button type="default" size="small" class="create-new-label" v-if="!isUngrouped" :disabled="isBatchDeleteDisabled" @click="handleDeletePatients">批量删除</el-button>
         </div>
       </div>
       <el-table
@@ -79,7 +79,7 @@
         @current-change="handleCurrentChange"
         :total="searchData.totalRows"
         :current-page="1"
-        :page-sizes="[10, 30, 50, 100]"
+        :page-sizes="[15, 30, 50, 100]"
         :page-size="searchData.pageSize"
         layout="total, sizes, prev, pager, next, jumper">
       </el-pagination>
@@ -178,7 +178,7 @@
         patientIdList: [],
         searchData: {
           pageNo: 1,  // 第几页
-          pageSize: 10,  // 每页条数
+          pageSize: 15,  // 每页条数
           tableData: [],
           totalRows: 0,
         },
@@ -199,6 +199,13 @@
       },
       isUngrouped(){  // 是否未分组
         return this.$route.query.labelId == 0 ? true : false;
+      },
+      isBatchDeleteDisabled() {
+        let selectList = this.multipleSelection;
+        if(selectList.length < 1){
+          return true;
+        }
+        return false;
       }
     },
     created() {
@@ -351,14 +358,7 @@
       },
       handleDeletePatients() {
         let selectList = this.multipleSelection;
-        if(selectList.length < 1){
-          this.$message({
-            message: '请先勾选病人，再进行删除',
-            type: 'error'
-          });
-          return;
-        };
-        console.log('list: ', selectList);
+        // console.log('list: ', selectList);
         let tempArr = [];
         for(let i=0; i<selectList.length; i++){
           tempArr.push({

src/views/patients/labels-manage/labels-list.vue

@@ -113,7 +113,7 @@
             for(let i=0; i<this.labelNameList.length; i++){
               if(this.labelNameList[i].labelId == 0){
                 hasNoLabel = 1;
-                return;
+                break;
               }
             }
             if( hasNoLabel == 1 ){

src/views/patients/new-manage/components/batch-import.vue

@@ -70,7 +70,7 @@
     </div>
     <div class="component-content screenSet upload-history-wrap">
       <p class="septal-line"></p>
-      <p class="upload-record">上传历史记录：120</p>
+      <p class="upload-record">上传历史记录：{{searchData.totalCount}}</p>
       <el-table
         :data="searchData.tableData"
         class="upload-table"
@@ -104,7 +104,7 @@
         </el-table-column>
         <el-table-column
           align="left"
-          prop="address"
+          prop="reason"
           label="关闭理由">
         </el-table-column>
       </el-table>
@@ -114,7 +114,7 @@
         @current-change="handleCurrentChange"
         :total="searchData.totalCount"
         :current-page="1"
-        :page-sizes="[10, 30, 50, 100]"
+        :page-sizes="[15, 30, 50, 100]"
         :page-size="searchData.pageSize"
         layout="total, sizes, prev, pager, next, jumper">
       </el-pagination>
@@ -137,6 +137,7 @@
 </template>
 
 <script>
+  import { mapGetters } from 'vuex';
   import { getSaasDomain } from '@/utils/index';
   import {
     getUploadHistory,
@@ -146,10 +147,9 @@
   export default {
     data() {
       return {
-        // uploadUrl: `${getSaasDomain('web/patientManages/import')}`,
         searchData: {
           pageNo: 1,  // 第几页
-          pageSize: 10,  // 每页条数
+          pageSize: 15,  // 每页条数
           tableData: [],
           totalCount: 0,
         },
@@ -164,6 +164,11 @@
     created() {
       this.goToGetUploadHistory();
     },
+    computed: {
+      ...mapGetters([
+        '_token',
+      ]),
+    },
     methods: {
       notUseDefaultUpload(){
         // console.log('just console>>>>>>>>')
@@ -195,19 +200,27 @@
             }];
 
             let req = {
-                // token: localStorage.getItem("token"),
-                token: '496F36FCB4CB494E81EAC9FDAA5E2D4B',
                 fileArray: fileArray,
                 import_type: 2,
             };
+            if( process.env.BUILD_ENV == "development" ){
+              req.token = '5E2F79D96DD144A0B23E7607E2169A68'
+            }else{
+              req.token = self._token;
+            }
             self.postData = JSON.stringify(req);
             uploadExcel(self.postData).then(res => {
-              console.log('%c res >> ','color: red;', res)
+              // console.log('%c res >> ','color: red;', res)
               if(typeof res.importFlag != 'undefined' && res.importFlag == true){
                 self.$message({
                   message: '上传成功!',
                   type: 'success'
                 });
+                try{
+                  self.goToGetUploadHistory();
+                }catch(err){
+                  console.log('reload history list error');
+                }
               }else{
                 self.$message({
                   message: '上传失败，请重新上传!',
@@ -215,21 +228,22 @@
                 });
               }
             })
-            
         };
         reader.readAsDataURL(file);
       },
       handleDownloadDemo(){
-        window.location.href = 'https://file.yunqueyi.com/File/template/居民导入模板.xlsx';
+        let src = 'https://file.yunqueyi.com/File/template/居民导入模板.xlsx';
+        let newTab=window.open('about:blank');
+        newTab.location = src;
       },
       goToGetUploadHistory(){
-        console.log('go get upload history>>>>>>')
+        // console.log('go get upload history>>>>>>')
         let params = {
           pageNo: this.searchData.pageNo,
           pageSize: this.searchData.pageSize,
         };
         getUploadHistory(params).then(res => {
-          console.log('获取上传历史记录：', res);
+          // console.log('获取上传历史记录：', res);
           if(res.code == "000000"){
             if(res.data.importRecordsModelList.length > 0){
               this.searchData.tableData = res.data.importRecordsModelList;
@@ -244,48 +258,6 @@
           }
         })
       },
-      changeFile(file, fileList) {
-        const name = file.name;
-        const type = name.substring(name.lastIndexOf('.') + 1);
-
-        if (type !== 'xls' && type !== 'xlsx') {
-          this.$message({
-            message: '上传文件只能是 xls、xlsx格式!',
-            type: 'warning'
-          });
-          fileList.splice(0, 1);
-          return false;
-        }
-
-        if (fileList.length > 1) {
-          fileList.splice(0, 1);
-        }
-
-        this.files = [file];
-      },
-      uploadError(err, file, fileList){
-        console.log('%c upload Error >>>>>>>>', 'color: red;')
-      },
-      uploadSuccess(response, file, fileList) {
-        console.log('%c upload Success >>>>>>>>', 'color: red;')
-        // this.loading = false;
-        // this.visible = false;
-        // this.tipShow = true;
-        console.log('response: ', response);
-        console.log('file: ', file);
-        console.log('fileList: ', fileList)
-        // console.log(response, file, fileList);
-        const { code } = response;
-        this.code = response.code;
-
-        const codes = ['000000', '400002', '400004'];
-
-        if (codes.indexOf(code) > -1) {
-          this.error = response.data;
-        } else {
-          this.error = response.message;
-        }
-      },
       handleCurrentChange(val) {
         this.searchData.pageNo = val;
         this.goToGetUploadHistory();

src/views/patients/new-manage/components/qr-code-import.vue

@@ -33,7 +33,7 @@
     <!-- 选择分组 弹窗 -->
     <el-dialog
       class="choose-label-wrap"
-      title="选择分组"
+      :title="showDownloadQRModal == false ? '选择分组' : '下载二维码'"
       :visible.sync="showChooseLabelModal"
       width="680px"
       :close-on-click-modal="false"
@@ -117,7 +117,6 @@
     watch: {
       showChooseLabelModal: function(val) {
         if(val == false){
-          console.log('%c 隐藏选择分组', 'color: red;', val)
           this.labelNameList = [];
           this.choosedLabelList = [];
         }
@@ -166,7 +165,7 @@
                   }
                 }
               }
-              console.log('obj.labels: ', obj.labels);
+              // console.log('obj.labels: ', obj.labels);
               cb && cb(obj);
             }
           }else{
@@ -199,7 +198,7 @@
         var msg= document.getElementById('msg')
         // 将获取到的数据（val）画到msg（canvas）上
         QRCode.toCanvas(msg, val, function (error) {
-              console.log(error)
+              // console.log(error)
         })
       },
       handleChooseGroup() {
@@ -270,7 +269,7 @@
         // 下载二维码
         downloadQRCode(params).then(res => {
           if(res.code == '000000'){
-            // window.location.href = res.data;
+            this.showChooseLabelModal = false;
             this.downloadFile(res.data);
           }else{
             this.$message({
@@ -313,17 +312,8 @@
         this.goToGetGroupList();
       },
       downloadFile(src) {
-        debugger;
-        var eleLink = document.createElement('a');
-        eleLink.download = src;
-        eleLink.style.display = 'none';
-        // // 字符内容转变成blob地址
-        eleLink.href = src;
-        // // 触发点击
-        document.body.appendChild(eleLink);
-        eleLink.click();
-        // // 然后移除
-        document.body.removeChild(eleLink);
+        let newTab=window.open('about:blank');
+        newTab.location = src;
       }
 
     },

src/views/patients/new-manage/new-patient.vue

@@ -74,7 +74,7 @@
     },
     methods: {
       handleTabClick(tab, event) {
-        console.log(tab, event);
+        // console.log(tab, event);
       },
       saveEdit() {
         this.checkForm = true;