Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/lang/zh.js

@@ -204,6 +204,7 @@ export default {
     scrm: 'SCRM',
     shop: '分销商城',
 
+    incomeStatistics:'收入统计',
     outpatientRegistration:'门诊挂号',
     outpatientRegistrationIndex:'门诊挂号',
     outpatientRegistrationRegistrationHistory:'挂号历史',

src/router/modules/outpatientCharges.js

@@ -42,6 +42,12 @@ export default {
         name: 'summary',
         meta: { title: 'summary', noCache: true }
     },
+    {
+        path: '/outpatientCharges/incomeStatistics',
+        component: () => import('@/xt_pages/outpatientCharges/incomeStatistics'),
+        name: 'incomeStatistics',
+        meta: { title: 'incomeStatistics', noCache: true }
+    },
     {
         path: '/outpatientCharges/summaryDetail',
         component: () => import('@/xt_pages/outpatientCharges/summaryDetail'),

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -394,7 +394,7 @@
                 v-model="nameForm.advice_name"
                 :fetch-suggestions="querySearch"
                 placeholder="请输入内容"
-                @select="handleSelect"
+              
                 @input="changeDrugName"
               ></el-autocomplete>
             </el-form-item>
@@ -431,7 +431,7 @@
                   v-model="nameForm.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                  @select="handleSelect1"
+                 
                   @input="changeDrugDesc"
                 ></el-autocomplete>
               </el-col>

src/xt_pages/dialysis/details/index.vue

@@ -758,13 +758,11 @@ export default {
       clearInterval(timer)
     })
 
-    this.timers = setInterval(() => {
-      let obj = {
-        cmd: "queue/join",
-        data: {type:3,page:0,size:0},
-      };
-      this.websocketSend(obj)
-    }, 1000*50);
+    let obj = {
+      cmd: "queue/join",
+      data: {type:3,page:0,size:0},
+    };
+    this.websocketSend(obj)
   },
   computed: {
     websocket() {
@@ -882,8 +880,6 @@ export default {
     }
   },
   beforeDestroy(){
-    clearInterval(this.timers);　　// 清除定时器
-    this.timers = null
 
     let unObj = {
       cmd: "queue/unjoin",
@@ -969,6 +965,7 @@ export default {
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+        
         var resp = rs.data
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
@@ -1118,6 +1115,7 @@ export default {
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
+          
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
 
@@ -1692,7 +1690,7 @@ export default {
       this.websocket.onmessage = e => {
         let res = JSON.parse(e.data);
         // let res = re.data;
-        console.log('res3333333333',res)
+        // console.log('res3333333333',res)
         if(res.channel == 'queue/join'){
           if(res.data.fisrtQueueInfo != null){
             if(res.data.fisrtQueueInfo.create_time){

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -70,7 +70,8 @@
         :row-class-name="tableRowClassName"
         :span-method="objectSpanMethod"
         :cell-class-name="adviceNameShow"
-        :modal-append-to-body="false">
+        :modal-append-to-body="false"
+        v-show="show">
         <el-table-column type="selection" width="55" align="center"></el-table-column>
         <el-table-column prop="date" label="姓名" align="center" min-width="26px">
           <template slot-scope="scope">
@@ -184,24 +185,127 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        
+      </el-table>
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="showOne">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
 
-        
-        
-        <!-- <el-table-column
-          v-if="template_id != 6"
-          prop="checker"
-          min-width="30px"
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
           align="center"
-          label="核对人员"
+          min-width="30px"
+          label="执行时间"
+          sortable
         >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
           <template slot-scope="scope">
             <span v-if="scope.row.parent_id == 0">
               {{getXuserName(scope.row.checker)}}
             </span>
             <span v-else></span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -254,7 +358,9 @@ export default {
       selecting_schs: [],
       partitionArr: [],
 
-      scheduleMap:[]
+      scheduleMap:[],
+      show:true,
+      showOne:false,
     };
   },
   created() {
@@ -338,14 +444,20 @@ export default {
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
             var schedules = resp.data.scheduals
-            // console.log("schedules",schedules)
+            console.log("schedules",schedules)
+            var config = resp.data.config
+           if(config.is_open == 0){
+            this.show = true
+            this.showOne = false
             let arr = []
             let newArr = []
             let newSchedules = []
             schedules.map(item => {
-                item.doctor_advice.map(it =>{
-                    it.name = item.patient.name
-                    it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id
                     it.dialysis_no = item.patient.dialysis_no
@@ -389,7 +501,68 @@ export default {
                 }
             })
             this.indexInfoList = newArr
-        }
+           }
+           if(config.is_open == 1 || config.is_open == 2){
+             this.show = false
+             this.showOne  = true
+            var schedules =  resp.data.hisAdvices
+          
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+           }
+         
+  
+         }
         })
     },
     getValue: function(val) {

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -8,7 +8,118 @@
             </el-col>
         </el-row>
         </div>
-        <div class="app-container" style="background-color: white;">
+        <div class="app-container" style="background-color: white;" v-show="show">
+            <div id="dialysisTable">
+                <div class="order_title_panl">
+                    <span class="main_title">透析医嘱</span>
+                </div>
+                <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
+                <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
+                    <tr>
+                    <th width="40px">姓名</th>
+                    <th width="40px">透析器</th>
+                    <!-- <th width="50px">类型</th> -->
+                    <th width="50px">开始时间</th>
+                    <th width="100px">医嘱内容</th>
+                    <th width="50px">执行时间</th>
+                    <th width="50px">执行护士</th>
+                    <th width="50px">校对护士</th>
+                    <th width="50px">校对时间</th>
+                    <th width="50px">开嘱医生</th>
+                    <th width="50px">开嘱时间</th>
+                    </tr>
+                    <template v-for="(schedules, zone_name, index) in scheduleMap">
+                    <tr :key="index">
+                        <td>{{ zone_name }}</td>
+                        <!-- <td></td> -->
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <template v-for="schedule in schedules">
+                        <template v-for="(group, group_index) in schedule.new_advice">
+                        <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
+                            <td
+                            v-if="advice_index == 0"
+                            :rowspan="group.advices.length"
+                            >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}
+                            <br>
+                            （{{ advice.parent_id == 0 ? schedule.dialysis_no : ""}}）
+                            <br>
+                            <span v-if="schedule.mode_id == 1">(HD)</span>
+                            <span v-if="schedule.mode_id == 2">(HDF)</span>
+                            <span v-if="schedule.mode_id == 3">(HD+HP)</span>
+                            <span v-if="schedule.mode_id == 4">(HP)</span>
+                            <span v-if="schedule.mode_id == 5">(HF)</span>
+                            <span v-if="schedule.mode_id == 6">(SCUF)</span>
+                            <span v-if="schedule.mode_id == 7">(IUF)</span>
+                            <span v-if="schedule.mode_id == 8">(HFHD)</span>
+                            <span v-if="schedule.mode_id == 9">(HFHD+HP)</span>
+                            <span v-if="schedule.mode_id == 10">(PHF)</span>
+                            <span v-if="schedule.mode_id == 11">(HFR)</span>
+                            <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
+                            <span v-if="schedule.mode_id == 13">(CRRT)</span>
+                            <span v-if="schedule.mode_id == 14">(腹水回输)</span>
+                                
+                            </td>
+                            <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                            {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
+                            </td>
+                            <!-- <td
+                            v-if="advice_index == 0"
+                            :rowspan="group.advices.length"
+                            >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>-->
+                            <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                            {{
+                            advice.parent_id == 0
+                            ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
+                            : ""
+                            }}
+                            </td>
+                            <td
+                            :class="
+                                advice.parent_id == 0
+                                ? 'advice_content'
+                                : 'subadvice_content'
+                            "
+                            >
+                            <span>{{ advice.advice_name }}</span>
+                            <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
+                            <span v-if="advice.prescribing_number">
+                                {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}
+                            </span>
+                            <span v-if="advice.single_dose">
+                                单次用量 {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}
+                            </span>
+                            <span>{{ advice.delivery_way }}</span>
+                            <span>{{ advice.execution_frequency }}</span>
+                            <span
+                                v-if="advice.parent_id == 0 && advice.remark.length > 0"
+                            >({{ advice.remark }})</span>
+                            </td>
+                            <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
+                            <td>{{ getName(advice.execution_staff) }}</td>
+                            <td>{{ getName(advice.checker) }}</td>
+                            <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
+                            <td>{{ getName(advice.advice_doctor) }}</td>
+                            <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
+                        </tr>
+                        </template>
+                    </template>
+                    </template>
+                </table>
+            </div>
+        </div>
+
+          <div class="app-container" style="background-color: white;" v-show="showOne">
             <div id="dialysisTable">
                 <div class="order_title_panl">
                     <span class="main_title">透析医嘱</span>
@@ -144,7 +255,9 @@ export default {
 
             zone_selected: 0,
             scheduleMap:[],
-            time:''
+            time:'',
+            show:true,
+            showOne:false,
         }
     },
     methods:{
@@ -169,21 +282,24 @@ export default {
                 var resp = rs.data
                 if (resp.state == 1) {
                 this.admin_user = resp.data.adminUser
-                var schedulesArr = resp.data.scheduals
-                let schedules = []
-                var ids = this.$store.getters.temp_params.advice_ids
-                console.log('ids',ids)
-                schedulesArr.map(item => {
+                var config = resp.data.config
+                if(config.is_open == 0 || config.is_open == 2){
+                
+                   var schedulesArr = resp.data.scheduals
+                   let schedules = []
+                   var ids = this.$store.getters.temp_params.advice_ids
+                   console.log('ids',ids)
+                   schedulesArr.map(item => {
                     if(ids.indexOf(item.patient_id) > -1){
                         schedules.push(item)
                     }
                     
                 })
-                // console.log("schedules",schedules)
+               
                 for (let i = 0; i < schedules.length; i++) {
                     schedules[i].dialysis_no = schedules[i].patient.dialysis_no
                 }
-                // console.log('schedules', schedules)
+           
 
                 var arr = []
                 for (let j = 0; j < schedules.length; j++) {
@@ -192,7 +308,7 @@ export default {
                 arr.sort(function (a, b) {
                     return a - b
                 })
-                // console.log('arr', arr)
+               
 
                 var arrTwo = []
                 for (let i = 0; i < arr.length; i++) {
@@ -204,20 +320,17 @@ export default {
                 }
 
                 arrTwo.map((item, index) => {
-                    // console.log(item);
-                    // item.doctor_advice.map((items, i) => {
-                    //   console.log(items);
-                    // });
+                  
                     item.doctor_advice.sort(this.compare('start_time'))
                 })
-                // console.log('arrTwo', arrTwo)
+                
 
                 const res = new Map()
                 let a = arrTwo.filter(
                     a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
                 )
 
-                // console.log('a', a)
+               
 
                 schedules = a
                 var zoneMap = {}
@@ -324,11 +437,170 @@ export default {
                     }
                     maps.new_advice = advice_groups
                     }
+                 }
+                
+
+                 this.scheduleMap = scheduleMap  
+                }
+               
+                 if(config.is_open == 1){
+                   var schedulesArr = resp.data.hisAdvices
+                   let schedules = []
+                   var ids = this.$store.getters.temp_params.advice_ids
+                   console.log('ids',ids)
+                   schedulesArr.map(item => {
+                    if(ids.indexOf(item.patient_id) > -1){
+                        schedules.push(item)
+                    }
+                    
+                })
+               
+                for (let i = 0; i < schedules.length; i++) {
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
+                }
+           
+
+                var arr = []
+                for (let j = 0; j < schedules.length; j++) {
+                    arr.push(schedules[j].dialysis_no)
+                }
+                arr.sort(function (a, b) {
+                    return a - b
+                })
+               
+
+                var arrTwo = []
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < schedules.length; j++) {
+                    if (arr[i] == schedules[j].dialysis_no) {
+                        arrTwo.push(schedules[j])
+                    }
+                    }
+                }
+
+                arrTwo.map((item, index) => {
+                  
+                    item.doctor_advice.sort(this.compare('start_time'))
+                })
+                
+
+                const res = new Map()
+                let a = arrTwo.filter(
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+                )
+
+               
+
+                schedules = a
+                var zoneMap = {}
+                var scheduleMap = {}
+                for (let index = 0; index < schedules.length; index++) {
+                    const schedule = schedules[index]
+                    if (schedule.doctor_advice.length == 0) {
+                    continue
+                    }
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
+                    scheduleMap[schedule.device_number.zone.name] = []
+                    }
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
+                    zoneMap[schedule.device_number.zone.name] =
+                        schedule.device_number.zone
+                    }
+                }
+
+                var zones = []
+                zones.push({ value: 0, text: '全部分区' })
+                for (var zoneName in zoneMap) {
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+                }
+
+                zones = zones.sort(function (a, b) {
+                    return a.value > b.value
+                })
+                this.zones = zones
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    mapArr[i]['new_advice'] = []
+                    }
                 }
+
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    var maps = mapArr[i]
+                    var resp_advices = maps.doctor_advice
+                    if (resp_advices.length > 0) {
+                        var newGroupObject = function () {
+                        return Object.assign(
+                            {},
+                            {
+                            group_no: 0,
+                            advices: []
+                            }
+                        )
+                        }
+                        var initGroupBlock = function (group, advice) {
+                        group.group_no = advice.groupno
+                        }
+
+                        var advice_groups = []
+                        var group = newGroupObject()
+                        for (let index = 0; index < resp_advices.length; index++) {
+                        const advice = resp_advices[index]
+                        if (advice.groupno == 0) {
+                            // 老版本的医嘱
+                            if (advice.parent_id > 0) {
+                            if (advice_groups.length > 0) {
+                                var parent_group = advice_groups[advice_groups.length - 1]
+                                if (parent_group.advices.length > 0) {
+                                if (parent_group.advices[0].id == advice.parent_id) {
+                                    parent_group.advices.push(advice)
+                                }
+                                }
+                            }
+                            continue
+                            } else {
+                            if (group.group_no > 0) {
+                                advice_groups.push(group)
+                                group = newGroupObject()
+                            }
+
+                            initGroupBlock(group, advice)
+                            group.advices.push(advice)
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            continue
+                            }
+                        } else {
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            }
+                            if (group.group_no == 0) {
+                            initGroupBlock(group, advice)
+                            }
+                            if (group.group_no == advice.groupno) {
+                            group.advices.push(advice)
+                            }
+                        }
+                        }
+                        if (group.group_no > 0) {
+                        // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                        advice_groups.push(group)
+                        }
+                        advice_groups = advice_groups
+                    } else {
+                        advice_groups = []
+                    }
+                    maps.new_advice = advice_groups
+                    }
+                 }
                 
 
-                this.scheduleMap = scheduleMap
-                // console.log(9999999999,this.scheduleMap)
+                     this.scheduleMap = scheduleMap  
+                 }
 
                 
                 }

src/xt_pages/dialysis/schedualPatient.vue

@@ -380,7 +380,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.websocket.onmessage = e => {
           let res = JSON.parse(e.data);
           // let res = re.data;
-          console.log('res3333333333',res)
+          // console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
             if(res.data.fisrtQueueInfo != null){
               if(res.data.fisrtQueueInfo.create_time){

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -65,7 +65,7 @@
             <td width="10"></td>
             <td width="70">有/无特殊:</td>
             <td width="200">
-                <div class="under-line" style="text-align:left">&nbsp;{{ prescription.remark ? prescription.remark : '' }}</div>
+                <div class="under-line" style="text-align:left">&nbsp;{{receiverTreatmentAccess.sick_condition_other?receiverTreatmentAccess.sick_condition_other:''}}</div>
             </td>
           </tr>
         </tbody>
@@ -100,7 +100,7 @@
           <tbody>
             <tr>
                 <td width="70">血管通路:</td>
-                <td width="300">
+                <td width="370">
                     <div>
                         <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘') > -1 ? true : false" showValue="内瘘"></label-box>
                         &nbsp;
@@ -110,12 +110,14 @@
                         &nbsp;
                         <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('直穿') > -1 ? true : false" showValue="直穿"></label-box>
                         &nbsp;
+                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') > -1 ? true : false" showValue="人造血管"></label-box>
+                        &nbsp;
                     </div>
                 </td>
-                <td width='30'></td>
+                <td width='20'></td>
                 <td width="70">封管用药:</td>
                 <td>
-                    <div class="under-line" style="text-align:left;">&nbsp;</div>
+                    <div class="under-line" style="text-align:left;">&nbsp;{{prescription.remark?prescription.remark:''}}</div>
                 </td>
             </tr>
           </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -289,6 +289,7 @@
                 </tbody>
               </table>
 
+
               <table class="table-box">
                 <tbody>
                   <tr>
@@ -418,6 +419,42 @@
                   </tr>
                 </tbody>
               </table>
+              <table >
+                <tbody>
+                  <tr class="table-box">
+                      <td width='50'>体温:</td>
+                      <td width="50">
+                        <div class="under-line">&nbsp;{{ predialysis.temperature ? predialysis.temperature : "/" }}</div>
+                      </td>
+                      <td width="10">℃</td>
+                      <td width="30"></td>
+                      <td width='70'>收缩压:</td>
+                      <td width="50">
+                        <div class="under-line">&nbsp;{{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/" }}</div>
+                      </td>
+                      <td width="10">mmHg</td>
+                      <td width="10"></td>
+                      <td width='70'>舒张压:</td>
+                      <td width="50">
+                        <div class="under-line">&nbsp;{{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : "/" }}</div>
+                      </td>
+                      <td width="10">mmHg</td>
+                      <td width="30"></td>
+                      <td width='70'>脉搏:</td>
+                      <td width="50">
+                        <div class="under-line">&nbsp;{{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "/" }}</div>
+                      </td>
+                      <td width="60">次/分</td>
+                      <td width="30"></td>
+                      <td width='70'>呼吸:</td>
+                      <td width="50">
+                        <div class="under-line">&nbsp;{{ predialysis.breathing_rate ? predialysis.breathing_rate : "/" }}</div>
+                      </td>
+                      <td width="60">次/分</td>
+                      <td></td>
+                  </tr>
+                </tbody>
+              </table>
             </td>
           </tr>
         </tbody>

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -0,0 +1,320 @@
+<template>
+  <div class="main-contain incomeStatistics">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div>
+          <el-input size="small" style="width:150px;"  v-model="keywords"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
+            搜索
+          </el-button>
+          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
+            <el-option
+              label="全部"
+              value="0">
+            </el-option>
+            <el-option
+              v-for="(item,index) in type"
+              :key="index"
+              :label="item.user_name"
+              :value="item.admin_user_id">
+            </el-option>
+          </el-select>
+          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+                          @change="handleStartTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+
+          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                          @change="handleEndTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+        </div>
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+          prop="date"
+          label="序号"
+          width="60"
+          align="center"
+          type="index"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="就诊号">
+          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="患者名字">
+          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope"></template>-->
+        <!--</el-table-column>-->
+        <el-table-column align="center" prop="name" label="应收金额">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="实收金额">
+          <template slot-scope="scope">{{scope.row.reality_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="科室">
+          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费员">
+          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_status == 1">待结算</div>
+            <div v-if="scope.row.order_status == 2">已结算</div>
+            <div v-if="scope.row.order_status == 3">已退费</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+
+      >
+      </el-pagination>
+    </div>
+
+
+  </div>
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '门诊收费' },
+          { path: false, name: '项目消费明细汇总' }
+        ],
+        tableData: [],
+        limit:10,
+        page:1,
+        keywords:"",
+        start_time:"",
+        end_time:"",
+        total:"",
+        doctors:[],
+        admin_user_id:"",
+
+      }
+    },
+    methods: {
+      export_detail(){
+        let params= {
+          start_time:this.start_time,
+          end_time: this.end_time,
+        }
+        getExportConsumeDetailList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            let list = []
+            for (let i =0; i < response.data.data.order.length; i++){
+            let order =   response.data.data.order[i]
+              let number = ""
+              let name = ""
+              let department = ""
+              let doctor_name = ""
+              let balance_accounts = ""
+
+              let order_status = ""
+
+
+
+              if(order.his_patient != null && order.his_patient.number.length > 0){
+                number = order.his_patient.number
+
+              }
+
+              if(order.his_patient != null ){
+                if(order.his_patient.balance_accounts_type == 1){
+                  balance_accounts = "自费"
+                }
+
+                if(order.his_patient.balance_accounts_type == 2){
+                  balance_accounts = "医保"
+                }
+              }
+
+              if(order.patient != null && order.patient.name.length > 0){
+                name = order.patient.name
+
+              }
+
+              if(order.p_info != null && order.p_info.department != null && order.p_info.department.name.length > 0){
+                department = order.p_info.department.name
+
+              }
+
+              if(order.p_info != null && order.p_info.doctor.length > 0){
+                doctor_name = order.p_info.doctor
+              }
+
+              if(order.order_status == 1){
+                order_status = "待结算"
+              }
+
+              if(order.order_status == 2){
+                order_status = "已结算"
+              }
+
+              if(order.order_status == 3){
+                order_status = "已退费"
+              }
+
+
+              let obj = {
+                "就诊号":number,
+                "患者姓名":name,
+                "应收金额":order.medfee_sumamt,
+                "实收金额":order.medfee_sumamt,
+                "科室":department,
+                "医生姓名":doctor_name,
+                "收费类别":balance_accounts,
+                "收费者姓名":doctor_name,
+                "总金额":order.medfee_sumamt,
+                "现金支付":"",
+                "账户支付":"",
+                "支付宝支付":"",
+                "微信支付":"",
+                "其他支付":"",
+                "收费日期":"",
+                "收费状态":order_status,
+                "退费日期":"",
+              }
+              list.push(obj)
+            }
+            import('@/vendor/Export2Excel').then(excel => {
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室',"医生姓名","收费类别","收费者姓名","总金额","现金支付","账户支付","支付宝支付","微信支付","其他支付","收费日期","收费状态","退费日期"]
+              const data = this.formatJson(filterVal, list)
+              excel.export_json_to_excel({
+                header: tHeader,
+                data,
+                filename: "消费明细"
+              })
+            })
+
+          }
+        })
+
+      },  formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+      changeDoctor(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      handleSizeChange(limit){
+        this.limit = limit;
+        this.getHisOrderList()
+
+      },handleCurrentChange(page){
+        this.page = page;
+        this.getHisOrderList()
+
+
+      },
+      handleStartTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },handleEndTimeChange(){
+        this.page = 1
+        this.keywords=""
+        this.getHisOrderList()
+      },
+      searchAction(){
+        this.page = 1
+        this.getHisOrderList()
+
+
+      },
+      getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d}");
+      },
+      toDetail(row) {
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id='+row.patient.id+"&number="+row.number)
+      }, getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },getHisOrderList(){
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          type: this.admin_user_id
+        }
+        getHisOrderList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.order
+            this.total = response.data.data.total
+          }
+        })
+
+      },getDoctorList(){
+        getDoctorList().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.doctors = response.data.data.doctors
+          }
+        })
+
+
+      }
+    }, created() {
+     this.getDoctorList()
+     this.getHisOrderList()
+
+
+    }
+  }
+</script>

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -4,6 +4,7 @@
     :visible.sync="isLastOrNextVisible"
     @close="hide"
     width="1010px"
