From 0736f9c48566ecfe0a9d52242d654cfc912e745c Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 3 Jul 2023 14:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E9=95=9C=E7=AD=BE=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BB=A5=E5=8F=8Aok=E9=95=9C=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |   4 +-
 .../views/modules/formList/Lacrimal.vue       |   8 +-
 .../reservation/schedule/addPatientOrder.vue  |  19 +--
 .../reservation/schedule/doctor-schedule.vue  |  25 ++-
 .../reservation/subList/index.vue             |  17 +-
 .../optometryManagement/cornea/index.vue      | 114 ++++++++++++-
 .../seeDoctor/CornealReview.vue               |  13 +-
 .../optometryManagement/seeDoctor/index.vue   |  26 +--
 .../seeDoctor/ok-lens-rgp/index.vue           |  33 +++-
 .../seeDoctor/ok-lens-rgp/left-right-eye.vue  |   2 +-
 .../removeLens-returnGoods-or-update.vue      |  42 ++---
 .../seeDoctor/ok-lens-rgp/reviewSum.vue       | 151 ++++++++++++++++++
 12 files changed, 373 insertions(+), 81 deletions(-)
 create mode 100644 src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/reviewSum.vue

diff --git a/public/index.html b/public/index.html
index e24ae46..47688a7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -53,8 +53,8 @@
   <!-- 生产环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
     <script>
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://10.80.5.32:8031/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://10.80.5.32:8031/xiangan-crf';
     </script>
   <% } %>
 </head>
diff --git a/src/page-subspecialty/views/modules/formList/Lacrimal.vue b/src/page-subspecialty/views/modules/formList/Lacrimal.vue
index c855a2e..0d21e52 100644
--- a/src/page-subspecialty/views/modules/formList/Lacrimal.vue
+++ b/src/page-subspecialty/views/modules/formList/Lacrimal.vue
@@ -51,7 +51,7 @@
                 />
               </el-select>
               <span class="text">液体，</span>
-              <el-input v-model="confirmData.odSecretion" style="width: 100px" /><span class="text">分泌物。</span>
+              <el-input v-model="confirmData.odSecretion" style="flex: 1" /><span class="text">分泌物。</span>
             </div>
             <div class="flex" style="flex-wrap: wrap;margin-top: 15px">
               <el-select v-model="confirmData.odPunctum2" filterable allow-create style="width: 100px" clearable placeholder="">
@@ -90,7 +90,7 @@
                 />
               </el-select>
               <span class="text">液体，</span>
-              <el-input v-model="confirmData.odSecretion2" style="width: 100px" /><span class="text">分泌物。</span>
+              <el-input v-model="confirmData.odSecretion2" style="flex: 1" /><span class="text">分泌物。</span>
             </div>
           </div>
         </div>
@@ -134,7 +134,7 @@
                 />
               </el-select>
               <span class="text">液体，</span>
-              <el-input v-model="confirmData.osSecretion" style="width: 100px" /><span class="text">分泌物。</span>
+              <el-input v-model="confirmData.osSecretion" style="flex: 1" /><span class="text">分泌物。</span>
             </div>
             <div class="flex" style="flex-wrap: wrap;margin-top: 15px">
               <el-select v-model="confirmData.osPunctum2" filterable allow-create style="width: 100px" clearable placeholder="">
@@ -173,7 +173,7 @@
                 />
               </el-select>
               <span class="text">液体，</span>
-              <el-input v-model="confirmData.osSecretion2" style="width: 100px" /><span class="text">分泌物。</span>
+              <el-input v-model="confirmData.osSecretion2" style="flex: 1" /><span class="text">分泌物。</span>
             </div>
           </div>
         </div>
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
index d255cf3..da683cf 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -97,7 +97,7 @@
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="goFormList">表单</el-button>
+      <!--      <el-button size="small" @click="goFormList">表单</el-button>-->
       <el-button type="primary" size="small" @click="handleSave">保存</el-button>
       <el-button size="small" @click="closeDialog">关闭</el-button>
     </span>
