update

package.json

@@ -25,6 +25,7 @@
     "iscroll": "^5.2.0",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
+    "qrcode": "^1.3.3",
     "showdown": "^1.6.4",
     "vue": "^2.1.0",
     "vue-infinite-scroll": "^2.0.2",

src/utils/patients/patientsapi.js

@@ -74,17 +74,35 @@ export const getDiseasesList = (params) => {
 };
 
 // 新增居民
+export const getQRCode = data => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/qrcodes/get`),
+    method: 'post',
+    data: data,
+    description: '获取二维码',
+  })
+}
 
-export const getUploadHistory = params => {  // 获取上传历史记录
+export const getUploadHistory = params => {  
   return fetch({
     headers,
-    url: getBaseUrl(`/healths/docImpPat/import/records`),
+    url: getBaseUrl(`healths/docImpPat/import/records`),
     method: 'get',
     params: params,
     description: '获取上传历史记录',
   })
 }
 
+export const refreshCode = data => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/qrcodes/refresh`),
+    method: 'post',
+    data: data,
+    description: '刷新二维码有效期',
+  })
+}
 
 // 分组管理
 export const getLabelList = (params) => {

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

@@ -72,6 +72,7 @@
         </div>
       </el-table>
       <el-pagination
+         v-if="searchData.tableData && searchData.tableData.length > 0"
         class="pagination-style"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -201,7 +202,7 @@
     },
     // 挂载到Dom完成时
     mounted() {
-      commonUtil.resizeHeight();
+      // commonUtil.resizeHeight();
     },
     methods: {
       getDetail() {
@@ -284,6 +285,7 @@
       },
       handleChangeLabelName(){
         this.showChangeLabelNameDialog = true;
+        this.ruleForm.newLabelName = this.$route.query.labelName;
       },
       cancelChangeName(){
         this.isChangeNameError = false;
@@ -417,8 +419,30 @@
   }
 </script>
 
+<style lang="less">
+  .label-detail-wrap{
+    .err-text{
+      height: 12px;
+      // display: none;
+      visibility: hidden;
+    }
+    .special-error-tips{
+      .el-textarea__inner{
+        border: 1px solid red;
+        outline: none;
+      }
+      .err-text{
+        color: red;
+        visibility: visible;
+      }
+    }
+  }
+
+</style>
+
 <style lang="less" scoped>
   .label-detail-wrap{
+    
     .screenSet{
       background: #fff;
       padding: 30px;
@@ -470,11 +494,13 @@
     }
     .pagination-style{
       text-align: right;
+      margin: 20px 0;
     }
     .table-empty{
       width: 100%;
       height: auto;
       text-align: center;
+      margin-top: 20%;
       .empty-pic{
         width: 100px;
         height: 100px;
@@ -486,6 +512,7 @@
         font-size: 14px;
         color: #909399;
         line-height: 14px;
+        padding-bottom: 200px;
       }
     }
   }

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

@@ -21,7 +21,7 @@
           </el-button>
         </el-col>
       </el-row>
-      <p class="total-label">共：{{labelNameList.length}}个分组</p>
+      <p class="total-label">共：{{totalListCount}}个分组</p>
       <div class="label-list" v-if="labelNameList && labelNameList.length > 0">
         <el-tag class="each-label" @click="goToDetail(item)" v-for="(item, index) in labelNameList" :key="index">{{item.labelName}}({{item.labelPatientNums}}人)</el-tag>
       </div>
@@ -70,6 +70,7 @@
         curmbSecond: "分组管理",
         labelName: '',
         labelNameList: [],
+        totalListCount: 0,
         centerDialogVisible: false,
         ruleForm: {
           newLabelName: '', // 新建分组名
@@ -98,17 +99,23 @@
         // 获取分组列表
         let params = {
           type: 1,
-          token : localStorage.getItem("token"),
         };
         if(this.labelName){
           params.labelName = this.labelName;
         }
-        commonUtil.openLoading(this);
+        // commonUtil.openLoading(this);
         getLabelList(params).then(data => {
-          commonUtil.closeLoading(this);
+          // commonUtil.closeLoading(this);
           // console.log('获取分组列表>> ', data)
           if(data.data && data.data.labelNameList){
             this.labelNameList = data.data.labelNameList;
+            for(let i=0; i<this.labelNameList.length; i++){
+              if(this.labelNameList[i].labelId == 0){
+                this.totalListCount = this.labelNameList.length - 1;
+              }else{
+                this.totalListCount = this.labelNameList.length;
+              }
+            }
           }
         }).catch(err => {
           console.log('error: ', err)