+    class="callPrescription"
     :modal-append-to-body="false"
   >
     <el-date-picker
@@ -36,15 +37,15 @@
 
 
     <div v-for="(item,index) in allPrescription" :key="index">
-      <div>引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
+      <div class="quote" v-if="item.prescriptions.length > 0">引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
       <el-checkbox-group v-model="item.check_group">
         <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
-          <el-checkbox :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+          <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
           <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="drug_name"  width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="drug_name"  width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.advice_name }}</span>
               </template>
@@ -52,9 +53,7 @@
 
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
-                </div>
+                <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
@@ -68,7 +67,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="day" width="50" label="天数">
+            <el-table-column align="center" prop="day" width="60" label="天数">
               <template slot-scope="scope">
                 {{scope.row.day}}
               </template>
@@ -76,9 +75,7 @@
 
             <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
-                </div>
+                <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="retail_price" width="80" label="单价">
@@ -86,7 +83,7 @@
                 <div>{{scope.row.retail_price}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="200" label="备注">
+            <el-table-column align="center" prop="remark" label="备注">
               <template slot-scope="scope">
                 <div>{{scope.row.remark}}</div>
               </template>
@@ -95,8 +92,8 @@
           <el-table v-if="subItem.type == 2" :data="subItem.project" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="project_name" width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.project.project_name }}</span>
               </template>