@@ -286,23 +286,6 @@ export default {
     // 关闭弹框
     closeDialog() {
       this.$emit('closeDialog')
-    },
-    goFormList() {
-      this.handleSave()
-      if (this.patientInfo) {
-        const { href } = this.$router.resolve({
-          path: '/360view',
-          query: {
-            onlyRead: false,
-            isSearch: '2',
-            patientId: this.patientInfo.patientId,
-            jzNumber: this.patientInfo.jzNumber
-          }
-        })
-        window.open(href, '_blank')
-      } else {
-        this.$message.info('请选择患者')
-      }
     }
   }
 }
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
index 87536cf..ff8238f 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
@@ -76,14 +76,20 @@
                     class="yue-man"
                   >
                     <p>约满</p>
-                    <p>{{ weekInfoItem.morning.orderNum }} / {{ weekInfoItem.morning.maxNumber }}</p>
+                    <p>
+                      <span style="font-size: 18px">{{ weekInfoItem.morning.orderNum }}</span> /
+                      <span :class="{grayfont: !item.needLimit}">{{ weekInfoItem.morning.maxNumber }}</span>
+                    </p>
                   </div>
                   <div
                     v-show="weekInfoItem.morningOpen && (weekInfoItem.morning.maxNumber > weekInfoItem.morning.orderNum) "
                     :class="index%2===0?'yi-yue':'yi-yue2'"
                   >
                     <p>已约</p>
-                    <p>{{ weekInfoItem.morning.orderNum }} / {{ weekInfoItem.morning.maxNumber }}</p>
+                    <p>
+                      <span style="font-size: 18px">{{ weekInfoItem.morning.orderNum }}</span> /
+                      <span :class="{grayfont: !item.needLimit}">{{ weekInfoItem.morning.maxNumber }}</span>
+                    </p>
                   </div>
                   <div
                     v-show="currentIndex===index && currentWeekIndex===weekInfoIndex && mouseMoveIsShow && showMorningAfterText==='morning'"
@@ -118,14 +124,20 @@
                     class="yue-man"
                   >
                     <p>约满</p>
-                    <p>{{ weekInfoItem.after.orderNum }} / {{ weekInfoItem.after.maxNumber }}</p>
+                    <p>
+                      <span style="font-size: 18px">{{ weekInfoItem.after.orderNum }}</span> /
+                      <span :class="{grayfont: !item.needLimit}">{{ weekInfoItem.after.maxNumber }}</span>
+                    </p>
                   </div>
                   <div
                     v-show="weekInfoItem.afterOpen && (weekInfoItem.after.maxNumber > weekInfoItem.after.orderNum) "
                     :class="index%2===0?'yi-yue':'yi-yue2'"
                   >
                     <p>已约</p>
-                    <p>{{ weekInfoItem.after.orderNum }} / {{ weekInfoItem.after.maxNumber }}</p>
+                    <p>
+                      <span style="font-size: 18px">{{ weekInfoItem.after.orderNum }}</span> /
+                      <span :class="{grayfont: !item.needLimit}">{{ weekInfoItem.after.maxNumber }}</span>
+                    </p>
                   </div>
                   <div
                     v-show="currentIndex===index && currentWeekIndex===weekInfoIndex && mouseMoveIsShow && showMorningAfterText==='after'"
