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

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

@@ -198,8 +198,8 @@
                     </div>
                   </div>
                   <div v-if="scope.row.a.length" style="display: flex">
-                    <div style="width: 200px;word-break: keep-all">聚散功能异常：</div>
-                    <div style="display: flex;flex-wrap: wrap;line-height: 30px">
+                    <div style="width: 240px;">聚散功能异常：</div>
+                    <div style="display: flex;flex-wrap: wrap">
                       <div v-for="(item,index) in scope.row.a" :key="index" class="check" @click="item.isSelect = !item.isSelect">
                         <input type="checkbox" :checked="item.isSelect">
                         <div>{{ item.name }}</div>
@@ -207,8 +207,8 @@
                     </div>
                   </div>
                   <div style="display: flex">
-                    <p style="width: 135px;;word-break: keep-all">调节功能异常：</p>
-                    <div style="display: flex;flex-wrap: wrap;line-height: 30px">
+                    <div style="width: 160px;">调节功能异常：</div>
+                    <div style="display: flex;flex-wrap: wrap">
                       <div v-for="(item,index) in scope.row.b" :key="index" class="check" @click="item.isSelect = !item.isSelect">
                         <input type="checkbox" :checked="item.isSelect">
                         <div>{{ item.name }}</div>
@@ -332,14 +332,6 @@
               <!--            </div>-->
             </template>
           </el-table-column>
-          <!--        <el-table-column label="手术记录" :resizable="false">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <span v-if="scope.row.name !=='手术日期/主刀签字'">-->
-          <!--&lt;!&ndash;              <span v-if="!operationRecord.nurseSignImgOne" class="sign" @click="singHandle('nurseSignImgOne')">点击签字</span>&ndash;&gt;-->
-          <!--&lt;!&ndash;              <img v-if="operationRecord.nurseSignImgOne" :src="operationRecord.nurseSignImgOne" alt="" width="90px" @click="singHandle('nurseSignImgOne')">&ndash;&gt;-->
-          <!--            </span>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
         </el-table>
       </div>
     </div>

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

@@ -33,9 +33,9 @@
                 <div class="rowLine-l" />
                 <div class="cloLine-l" />
                 <div class="Rline">R</div>
-                <div class="Rline-os">R</div>
+                <div class="Rline-os">L</div>
                 <div class="Lline">L</div>
-                <div class="Lline-os">L</div>
+                <div class="Lline-os">R</div>
                 <el-input v-model="scope.row.a" class="ipt-a" placeholder="" />
                 <el-input v-model="scope.row.b" class="ipt-b" placeholder="" />
                 <el-input v-model="scope.row.c" class="ipt-c" placeholder="" />
@@ -82,7 +82,6 @@
           </el-table-column>
           <el-table-column label="" width="" :resizable="false" prop="type">
             <template slot-scope="scope">
-              <!--              {{scope.row.name}}-->
               <div v-if="scope.row.name == '屈光状态'">
                 <div class="width-180 center">
                   <el-input v-model="scope.row.OD" placeholder="">

src/components/360View/index1.vue

@@ -232,22 +232,11 @@ import imgRecord from './img-reccrd.vue'
 import pacsList from '@/components/360View/pacs/patientList'
 import medicalRecord from '@/components/360View/medicalRecord' // 门诊病历
 import opticalFile from '@/components/360View/opticalFile' // 视光档案
