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

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

@@ -1152,9 +1152,6 @@ export default {
     ::v-deep .el-textarea__inner{
       border: none;
     }
-    ::v-deep .width-180{
-      width: 180px;
-    }
   }
   .check {
     cursor: pointer;
@@ -1186,5 +1183,8 @@ export default {
   ::v-deep .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
     background: none !important;
   }
+  ::v-deep .el-input__prefix {
+    display: none;
+  }
 }
 </style>

src/components/360View/index.vue

@@ -403,7 +403,7 @@ export default {
         this.$router.push('/outpatientManagement-call')
       } else {
         this.$parent.detailViewVisible = false
-        this.$parent.getDataListInitial()
+        this.$parent.reFresh()
       }
     },
     // 360浏览器

src/components/patient-search/data-list.vue

@@ -106,7 +106,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.dataList)
   },
   methods: {
     getExamItem(obj) {

src/components/patient-search/index.vue

@@ -144,6 +144,9 @@ export default {
     this.retrieval()
   },
   methods: {
+    reFresh() {
+      this.pageCurrentChangeHandle(this.page)
+    },
     // 初始化查询
     getDataListInitial() {
       this.page = 1

src/page-subspecialty/router/index.js

@@ -68,7 +68,7 @@ export const moduleRoutes = {
     {
       path: '/patientInfo',
       name: 'patientInfo',
-      meta: { title: '详情', isTab: true },
+      meta: { title: '视光工作台 / OK镜 / 详情', isTab: true },
       component: () => import('@/page-subspecialty/views/modules/optometryManagement/seeDoctor/index')
     },
     {

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

@@ -30,19 +30,8 @@
             </el-form-item>
           </el-form>
         </div>
-        <div style="display: flex;justify-content: space-between;background-color: white;padding: 16px 16px 0">
+        <div style="display: flex;justify-content: flex-end;background-color: white;padding: 16px 16px 0">
           <div>
-<!--            <el-select v-model="dataForm.searchType" placeholder="请选择" style="width:120px;float: left;margin-right: 16px" size="small" @change="getDataListInitial">-->
-<!--              <el-option-->
-<!--                v-for="item in options"-->
-<!--                :key="item.value"-->
-<!--                :label="item.label"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-          </div>
-          <div>
-<!--            <el-button type="primary" size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>-->
             <el-button type="primary" size="small" @click="HISHandle">
               <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />
               <span style="padding-left:5px;vertical-align: middle;">HIS引入</span>
@@ -126,6 +115,9 @@ export default {
   created() {
   },
   methods: {
+    reFresh() {
+      this.pageCurrentChangeHandle(this.page)
+    },
     // 浏览
     browseClick(scopeRow) {
       this.$router.push({

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

@@ -232,6 +232,9 @@ export default {
     }
   },
   methods: {
+    reFresh() {
+      this.pageCurrentChangeHandle(this.page)
+    },
     getYLProject(list) {
       if (!list.length) {
         return

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

@@ -75,13 +75,14 @@
             </template>
           </el-table-column>
           <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" width="100" />
-          <el-table-column prop="sgDoctorName" label="视光师" header-align="center" align="center" width="100" />
-          <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center">
+<!--          <el-table-column prop="sgDoctorName" label="视光师" header-align="center" align="center" width="100" />-->
+          <el-table-column label="常规检查" header-align="center" align="center">
             <template slot-scope="scope">
-              {{ getYLProject(scope.row.zlProjectList) }}
+<!--              {{ scope.row.createTime}}-->
+              <el-button class="copyBtn" type="primary" plain style="width: 48%" size="small" :data-clipboard-text="scope.row.createTime" @click="onCopy">复制</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="remark" label="备注" header-align="center" align="center" />
+<!--          <el-table-column prop="remark" label="备注" header-align="center" align="center" />-->
           <el-table-column prop="updateDate" label="就诊时间" header-align="center" align="center" width="165" />
           <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
           <!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
@@ -127,6 +128,7 @@ import tableAutoHeight from '@/mixins/tableAutoHeight'
 import AddOrUpdate from './patient-add-or-update'
 import hisAdd from './HIS-add'
 import detailView from '@/components/360View/index' // 360试图
+import Clipboard from 'clipboard'
 export default {
   components: {
     hisAdd,
@@ -169,6 +171,7 @@ export default {
         getDataListIsPage: true
       },
       curIndex: 0,
+      clipboard: null,
       options: [
         {
           value: '0',
@@ -228,7 +231,15 @@ export default {
   },
   created() {
   },
+  destroyed() {
+    this.clipboard && this.clipboard.destroy()
+  },
+  mounted() {
+  },
   methods: {
+    reFresh() {
+      this.pageCurrentChangeHandle(this.page)
+    },
     // 医疗项目拼接
     getYLProject(list) {
       if (!list.length) {
@@ -237,6 +248,21 @@ export default {
       const projects = list.map(item => item.porjectName).join('、')
       return projects
     },
+    // 复制
+    onCopy() {
+      if (JSON.stringify(this.clipboard) !== '{}') {
+        this.clipboard && this.clipboard.destroy()
+      }
+      this.clipboard = new Clipboard('.copyBtn')
+      const self = this
+      this.clipboard.on('success', function(e) {
+        self.$message.success('复制成功!')
+        e.clearSelection()
+      })
+      this.clipboard.on('error', function(e) {
+        self.$message.warning('复制失败!')
+      })
+    },
     // HIS引入事件
     getHisData(val) {
       this.addOrUpdateHandle('', { ...val }, 'HIS引入')
@@ -254,8 +280,25 @@ export default {
       this.dataForm.patientStatus = value
       this.getDataListInitial()
     },
+    async receiveTreat(item) {
+      const { data: res } = await this.$http.get('/patient/updateSGDoctorAndJzStatus', {
+        params: {
+          patientId: item.patientId,
+          jzNumber: item.jzNumber,
+          risNo: item.risNo,
+          platform: 1
+        }
+      })
+      if (res.code === 0) {
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
     // 查看详情
     showDetail(scopeRow, index) {
+      if (index === 1) {
+        this.receiveTreat(scopeRow)
+      }
       this.onlyRead = index !== 1
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId

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

@@ -254,16 +254,17 @@ export default {
           value: '400',
           label: '已诊'
         }],
-      eyeList: [{
-        value: 'OD',
-        label: 'OD'
-      }, {
-        value: 'OS',
-        label: 'OS'
-      }, {
-        value: 'OU',
-        label: 'OU'
-      }],
+      eyeList: [
+        {
+          value: 'OD',
+          label: 'OD'
+        }, {
+          value: 'OS',
+          label: 'OS'
+        }, {
+          value: 'OU',
+          label: 'OU'
+        }],
       nextVisitTime: [],
       appointRange: [],
       onlyRead: false,
@@ -297,6 +298,9 @@ export default {
     this.queryProjectList()
   },
   methods: {
+    reFresh() {
+      this.pageCurrentChangeHandle(this.page)
+    },
     // 展示列表项目列
     getYLProject(list) {
       if (!list.length) {
@@ -375,6 +379,7 @@ export default {
         this.$message.error(res.msg)
       }
     },
+    // 结束
     finishTreat(scope) {
       const idList = scope.zlProjectList.map(item => item.id)
       if (!idList.length) {
@@ -384,7 +389,7 @@ export default {
       this.receiveTreat(scope)
       this.$http.post('/patient/updateProjectStatus', idList).then((res) => {
         this.$message.success(res.data.data)
-        this.getDataListInitial()
+        this.pageCurrentChangeHandle(this.page)
       })
     },
     // 查看详情
@@ -408,7 +413,7 @@ export default {
           type: '2'
         }}).then(res => {
           this.$message.success(res.data.data)
-          this.getDataListInitial()
+          this.pageCurrentChangeHandle(this.page)
         })
       })
     },