@@ -104,7 +101,7 @@
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
               <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
                 <span>{{ scope.row.single_dose }}</span>
@@ -134,20 +131,17 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <!--<el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>-->
-                  <div>{{ scope.row.total }}{{scope.row.unit}}</div>
-                </div>
+                <div>{{ scope.row.total }}{{scope.row.unit}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="单价">
+            <el-table-column align="center" prop="name" width="60" label="单价">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
                 <span>{{ scope.row.price }}</span>
 
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="100" label="备注">
+            <el-table-column align="center" prop="name" label="备注">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
                 <span>{{ scope.row.remark }}</span>
@@ -349,6 +343,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.callPrescription{
+  .el-dialog__body{
+    padding:0px 20px 30px;
+  }
+  .quote{
+    margin-top: 10px;
+    font-size: 14px;
+  }
+}
 </style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -25,10 +25,10 @@
           <el-form-item label="处方类型: " prop="name" label-position="right">
             <el-select style="width:100%;" v-model="register_type" placeholder="">
               <el-option
-                v-for="(item,index) in register"
+                v-for="(item,index) in getDictionaryDataConfig('system','prescription_type')"
                 :key="index"
-                :label="item.label"
-                :value="item.value">
+                :label="item.name"
+                :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -84,22 +84,26 @@
             </el-tab-pane>
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
             </el-tab-pane>
-            <div class="RP">Rp</div>
-
-            <div style="float: right">
-              <el-button
-                round
-                @click="openLast(3)"
-              >上一方
-              </el-button>
-
-              <el-button
-                round
-                @click="openNext(4)"
-              >下一方
-              </el-button>
+            <div class="RP">Rp
+              <div style="float: right;margin-bottom:5px;margin-right:1%;">
+                <el-button
+                  round
+                  size="small"
+                  @click="openLast(3)"
+                >上一方
+                </el-button>
+
+                <el-button
+                  round
+                  size="small"
+                  @click="openNext(4)"
+                >下一方
+                </el-button>
+              </div>
             </div>
 
+            
+
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>
@@ -367,13 +371,13 @@
     data() {
       return {
         register: [
-          {value: 1, label: "普通"},
-          {value: 2, label: '急诊'},
-          {value: 3, label: "儿科"},
-          {value: 4, label: "麻醉"},
-          {value: 5, label: "精一"},
-          {value: 6, label: "精二"},
-          {value: 7, label: "其他"},
+          {value: 11, label: "普通门诊"},
+          {value: 12, label: '门诊挂号'},
+          {value: 13, label: "急诊"},
+          {value: 14, label: "门诊慢性病"},
+          {value: 15, label: "门诊统筹"},
+          {value: 16, label: "门诊特殊病"},
+          {value: 21, label: "普通住院"},
 
         ],
         isLastOrNextVisible: false,
@@ -1519,7 +1523,8 @@
           }, 400)
         }
       }
