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

@@ -13,7 +13,7 @@
               class="upload-demo"
               :action="action"
               :headers="headers"
-              :multiple="false"
+              multiple
               list-type="picture"
               :limit="imgLimit"
               :accept="'image/jpg,image/jpeg,image/png,image/bmp'"

src/style/common.scss

@@ -14,7 +14,8 @@ body, div, span, header, footer, nav, section, aside, article, ul, dl, dt, dd, l
     border: none;
     // color: #333;
     font-weight: normal;
-    font-family: "PingFangSC", "Microsoft Yahei";
+    // font-family: "PingFangSC", "Microsoft Yahei";
+    font-family: "Helvetica Neue", "Helvetica", "PingFang SC", "Hiragino Sans GB","Microsoft YaHei", "SimSun", "sans-serif";
     box-sizing: border-box;
     -webkit-tap-highlight-color:transparent;
     -webkit-font-smoothing: antialiased;
@@ -60,7 +61,8 @@ html,body{
     height: 100%;
     width: 100%;
     background-color: #fff;
-    font-family: Arial, Helvetica, sans-serif;
+    // font-family: Arial, Helvetica, sans-serif;
+    font-family: "Helvetica Neue", "Helvetica", "PingFang SC", "Hiragino Sans GB","Microsoft YaHei", "SimSun", "sans-serif";
     font-size: 16px;
 }
 #app {

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

@@ -169,7 +169,7 @@
             height: 237px;
             margin-top: 15px;
             .first{
-              width: 308px;
+              width: 250px;
               // width: 30%;
               height: 200px;
               float: left;
@@ -192,8 +192,8 @@
                 }
                 .border{
                   display: inline-block;
-                  width: 200px;
-                  // width: 70%;
+                  // width: 200px;
+                  width: 60%;
                   height: 0px;
                   border-bottom: 1px solid #449284;
                   vertical-align: middle;
@@ -217,12 +217,12 @@
               }
             }
             .second{
-                width: 380px;
+                width: 350px;
                 // width: 40%;
                 .procedure{
                   .border{
-                    width: 250px;
-                    // width: 70%;
+                    // width: 250px;
+                    width: 63%;
                   }
                 }
                 .under-info{
@@ -363,7 +363,7 @@
         }
         .flow-path{
           // width: 100%; 
-          height: 441px;
+          height: 430px;
           display: block;
           border: 0;
           margin-left: -20px;

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

@@ -333,6 +333,9 @@
                 labelName: params.newLabelName,
               }
             })
+          }else if(data.code == '202520'){
+            this.isChangeNameError = true;
+            this.changeNameTips = '该分组名称已被您使用，请重新输入';
           }else{
             this.$message({
               message: '请求接口失败，请重新再试',

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

@@ -71,6 +71,7 @@
     <div class="component-content screenSet upload-history-wrap">
       <p class="septal-line"></p>
       <p class="upload-record">上传历史记录：{{searchData.totalCount}}</p>
+        <!-- :cell-style="aaa" -->
       <el-table
         :data="searchData.tableData"
         class="upload-table"
@@ -80,7 +81,7 @@
           align="left"
           prop="fileName"
           label="文件名"
-          width="180">
+          width="250">
         </el-table-column>
         <el-table-column
           align="left"
@@ -154,9 +155,6 @@
           tableData: [],
           totalCount: 0,
         },
-        uploadHeaders: {
-          token: localStorage.getItem('token')
-        },
         files: [],
         postData: {},
         showUploadSuccess: false,
@@ -171,6 +169,14 @@
       ]),
     },
     methods: {
+      // aaa(obj){
+      //   console.log('%c cell-style obj>>>>>>', 'color: red;', obj);
+      //   if(obj.column.property == 'reason'){
+      //     return 'red>>>'
+      //   }else{
+      //     return 'pink'
+      //   }
+      // },
       notUseDefaultUpload(){
         // console.log('just console>>>>>>>>')
       },
@@ -205,11 +211,13 @@
                 import_type: 2,
             };
             if( process.env.BUILD_ENV == "development" ){
-              req.token = '4E971382E2E14BDC91CC23A450343788'
+              req.token = '77DDB524DE0742B19CEC759CA463F3A5'
             }else{
-              req.token = self._token;
+              // req.token = self._token;
+              req.token = localStorage.getItem('storageToken');
             }
             self.postData = JSON.stringify(req);
