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

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

@@ -133,25 +133,25 @@
               </div>
               <div v-if="scope.row.name == '交替遮盖试验(CT)'">
                 <div class="center">
-                  <p style="display: flex;justify-content: space-around" /><p>远:</p>
-                  <el-select v-model="formData.ctYuan" placeholder="" clearable style="display: inline-block;width: 100px">
-                    <el-option
-                      v-for="item in ctList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.name"
-                    />
-                  </el-select>
-                  <p>近:</p>
-                  <el-select v-model="formData.ctYuan" placeholder="" clearable style="display: inline-block;width: 100px">
-                    <el-option
-                      v-for="item in ctList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.name"
-                    />
-                  </el-select>
-                  </p>
+                  <div style="display: flex;justify-content: space-around"><span>远:</span>
+                    <el-select v-model="formData.ctYuan" placeholder="" clearable style="display: inline-block;width: 100px">
+                      <el-option
+                        v-for="item in ctList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      />
+                    </el-select>
+                    <span>近:</span>
+                    <el-select v-model="formData.ctYuan" placeholder="" clearable style="display: inline-block;width: 100px">
+                      <el-option
+                        v-for="item in ctList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      />
+                    </el-select>
+                  </div>
                 </div>
               </div>
               <div v-if="scope.row.name == '集合近点(NPC)'">
@@ -200,7 +200,9 @@
               </div>
               <div v-if="scope.row.name == '梯度性AC/A'">
                 <div class="width-180 center">
-                  <el-input v-model="formData.aca1" placeholder="" />
+                  <el-input v-model="formData.aca1" placeholder="">
+                    <template slot="append">△/D</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '融像性聚散(FV)'">
@@ -431,9 +433,10 @@
                 </div>
               </div>
               <div v-if="scope.row.name == '梯度性AC/A'">
-                <div class="width-180 center">
+                <div class="width-200 center">
                   <el-input v-model="formData.aca2" placeholder="">
                     <template slot="prepend">计算性AC/A:</template>
+                    <template slot="append">△/D</template>
                   </el-input>
                 </div>
               </div>
@@ -732,76 +735,39 @@ export default {
       ],
       tableData: [
         {
-          name: '屈光状态',
-          type: ''
+          name: '屈光状态'
         }, {
-          name: '1',
-          type: ''
+          name: '1'
         }, {
-          name: '交替遮盖试验(CT)',
-          type: ''
+          name: '交替遮盖试验(CT)'
         }, {
-          name: '集合近点(NPC)',
-          a: '',
-          b: '',
-          type: ''
+          name: '集合近点(NPC)'
         }, {
-          name: 'Worth-4-dot',
-          a: '',
-          b: '',
-          c: '',
-          d: '',
-          type: ''
+          name: 'Worth-4-dot'
         }, {
-          name: '立体视(stereo)',
-          a: '',
-          b: ''
+          name: '立体视(stereo)'
         }, {
-          name: '眼位',
-          a: '',
-          b: ''
+          name: '眼位'
         }, {
-          name: '梯度性AC/A',
-          a: '',
-          b: ''
+          name: '梯度性AC/A'
         }, {
-          name: '融像性聚散(FV)',
-          a: '',
-          b: ''
+          name: '融像性聚散(FV)'
         }, {
-          name: 'FV',
-          a: '',
-          b: '',
-          type: ''
+          name: 'FV'
         }, {
-          name: '相对调节(RA)',
-          a: '',
-          b: ''
+          name: '相对调节(RA)'
         }, {
-          name: '调节幅度(AMP)',
-          a: '',
-          b: '',
-          c: ''
+          name: '调节幅度(AMP)'
         }, {
-          name: '调节灵活度(AF)',
-          a: '',
-          b: '',
-          c: ''
+          name: '调节灵活度(AF)'
         }, {
-          name: '调节反应(FCC)',
-          a: '',
-          b: '',
-          c: ''
+          name: '调节反应(FCC)'
         }, {
           name: '初步诊断'
         }, {
-          name: '建议',
-          value: ''
+          name: '建议'
         }, {
-          name: '签名',
-          a: '',
-          b: '',
-          c: ''
+          name: '签名'
         }]
     }
   },