@@ -328,7 +340,7 @@ export default {
 
     // 下个星期
     weekNext() {
-      const d = this.days[6]; // 如果当期日期是7号或者小于7号
+      const d = this.days[6]; // 如果当期日期是7号或者小于7
       d.setDate(d.getDate() + 7);
       this.initData(d);
       this.newDate = dateFilterTwo(this.days[0])
@@ -396,6 +408,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.grayfont{
+  color: #C0C4CC;
+}
 .doctor-schedule {
   font-size: 14px;
   margin-top: 15px;
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
index 65bea98..2574670 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -165,8 +165,9 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" class-name="hidden" header-align="center" align="center" width="200px">
+            <el-table-column label="操作" class-name="hidden" header-align="center" align="center" width="210px">
               <template slot-scope="scope">
+                <span class="call" @click="goFormList(scope.row)">表单</span>
                 <span class="call" @click="editOpera(scope.row)">{{ scope.row.appointDate ? "改约":"预约" }}</span>
                 <span class="cancel" @click="cancelClick(scope.row)">取消</span>
                 <span class="call" @click="checkPatientDetail(scope.row)">患者360</span>
@@ -332,7 +333,7 @@ export default {
       curIndex2: 0,
       curIndex3: 0,
       projects: [],
-      curProject: '',
+      curProject: null,
       selectedProjects: [],
       patientList: [],
       // 用一个字符串来保存当前双击的是哪一个单元格
@@ -474,6 +475,18 @@ export default {
         this.$refs.addPatientOrder.init()
       })
     },
+    goFormList(scopeRow) {
+      const { href } = this.$router.resolve({
+        path: '/360view',
+        query: {
+          onlyRead: false,
+          isSearch: '2',
+          patientId: scopeRow.patientId,
+          jzNumber: scopeRow.jzNumber
+        }
+      })
+      window.open(href, '_blank')
+    },
     // 取消预约
     cancelClick(scopeRow) {
       this.$confirmFun('确定要取消此患者预约吗？').then(async() => {
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
index 4e9bb3b..16ee04b 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
@@ -30,7 +30,10 @@
             </el-form-item>
           </el-form>
         </div>
-        <div style="display: flex;justify-content: flex-end;background-color: white;padding: 16px 16px 0">
+        <div style="display: flex;justify-content: space-between;background-color: white;padding: 16px 16px 0">
+          <div>
+            <el-button v-for="(item,index) in typeList" :key="index" :class="[curIndex === index ? 'active' : '']" style="margin-left: 0" size="small" color="white" @click="handleType(item.value, index)">{{ item.label }}</el-button>
+          </div>
           <div>
             <el-button type="primary" size="small" @click="HISHandle">
               <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />
@@ -48,12 +51,53 @@
           >
             <el-table-column prop="patientId" label="登记号 " header-align="center" align="center" />
             <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" />
+            <el-table-column prop="brand" label="品牌" header-align="center" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.brandEyeTypeList && scope.row.brandEyeTypeList.length">
+                  <span class="odType">{{ scope.row.brandEyeTypeList[0]. brand }}</span>/
+                  <span class="osType">{{ scope.row.brandEyeTypeList[1].brand }}</span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="eyeType" label="眼别" header-align="center" align="center">
+              <template slot-scope="scope">
+                <div v-if="scope.row.brandEyeTypeList && scope.row.brandEyeTypeList.length">
+                  <span class="odType">{{ scope.row.brandEyeTypeList[0].eyeType }}</span>/
+                  <span class="osType">{{ scope.row.brandEyeTypeList[1].eyeType }}</span>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column prop="patientSex" label="患者性别" header-align="center" align="center" />
+            <el-table-column prop="djTime" label="戴镜时间" header-align="center" align="center" />
             <el-table-column label="出生日期" header-align="center" align="center">
               <template slot-scope="scope">
                 {{ scope.row.patientBirthday ? $options.filters.dateFilterTwo( scope.row.patientBirthday): '- ' }}
               </template>
             </el-table-column>
+            <el-table-column prop="doctor" label="负责医生" header-align="center" align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.doctorName" class="eyeType" placeholder="" size="small" @change="value=>changeDoctor(value,scope.row,1)">
+                  <el-option
+                    v-for="item in doctorList"
+                    :key="item.employeeId"
+                    :label="item.realName"
+                    :value="item.employeeId"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column prop="opDoctor" label="验配师" header-align="center" align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.ypName" class="eyeType" placeholder="" size="small" @change="value=>changeDoctor(value,scope.row)">
+                  <el-option
+                    v-for="item in doctorList"
+                    :key="item.employeeId"
+                    :label="item.realName"
+                    :value="item.employeeId"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column prop="operation" label="操作" header-align="center" align="center">
               <template slot-scope="scope">
                 <span
@@ -105,14 +149,32 @@ export default {
         // searchType: '0',
         patientName: '',
         patientStatus: '',
-        patientIdNumber: ''
+        patientIdNumber: '',
+        nextCheckFlag: ''
       },
       addGroupVisible: false,
       patientIdNumber: '',
-      detailId: ''
+      detailId: '',
+      curIndex: 0,
+      doctorList: [],
+      typeList: [
+        {
+          value: '',
+          label: '全部'
+        }, {
+          value: '1',
+          label: '待查'
+        }, {
+          value: '3',
+          label: '今日已诊'
+        }, {
+          value: '2',
+          label: '超时'
+        }]
     }
   },
   created() {
+    this.getDoctorList()
   },
   methods: {
     reFresh() {
@@ -130,6 +192,26 @@ export default {
         }
       })
     },
+    handleType(value, index) {
+      this.curIndex = index
+      this.dataForm.nextCheckFlag = value
+      this.getDataListInitial()
+    },
+    // 下拉选择医生
+    changeDoctor(value, scopeRow, type) {
+      const params = {}
+      params.id = scopeRow.id
+      // let ypCode = ''
+      // let doctorCode = ''
+      if (type) {
+        params.doctorCode = value
+      } else {
+        params.ypCode = value
+      }
+      this.$http.post('lenses/updateDoctorInfo', params).then(res => {
+        this.getDataList()
+      })
+    },
     // 日期改变时
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
@@ -142,11 +224,23 @@ export default {
       this.$nextTick(() => {
         this.$refs.HisAddRef.init()
       })
+    },
+    // 获取医师列表
+    getDoctorList(val) {
+      this.$http.get('/sys/user').then(res => {
+        this.doctorList = res.data.data
+      })
     }
   }
 }
 </script>
 <style lang="scss" scoped>
