'护士工作台相关逻辑'

public/index.html

@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->

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

@@ -73,7 +73,13 @@
         <tbody>
           <tr v-for="(item,index) in treatData" :key="index">
             <td>
-              <div class="flex a-c">日期：<el-input v-model="item.OD.date" style="flex: 1" /></div>
+              <div class="flex a-c">日期：
+                <el-date-picker
+                  v-model="item.OD.date"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                />
+              </div>
               <div class="flex a-c">次数：<el-input v-model="item.OD.order" style="flex: 1" /></div>
               <div class="flex a-c">视力：<el-input v-model="item.OD.vision" style="flex: 1" /></div>
               <div class="flex a-c">光斑大小：<el-input v-model="item.OD.flareSize" style="flex: 1" /></div>
@@ -87,7 +93,13 @@
               </div>
             </td>
             <td>
-              <div class="flex a-c">日期：<el-input v-model="item.OS.date" style="flex: 1" /></div>
+              <div class="flex a-c">日期：
+                <el-date-picker
+                  v-model="item.OS.date"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                />
+              </div>
               <div class="flex a-c">次数：<el-input v-model="item.OS.order" style="flex: 1" /></div>
               <div class="flex a-c">视力：<el-input v-model="item.OS.vision" style="flex: 1" /></div>
               <div class="flex a-c">光斑大小：<el-input v-model="item.OS.flareSize" style="flex: 1" /></div>