-const Base64 = require('js-base64').Base64
 import eventBus from '@/page-subspecialty/utils/eventBus'
 export default {
   components: { timeLine, drawer, keyIndicators, shrink, business, collection, imgRecord, overView, medicalRecord, dataInfo, routine, special, followUpRecord, opticalFile, pacsList },
-  directives: {
-    move(el, bindings) {
-      el.onmousedown = (e) => {
-      }
-    }
-  },
   mixins: [],
   props: {
-    patientIdNumber: {
-      type: String,
-      default: ''
-    },
     patientId: {
       type: String,
       default: ''
@@ -431,8 +420,7 @@ export default {
         params: {
           date: item.opDate,
           groupName: item.groupName,
-          patientId: '797064'
-          // patientId: this.patientId
+          patientId: this.patientId
         }
       })
       if (res.code === 0) {

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

@@ -35,7 +35,7 @@
           :filter-node-method="treeFilter"
           empty-text=""
           @node-click="nodeClick"
-          @check-change="nodeCheck"
+          @check="nodeCheck"
         >
           <span slot-scope="{ node, data }" class="custom-tree-node">
             <span style="display: inline-block;min-width: 80px">
@@ -47,7 +47,6 @@
             </span>
           </span>
         </el-tree>
-        <!--        <el-button v-if="!options.length" type="primary" plain size="small" @click="addNode">+</el-button>-->
       </el-scrollbar>
     </el-option>
   </el-select>

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

@@ -83,7 +83,9 @@ export default {
     }
   },
   created() {
+    if (this.isSearch === '2') {
     this.getFormList()
+    }
   },
   methods: {
     handleForm({ index, item }) {
@@ -128,7 +130,6 @@ export default {
         platform: this.isSearch
       }
       this.$http.post('/case/save', params).then(res => {
-        this.$message.success('添加成功！')
         this.getFormList()
       }).catch(err => {
         this.$message.error(err.msg)

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

@@ -4,23 +4,27 @@
       <i class="el-icon-refresh refresh" @click="getSpecialItem"></i>
       <el-table
         :data="tableData"
+        v-loading="loading"
         @row-click="handleData"
         style="width: 100%;margin-top: 16px"
       >
         <el-table-column
           prop="examTime"
           label="时间"
-          width="160"
+          align="center"
+          width="165"
         />
         <el-table-column
           prop="examineItem"
           label="检查项目"
-          width="180"
+          align="center"
+          width="195"
         />
         <el-table-column
           prop="name"
           label="检查报告"
-          width="200"
+          align="center"
+          width="180"
         >
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleRecord(scope.row)">
@@ -34,7 +38,7 @@
       </el-table>
     </div>
     <div class="examineData">
-      <i class="el-icon-refresh refresh-r" @click="getSpecialItem"></i>
+      <i class="el-icon-refresh refresh-r" @click="getItemData"></i>
       <div style="display: flex;justify-content: space-between">
         <span style="font-size: 16px;font-weight: 500;color: rgba(0, 0, 0, 0.88);margin-top: 4px">提取数据</span>
         <div v-if="!onlyRead" size="small" style="display:inline-block;margin-left:10px;width: 32px;height: 32px;line-height:32px;text-align:center;background-color: #1e79ff;border-radius: 4px;vertical-align: middle" @click="addDataList">
@@ -44,6 +48,7 @@
       <el-table
         class="tableBox"
         :data="extractData"
+        v-loading="loadingFlag"
         style="width: 100%;margin-top: 16px"
         @selection-change="handleSelectionChange"
       >
@@ -114,6 +119,8 @@ export default {
       tableData: [],
       extractData: [],
       patientBaseData: {},
+      loading: false,
+      loadingFlag: false,
       isActive: false
     }
   },
@@ -121,21 +128,22 @@ export default {
 
   },
   mounted() {
-
     this.getPatientData()
     this.getSpecialItem()
   },
   methods: {
     // 获取特殊检查项
     async getSpecialItem() {
+      this.loading = true
       const { data: res } = await this.$http.get('/patient/view/getExamineItem', {
         params: {
-          // patientId: '2553716'
-          patientId: '1693275'
+          // patientId: '1693275'
+          patientId: this.patientId
           // date: this.date
         }
       })
       if (res.code === 0) {
+        this.loading = false
         this.tableData = res.data || []
         if (res.data.length) {
           this.examNo = res.data[0].examNo
@@ -148,18 +156,18 @@ export default {
       }
     },
     async getItemData() {
+      this.loadingFlag = true
       const { data: res } = await this.$http.get('/patient/view/getExtractData', {
         params: {
           examNo: this.examNo,
-          // examNo: 'MZ17345997_0',
           examineItem: this.examineItem
-          // examineItem: '眼部B超'
         }
       })
       if (res.code === 0) {
+        this.loadingFlag = false
         this.extractData = res.data || []
       } else {
-        // this.$message.error(res.msg)
+        this.loadingFlag = false
       }
     },
     handleSelectionChange(val) {
@@ -189,7 +197,6 @@ export default {
       this.getItemData()
     },
     handleRecord(item) {
-      console.log(item)
       const patientInfo = {
         examDate: item.examTime ? item.examTime.substring(0, 11) : '',
         itemCode: item.examineItem,
@@ -204,10 +211,6 @@ export default {
       })
       window.open(href, '_blank')
     },
-    // 查看报告
-    // handleRecord() {
-    //   this.isActive = true
-    // },
     // 关闭360弹框
     closePacs() {
       this.isActive = false
@@ -234,7 +237,7 @@ export default {
 
     .refresh{
       position: absolute;
-      right: 20px;
+      right: 18px;
       top: 35px;
       z-index: 999;
       cursor: pointer;

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

@@ -235,23 +235,6 @@ export default {
     }
   },
   methods: {
-    // 浏览
-    browseClick(scopeRow) {
-      window.sessionStorage.removeItem('itemCurrentIndex')
-      window.sessionStorage.removeItem('itemListIndex')
-      this.$router.push({
-        path: '/seeDoctor',
-        query: {
-          info: this.$Base64.encode(JSON.stringify({
-            patientIdNumber: scopeRow.patientIdNumber,
-            patientCentreId: scopeRow.patientCentreId,
-            title: '门诊'
-            // crfId: scopeRow.crfId,
-            // patientId: scopeRow.patientId
-          }))
-        }
-      })
-    },
     // 日期改变时
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
@@ -265,12 +248,10 @@ export default {
     },
     // 查看详情
     showDetail(scopeRow, index) {
-      console.log(scopeRow)
       this.onlyRead = index !== 1
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId
       this.patientIdNumber = scopeRow.patientIdNumber
-      this.patientId = '797064'
       this.$nextTick(() => {
         // // 根据id获取患者信息--中间上侧患者信息
         this.$refs.viewRef.getPatientData()
@@ -284,21 +265,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.HisAddRef.init()
       })
-    },
-    // 获取管理师
-    async getDoctorName() {
-      const { data: res } = await this.$http.get('/pat/Manage/selectDoctorName', {
-        params: {
-          drgsName: window.localStorage.getItem('identity')
-        }
-      })
-      if (res.code === 0) {
-        this.doctorNameList = res.data
-      } else {
-        this.$message.error(res.msg)
-      }
     }
-
   }
 }
 </script>

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

@@ -265,7 +265,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.HisAddRef.init()
       })
-    },
+    }
   }
 }
 </script>

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

@@ -259,7 +259,6 @@ export default {
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId
       this.patientIdNumber = scopeRow.patientIdNumber
-      this.patientId = '797064'
       this.$nextTick(() => {
         // // 根据id获取患者信息--中间上侧患者信息
         this.$refs.viewRef.getPatientData()

src/page-subspecialty/views/pages/pacs/img-record.vue

@@ -117,7 +117,7 @@
                       {{ item.seriesDescription }}
                       <span class="" v-if="item.laterality">({{ item.laterality }})</span>
                     </p>
-                    <p class="imgName">{{  item.time }}</p>
+                    <p class="imgName">{{ item.time }}</p>
                   </div>
                 </div>
               </draggable>
@@ -345,7 +345,7 @@ export default {
       packFlag: true,
       proFlag: true,
       loading: false,
-      examineType: 2, // 项目树
+      examineType: 2, // 1时间树 2项目树
       treeProps: {
         children: 'children',
         label: 'text'
@@ -479,53 +479,20 @@ export default {
       if (res.code === 0) {
         const data = res.data || []
         for (let i = 0; i < data.length; i++) {
+          const cur = data[i]
           const temp = data[i].children
+          this.examDate = type === 1 ? data[0].id : ''
+          this.examItemCode = type === 2 ? data[0].id : ''
           for (let j = 0; j < temp.length; j++) {
             if (type === 2) {
               temp[j].examTime = temp[j].examTime ? temp[j].examTime.substring(0, 11) : ''
+            } else {
+              temp[j].examDate = cur.id
             }
           }
         }
-
-        this.allExamine = []
-        // if (res.data.length) {
-        //   for (let i = 0; i < data.length; i++) {
-        //     const cur = data[i]
-        //     const temp = data[i].children
-        //     if (type === 1) {
-        //       this.examDate = data[0].id
-        //     } else {
-        //       this.examItemCode = data[0].id
-        //     }
-        //     for (let j = 0; j < temp.length; j++) {
-        //       if (this.examineType === 1) {
-        //         temp[j].examDate = cur.id
-        //       }
-        //     }
-        //     this.defaultExpandedKeys = this.allExamine
-        //   }
-          this.treeData = data || []
-        //   this.queryExamine()
-        // }
-        // this.treeData = res.data || []
-        // this.examNoList = []
-        // if (this.treeData.length) {
-        //   this.examNoList.push(this.treeData[0].children[0].examNo)
-        //   this.$nextTick(() => {
-        //     this.$refs.examineTree.setCurrentKey(this.treeData[0].children[0].rownows)
-        //   })
-        //   for (let i = 0; i < this.treeData.length; i++) {
-        //     const temp = this.treeData[i].children
-        //     for (let j = 0; j < temp.length; j++) {
-        //       if (type === 1) {
-        //         temp[j].name = temp[j].examineItem || ''
-        //       } else {
-        //         temp[j].name = temp[j].examTime ? temp[j].examTime.substring(0, 11) : ''
-        //       }
-        //     }
-        //   }
+        this.treeData = data || []
         this.queryExamine()
-        // }
       } else {
         this.$message.error(res.msg)
       }
@@ -596,8 +563,11 @@ export default {
       const params = {
         searchType: this.examineType,
         searchChild: this.searchChild,
-        examDate: '2020-07-20',
+        // examDate: this.examDate,
+        // examNo: this.examNo,
+        // examItemCode: this.examItemCode,
         // patientId: this.patientInfo.patientId,
+        // patientId: '2553716',
         patientId: '2553716',
         eyeType: this.eyeType,
         fileType: this.fileType