Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

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

@@ -58,7 +58,15 @@
         </div>
       </div>
       <div>
-        在向患方说明各治疗方案并告知利弊后，患方基于当前病情需要，经慎重考虑，自愿选择 <el-input v-model="confirmData.treatOperate" style="width: 200px" /> 手术。
+        在向患方说明各治疗方案并告知利弊后，患方基于当前病情需要，经慎重考虑，自愿选择
+        <el-select v-model="confirmData.treatOperate" style="width: 200px" clearable placeholder="">
+          <el-option
+            v-for="item in types"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>手术。
       </div>
       <div class="flex strongTitle">
         患者知情选择：
@@ -160,22 +168,22 @@ export default {
     return {
       types: [
         {
-          label: '麦粒肿',
+          label: '麦粒肿切除术',
           value: 1,
           id: '11'
         },
         {
-          label: '霰粒肿',
+          label: '霰粒肿切除术',
           value: 2,
           id: '22'
         },
         {
-          label: '肉芽肿',
+          label: '肉芽肿切除术',
           value: 3,
           id: '33'
         },
         {
-          label: '眼睑肿物',
+          label: '眼睑肿物切除术',
           value: 4,
           id: '44'
         }

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

@@ -44,9 +44,20 @@
           </tr>
           <tr>
             <td colspan="2">
-              <div class="flex">
+              <div class="flex a-c j-b">
+                <div>
                   操作者：<img v-if="confirmData.operator" :src="confirmData.operator" alt="" style="width: 80px;height: 50px;border-style:none;">
                 </div>
+                <div class="flex a-c" style="margin-left: 15px">
+                  日期：<el-date-picker
+                    v-model="confirmData.operateDate"
+                    style="flex: 1"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  />
+                </div>
+              </div>
             </td>
           </tr>
         </tbody>
@@ -85,7 +96,8 @@ export default {
         patientName: '',
         remark: '',
         operator: '',
-        idList: []
+        idList: [],
+        operateDate: ''
       },
       formData: {
         patientName: '',
@@ -186,7 +198,6 @@ export default {
     // 保存
     handleSaveTable() {
       this.confirmData.fmwOd = this.handleFormEye(this.formData.form.OD).join('/')
-      console.log(this.handleFormEye(this.formData.form.OD))
       this.confirmData.fmwOs = this.handleFormEye(this.formData.form.OS).join('/')
       this.confirmData.jzNumber = window.sessionStorage.getItem('jzNumber')
       this.$http.post('/mzbl/saveMzblBg', {
@@ -212,6 +223,7 @@ export default {
           this.confirmData.patientName = this.patientDetail.patientName
           const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
           this.confirmData.operator = userData.signImgBase
+          this.confirmData.operateDate = this.$moment().format('YYYY-MM-DD')
         }
       })
     },
@@ -275,6 +287,12 @@ export default {
 .flex{
   display: flex;
 }
+.a-c{
+  align-items: center;
+}
+.j-b{
+  justify-content: space-between;
+}
 .treatAction{
   width: 100%;
   margin-top: 10px;

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue

@@ -4,7 +4,7 @@
       <div class="content-top">
         <div v-for="(item, index) in formList" :key="index" class="formBox" :class="[index === curIndex ? 'active' : '']" @click="handleForm(index, item)">
           <div style="display: flex;padding: 2px 0">
-            <p :class="[index === curIndex ? 'activeFont' : 'curFont']">{{ item.createDate }}</p>
+            <p :class="[index === curIndex ? 'activeFont' : 'curFont']">{{ item.checkDate }}</p>
             <i v-if="index === curIndex" style="margin-top: 5px;color: rgb(199,5,5);margin-left: 12px" class="el-icon-delete" @click="deleteForm(item.caseId)" />
           </div>
         </div>
@@ -14,7 +14,7 @@
         <div class="commonForm-text">
           <span>常用表单</span>
           <span class="line" />
-<!--          <el-checkbox v-model="defaultChecked">默认新建今日</el-checkbox>-->
+          <!--          <el-checkbox v-model="defaultChecked">默认新建今日</el-checkbox>-->
         </div>
         <div class="record">
           <p>角膜塑形镜复查单</p>
@@ -23,16 +23,16 @@
       </div>
     </div>
     <div class="reviewRight">
-      <corneal-review v-if="formList.length" :case-id="caseId" :patient-id="patientId"/>
+      <corneal-review v-if="formList.length" :case-id="caseId" :patient-id="patientId" />
     </div>
-<!--    <el-tabs v-model="activeName">-->
-<!--      <el-tab-pane label="复查情况" name="first">-->
-<!--&lt;!&ndash;        <review-situation :patient-id="patientId" />&ndash;&gt;-->
-<!--      </el-tab-pane>-->
-<!--      <el-tab-pane label="角膜塑形镜复查单" name="second">-->
-<!--        <corneal-review :patient-id="patientId" />-->
-<!--      </el-tab-pane>-->
-<!--    </el-tabs>-->
+    <!--    <el-tabs v-model="activeName">-->
+    <!--      <el-tab-pane label="复查情况" name="first">-->
+    <!--&lt;!&ndash;        <review-situation :patient-id="patientId" />&ndash;&gt;-->
+    <!--      </el-tab-pane>-->
+    <!--      <el-tab-pane label="角膜塑形镜复查单" name="second">-->
+    <!--        <corneal-review :patient-id="patientId" />-->
+    <!--      </el-tab-pane>-->
+    <!--    </el-tabs>-->
   </div>
 </template>
 <script>