@@ -832,7 +798,7 @@ export default {
         patientId: this.patientId
       }}).then(data => {
         const form = data.data.data
-        form.cbzdCheck = form.cbzdCheck ? JSON.parse(form.cbzdCheck) : true
+        form.cbzdCheck = form.cbzdCheck ? JSON.parse(form.cbzdCheck) : false
         form.cbzdJsgnyc = form.cbzdJsgnyc ? form.cbzdJsgnyc.split(',') : []
         form.cbzdTjgnyc = form.cbzdTjgnyc ? form.cbzdTjgnyc.split(',') : []
         form.cbzdXs = form.cbzdXs ? form.cbzdXs.split(',') : []

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

@@ -983,8 +983,17 @@ export default {
     padding: 0;
     border: none;
     text-align: center;
+    border-radius: 0;
     border-bottom: 1px solid #8e8c8c;
   }
+  .operation-record-table{
+    .el-input__inner {
+      padding: 0;
+      border: none;
+      text-align: center;
+      border-radius: 0;
+    }
+  }
   .bold{
     font-weight: 700;
   }

src/components/360View/index1.vue

@@ -48,10 +48,10 @@
             <el-tab-pane name="视光档案" label="视光档案" style="height: 100%">
               <opticalFile :patient-id="patientId" :is-search="isSearch" :only-read="onlyRead" />
             </el-tab-pane>
-            <el-tab-pane name="诊断" label="诊断">
+            <el-tab-pane name="诊断" label="诊断" style="height: 100%">
               <el-table
                 :data="timeAxisNodeInfo"
-                style="width: 100%"
+                style="width: 100%;height: 100%;overflow: auto"
               >
                 <el-table-column
                   prop="diagName"
@@ -68,10 +68,10 @@
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane name="手术" label="手术">
+            <el-tab-pane name="手术" label="手术" style="height: 100%">
               <el-table
                 :data="timeAxisNodeInfo"
-                style="width: 100%"
+                style="width: 100%;height: 100%;overflow: auto"
               >
                 <el-table-column
                   prop="bedNo"
@@ -122,10 +122,10 @@
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane name="用药" label="用药">
+            <el-tab-pane name="医嘱" label="医嘱" style="height: 100%">
               <el-table
                 :data="timeAxisNodeInfo"
-                style="width: 100%"
+                style="width: 100%;height: 100%;overflow: auto"
               >
                 <el-table-column
                   prop="medName"
@@ -148,15 +148,14 @@
                   align="center"
                 />
               </el-table>
-
             </el-tab-pane>
-            <el-tab-pane name="住院" label="住院">
+            <el-tab-pane name="住院" label="住院" style="height: 100%">
               <el-table
                 :data="timeAxisNodeInfo"
-                style="width: 100%"
+                style="width: 100%;height: 100%;overflow: auto"
               >
                 <el-table-column
-                  prop="deptName"
+                  prop="profName"
                   label="部门名称"
                   align="center"
                 />
@@ -301,6 +300,7 @@ export default {
     // 切换病史总览时间轴
     tabClick(type) {
       this.timeAxisType = type.name
+      this.timeAxisNodeInfo = []
     },
     selectType(type) {
       this.dataType = type

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

@@ -63,7 +63,7 @@
             />
           </div>
         </template>
-        <div v-if="!formList.length && isSearch === '2'" style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
+        <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>
       </div>

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

@@ -24,16 +24,16 @@
             <span class="mr16">专科检查:</span>
             <span style="word-break:break-all">{{ item.jc }}</span>
           </p>
-          <p class="info">
-            <span class="mr16">治疗意见:</span>
-            <span style="word-break:break-all">{{ item.zlyj }}</span>
-          </p>
         </div>
         <div style="margin-right: 32px;width: 25%">
           <div class="info">
             <span class="mr16">诊断:</span>
             <p v-for="row in item.diagnoseNameList">{{row}}</p>
           </div>
+          <p class="info">
+            <span class="mr16">治疗意见:</span>
+            <span style="word-break:break-all">{{ item.zlyj }}</span>
+          </p>
         </div>
         <div style="margin-right: 32px;width: 40%">
           <div class="info">
@@ -60,16 +60,16 @@
             <span class="mr16">专科检查:</span>
             <span style="word-break:break-all">{{ item.jc }}</span>
           </p>
-          <p class="info">
-            <span class="mr16">治疗意见:</span>
-            <span style="word-break:break-all">{{ item.zlyj }}</span>
-          </p>
         </div>
         <div style="margin-right: 32px;width: 25%">
           <div class="info">
             <span class="mr16">诊断:</span>
             <p v-for="row in item.diagnoseNameList">{{row}}</p>
           </div>
+          <p class="info">
+            <span class="mr16">治疗意见:</span>
+            <span style="word-break:break-all">{{ item.zlyj }}</span>
+          </p>
         </div>
         <div style="margin-right: 32px;width: 40%">
           <div class="info">

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

@@ -140,16 +140,12 @@ export default {
       switch (val) {
         case '1':
           return '未叫号'
-          break
         case '2':
           return '已叫号'
-          break
         case '3':
           return '过号'
-          break
         case '4':
           return '呼叫中'
-          break
         default:
           return val
       }
@@ -206,19 +202,13 @@ export default {
           value: '',
           label: '全部'
         }, {
-          value: '1',
+          value: '200',
           label: '未报到'
         }, {
-          value: '2',
+          value: '300',
           label: '未诊'
-        }, {
-          value: '4',
-          label: '回诊 '
-        }, {
-          value: '3',
-          label: '就诊中'
-        }, {
-          value: '已诊',
+        },{
+          value: '400',
           label: '已诊'
         }],
       nextVisitTime: [],

src/page-subspecialty/views/modules/outpatientManagement/call/index.vue

@@ -138,16 +138,12 @@ export default {
       switch (val) {
         case '1':
           return '未叫号'
-          break
         case '2':
           return '已叫号'
-          break
         case '3':
           return '过号'
-          break
         case '4':
           return '呼叫中'
-          break
         default:
           return val
       }
@@ -156,19 +152,14 @@ export default {
       switch (val) {
         case '1':
           return '未报到'
-          break
         case '2':
           return '未诊断'
-          break
         case '3':
           return '就诊中'
-          break
         case '4':
           return '回诊'
-          break
         case '5':
           return '已诊'
-          break
         default:
           return val
       }

src/page-subspecialty/views/pages/login.vue

@@ -27,16 +27,16 @@
         <el-form-item prop="password">
           <el-input v-model="dataForm.password" type="password" placeholder="请输入密码" />
         </el-form-item>
-<!--        <el-form-item prop="captcha">-->
-<!--          <el-row :gutter="10">-->
-<!--            <el-col :span="14">-->
-<!--              <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')" />-->
-<!--            </el-col>-->
-<!--            <el-col :span="10" class="login-captcha">-->
-<!--              <img :src="captchaPath" @click="getCaptcha()">-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item prop="captcha">-->
+        <!--          <el-row :gutter="10">-->
+        <!--            <el-col :span="14">-->
+        <!--              <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')" />-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="10" class="login-captcha">-->
+        <!--              <img :src="captchaPath" @click="getCaptcha()">-->
+        <!--            </el-col>-->
+        <!--          </el-row>-->
+        <!--        </el-form-item>-->
         <el-form-item>
           <el-button type="primary" class="w-percent-100" @click="dataFormSubmitHandle()">{{ $t('login.title') }}
           </el-button>
@@ -103,6 +103,8 @@ export default {
             this.getCaptcha()
             return this.$message.error(res.msg)
           }
+          const ip = window.location.host
+          console.log('ip', ip.split(':')[0])
           Cookies.set('xa-token', res.data.token)
           window.localStorage.setItem('qg-userData', JSON.stringify(res.data.currentUser))
           this.$router.push({ name: 'outpatientManagement-call' })