+            console.log('>>>>>> batch upload req', req)
             uploadExcel(self.postData).then(res => {
               if(typeof res.importFlag != 'undefined' && res.importFlag == true){
                 self.showUploadSuccess = true;
@@ -242,9 +250,17 @@
         getUploadHistory(params).then(res => {
           // console.log('获取上传历史记录：', res);
           if(res.code == "000000"){
-            if(res.data.importRecordsModelList && res.data.importRecordsModelList.length > 0){
-              this.searchData.tableData = res.data.importRecordsModelList;
+            let data = res.data.importRecordsModelList;
+            if(data && data.length > 0){
+              data = data.map(item => {
+                if(!item.reason) {
+                  item.reason = '-'
+                }
+                return item;
+              });
+              this.searchData.tableData = data;
               this.searchData.totalCount = res.data.count;
+
             }
           }else{
             // 获取失败

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

@@ -100,11 +100,11 @@
           id: '',
           labelIds: '',
         },
-        labelsInfoList: [],
-        currentLabelList: [],
-        labelNameList: [],
-        choosedLabelList: [],
-        forDownloadInfo: {},  // 下载用的信息
+        labelsInfoList: [],    // 二维码分组 列表信息
+        labelNameList: [],     // 分组列表
+        currentLabelList: [],  // 接口返回的二维码分组id列表
+        choosedLabelList: [],  //          勾选的分组id列表
+        forDownloadInfo: {},   // 下载用的信息
       }
     },
     created() {
@@ -117,7 +117,7 @@
     watch: {
       showChooseLabelModal: function(val) {
         if(val == false){
-          this.labelNameList = [];
+          // this.labelNameList = [];
           this.choosedLabelList = [];
         }
       },
@@ -138,15 +138,19 @@
             let data = res.data;
             if( !justDownload ){  // 非下载二维码时
               this.qrCodeInfo = data;
-              if(data.labelIds != ''){
+              if(data.labelIds && (data.labelIds != '')){  // 存在labelIds，则去请求label信息列表
                 let temp = data.labelIds.split(',');
                 this.currentLabelList = this.formatList(temp);
+                 this.handleGetLabelsInfo({
+                  labelIds: data.labelIds,
+                });
+              }else{
+                this.labelsInfoList = [];
+                this.currentLabelList = [];
               }
               this.calculateQRCode(data.qrcodeUrl);
-              this.handleGetLabelsInfo({
-                labelIds: data.labelIds,
-              });
             }else{  // 下载二维码时，不用更新页面中的二维码信息
+            // debugger;
               this.forDownloadInfo = data;
               let { id, beginTime, endTime, forever } = this.forDownloadInfo;
               let obj = {
@@ -202,6 +206,7 @@
         })
       },
       handleChooseGroup() {
+        // debugger;
         this.showDownloadQRModal = false;  
         // 回显已经选择的label
         this.choosedLabelList = this.currentLabelList;
@@ -217,7 +222,7 @@
           if(res.code == '000000'){
             let data = res.data;
             this.qrCodeInfo = data;
-            if(data.labelIds != ''){
+            if(data.labelIds && data.labelIds != ''){
               let temp = data.labelIds.split(',');
               this.currentLabelList = this.formatList(temp);
             }
@@ -234,16 +239,10 @@
         // 回显已经选择的label
         this.choosedLabelList = this.currentLabelList;
         this.goToGetGroupList();
-
       },
       handleAfterChooseLabel() {
-        if(this.choosedLabelList.length < 1){
-          this.$message({
-            message: '请选择分组',
-            type: 'warning'
-          });
-          return;
-        }
+        console.log('this.choosedLabelList ', this.choosedLabelList)
+        console.log('this.choosedLabelList ', this.choosedLabelList.join(','))
         if( this.showDownloadQRModal == false ){  // 选择分组时
           this.showChooseLabelModal = false;
           this.goToGetQRCode({
@@ -251,7 +250,6 @@
             id: '',
             first: false,
           });
-          this.choosedLabelList = [];
         }else{  // 下载二维码时
           // 获取最新二维码参数，但不影响之前的二维码参数
           this.goToGetQRCode({
@@ -260,10 +258,7 @@
             first: false,
             justDownload: true,
           }, this.goToDownloadQRCode);
-
-          
         }
-        
       },
       goToDownloadQRCode(params) {
         // 下载二维码
@@ -315,10 +310,7 @@
         let newTab=window.open('about:blank');
         newTab.location = src;
       }
-
     },
-    
-    
   }
 </script>