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

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

@@ -598,7 +598,7 @@
               </div>
               <div v-if="scope.row.name == '主观斜视角'">
                 <div class="width-180 center">
-                  <el-input v-model="dataForm.tssjcZgxsj1" placeholder="" />
+                  <el-input v-model="dataForm.tssjcZgxsj1" placeholder="" @change="handleZg" />
                 </div>
               </div>
               <div v-if="scope.row.name == '客观斜视角'">
@@ -676,6 +676,7 @@
                 <div class="width-180 center">
                   <el-input v-model="dataForm.tssjcZgxsj2" placeholder="">
                     <template slot="prepend">AC/A:</template>
+                    <template slot="append">△/D</template>
                   </el-input>
                 </div>
               </div>
@@ -692,8 +693,8 @@
               </div>
               <div v-if="scope.row.name == '融合点'">
                 <div class="center">
-                  <span>分开/集合：</span>
-                  <el-select v-model="dataForm.rhgnjcFkjh1" placeholder="" clearable style="display: inline-block;width: 70px;margin-right: 8px">
+                  <span>分开/集合:</span>
+                  <el-select v-model="dataForm.rhgnjcFkjh1" placeholder="" clearable style="display: inline-block;width: 45px;margin-right: 5px">
                     <el-option
                       v-for="item in separateList"
                       :key="item.id"
@@ -701,7 +702,17 @@
                       :value="item.name"
                     />
                   </el-select>
-                  <el-input v-model="dataForm.rhgnjcFkjh2" placeholder="" style="width: 110px" />
+                  <el-input v-model="dataForm.rhgnjcFkjh2" placeholder="" style="width: 45px" />
+                  <span>°</span> /
+                  <el-select v-model="dataForm.rhgnjcFkjh3" placeholder="" clearable style="display: inline-block;width: 45px;margin-right: 5px">
+                    <el-option
+                      v-for="item in separateList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
+                  <el-input v-model="dataForm.rhgnjcFkjh4" placeholder="" style="width: 45px" />
                   <span>°</span>
                 </div>
               </div>
@@ -768,32 +779,9 @@ export default {
   },
   data() {
     return {
-      options: {
-        layout: 'en-US',
-        layouts: {
-          // 添加自定义符号
-          custom: [
-            [
-              { key: '1', value: '1' },
-              { key: '2', value: '2' },
-              { key: '3', value: '3' },
-              { key: '11', value: 'custom-word' }, // 将新的键码添加到自定义符号中
-              { key: '4', value: '4' },
-              { key: '5', value: '5' },
-              { key: '6', value: '6' },
-              { key: '7', value: '7' },
-              { key: '8', value: '8' },
-              { key: '9', value: '9' },
-              { key: '0', value: '0' },
-              { key: '.', value: '.' },
-              { key: 'delete', value: '删除' }
-            ]
-          ]
-        }
-      },
       myLayout: [
         '1234567890{delete:backspace}|qwertyuiop|asdfghjkl|{shift:goto:1}zxcvbnm|{space:space}{custom:custom}',
-        '@+-/%△°*()ᴿᴸ|QWERTYUIOP|ASDFGHJKL|{shift:goto:0}ZXCVBNM|{space:space}{custom:custom}'
+        '@+-/%△°*()ᴿᴸ|1234567890|QWERTYUIOP|ASDFGHJKL|{shift:goto:0}ZXCVBNM|{space:space}{custom:custom}'
       ],
       // myLayout: '||{EX:EX}',
       focusItem: '',
@@ -1028,6 +1016,8 @@ export default {
         // 同时检查-分开/集合
         rhgnjcFkjh1: '',
         rhgnjcFkjh2: '',
+        rhgnjcFkjh3: '',
+        rhgnjcFkjh4: '',
         // Worth-4-dot
         worth1: '',
         worth2: '',
@@ -1217,7 +1207,10 @@ export default {
       }
       this.dataForm[item] = this.dataForm[item] ? this.dataForm[item] + input : input
     },
-    // 获取报告单id
+    handleZg() {
+      this.dataForm.rhgnjcRhd = this.dataForm.tssjcZgxsj1
+    },
+    // 获取报告 单id
     async queryProject() {
       const project = window.localStorage.getItem('projectItem') ? JSON.parse(window.localStorage.getItem('projectItem')) : []
       const { data: res } = await this.$http.get(

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

@@ -28,6 +28,10 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+#formDiagnosis{
+  .el-textarea__inner{
+    font-size: 16px;
+  }
+}
 </style>

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

@@ -40,6 +40,10 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+#medHistory{
+  .el-textarea__inner{
+    font-size: 16px;
+  }
+}
 </style>