+.odType{
+  color: #409EFF;
+}
+.osType{
+  color: #67C23A;
+}
 .patient-info {
   width: 100%;
   height: 100%;
@@ -160,6 +254,15 @@ export default {
   .patient-info-content {
     padding: 16px;
     margin-bottom: 45px;
+    ::v-deep .el-input__suffix{
+      display: none;
+    }
+    ::v-deep .el-input__inner{
+      border: 0;
+      font-size: 16px;
+      text-align: center;
+      padding: 0;
+    }
   }
   .patient-info-head {
     margin-bottom: 16px;
@@ -222,5 +325,10 @@ export default {
     background: #0c1016;
     padding: 0;
   }
+  .active{
+    color: #3ea3f6;
+    background-color: #e0f2fd;
+    border-color: #3ea3f6;
+  }
 }
 </style>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
index b3889dc..030aa35 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
@@ -110,8 +110,16 @@
             </tr>
             <tr>
               <td>备注</td>
+              <td colspan="3">
+                <el-input v-model="formData.remark" :autosize="{ minRows: 1, maxRows: 3}" type="textarea" />
+              </td>
+              <td>复查时间</td>
               <td colspan="5">
-                <el-input v-model="formData.remark" autosize type="textarea" />
+                <el-date-picker
+                  v-model="formData.nextCheckDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                />
               </td>
             </tr>
             <tr>
@@ -393,7 +401,8 @@ export default {
         remark: '', // 备注
         vaOd: '', // 右眼视力
         vaOs: '', // 左眼视力
-        checkDate: '' // 检查日期
+        checkDate: '', // 检查日期
+        nextCheckDate: '' // 复查时间
       },
       formListValue: {
         checkSign: ''
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
index 1e3e191..4c2fdde 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
@@ -22,24 +22,30 @@
     <div class="see-docto-right">
       <el-tabs v-model="activeName" type="card" @tab-click="TabClick">
         <el-tab-pane label="告知书" name="noticeBook">
-          <notice-book :patient-id="patientId" />
+          <notice-book v-if="activeName==='noticeBook'" :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="首诊单" name="firstVisit">
-          <first-visit :patient-id="patientId" />
+          <first-visit v-if="activeName==='firstVisit'" :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="OK镜" name="okLens">
-          <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="okLens" />
+          <ok-lens-rgp v-if="activeName==='okLens'" ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="okLens" />
         </el-tab-pane>
         <el-tab-pane label="复查情况" name="review">
-          <review :patient-id="patientId" />
+          <review v-if="activeName==='review'" :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="历史档案" name="history">
-          <history-file :patient-id="patientId" />
+          <history-file v-if="activeName==='history'" :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="RGP" name="RGP">
-          <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="RGP" />
+          <ok-lens-rgp v-if="activeName==='RGP'" ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="RGP" />
         </el-tab-pane>
         <el-tab-pane label="离焦软镜" name="离焦软镜">
+          <ok-lens-rgp v-if="activeName==='离焦软镜'" ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="LJRJ" />
+        </el-tab-pane>
+        <el-tab-pane label="复查汇总" name="reviewSum">
+          <review-sum v-if="activeName==='reviewSum'" :patient-id="patientId" />
+        </el-tab-pane>
+        <el-tab-pane label="眼轴变化图" name="眼轴变化图">
           <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="LJRJ" />
         </el-tab-pane>
       </el-tabs>
@@ -48,17 +54,17 @@
 </template>
 <script>
 import firstVisit from './first-visit/index.vue' // 首诊单
-import okLens from './ok-lens/index.vue' // ok镜
 import noticeBook from './informBook' // 告知书
 import review from './review.vue' // 复查情况
 import historyFile from './historyRecord.vue' // 历史档案
-import okLensRgp from './ok-lens-rgp/index.vue' // ok镜
+import okLensRgp from './ok-lens-rgp/index.vue'
+import ReviewSum from '@/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/reviewSum.vue' // ok镜
 
 export default {
   components: {
+    ReviewSum,
     firstVisit,
     okLensRgp,
-    okLens,
     noticeBook,
     review,
     historyFile
@@ -128,7 +134,7 @@ export default {
     },
     // 获取患者信息
     async getPatientInfo() {
-      this.$http.get('/patient/getPatientInfo', {
+      this.$http.get('/patient/view/getPatientData', {
         params: {
           patientId: this.patientId
         }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue
index ad2ad85..158a904 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue
@@ -62,7 +62,7 @@
           {{ scope.row.dpDate ? $options.filters.dateFilterTwo( scope.row.dpDate): '- ' }}
         </template>
       </el-table-column>
-      <el-table-column v-if="tabTitle !=='LJRJ'" prop="content" :label="tabTitle==='okLens' ? '内容(眼别 品牌 曲率 度数 直径)' : '内容(眼别 品牌 基弧 度数 直径)'" width="240">
+      <el-table-column v-if="tabTitle !=='LJRJ'" prop="content" :label="tabTitle==='okLens' ? '内容(眼别 品牌 曲率 度数 直径)' : '内容(眼别 品牌 AC 度数 直径)'" width="240">
         <template slot-scope="scope">
           <div class="table-colum-content">
             <span v-show="scope.row.eyeType"><b :style="{'color':scope.row.eyeType==='OD' ? 'green': '#1E79FF'}">眼别：{{ scope.row.eyeType }}</b></span>
@@ -70,7 +70,7 @@
             <!-- flag 0 第一种国产品牌  flag 1 进口品牌    flag 0 第二种国产品牌 -->
             <!-- 根据不同的flag显示不同的内容 -->
             <span v-show="scope.row.curvity && (scope.row.flag=='0'||scope.row.flag=='2') && tabTitle==='okLens'">曲率：{{ scope.row.curvity }}</span>
-            <span v-show="scope.row.baseArc && (scope.row.flag=='0'||scope.row.flag=='2') && tabTitle==='RGP'">基弧：{{ scope.row.baseArc }}</span>
+            <span v-show="scope.row.baseArc && (scope.row.flag=='0'||scope.row.flag=='2') && tabTitle==='RGP'">AC：{{ scope.row.baseArc }}</span>
             <span v-show="scope.row.degrees && (scope.row.flag=='0'||scope.row.flag=='2')">度数：{{ scope.row.degrees }}</span>
             <span v-show="scope.row.degrees && scope.row.flag=='2'">AZT：{{ scope.row.azt }}</span>
             <span v-show="scope.row.bc && (scope.row.flag=='1' ||scope.row.flag=='2')">BC：{{ scope.row.bc }}</span>
@@ -179,14 +179,13 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-show="scope.row.status==3" command="退货">退货</el-dropdown-item>
                 <el-dropdown-item command="编辑">编辑</el-dropdown-item>
-                <el-dropdown-item v-if="$hasPermission('patientManagement:delete')" command="删除">删除</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <div v-show="scope.row.status==6 || scope.row.status==7 || scope.row.status==8 || scope.row.status==100 || tabTitle =='LJRJ'">
             <span v-show="scope.row.status==7 || scope.row.status==8 || tabTitle =='LJRJ'" class="operation-details" @click="addOrUpdateHandle(scope.row.id,scope.row,`编辑${scope.row.status===7 ? '补录' : (scope.row.status==8 ? '借片' : (tabTitle =='LJRJ' ? '离焦软镜' :''))}`)">编辑</span>
-            <template v-if="$hasPermission('patientManagement:delete')">
-              <span v-show="scope.row.status==6 || scope.row.status==7 || scope.row.status==8 || scope.row.status==100 || tabTitle =='LJRJ'" class="operation-details" @click="deleteHandle(scope.row.id)">删除</span>
+            <template>
+              <span v-show="scope.row.status==6 || scope.row.status==7 || scope.row.status==8 || scope.row.status==100 || tabTitle =='LJRJ'" class="operation-details" @click="deleteOrder(scope.row.id)">删除</span>
             </template>
           </div>
         </template>
@@ -284,15 +283,33 @@ export default {
         return ''
       }
     },
+    deleteOrder(id) {
+      this.$confirm(this.$t('prompt.info', { handle: this.$t('delete') }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http.delete('/dp', { params: { id }}).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.getDataList()
+            }
+          })
+        })
+      })
+    },
     // 点击菜单触发事件回调
     handleCommandDropdowm(id, scopeRow, e) {
-      console.log(id, scopeRow, e)
       if (e === '编辑') {
         this.addOrUpdateHandle(id, scopeRow, e)
       } else if (e === '退货') {
         this.removeLensReturnGoodsClick(id, scopeRow, e)
-      } else if (e === '删除') {
-        this.deleteHandle(id)
       }
     },
     // 到货-通知
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
index fe45730..87d229f 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
@@ -20,7 +20,7 @@
       <el-form-item v-if="tabTitle==='okLens' && tabTitle !== 'LJRJ'" label="曲 率:" label-width="95px" prop="curvity">
         <el-input v-model="dataForm.curvity" placeholder="请填写曲率" />
       </el-form-item>
-      <el-form-item v-if="tabTitle==='RGP' && tabTitle !== 'LJRJ'" label="基弧:" label-width="95px" prop="baseArc">
+      <el-form-item v-if="tabTitle==='RGP' && tabTitle !== 'LJRJ'" label="AC:" label-width="95px" prop="baseArc">
         <el-input v-model="dataForm.baseArc" placeholder="请填写基弧" />
       </el-form-item>
       <el-form-item label="度 数:" label-width="95px" prop="degrees">
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue
index a2ff747..3b65a30 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue
@@ -71,13 +71,12 @@
     <template v-if="dataForm.title=='取镜'">
       <div class="signFile">
         <span class="info-left">取镜签名：</span>
-        <div class="signFile-right" @click="signClick">
-          <el-button v-if="lensFlag" type="primary" icon="el-icon-edit" size="small">签名</el-button>
-          <span v-else class="sign-img">
-            <img style="width: 80px;height: 40px;" :src="lensSign">
-          </span>
-          <span />
-        </div>
+        <img
+          v-if="formListValue.lensSign"
+          style="width: 80px;height: 40px;"
+          :src="formListValue.lensSign"
+          @click="signClick('lensSign')"
+        >
       </div>
     </template>
     <template slot="footer">
@@ -89,7 +88,9 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import styeFormSign from '@/mixins/styeFormSign'
 export default {
+  mixins: [styeFormSign],
   props: {
     brandList: {
       type: Array,
@@ -110,6 +111,9 @@ export default {
         signFile: '',
         remark: ''
       },
+      formListValue: {
+        lensSign: ''
+      },
       ISCRTForm: false
     }
   },
@@ -129,19 +133,6 @@ export default {
         //   { required: true, validator: validataFactoryNumber, trigger: 'blur' }
         // ]
       }
-    },
-    lensFlag: {
-      get() {
-        return this.$store.getters.lensFlag
-      },
-      set(val) {}
-    },
-    lensSign: {
-      get() {
-        return this.$store.getters.lensSign
-      },
-      set(val) {
-      }
     }
   },
   methods: {
@@ -149,8 +140,8 @@ export default {
       this.visible = true
       if (this.dataForm.title !== '取镜记录') {
         this.$nextTick(() => {
-          this.$store.commit('lensSign', '')
-          this.$store.commit('lensFlag', true)
+          const user = JSON.parse(window.sessionStorage.getItem('qg-userData'))
+          this.formListValue.lensSign = user.signImgBase
           this.$refs.dataForm.resetFields() // 重置表单
         })
       }
@@ -172,13 +163,12 @@ export default {
         this.dataForm.remark = ''
       }
     },
-    signClick() {
-      // this.$parent.$parent.$parent.$parent.beginSign(2)
-      this.$store.commit('beginSign', 5)
+    signClick(text) {
+      this.initPlugin(text)
     },
     // 表单提交 320321188808123330    18888888888
     dataFormSubmitHandle: debounce(function() {
-      this.dataForm.signFile = this.$store.getters.lensSign
+      this.dataForm.signFile = this.formListValue.lensSign
       if (this.dataForm.title !== '取镜记录') {
         this.$refs.dataForm.validate((valid) => {
           if (!valid) {
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/reviewSum.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/reviewSum.vue
new file mode 100644
index 0000000..660f4ce
--- /dev/null
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/reviewSum.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="reviewSum">
+    <head-template>
+      <el-button v-print="'cornealPrint'" size="small">打印</el-button>
+    </head-template>
+    <div class="notice-content">
+      <div class="notice-box">
+        <div id="cornealPrint" class="notice_tip" style="page-break-after:always">
+          <table class="cornealTable">
+            <tr style="font-weight: bold">
+              <td style="width: 20%">日期</td>
+              <td>眼别</td>
+              <td>视力</td>
+              <td>眼轴</td>
+            </tr>
+            <template v-for="(item,index) in dataList">
+              <tr :key="index" :class="{success:index%2}">
+                <td rowspan="2">{{ item.date }}</td>
+                <td>OD</td>
+                <td>{{ item.visionOd }}</td>
+                <td>{{ item.eyeAxisOd }}</td>
+              </tr>
+              <tr :key="`_${index}`" :class="{success:index%2}">
+                <td>OS</td>
+                <td>{{ item.visionOs }}</td>
+                <td>{{ item.eyeAxisOs }}</td>
+              </tr>
+            </template>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import headTemplate from '@/components/head'
+export default {
+  name: 'ReviewSum',
+  components: {
+    headTemplate
+  },
+  props: ['patientId'],
+  data() {
+    return {
+      dataList: [
+        {
+          date: '2022-4-10',
+          visionOd: '2.0',
+          visionOs: '2.0',
+          eyeAxisOd: '2.0',
+          eyeAxisOs: 'asdf'
+        }, {
+          date: '2022-4-10',
+          visionOd: '2.0',
+          visionOs: '2.0',
+          eyeAxisOd: '2.0',
+          eyeAxisOs: 'asdf'
+        }, {
+          date: '2022-4-10',
+          visionOd: '2.0',
+          visionOs: '2.0',
+          eyeAxisOd: '2.0',
+          eyeAxisOs: 'asdf'
+        }, {
+          date: '2022-4-10',
+          visionOd: '2.0',
+          visionOs: '2.0',
+          eyeAxisOd: '2.0',
+          eyeAxisOs: 'asdf'
+        }, {
+          date: '2022-4-10',
+          visionOd: '2.0',
+          visionOs: '2.0',
+          eyeAxisOd: '2.0',
+          eyeAxisOs: 'asdf'
+        }
+      ]
+    }
+  },
+  created() {
+    this.queryReviewSum()
+  },
+  methods: {
+    queryReviewSum() {
+      this.$http.get('hospital/notice/getAllSecDiagInfoByPid', { params: {
+        patientld: this.patientId
+      }}).then(res => {
+        console.log(res)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.reviewSum{
+  height: 100%;
+}
+.notice-content{
+  width: 100%;
+  height: calc(100% - 50px);
+  flex:1;
+//overflow-y: auto;
+  .notice-box{
+    width: 100%;
+    height: 100%;
+  }
+
+  .notice_tip{
+    height: 100%;
+    overflow-y: auto;
+    border: 1px solid #000;
+    padding: 32px 32px;
+    margin-right: 16px;
+  }
+}
+.success{
+  background: rgba(64, 158, 255, 0.2);
+}
+.cornealTable{
+  width: 100%;
+  tr td{
+    border: 1px solid #ccc;
+    font-size: 18px;
+    padding: 5px 10px;
+    ::v-deep .el-input__inner {
+      border: none !important;
+      text-align: center;
+      border-radius: 0;
+      padding: 0;
+    }
+    ::v-deep .el-textarea__inner{
+      border: none;
+    }
+    .tdItem{
+      display: flex !important;
+      align-items: center;
+    }
+    .checkItem{
+      cursor: pointer;
+      user-select: none;
+      word-break: keep-all;
+      margin-right: 20px;
+    }
+    ::v-deep .el-icon-arrow-up{
+      display: none;
+    }
+  }
+}
+</style>