-    }
+    },
+   
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -5,8 +5,9 @@
     @close="hide"
     width="1010px"
     :modal-append-to-body="false"
+    class="isLastOrNext"
   >
-    <div class="txsj">
+    <div class="txsj" style="text-align:center;">
       <el-button
         round
 
@@ -22,15 +23,15 @@
     </div>
 
     <div v-for="(item,index) in allPrescription" :key="index">
-      <div>引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
+      <div class="quote">引用 {{getTime(item.record_date, '{y}年{m}月{d}日')}} 的处方</div>
       <el-checkbox-group v-model="item.check_group">
         <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
-          <el-checkbox :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+          <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
           <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="drug_name"  width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="drug_name"  width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.advice_name }}</span>
               </template>
@@ -38,9 +39,7 @@
 
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
                   <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
-                </div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
@@ -54,7 +53,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="day" width="50" label="天数">
+            <el-table-column align="center" prop="day" width="60" label="天数">
               <template slot-scope="scope">
                 {{scope.row.day}}
               </template>
@@ -62,9 +61,7 @@
 
             <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
-                </div>
+                <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="retail_price" width="80" label="单价">
@@ -72,7 +69,7 @@
                 <div>{{scope.row.retail_price}}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="200" label="备注">
+            <el-table-column align="center" prop="remark" label="备注">
               <template slot-scope="scope">
                 <div>{{scope.row.remark}}</div>
               </template>
@@ -81,8 +78,8 @@
           <el-table v-if="subItem.type == 2" :data="subItem.project" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
-            <el-table-column align="center" prop="project_name" width="100" label="名称">
+            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.project.project_name }}</span>
               </template>
@@ -90,7 +87,7 @@
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
               <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
                 <span>{{ scope.row.single_dose }}</span>
@@ -120,20 +117,17 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                <div style="display:flex;align-items:center;">
-                  <!--<el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>-->
                   <div>{{ scope.row.total }}{{scope.row.unit}}</div>
-                </div>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="单价">
+            <el-table-column align="center" prop="name" width="60" label="单价">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
                 <span>{{ scope.row.price }}</span>
 
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="100" label="备注">
+            <el-table-column align="center" prop="name" label="备注">
               <template slot-scope="scope">
                 <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
                 <span>{{ scope.row.remark }}</span>
@@ -410,6 +404,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.isLastOrNext{
+  .el-dialog__body{
+    padding:0px 20px 30px;
+  }
+  .quote{
+    margin-top: 10px;
+    font-size: 14px;
+  }
+}
 </style>

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -85,17 +85,13 @@ export default {
         }
     },
     mounted(){
-        this.timer = setInterval(() => {
-            let obj = {
-                cmd: "queue/join",
-                data: {type:3,page:0,size:0},
-            };
-            this.websocketSend(obj)
-        }, 1000*50);
+        // let obj = {
+        //     cmd: "queue/join",
+        //     data: {type:3,page:0,size:0},
+        // };
+        // this.websocketSend(obj)
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
-        this.timer = null
 
         let unObj = {
             cmd: "queue/unjoin",

src/xt_pages/sign/components/computerCalling.vue

@@ -63,17 +63,13 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        this.timer = setInterval(() => {
-            let obj = {
-                cmd: "queue/join",
-                data: {type:4,page:0,size:0},
-            };
-            this.websocketSend(obj)
-        }, 1000*50);
+        // let obj = {
+        //     cmd: "queue/join",
+        //     data: {type:4,page:0,size:0},
+        // };
+        // this.websocketSend(obj)
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
-        this.timer = null
         let unObj = {
             cmd: "queue/unjoin",
             data: {type:4},

src/xt_pages/sign/signIn.vue

@@ -155,25 +155,23 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        this.timer = setInterval(() => {
-            if(this.page < Math.ceil(this.count / 10)){
-                console.log('执行')
-                this.page++
-                let obj = {
-                    cmd: "queue/queuelist",
-                    data: {page:this.page,size:10}
-                };
-                this.websocketSend(obj)
-            }else{
-                console.log('执行2222')
-                this.page = 1
-                let newobj = {
-                    cmd: "queue/queuelist",
-                    data: {page:this.page,size:10}
-                };
-                this.websocketSend(newobj)
-            }
-        }, 5000);
+        if(this.page < Math.ceil(this.count / 10)){
+            console.log('执行')
+            this.page++
+            let obj = {
+                cmd: "queue/queuelist",
+                data: {page:this.page,size:10}
+            };
+            this.websocketSend(obj)
+        }else{
+            console.log('执行2222')
+            this.page = 1
+            let newobj = {
+                cmd: "queue/queuelist",
+                data: {page:this.page,size:10}
+            };
+            this.websocketSend(newobj)
+        }
         
         this.timerID = setInterval(() => {
             this.updateTime()
@@ -181,9 +179,7 @@ export default {
         // this.updateTime();
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
         clearInterval(this.timerID);　　// 清除定时器
-        this.timer = null;
         let obj = {
             cmd: "queue/unjoin",
             data: {type:1},

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择商品" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog title="选择耗材" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -105,6 +105,7 @@
         SelectedDatas: [],
         table_current_index: -1,
         tableData:[],
+        row_id:0,
       }
     },
     props: {
@@ -135,7 +136,7 @@
         }
       },
        goodTypeTableChange: function(currentRow, oldCurrentRow) {
-       
+        
         let keyName = ""
         var arr = []
         for(let i= 0;i<this.propForm.goods.length;i++){
@@ -229,11 +230,27 @@
         console.log("searchArr",searchArr)
         this.propForm.goodType = []
         this.propForm.goodType = searchArr
+        
+       
       },
       changeGoodInfoTableData: function(val) {
-      }, changeAllGoodInfoTableData: function(selection) {
-
-        var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
+      },
+      changeAllGoodInfoTableData: function(selection) {
+        console.log("888878888888",this.propForm.goods)
+        var arr = []
+        var id = 0
+         for(let i=0;i<this.propForm.goods.length;i++){
+            for(let key in this.propForm.goods[i]){
+               if(key == this.row_id){
+                  arr.push(this.propForm.goods[i])
+                  id = i
+               }
+            }
+         }
+       console.log("arrr33333",arr)
+       console.log("i9999",id)
+        var goodInfos = this.propForm.goods[id][this.currentGoodTypeId]
+        console.log("999999",goodInfos)
         for (let y = 0; y < goodInfos.length; y++) {
           goodInfos[y].isSelected = false
         }
@@ -276,9 +293,27 @@
         row.index = rowIndex
       },
       onRowClicks(row, event, column) {
+        
         this.table_current_index = row.index
-      }, selectGoodInfo(selection, row) {
-        var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
+        this.row_id = row.id
+        
+      }, 
+      selectGoodInfo(selection, row) {
+
+        var arr = []
+        var id = 0
+        for(let i=0;i<this.propForm.goods.length;i++){
+              for(let key in this.propForm.goods[i]){
+                if(key == this.row_id){
+                    arr.push(this.propForm.goods[i])
+                    id = i
+                }
+              }
+          }
+        console.log("arrr33333",arr)
+        console.log("i9999",id)
+        var goodInfos = this.propForm.goods[id][this.currentGoodTypeId]
+        // var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]
         for (let y = 0; y < goodInfos.length; y++) {
           goodInfos[y].isSelected = false
         }

src/xt_pages/stock/detail/print.vue

@@ -23,30 +23,38 @@
             <tbody>
             <tr>
               <td style="line-height: 50px" width="50">序号</td>
-              <td style="line-height: 50px" width="250">耗材类型</td>
-               <td style="line-height: 50px" width="250">耗材名称</td>
+              <td style="line-height: 50px" width="250">耗材名称</td>
               <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <!-- <td style="line-height: 50px" width="250">耗材类型</td> -->
+            
+              
               <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
+             <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
               <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
             </tr>
 
-
             <tr v-for="(stock,index) in stockDatas" :key="stock.id">
               <td style="line-height: 50px">&nbsp;
                 {{index+1}}
               </td>
-              <td style="line-height: 50px">
-                <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
+               <td style="line-height: 50px">
+                <span>{{stock.good_name}}</span>
               </td>
-              <td style="line-height: 50px">
-                <span v-if="stock">{{stock.good_name}}</span>
+               <td style="line-height: 50px">
+                <span v-if="stock">{{stock.specification_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span v-if="stock">{{stock.specification_name}}</span>
+                <span>{{getUnit(stock.good_unit)}}</span>
               </td>
-
+              <!-- <td style="line-height: 50px">
+                <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
+              </td> -->
               <td style="line-height: 50px">{{calCount(stock)}}</td>
+              <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
+              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">{{stock.query_warehouseout_info[0].price}}</td>
               <td style="line-height: 50px" v-if="type == 1 || type == 3">{{calTotal(stock)}}</td>
               <td style="line-height: 50px"></td>
             </tr>
@@ -268,6 +276,15 @@
         r1 = Number(price.toString().replace('.', ''))
         r2 = Number(total.toString().replace('.', ''))
         return r1 * r2 / Math.pow(10, m)
+      },
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+           if(this.goodUnit[i].id == id){
+              name = this.goodUnit[i].name
+           }
+        }
+        return name
       }
     },
     created() {

src/xt_pages/stock/stockInOrder.vue

@@ -586,14 +586,16 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
-  
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
     this.start_time =
       nowYear +
       "-" +
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-   
+     
+     
 
       // this.warehousing_time =
       //   nowYear +

src/xt_pages/stock/stockInOrderAdd.vue

@@ -455,7 +455,7 @@
         }
         return name
       }, specificationName: function(good_info_id) {
-        console.log("333333333",this.goodInfo)
+        // console.log("333333333",this.goodInfo)
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == good_info_id) {

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -327,7 +327,7 @@ export default {
             tempForm['count'] = ''
             tempForm['price'] = val.selectedGoodInfo[i].buy_price.toString()
             tempForm['remark'] = ''
-            tempForm['good_unit'] = ''
+            tempForm['good_unit'] = val.selectedGoodInfo[i].good_unit
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }

src/xt_pages/stock/stockQuery.vue

@@ -46,7 +46,7 @@
             style="width: 200px;margin-left:10px;"
             class="filter-item"
             v-model.trim="keywords"
-            placeholder="商品编码/商品名称/规格名称"
+            placeholder="耗材名称/商品编码/商品名称/规格名称"
           />
           <el-button
             size="small"
@@ -226,7 +226,7 @@ export default {
         end_time:this.end_time,
         type_name:this.type_name,
       };
-      console.log("params-----",Params)
+     
       this.WarehouseInfo.loading = true;
       this.WarehouseInfo.warehouseInfoDate = [];
       getAllStockQueryList(Params).then(response => {

src/xt_pages/upload/fast/dialysisParams.vue

@@ -437,7 +437,7 @@ export default {
     watch:{
         monitor_records:{
             handler:function(val) {
-                console.log(333333333333,this.monitor_records)
+                // console.log(333333333333,this.monitor_records)
                 if(this.monitor_records.length > 5){
                     this.monitor_records = this.monitor_records
                 }else{