From 33806c75a29fc4fd498474bd3247d687f1710cda Mon Sep 17 00:00:00 2001
From: binbin0314 <binbin0314@126.com>
Date: Thu, 8 Jul 2021 18:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=94=99=E8=AF=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                      |  5 +++++
 package.json                           |  1 +
 src/App.vue                            | 23 ++++++++++-------------
 src/main.js                            |  5 +++--
 src/views/CaseSearch/CaseSearch.vue    |  2 +-
 src/views/PatientInfo/PatientInfo.vue  |  5 +++--
 src/views/ProjectAssistant/Examine.vue | 10 +++++++++-
 7 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8fc02c0..f72ba88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4668,6 +4668,11 @@
         }
       }
     },
+    "current-device": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/current-device/-/current-device-0.10.2.tgz",
+      "integrity": "sha512-FN223n2Cp1fRI/gyjJEAdagHhJ/2Z2STz3tUg1t4F259BhmVRCChkmxcgFtjYJsWuIacQEs7bqJpnAczIXIkWw=="
+    },
     "cyclist": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz",
diff --git a/package.json b/package.json
index e09c4b1..5275b50 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "ant-design-vue": "^1.2.4",
     "compression-webpack-plugin": "^6.1.1",
     "core-js": "^3.6.5",
+    "current-device": "^0.10.2",
     "echarts": "^4.9.0",
     "echarts-gl": "^1.1.1",
     "moment": "^2.29.1",
diff --git a/src/App.vue b/src/App.vue
index c884870..38d3c99 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,11 +3,12 @@
  * @email: 18603454788@163.com
  * @Date: 2021-04-19 10:23:19
  * @LastEditors: aBin
- * @LastEditTime: 2021-06-11 15:50:57
+ * @LastEditTime: 2021-07-08 15:33:53
 -->
 <template>
   <a-config-provider :locale="zh_CN">
     <div v-if="isRouter" class="d-flex flex-row flex-nowrap" id="app">
+      <!-- <div class="d-flex flex-row flex-nowrap" id="app"> -->
       <!-- <btn-con /> -->
       <router-view class="flex-1 bg" style="padding: 6px"></router-view>
     </div>
@@ -26,6 +27,7 @@ export default {
   data() {
     return { zh_CN, isRouter: false };
   },
+  computed: mapState('home', ['anyringToken', 'ptProps']),
   watch: {
     anyringToken(val) {
       if (val) {
@@ -33,14 +35,11 @@ export default {
       }
     },
   },
-  computed: mapState('home', ['anyringToken', 'ptProps']),
-
   async created() {
-    // async created() {
-    //   const userId = '1387952026067013632';
-    //   const params = { userId };
-    //   await this.getUserId(params);
-    //   await this.getToken();
+    // const userId = '1387952026067013632';
+    // const params = { userId };
+    // await this.getUserId(params);
+    // await this.getToken();
     if (localStorage.getItem('patientId')) {
       this.setPatientId(localStorage.getItem('patientId'));
     }
@@ -71,10 +70,8 @@ export default {
     },
 
     isMobile() {
-      this.flag = navigator.userAgent.match(
-        /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i,
-      );
-      if (this.flag === null) {
+      this.flag = device.mobile();
+      if (!this.flag) {
         console.log('pc端');
         this.getPtpropsPC();
       } else {
@@ -109,7 +106,7 @@ export default {
         const params = { userId: props.userId };
         await that.getUserId(params);
         await that.getToken();
-        await that.getHospitalId(data.data.projectId);
+        await that.getHospitalId(props.projectId);
       });
     },
   },
diff --git a/src/main.js b/src/main.js
index b7fa45b..9e9c856 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,8 +2,8 @@
  * @Author: wally
  * @email: 18603454788@163.com
  * @Date: 2021-01-29 11:16:27
- * @LastEditors: wally
- * @LastEditTime: 2021-02-04 17:47:01
+ * @LastEditors: aBin
+ * @LastEditTime: 2021-06-15 11:41:52
  */
 // @ts-ignore
 import Vue from 'vue';
@@ -18,6 +18,7 @@ import echarts from 'echarts';
 import 'echarts-gl';
 import 'echarts/map/js/province/shanxi.js'; //对应的省份
 import './plugins/vue-quill-editor.js';
+import device from 'current-device';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
 // import { getUserId } from 'config/api-user';
 
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index 780129a..84362d8 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-column">
+  <div class="flex-column main">
     <div class="d-flex flex-row flex-wrap">
       <a-form :form="form1" class="d-flex flex-wrap align-center" layout="inline">
         <a-form-item>
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index 592508c..1c69df0 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -10,7 +10,8 @@
         <a-collapse v-model="activeKey" style="boeder-bottom: none !important" accordion>
           <!-- 首先遍历整个data大数组 -->
           <!-- <div v-for="(item, index) in list" :key="index"> -->
-          <a-collapse-panel :header="item.name" :key="index.toString()" v-for="(item, index) in list">
+          <a-collapse-panel :key="index.toString()" v-for="(item, index) in list">
+            <div slot="header">{{ item.name }}<span v-if="item.must === 2" style="color: red">*</span></div>
             <!-- 一级标题下的各种问题（questionVos），判断类型1-12，展示不同需要填写的内容 -->
             <div :key="a.name" v-for="a in item.questionVos" style="position: relative">
               <a-form-item :label="a.question" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
@@ -657,7 +658,7 @@
             <div v-for="(w, indexB) in item.subReportCodes" :key="w.name">
               <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
                 <!-- 二级大标题 -->
-                <span class="hhh2">{{ w.name }}：</span>
+                <span class="hhh2">{{ w.name }}<span v-if="w.must === 2" style="color: red">*</span>：</span>
                 <a-upload
                   v-if="w.recordType && (getCode || code || showrzlb)"
                   name="files"
diff --git a/src/views/ProjectAssistant/Examine.vue b/src/views/ProjectAssistant/Examine.vue
index 374af7f..4745839 100644
--- a/src/views/ProjectAssistant/Examine.vue
+++ b/src/views/ProjectAssistant/Examine.vue
@@ -43,6 +43,7 @@
         :row-key="record => record.id"
         bordered
         class="white pa-3 mt-3"
+        @change="changePage"
       >
         <template slot="id" slot-scope="text, record, index">
           <span>{{ index + 1 }}</span>
@@ -74,7 +75,7 @@
               <template slot="title">
                 <p>是否确定通过该病例记录</p>
               </template>
-              <a-button v-if="record.inputStatus === 2" size="small" type="primary">审核通过</a-button>
+              <a-button size="small" type="primary">审核通过</a-button>
             </a-popconfirm>
 
             <a-button type="primary" size="small" class="mt-4" @click="details(record.id, record.hospitalization, record.code)">
@@ -166,6 +167,10 @@ export default {
   methods: {
     ...mapMutations('home', ['setPatientId', 'setHospitalization', 'setRecordCode']),
     ...mapActions('home', ['getDoctor', 'getControlGroups']),
+    async changePage(pagination) {
+      this.pagination.current = pagination.current;
+      await this.handleSelPatientMes();
+    },
     handleSearch() {
       this.pagination.current = 1;
       this.handleSelPatientMes();
@@ -194,6 +199,9 @@ export default {
           let { lists } = this;
           lists = { ...data };
           this.lists = { ...lists };
+          this.pagination.current = data.pageNum;
+          this.pagination.pageSize = data.pageSize;
+          this.pagination.total = +data.total;
         } else {
           this.$message.error(msg || '查询失败');
           throw msg;