peter

src/components/360View/commonForm/deveopmentFIle-copy.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="printObj" size="small">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
@@ -313,6 +313,10 @@ export default {
       type: String,
       default: ''
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     onlyRead: {
       type: Boolean,
       default: false

src/components/360View/commonForm/eyesVision.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#eyesFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
@@ -38,7 +38,7 @@
               <div v-else-if="scope.row.name == '集合近点(NPC)'">
                 <p>{{ scope.row.name }}</p>
                 <div style="border-top: 1px solid #D9D9D9;display: flex;flex-wrap: wrap;margin: 3px 0">
-                  <div v-for="(item,index) in npcList" :key="index" class="check" style="margin-left: 8px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                  <div v-for="(item,index) in npcList" :key="index" class="check" style="margin: 0 10px 0 16px;font-size: 14px" @click="item.isSelect = !item.isSelect">
                     <input type="checkbox" :checked="item.isSelect">
                     <div>{{ item.name }}</div>
                   </div>
@@ -47,7 +47,7 @@
               <div v-else-if="scope.row.name == '梯度性AC/A'">
                 <p>{{ scope.row.name }}</p>
                 <div style="border-top: 1px solid #D9D9D9;display: flex;flex-wrap: wrap;margin: 3px 0">
-                  <div v-for="(item,index) in acaList" :key="index" class="check" style="margin-left: 8px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                  <div v-for="(item,index) in acaList" :key="index" class="check" style="margin: 0 12px 0 20px;font-size: 14px" @click="item.isSelect = !item.isSelect">
                     <input type="checkbox" :checked="item.isSelect">
                     <div>{{ item.name }}</div>
                   </div>
@@ -56,7 +56,7 @@
               <div v-else-if="scope.row.name == '调节幅度(AMP)'">
                 <p>{{ scope.row.name }}</p>
                 <div style="border-top: 1px solid #D9D9D9;display: flex;flex-wrap: wrap;margin: 3px 0">
-                  <div v-for="(item,index) in ampList" :key="index" class="check" style="margin-left: 8px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                  <div v-for="(item,index) in ampList" :key="index" class="check" style="margin: 0 12px 0 16px;font-size: 14px" @click="item.isSelect = !item.isSelect">
                     <input type="checkbox" :checked="item.isSelect">
                     <div>{{ item.name }}</div>
                   </div>
@@ -302,7 +302,7 @@
                     <div style="display: flex">
                       <div style="width: 160px;">聚散功能异常：</div>
                       <div style="width: 100%;display: flex;flex-wrap: wrap;">
-                        <div v-for="(item,index) in dispersionList" :key="index" class="check" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                        <div v-for="(item,index) in dispersionList" :key="index" class="check" :class="[index !== dispersionList.length - 1 ? 'width-100' : '']" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
                           <input type="checkbox" :checked="item.isSelect">
                           <div>{{ item.name }}</div>
                         </div>
@@ -311,18 +311,10 @@
                     <div style="display: flex">
                       <div style="width: 160px;">调节功能异常：</div>
                       <div style="width: 100%;display: flex;flex-wrap: wrap;">
-                        <div v-for="(item,index) in regulatoryList" :key="index" class="check" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                        <div v-for="(item,index) in regulatoryList" :key="index" class="check" :class="[index !== regulatoryList.length - 1 ? 'width-100' : '']" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
                           <input type="checkbox" :checked="item.isSelect">
                           <div>{{ item.name }}</div>
                         </div>
-                        <!--                        <el-select v-model="formData.cbzdTjgnyc" multiple placeholder="请选择" style="width: 100%">-->
-                        <!--                          <el-option-->
-                        <!--                            v-for="item in scope.row.b"-->
-                        <!--                            :key="item.id"-->
-                        <!--                            :label="item.name"-->
-                        <!--                            :value="item.name"-->
-                        <!--                          />-->
-                        <!--                        </el-select>-->
                       </div>
                     </div>
                     <div style="display: flex">
@@ -495,6 +487,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     caseId: {
       type: String,
       default: ''
@@ -504,6 +500,7 @@ export default {
     return {
       formData: {
         idList: [],
+        jzNumber: '',
         patientId: '',
         patientName: '',
         patientSex: '',
@@ -807,13 +804,13 @@ export default {
       this.formData.ysSign = mzName
       this.formData.riQi = date
     },
-    getSysgnjc() {
-      this.$http.get('/sysgnjc/getSysgnjc', { params: {
+    async getSysgnjc() {
+      const { data: res } = await this.$http.get('/sysgnjc/getSysgnjc', { params: {
         caseId: this.caseId,
         patientId: this.patientId
-      }}).then(data => {
-        const form = data.data.data
-        this.formData = form
+      }})
+      if (res.code === 0) {
+        this.formData = res.data
         if (this.formData.ctYuan) {
           this.formData.ctYuan = this.formData.ctYuan.replace('&gt;', '>')
           this.formData.ctJin = this.formData.ctJin.replace('&gt;', '>')
@@ -827,13 +824,14 @@ export default {
           this.formData.stereoRdd = this.formData.stereoTno = '60“'
           this.setSign()
         }
+        this.formData.jzNumber = window.localStorage.getItem('jzNumber')
         this.handleStr(this.formData.npcBd, this.npcList)
         this.handleStr(this.formData.acaAdd, this.acaList)
         this.handleStr(this.formData.ampFjf, this.ampList)
         this.handleStr(this.formData.cbzdJsgnyc, this.dispersionList)
         this.handleStr(this.formData.cbzdTjgnyc, this.regulatoryList)
         this.handleStr(this.formData.cbzdXs, this.strabismusList)
-      })
+      }
     },
     selectWorth(val, type) {
       if (val === '5个') {
@@ -887,7 +885,6 @@ export default {
               }
             }
           }
-          console.log('list', list)
           this.formData.idList = list
         }
       } else {
@@ -1009,6 +1006,9 @@ export default {
     margin-right: 5px !important;
   }
 }
+.width-100{
+  width: 150px;
+}
 .bold{
   font-weight: 700;
 }
@@ -1074,6 +1074,24 @@ export default {
     .center {
       text-align: left;
     }
+    .el-input__inner {
+      padding: 0;
+      border: none;
+      text-align: center;
+      border-radius: 0;
+    }
+    .el-textarea__inner{
+      border: none;
+    }
+  }
+  .check {
+    cursor: pointer;
+    user-select: none;
+    display: flex;
+    input{
+      -webkit-appearance: checkbox !important;
+      margin-right: 5px !important;
+    }
   }
   .el-table th {
     border-color: #8e8c8c !important;

src/components/360View/commonForm/optometryForm-copy.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="print" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
@@ -370,6 +370,10 @@ export default {
       type: String,
       default: ''
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     onlyRead: {
       type: Boolean,
       default: false
@@ -385,6 +389,7 @@ export default {
       timeoutnum: null, // 断开 重连倒计时
       dataForm: {
         id: '',
+        jzNumber: '',
         idList: [],
         patientId: '',
         patientName: '',
@@ -630,6 +635,7 @@ export default {
           this.setVision()
           this.setSign()
         }
+        this.dataForm.jzNumber = window.localStorage.getItem('jzNumber')
         this.handleStr(this.dataForm.pjyjCheck, this.suggest)
         this.handleStr(this.dataForm.zzcfCheck, this.remoteUse)
       } else {
@@ -658,7 +664,6 @@ export default {
               }
             }
           }
-          console.log('list',list)
           this.dataForm.idList = list
         }
       } else {

src/components/360View/commonForm/threeVision.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#threeFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
@@ -211,6 +211,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     caseId: {
       type: String,
       default: ''

src/components/360View/forePart/index-copy.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="foreBox">
-    <div v-if="!onlyRead" class="moveIcon">
+    <div v-if="!onlyRead && isPlatform" class="moveIcon">
       <p @click="moveAll(1)"><i style="font-size: 20px" class="el-icon-back" /></p>
       <p style="margin-top: 5px" @click="moveAll(2)"><i class="el-icon-back" style="transform: rotateY(180deg);font-size: 20px" /></p>
     </div>
     <div style="display: flex;margin-top: 32px">
       <div style="width: 200px;padding-right: 8px;text-align: left;overflow-x: auto">
         <p style="font-weight: bold;margin-bottom: 12px;text-align: left">描述项模板</p>
-        <el-button v-if="!treeCaseList.length && !onlyRead" type="primary" size="small" @click="append(1)">+新增</el-button>
+        <el-button v-if="!treeCaseList.length && !onlyRead && isPlatform" type="primary" size="small" @click="append(1)">+新增</el-button>
         <el-tree
           ref="tree"
           :data="treeCaseList"
@@ -23,8 +23,8 @@
               <span>{{ node.label }}</span>
             </span>
             <span>
-              <el-button v-if="!data.treeId && !onlyRead" icon="el-icon-plus" style="font-size: 12px;color: #409EFF" type="text" @click.stop="append(2, data)" />
-              <el-button v-if="!onlyRead" icon="el-icon-delete" style="font-size: 12px;color: #F56C6C" type="text" @click.stop="remove(node, data)" />
+              <el-button v-if="!data.treeId && !onlyRead && isPlatform" icon="el-icon-plus" style="font-size: 12px;color: #409EFF" type="text" @click.stop="append(2, data)" />
+              <el-button v-if="!onlyRead && isPlatform" icon="el-icon-delete" style="font-size: 12px;color: #F56C6C" type="text" @click.stop="remove(node, data)" />
             </span>
           </span>
         </el-tree>
@@ -255,7 +255,7 @@
           width="120"
         >
           <template slot-scope="scope">
-            <div v-if="!onlyRead">
+            <div v-if="!onlyRead && isPlatform">
               <p @click="moveHandle(scope.$index,1, scope.row)"><i style="font-size: 20px" class="el-icon-back" /></p>
               <p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row)"><i class="el-icon-back" style="transform: rotateY(180deg);font-size: 20px" /></p>
             </div>
@@ -551,6 +551,10 @@ export default {
       type: String,
       default: ''
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     onlyRead: {
       type: Boolean,
       default: false

src/components/360View/key-indicators.vue

@@ -17,7 +17,7 @@
       </el-tab-pane>
     </el-tabs>
 <!--    <div :style="{height:` calc(100% - 5px - ${patientInfoHeadHeight}px)`}" class="scroll-father-echeats">-->
-    <div :style="{height:` calc(100% - 240px)`}" class="scroll-father-echeats">
+    <div :style="{height:` calc(100% - 270px)`}" class="scroll-father-echeats">
       <el-scrollbar class="scrollbar-wrapper" style="height:100%">
         <echarts-yanya
           :id-name="'key-indicators-shili'"
@@ -68,7 +68,7 @@
 <script>
 import echartsShili from '@/components/echarts/shili'
 import echartsLine from '@/components/echarts/line'
-import echartsYanya from '@/components/echarts/eyeCharts'
+import echartsYanya from '@/components/echarts/yanya'
 
 export default {
   components: { echartsShili, echartsYanya, echartsLine },
@@ -146,7 +146,6 @@ export default {
     async getShiLiAndYanYaData() {
       const { data: res } = await this.$http.get('/patient/view/getYanZouAndYanYaData', {
         params: {
-          // patientId: '200203836'
           patientId: this.patientId
         }
       })

src/components/360View/medicalRecord/callMedical/index.vue

@@ -8,7 +8,7 @@
               <p :class="[index === curIndex ? 'activeFont' : 'curFont']">{{ item.createTime }}</p>
               <p>{{ item.name }}</p>
             </div>
-            <i v-if="index === curIndex && !onlyRead" style="margin-top: 28px;color: rgb(199,5,5)" class="el-icon-delete" @click="deleteForm(item.id)" />
+            <i v-if="index === curIndex && !onlyRead && isPlatform" style="margin-top: 28px;color: rgb(199,5,5)" class="el-icon-delete" @click="deleteForm(item.id)" />
           </div>
           <img v-if="!formList" src="@/assets/img/nodata.png" alt="" class="nodata">
         </div>
@@ -56,6 +56,10 @@ export default {
       type: String,
       default: ''
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     onlyRead: {
       type: Boolean,
       default: false
@@ -79,20 +83,41 @@ export default {
   },
   watch: {
     typeName(val) {
-      if (val === '门诊病历' && !this.formList.length && this.isSearch === '1') {
+      if (val === '门诊病历' && !this.formList.length) {
         this.getFormList()
       }
     }
   },
   methods: {
     handleForm(index, item) {
+      if (this.$parent.isPlatform && item.platform) {
+        this.confirmChange().finally(() => {
+          this.setForm(index, item)
+        })
+      } else {
+        this.setForm(index, item)
+      }
+    },
+    setForm(index, item) {
       this.curIndex = index
       this.id = item.id
       this.name = item.name
       this.$parent.name = item.name
-      if (item.name === '门急诊电子病历') {
-        this.$parent.caseId = this.id
-      }
+      this.$parent.jsonText = item.jsonText
+      this.$parent.isPlatform = this.isSearch === item.platform
+    },
+    // 切换保存
+    confirmChange() {
+      return this.$confirmFun('是否保存数据，否则当前数据会丢弃！', '保存', '', '已取消保存数据！')
+        .then(() => {
+          this.$nextTick(() => {
+            switch (this.name) {
+              case '门急诊电子病历':
+                this.$refs.ourPatient && this.$refs.ourPatient.handleSaveTable()
+                break
+            }
+          })
+        })
     },
     // 添加表单
     addRecord(name) {
@@ -117,7 +142,7 @@ export default {
       }
       const { data: res } = await this.$http.post('/case/save', params)
       if (res.code === 0) {
-        this.getFormList()
+        await this.getFormList()
       } else {
         this.$message.error(res.msg)
       }
@@ -141,7 +166,6 @@ export default {
       const { data: res } = await this.$http.get('/patient/view/getCases', {
         params: {
           patientId: this.patientId,
-          platform: this.isSearch,
           flag: 8
         }
       })
@@ -149,12 +173,10 @@ export default {
         this.formList = res.data || []
         if (this.formList.length) {
           const first = this.formList[0]
-          if (this.id === '') {
-            this.handleForm(0, first)
-          }
+          this.setForm(0, first)
         } else {
           if (this.isSearch === '1') {
-          this.addRecord('门急诊电子病历')
+            this.addRecord('门急诊电子病历')
           }
         }
       } else {

src/components/360View/medicalRecord/index.vue

@@ -2,7 +2,7 @@
   <div class="archives">
     <div class="archives-content">
       <div v-if="isSearch === '1' || isSearch === '3'" class="content-left">
-        <callMedical :type-name="typeName" :is-search="isSearch" :patient-id="patientId" :only-read="onlyRead" />
+        <callMedical :type-name="typeName" :is-platform="isPlatform" :is-search="isSearch" :patient-id="patientId" :only-read="onlyRead" />
       </div>
       <left-form-list
         v-if="isSearch === '2'"
@@ -10,6 +10,7 @@
         :patient-id="patientId"
         :is-search="isSearch"
         :only-read="onlyRead"
+        :is-platform="isPlatform"
         :form-list="formList"
         :cur-index="curIndex"
         @handleForm="handleForm"
@@ -17,52 +18,57 @@
         @addRecord="addRecord"
       />
       <div class="content-right">
-        <div v-if="name === '门急诊电子病历'" style="height: 100%">
+        <div style="height: 100%">
           <ourPatientRecord
             v-if="name === '门急诊电子病历'"
             ref="ourPatient"
             :patient-id="patientId"
+            :is-platform="isPlatform"
             :only-read="onlyRead"
             :is-search="isSearch"
             :case-id="caseId"
           />
+          <InformedConsent
+            v-if="name==='眼科激光手术患者知情同意书'"
+            ref="informedConsent"
+            :only-read="onlyRead"
+            :is-platform="isPlatform"
+            :patient-detail="patientData"
+            :json-text="jsonText"
+            @handleSaveTable="updateForm"
+            @formDelete="formDelete"
+          />
+          <mra-form
+            v-if="name==='眼底血管造影知情同意书'"
+            ref="mraForm"
+            :only-read="onlyRead"
+            :is-platform="isPlatform"
+            :patient-detail="patientData"
+            :json-text="jsonText"
+            @handleSaveTable="updateForm"
+            @formDelete="formDelete"
+          />
+          <laser-surgery
+            v-if="name==='眼科激光手术治疗'"
+            ref="laserSurgery"
+            :only-read="onlyRead"
+            :is-platform="isPlatform"
+            :patient-detail="patientData"
+            :json-text="jsonText"
+            @handleSaveTable="updateForm"
+            @formDelete="formDelete"
+          />
+          <report-form
+            v-if="name==='报告'"
+            ref="reportForm"
+            :only-read="onlyRead"
+            :is-platform="isPlatform"
+            :patient-detail="patientData"
+            :json-text="jsonText"
+            @handleSaveTable="updateForm"
+            @formDelete="formDelete"
+          />
         </div>
-        <template v-else>
-          <div v-if="formList.length && isSearch === '2'" style="height: 100%">
-            <InformedConsent
-              v-if="name==='眼科激光手术患者知情同意书'"
-              ref="informedConsent"
-              :patient-detail="patientData"
-              :json-text="jsonText"
-              @handleSaveTable="updateForm"
-              @formDelete="formDelete"
-            />
-            <mra-form
-              v-if="name==='眼底血管造影知情同意书'"
-              ref="mraForm"
-              :patient-detail="patientData"
-              :json-text="jsonText"
-              @handleSaveTable="updateForm"
-              @formDelete="formDelete"
-            />
-            <laser-surgery
-              v-if="name==='眼科激光手术治疗'"
-              ref="laserSurgery"
-              :patient-detail="patientData"
-              :json-text="jsonText"
-              @handleSaveTable="updateForm"
-              @formDelete="formDelete"
-            />
-            <report-form
-              v-if="name==='报告'"
-              ref="reportForm"
-              :patient-detail="patientData"
-              :json-text="jsonText"
-              @handleSaveTable="updateForm"
-              @formDelete="formDelete"
-            />
-          </div>
-        </template>
         <div v-if="!formList.length" style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
           <img src="@/assets/img/nodata.png" alt="">
         </div>
@@ -118,6 +124,7 @@ export default {
       id: '',
       name: '',
       caseId: '',
+      isPlatform: true,
       curIndex: 0,
       formList: [],
       defaultChecked: [],
@@ -127,9 +134,9 @@ export default {
     }
   },
   created() {
+    this.getPatientData()
     if (this.isSearch === '2') {
       this.getFormList()
-      this.getPatientData()
     }
   },
   methods: {
@@ -138,13 +145,14 @@ export default {
       if (this.curIndex === index) {
         return
       }
-      // 360视图不用保存
-      if (this.onlyRead) {
+      // 360视图和非本平台表单不用保存
+      if (this.onlyRead || !this.isPlatform) {
         this.curIndex = index
         this.id = item.id
         this.name = item.name
         this.caseId = item.id
         this.jsonText = item.jsonText
+        this.isPlatform = this.isSearch === item.platform
         return
       }
       this.confirmChange().finally(() => {
@@ -153,6 +161,7 @@ export default {
         this.name = item.name
         this.caseId = item.id
         this.jsonText = item.jsonText
+        this.isPlatform = this.isSearch === item.platform
       })
     },
     // 切换保存
@@ -254,7 +263,7 @@ export default {
       const { data: res } = await this.$http.get('/patient/view/getCases', {
         params: {
           patientId: this.patientId,
-          platform: this.isSearch,
+          // platform: this.isSearch,
           flag: 8
         }
       })
@@ -264,8 +273,9 @@ export default {
           if (mode) return
           this.name = this.formList[0].name
           this.id = this.formList[0].id
-          this.curIndex = this.formList.findIndex(item => item.id === this.id)
-          this.jsonText = this.formList[this.curIndex].jsonText
+          this.curIndex = 0
+          this.jsonText = this.formList[0].jsonText
+          this.isPlatform = this.isSearch === this.formList[0].platform
         } else {
           this.name = ''
         }

src/components/360View/medicalRecord/outPatientRecord/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="recordContainer">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="printAll" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button v-if="comonFormActive === '2' || comonFormActive === '3'" type="primary" size="small" @click="handleTemplate">保存为模板</el-button>
@@ -71,6 +71,10 @@ export default {
       type: String,
       default: ''
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     onlyRead: {
       type: Boolean,
       default: false

src/components/360View/opticalFile/index.vue

@@ -52,19 +52,21 @@
           ref="eyesVis"
           :case-id="id"
           :only-read="onlyRead"
+          :is-platform="isPlatform"
           :patient-id="patientId"
           @del="deleteForm"
         />
-        <optometryForm v-if="name === '验光报告单'" ref="optome" :case-id="id" :only-read="onlyRead" :patient-id="patientId" :is-search="isSearch" @del="deleteForm" />
+        <optometryForm v-if="name === '验光报告单'" ref="optome" :case-id="id" :is-platform="isPlatform" :only-read="onlyRead" :patient-id="patientId" :is-search="isSearch" @del="deleteForm" />
         <threeVision
           v-if="name === '三级视功能检查报告单'"
           ref="threeVis"
           :only-read="onlyRead"
+          :is-platform="isPlatform"
           :case-id="id"
           :patient-id="patientId"
           @del="deleteForm"
         />
-        <deveopmentFile v-if="name === '屈光发育档案'" ref="deveope" :case-id="id" :only-read="onlyRead" :patient-id="patientId" :is-search="isSearch" :form-content="deveopData" @del="deleteForm" />
+        <deveopmentFile v-if="name === '屈光发育档案'" ref="deveope" :is-platform="isPlatform" :case-id="id" :only-read="onlyRead" :patient-id="patientId" :is-search="isSearch" :form-content="deveopData" @del="deleteForm" />
       </div>
     </div>
   </div>
@@ -107,6 +109,7 @@ export default {
     return {
       id: '',
       name: '',
+      isPlatform: true,
       defaultChecked: [],
       curIndex: 0,
       formList: [],
@@ -118,7 +121,7 @@ export default {
     }
   },
   mounted() {
-    this.getFormList(1)
+    this.getFormList()
   },
   methods: {
     handleForm(index, item) {
@@ -126,17 +129,19 @@ export default {
       if (this.curIndex === index) {
         return
       }
-      // 360视图不用保存
-      if (this.onlyRead) {
+      // 360视图和非本平台表单不用保存
+      if (this.onlyRead || !this.isPlatform) {
         this.curIndex = index
         this.id = item.id
         this.name = item.name
+        this.isPlatform = this.isSearch === item.platform
         return
       }
       this.confirmChange().finally(() => {
         this.curIndex = index
         this.id = item.id
         this.name = item.name
+        this.isPlatform = this.isSearch === item.platform
       })
     },
     confirmChange() {
@@ -179,7 +184,7 @@ export default {
       const { data: res } = await this.$http.post('/case/save', params)
       if (res.code === 0) {
         this.$message.success('保存成功')
-        this.getFormList(1)
+        await this.getFormList()
       } else {
         this.$message.error(res.msg)
       }
@@ -192,31 +197,30 @@ export default {
         const { data: res } = await this.$http.post('/case/delete', params)
         if (res.code === 0) {
           this.$message.success('删除成功')
-          this.getFormList(1)
+          await this.getFormList()
         } else {
           this.$message.error(res.msg)
         }
       })
     },
-    async getFormList(type) {
+    async getFormList() {
       const { data: res } = await this.$http.get('/patient/view/getCases', {
         params: {
           patientId: this.patientId,
-          platform: this.isSearch,
           flag: 6
         }
       })
       if (res.code === 0) {
         this.formList = res.data || []
-        if (this.name === '') {
-          this.id = this.formList.length ? this.formList[0].id : ''
-          this.name = this.formList.length ? this.formList[0].name : ''
-        }
-        if (type && type === 1) {
+        if (this.formList.length) {
           this.curIndex = 0
-          this.id = this.formList.length ? this.formList[0].id : ''
-          this.name = this.formList.length ? this.formList[0].name : ''
+          this.id = this.formList[0].id
+          this.name = this.formList[0].name
+          this.isPlatform = this.isSearch === this.formList[0].platform
           this.handleForm(this.curIndex, { name: this.name, id: this.id })
+        } else {
+          this.id = ''
+          this.name = ''
         }
       } else {
         this.$message.error(res.msg)

src/components/360View/routine/index.vue

@@ -32,7 +32,7 @@
       <div class="lineBox">
         <el-checkbox v-model="checkedShiLi">视力</el-checkbox>
         <div style="display: flex">
-          <echarts-yanya
+          <echarts-shili
             :id-name="'indicators-shili'"
             :chart-data="routineData.shili"
             class="scroll-echearts"
@@ -105,28 +105,37 @@
           <el-table-column
             prop="examTime"
             label="时间"
-            width="180"
+            width="200"
           />
           <el-table-column
             prop="eyeType"
             label="眼别"
-            width="180"
+            align="center"
           />
           <el-table-column
             prop="odSph"
             label="球镜 DS"
+            align="center"
           />
           <el-table-column
             prop="odCyl"
             label="柱镜 DC"
+            align="center"
           />
           <el-table-column
             prop="odAx"
             label="轴位 Axis"
+            align="center"
+          />
+          <el-table-column
+            prop="odVa"
+            label="矫正视力(VA)"
+            align="center"
           />
           <el-table-column
-            prop="odSe"
-            label="等效球镜"
+            prop="odAdd"
+            label="下加光(ADD)"
+            align="center"
           />
         </el-table>
       </div>
@@ -145,28 +154,37 @@
           <el-table-column
             prop="examTime"
             label="时间"
-            width="180"
+            width="200"
           />
           <el-table-column
             prop="eyeType"
             label="眼别"
-            width="180"
+            align="center"
           />
           <el-table-column
             prop="odSph"
             label="球镜 DS"
+            align="center"
           />
           <el-table-column
             prop="odCyl"
             label="柱镜 DC"
+            align="center"
           />
           <el-table-column
             prop="odAx"
             label="轴位 Axis"
+            align="center"
           />
           <el-table-column
             prop="odVa"
             label="矫正视力VA"
+            align="center"
+          />
+          <el-table-column
+            prop="odAdd"
+            label="下加光(ADD)"
+            align="center"
           />
         </el-table>
       </div>
@@ -176,9 +194,11 @@
 <script>
 import eventBus from '@/page-subspecialty/utils/eventBus'
 import echartsYanya from '@/components/echarts/yanya'
+import echartsShili from '@/components/echarts/shili copy'
 const Base64 = require('js-base64').Base64
 export default {
   components: {
+    echartsShili,
     echartsYanya
   },
   mixins: [],
@@ -246,7 +266,6 @@ export default {
       const { data: res } = await this.$http.get('/patient/view/getVaAndIopAndRefAndLast', {
         params: {
           patientId: this.patientId,
-          // patientId: '2328656',
           date: ''
         }
       })
@@ -311,16 +330,6 @@ export default {
         this.$refs.tableZJ.clearSelection()
       }
     },
-    setResult(data) {
-      switch (data) {
-        case '10':
-          return '正常'
-        case '20':
-          return '色盲'
-        case '30':
-          return '色弱'
-      }
-    },
     // 添加数据集
     addDataList() {
       let dataArray = []

src/components/echarts/shili copy.vue

@@ -119,7 +119,7 @@ export default {
         title: {
           text: this.title,
           textStyle: {
-            color: '#ffffff'
+            color: '#fffcfc'
           },
           left: 10
         },
@@ -141,17 +141,29 @@ export default {
 
             dateDataList.forEach(item => {
               result += `<p>-------------------------------------</p>
-            ${item.examType}，时间：${formatDate(item.examTime, 'hh:mm:ss')}<br/>`
-              if (item.odVans || item.osVans) {
+              时间：${formatDate(item.examTime, 'hh:mm:ss')}<br/>`
+              if (item.odVan || item.osVan) {
                 result += `
-              ${params[0].marker}裸眼OD：${item.odVans}
-              ${params[1].marker}裸眼OS：${item.osVans}`
+                ${params[0].marker}裸眼OD：${item.odVan}
+                ${params[1].marker}裸眼OS：${item.osVan}`
               }
-              if (item.odVags || item.osVags) {
+              if (item.odVag || item.osVag) {
                 result += `
-              ${params[2].marker}矫正OD：${item.odVags}
-              ${params[3].marker}矫正OS：${item.osVags}`
+                ${params[2].marker}矫正OD：${item.odVag}
+                ${params[3].marker}矫正OS：${item.osVag}`
               }
+            //   result += `<p>-------------------------------------</p>
+            // ${item.examType}，时间：${formatDate(item.examTime, 'hh:mm:ss')}<br/>`
+            //   if (item.odVans || item.osVans) {
+            //     result += `
+            //   ${params[0].marker}裸眼OD：${item.odVans}
+            //   ${params[1].marker}裸眼OS：${item.osVans}`
+            //   }
+            //   if (item.odVags || item.osVags) {
+            //     result += `
+            //   ${params[2].marker}矫正OD：${item.odVags}
+            //   ${params[3].marker}矫正OS：${item.osVags}`
+            //   }
             })
             return result
           }
@@ -160,7 +172,7 @@ export default {
           data: legendData,
           icon: 'pin',
           textStyle: {
-            color: '#ffffff'
+            color: '#000000'
           },
           right: 30
         },

src/components/echarts/yanya.vue

@@ -51,9 +51,9 @@ export default {
         this.disabled = false
         this.chartData.forEach(item => {
           this.date.push(moment(item.examTime).format('l'))
-          this.typeList.OD.push([item.examTime, item.odVan])
+          this.typeList.OD.push([item.examTime, item.odIop])
           this.legendData[0] = 'OD'
-          this.typeList.OS.push([item.examTime, item.osVan])
+          this.typeList.OS.push([item.examTime, item.osIop])
           this.legendData[1] = 'OS'
           // if (item.type === 'OD') {
           //   this.typeList.OD.push([item.date, item.value])
@@ -106,7 +106,7 @@ export default {
       // 基于准备好的dom，初始化echarts实例
       yanya.setOption({
         title: {
-          text: '',
+          text: this.desc,
           textStyle: {
             'color': '#000000'
           },

src/page-subspecialty/views/main-sidebar.vue

@@ -53,8 +53,8 @@ export default {
     }
   },
   created() {
-    const defauleActiveIndex = window.sessionStorage.getItem('defauleActiveIndex')
-      ? window.sessionStorage.getItem('defauleActiveIndex') : window.SITE_CONFIG.menuList[0].children[0].id
+    const defauleActiveIndex = window.localStorage.getItem('defauleActiveIndex')
+      ? window.localStorage.getItem('defauleActiveIndex') : window.SITE_CONFIG.menuList[0].children[0].id
     setTimeout(() => {
       this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     }, 200)

src/page-subspecialty/views/modules/formList/InformedConsent.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#threeFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
@@ -126,6 +126,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     patientDetail: {
       type: Object
     }

src/page-subspecialty/views/modules/formList/laserSurgery.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#laserFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
@@ -123,6 +123,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     patientDetail: {
       type: Object
     }

src/page-subspecialty/views/modules/formList/mraForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#mraFunc'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
@@ -58,6 +58,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     patientDetail: {
       type: Object
     }

src/page-subspecialty/views/modules/formList/reportForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead" class="btnBox">
+    <div v-if="!onlyRead && isPlatform" class="btnBox">
       <el-button v-print="'#reportForm'" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
       <el-button type="danger" size="small" @click="formDelete">删除</el-button>
@@ -66,6 +66,10 @@ export default {
       type: Boolean,
       default: false
     },
+    isPlatform: {
+      type: Boolean,
+      default: true
+    },
     patientDetail: {
       type: Object
     }

src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue

@@ -93,7 +93,7 @@
           <el-table-column prop="operation" label="操作" header-align="center" align="center" width="170">
             <template slot-scope="scope">
               <span
-                v-if="scope.row.patientStatus === '300'"
+                v-if="scope.row.patientStatus >= '300'"
                 style="color: #1890ff; padding-right: 8px"
                 class="operation-details"
                 @click="handleCall(scope.row,'1')"
@@ -296,7 +296,6 @@ export default {
     },
     // 查看详情
     showDetail(scopeRow, index) {
-      console.log(scopeRow)
       const list = []
       const project = scopeRow.zlProjectList
       if (project.length) {

src/page-subspecialty/views/modules/systemManagement/team/index.vue

@@ -49,7 +49,7 @@
         <!-- <el-table-column prop="patientNum" label="患者数量" header-align="center" align="center" /> -->
         <el-table-column prop="operation" label="操作" header-align="center" align="center">
           <template slot-scope="scope">
-            <span v-show="qgUserData.employeeId !== scope.row.employeeId" style="color: #1890ff; padding-right: 8px" class="details" @click="addOrUpdateHandle(scope.row.id,scope.row)">编辑</span>
+            <span v-show="qgUserData.employeeId === scope.row.employeeId" style="color: #1890ff; padding-right: 8px" class="details" @click="addOrUpdateHandle(scope.row.id,scope.row)">编辑</span>
             <span style="color: #1890ff; padding-right: 8px" class="details" @click="editPasswordHandle(scope.row.id,scope.row)">修改密码</span>
             <span v-show="qgUserData.realName !== scope.row.realName" style="color: #ff4d4f;" class="delete" @click="deleteHandle([scope.row.id])">删除</span>
           </template>