@@ -279,24 +291,42 @@ export default {
         this.confirmData.zlqJbfqOs = detail.zlqJbfqOs || ''
         this.confirmData.zlqSytOs = detail.zlqSytOs || ''
         // 治疗
-        this.confirmData.jgzlDateOd1 = detail.jgzlDateOd1 || ''
-        this.confirmData.jgzlCountOd1 = detail.jgzlCountOd1 || ''
-        this.confirmData.jgzlDsOd1 = detail.jgzlDsOd1 || ''
-        this.confirmData.jgzlSlOd1 = detail.jgzlSlOd1 || ''
-        this.confirmData.jgzlGlOd1 = detail.jgzlGlOd1 || ''
-        this.confirmData.jgzlGbOd1 = detail.jgzlGbOd1 || ''
-        this.confirmData.jgzlSytOd1 = detail.jgzlSytOd1 || ''
+        this.treatData.forEach((item, index) => {
+          item.OD.date = detail[`jgzlDateOd${index + 1}`]
+          item.OD.order = detail[`jgzlCountOd${index + 1}`]
+          item.OD.count = detail[`jgzlDsOd${index + 1}`]
+          item.OD.vision = detail[`jgzlSlOd${index + 1}`]
+          item.OD.power = detail[`jgzlGlOd${index + 1}`]
+          item.OD.flareSize = detail[`jgzlGbOd${index + 1}`]
+          item.OD.imgSrc = detail[`jgzlSytOd${index + 1}`]
+          item.OS.date = detail[`jgzlDateOs${index + 1}`]
+          item.OS.order = detail[`jgzlCountOs${index + 1}`]
+          item.OS.count = detail[`jgzlDsOs${index + 1}`]
+          item.OS.vision = detail[`jgzlSlOs${index + 1}`]
+          item.OS.power = detail[`jgzlGlOs${index + 1}`]
+          item.OS.flareSize = detail[`jgzlGbOs${index + 1}`]
+          item.OS.imgSrc = detail[`jgzlSytOs${index + 1}`]
+        })
       })
     },
     // 保存传值处理
     handleConfirmData() {
-      this.confirmData.jgzlDateOd1 = this.treatData[0].OD.date
-      this.confirmData.jgzlCountOd1 = this.treatData[0].OD.order
-      this.confirmData.jgzlDsOd1 = this.treatData[0].OD.count
-      this.confirmData.jgzlSlOd1 = this.treatData[0].OD.vision
-      this.confirmData.jgzlGlOd1 = this.treatData[0].OD.power
-      this.confirmData.jgzlGbOd1 = this.treatData[0].OD.flareSize
-      this.confirmData.jgzlSytOd1 = this.treatData[0].OD.imgSrc
+      this.treatData.forEach((item, index) => {
+        this.confirmData[`jgzlDateOd${index + 1}`] = item.OD.date
+        this.confirmData[`jgzlCountOd${index + 1}`] = item.OD.order
+        this.confirmData[`jgzlDsOd${index + 1}`] = item.OD.count
+        this.confirmData[`jgzlSlOd${index + 1}`] = item.OD.vision
+        this.confirmData[`jgzlGlOd${index + 1}`] = item.OD.power
+        this.confirmData[`jgzlGbOd${index + 1}`] = item.OD.flareSize
+        this.confirmData[`jgzlSytOd${index + 1}`] = item.OD.imgSrc
+        this.confirmData[`jgzlDateOS${index + 1}`] = item.OS.date
+        this.confirmData[`jgzlCountOS${index + 1}`] = item.OS.order
+        this.confirmData[`jgzlDsOS${index + 1}`] = item.OS.count
+        this.confirmData[`jgzlSlOS${index + 1}`] = item.OS.vision
+        this.confirmData[`jgzlGlOS${index + 1}`] = item.OS.power
+        this.confirmData[`jgzlGbOS${index + 1}`] = item.OS.flareSize
+        this.confirmData[`jgzlSytOS${index + 1}`] = item.OS.imgSrc
+      })
     },
     // 保存
     handleSaveTable() {

src/page-subspecialty/views/modules/nurseManagement/addProject.vue

@@ -1,5 +1,5 @@
 <template>
-  <my-dialog title="新增项目" :is-show="show" @close="closeDialog">
+  <my-dialog :title="title" :is-show="show" @close="closeDialog">
     <el-form id="reOrder" ref="form" size="small" :model="form" label-width="130px">
       <el-form-item required label="项目名称:" style="width: 100%">
         <el-select v-model="form.doctor" placeholder="请选择" style="width: 100%">
@@ -123,6 +123,10 @@ export default {
     isShow: {
       type: Boolean,
       default: false
+    },
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -142,7 +146,6 @@ export default {
       }],
       tableData: [
         {
-          Mon: 'Mon',
           time: '上午',
           MonTime: false,
           TuesTime: false,
@@ -152,7 +155,6 @@ export default {
           SatTime: false,
           SunTime: false
         }, {
-          Mon: 'Mon',
           time: '下午',
           MonTime: false,
           TuesTime: false,

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue

@@ -23,7 +23,7 @@
     <div class="doctor-schedule-content">
       <el-row class="weeks">
         <el-col v-if="title !=='plus' && sortName==='保存设置'" :span="1" class="moren">设为默认</el-col>
-        <el-col :span="title ==='plus' && sortName==='批量设置' ? 3 : 2" class="doctor-list-text">医生列表</el-col>
+        <el-col :span="title ==='plus' && sortName==='批量设置' ? 3 : 2" class="doctor-list-text">检查项目</el-col>
         <el-col
           v-for="(day, index) in days"
           :key="index"
@@ -169,7 +169,6 @@
                   </div>
                 </div>
               </div>
-
             </div>
           </el-col>
         </el-row>
@@ -444,10 +443,10 @@ export default {
     allPtClick() {
       if(this.sortName === '批量排台') {
         this.sortName = '保存设置'
-        this.getBatchNumSet()
+        // this.getBatchNumSet()
       } else {
         this.sortName = '批量排台'
-        this.batchNumSave()
+        // this.batchNumSave()
       }
     },
     // 批量排台获取

src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue

@@ -1,8 +1,15 @@
 <template>
   <!-- 一已约患者列表 -->
-  <div class="scheduled-patient">
+  <div class="nurse_content">
+    <div v-if="!detailViewVisible" class="scheduled-patient">
       <div class="scheduled-patient-head">
-      <el-select v-model="searchType" placeholder="请选择" size="small" @change="getDataListInitial">
+        <div>
+          <el-select
+            v-model="dataForm.searchType"
+            placeholder="请选择"
+            size="small"
+            @change="getDataListInitial"
+          >
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -10,15 +17,23 @@
               :value="item.value"
             />
           </el-select>
-      <el-select v-model="project" style="margin-left: 15px" placeholder="请选择" size="small" @change="getDataListInitial">
+          <el-select
+            v-model="project"
+            style="margin-left: 15px"
+            placeholder="请选择"
+            size="small"
+            @change="getDataListInitial"
+          >
             <el-option
               v-for="item in projects"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+              :key="item.itemId"
+              :label="item.itemName"
+              :value="item.itemId"
             />
           </el-select>
         </div>
+        <el-button type="primary" icon="el-icon-edit" size="small" @click="changeOrder">改约</el-button>
+      </div>
       <div class="scheduled-patient-content">
         <el-table
           ref="multipleTable"
@@ -31,89 +46,75 @@
         >
           <el-table-column type="selection" width="50px" />
           <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="150px" />
-        <el-table-column prop="caseId" label="就诊号" header-align="center" align="center" width="150px" />
+          <el-table-column prop="jzNumber" label="就诊号" header-align="center" align="center" width="150px" />
           <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" width="150px" />
           <el-table-column label="负责医生" header-align="center" align="center" width="150px">
             <template slot-scope="scope">
-            {{ scope.row.mainDoctorName ? scope.row.mainDoctorName : '-' }}
+              {{ scope.row.doctorName ? scope.row.doctorName : '-' }}
             </template>
           </el-table-column>
-        <el-table-column label="预约时间" header-align="center" align="center" sortable="OPERA_DATE">
+          <el-table-column label="预约时间" header-align="center" align="center" width="170px">
             <template slot-scope="scope">
-            {{ scope.row.orderTime ? scope.row.orderTime : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="检查项目" prop="project" header-align="center" align="center">
-          <template slot-scope="scope">
-            <div v-if="scope.row.ouOpera">OU：{{ scope.row.ouOpera }}</div>
-            <div v-if="scope.row.odOpera">OD：{{ scope.row.odOpera }}</div>
-            <div v-if="scope.row.osOpera">OS：{{ scope.row.osOpera }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="眼别" prop="eyeLevel" header-align="center" align="center">
-          <template slot-scope="scope">
-            <div v-show="scope.row.operaStatus == 0">
-              <span class="circle-status circle-green" />
-              <span>等待签到</span>
-            </div>
-            <div v-show="scope.row.operaStatus == 1">
-              <span class="circle-status circle-green" />
-              <span>等待呼叫</span>
-            </div>
-            <div v-show="scope.row.operaStatus == 2">
-              <span class="circle-status circle-red" />
-              <span>呼叫中</span>
-            </div>
-            <div v-show="scope.row.operaStatus == 3">
-              <span class="circle-status circle-yellow" />
-              <span>手术中</span>
-            </div>
-            <div v-show="scope.row.operaStatus == 4">
-              <span class="circle-status circle-grey" />
-              <span>手术结束</span>
-            </div>
-            <div v-show="scope.row.operaStatus == 100">
-              <span class="circle-status circle-grey" />
-              <span>已取消</span>
-            </div>
+              {{ scope.row.appointDate ? scope.row.appointDate : '-' }}
             </template>
           </el-table-column>
+          <el-table-column label="检查项目" prop="appointItemName" header-align="center" align="center" />
+          <el-table-column label="眼别" prop="eyeType" header-align="center" align="center" />
           <el-table-column label="操作" header-align="center" align="center" width="200px">
             <template slot-scope="scope">
-            <span v-if="scope.row.operaStatus === 0" class="call" @click="editOpera(scope.row)">改约</span>
-            <span v-if="scope.row.operaStatus === 0" class="call" @click="cancelClick(scope.row)">取消</span>
-            <span v-if="scope.row.operaStatus === 0" class="call" @click="cancelClick(scope.row)">患者360</span>
+              <span class="call" @click="editOpera(scope.row)">改约</span>
+              <span class="cancel" @click="cancelClick(scope.row)">取消</span>
+              <span class="call" @click="checkPatientDetail(scope.row)">患者360</span>
             </template>
           </el-table-column>
         </el-table>
         <el-pagination background layout="total,prev, pager, next" :total="total" :current-page.sync="page" @current-change="pageCurrentChangeHandle" />
       </div>
     </div>
+    <re-dialog :is-show="reDialogShow" @close="closeReDialog" />
+    <u-b-m-order :is-show="ubmShow" @close="closeUbmDialog" />
+    <detail-view
+      v-if="detailViewVisible"
+      ref="viewRef"
+      :only-read="onlyRead"
+      :is-search="'1'"
+      :patient-id="patientId"
+      :patient-id-number="patientIdNumber"
+      @detailViewVisible="detailViewVisible=false"
+    />
+  </div>
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
+import DetailView from '@/components/360View/index1.vue'
+import ReDialog from '@/page-subspecialty/views/modules/nurseManagement/reDialog.vue'
+import UBMOrder from '@/page-subspecialty/views/modules/nurseManagement/UBMOrder.vue'
 export default {
   name: 'SubList',
   components: {
+    UBMOrder,
+    ReDialog,
+    DetailView
     // scheduledOrder
   },
   mixins: [mixinViewModule],
   data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/opera/getList',
+        getDataListURL: '/appoint/page',
         getDataListIsPage: true,
         createdIsNeed: false
       },
       scheduledOrderVisible: false,
-      nextVisitTime: [],
+      detailViewVisible: false,
+      onlyRead: true,
+      reDialogShow: false,
+      ubmShow: false,
+      patientId: '',
+      patientIdNumber: '',
       dataForm: {
-        endTime: '',
-        startTime: '',
-        status: '',
-        doctorCode: '',
-        operaName: '',
-        patientId: ''
+        appointStatus: '',
+        searchType: '0'
       },
       options: [
         {
@@ -141,34 +142,8 @@ export default {
           value: '',
           label: '全部'
         }],
-      projects: [
-        {
-          value: '0',
-          label: '今天'
-        }, {
-          value: '1',
-          label: '昨天'
-        }, {
-          value: '2',
-          label: '前天'
-        }, {
-          value: '3',
-          label: '近三天'
-        }, {
-          value: '4',
-          label: '近一周'
-        }, {
-          value: '5',
-          label: '近一个月 '
-        }, {
-          value: '6',
-          label: '近半年 '
-        }, {
-          value: '',
-          label: '全部'
-        }],
-      searchType: '0',
-      project: '0',
+      projects: [],
+      project: '全部项目',
       // 0:等待签到 1:等待呼叫，2:呼叫中，3:手术中 4:手术结束 5:已取消
       statusList: [{
         status: 0,
@@ -192,21 +167,34 @@ export default {
       doctorList: [],
       operaList: [],
       currentRow: {},
-      today: '',
       // 用一个字符串来保存当前双击的是哪一个单元格
       currentCell: null
     }
   },
   created() {
-    this.today = this.$moment().format('YYYY-MM-DD')
-    this.dataForm.startTime = this.$moment().format('YYYY-MM-DD')
-    this.dataForm.endTime = this.$moment().format('YYYY-MM-DD')
-    this.nextVisitTime = [this.dataForm.startTime, this.dataForm.endTime]
-    this.getDoctorList()
-    this.getOperaList()
+    // this.dataForm.startTime = this.$moment().format('YYYY-MM-DD')
+    // this.dataForm.endTime = this.$moment().format('YYYY-MM-DD')
+    this.queryProjects()
+    // this.getDoctorList()
+    // this.getOperaList()
     this.getDataListInitial()
   },
   methods: {
+    queryProjects() {
+      this.$http.get('/patient/getZlItemDict', { params: { isAppoint: 1 }}).then(data => {
+        this.projects = data.data.data
+      })
+    },
+    // 改约
+    changeOrder() {
+      this.reDialogShow = true
+    },
+    closeReDialog(val) {
+      this.reDialogShow = val
+    },
+    closeUbmDialog(val) {
+      this.ubmShow = val
+    },
     // 日期改变时
     dateChange(e) {
       this.dataForm.startTime = e ? e[0] : ''
@@ -271,18 +259,15 @@ export default {
     // 修改手术
     editOpera(scopeRow) {
       this.currentRow = scopeRow
-      this.scheduledOrderVisible = true
-      this.$nextTick(() => {
-        this.$refs.scheduledOrderRef.init()
-        this.$refs.scheduledOrderRef.title = '修改预约'
-      })
+      this.ubmShow = true
     },
     // 取消手术
     cancelClick(scopeRow) {
-      this.$confirmFun('确定要取消此患者手术预约吗？', '已放弃取消操作').then(async() => {
-        const { data: res } = await this.$http.post('/opera/cancelStatus', {
-          id: scopeRow.id,
-          operaStatus: 100
+      this.$confirmFun('确定要取消此患者预约吗？').then(async() => {
+        const { data: res } = await this.$http.get('/appoint/delAppiontInfo', {
+          params: {
+            patientId: scopeRow.patientId
+          }
         })
         if (res.code === 0) {
           this.getDataList()
@@ -294,11 +279,19 @@ export default {
           this.$message.error(res.msg)
         }
       })
+    },
+    checkPatientDetail(scopeRow) {
+      this.detailViewVisible = true
+      this.patientId = scopeRow.patientId
+      this.patientIdNumber = scopeRow.patientIdNumber
     }
   }
 }
 </script>
 <style lang="scss" scoped>
+.nurse_content{
+  height: 100%;
+}
 .scheduled-patient {
   background: #fff;
   .scheduled-patient-content {
@@ -307,12 +300,19 @@ export default {
   }
   .scheduled-patient-head {
     padding: 10px 16px 0 16px;
+    display: flex;
+    justify-content: space-between;
   }
   .call {
     cursor: pointer;
     color: #1890ff;
     padding-right: 8px;
   }
+  .cancel{
+    cursor: pointer;
+    padding-right: 8px;
+    color: #FF4D4F;
+  }
 }
 .scheduled-patient {
   .form-item-date{

src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="project">
+    <div style="margin-bottom: 15px">
+      <el-button type="primary" size="small" icon="el-icon-plus" @click="addProject">新增</el-button>
+    </div>
+    <div>
       <el-table
         :data="tableData"
         style="width: 100%"
@@ -285,7 +289,8 @@
           </template>
         </el-table-column>
       </el-table>
-    <add-project :is-show="addShow" @close="closeDialog" />
+    </div>
+    <add-project :title="title" :is-show="addShow" @close="closeDialog" />
   </div>
 </template>
 
@@ -298,6 +303,7 @@ export default {
   data() {
     return {
       addShow: false,
+      title: '',
       tableData: [
         {
           projectName: '视诱发电位',
@@ -330,11 +336,16 @@ export default {
   },
   methods: {
     editOpera() {
+      this.title = '修改项目'
       this.addShow = true
     },
     cancelClick() {},
     closeDialog(val) {
       this.addShow = val
+    },
+    addProject() {
+      this.title = '新增项目'
+      this.addShow = true
     }
   }
 }

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

@@ -262,7 +262,6 @@ export default {
     },
     // 查看详情
     showDetail(scopeRow, index) {
-      console.log('treat', scopeRow)
       this.onlyRead = index !== 1
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId