Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
               prefix-icon="el-icon-date" @change="handleScheduleDateChange"
              :editable="false" :clearable="false"
               style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
         <!-- 透析区 -->
         <el-tab-pane label="透析区" name="second">
           <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date"  format="yyyy-MM-dd"
-             value-format="yyyy-MM-dd"
-             @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
-            </el-date-picker>
+            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
             <el-input size="small" style="width:25%;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
             <el-button size="small" class="filter-item" style="margin-right:20px;" type="primary" @click="searchAction">搜索</el-button>
           </div>
       lastDialysisPrescribe: { id: 0 },
       //
       activeName: 'first',
-      selected_date:moment().format('YYYY-MM-DD'),
+      selected_date: new Date(),
       // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
       search_keyword: '', // 确定用于搜索的关键字
       search_input: '', // 输入中的关键字
       // end_time2:'',
       first_monitor:{},
       last_monitor:{},
-      new_date:0,
     }
   },
   created() {
       this.activeName = sessionStorage.getItem("nameActive")
     }
     var patient_id = this.$route.query.patient_id
-    var date = moment().format('YYYY-MM-DD')
-    this.new_date = (new Date(date).getTime()/1000)-28800
-    this.dialysis_date = ""
-    this.dialysis_date = (new Date(date).getTime()/1000)-28800
-    // var date = this.$route.query.date
+    var date = this.$route.query.date
     this.patient_id = patient_id
-    // this.date = date
-    // this.new_date = date
-    // this.dialysis_date= date
+    this.date = date
+    this.dialysis_date=date
     this.getScheduleDetail()
     this.getLongAdvice()
 
-    // this.selected_date = this.$route.query.date * 1000
-    // this.new_date = this.$route.query.date * 1000
+    this.selected_date = this.$route.query.date * 1000
     var schedule_type_selected = this.$store.getters.schedule_type_selected
     var zone_selected = this.$store.getters.zone_selected
     var patient_state_selected = this.$store.getters.patient_state_selected
     var treat_state_selected = this.$store.getters.treat_state_selected
-    // var selected_date = this.$store.getters.selected_date
-    // console.log("日志时间2222222222222222",selected_date)
+    var selected_date = this.$store.getters.selected_date
     if (schedule_type_selected) {
       this.scheduleStateVal = schedule_type_selected.schedule_type_selected
     }
     if (treat_state_selected) {
       this.treatStateVal = treat_state_selected.treat_state_selected
     }
-    // if (selected_date.selected_date) {
-    //   this.selected_date = selected_date.selected_date.format('YYYY-MM-DD')
-    // }
+    if (selected_date.selected_date) {
+      this.selected_date = selected_date.selected_date
+    }
 
     this.initData = {
       cmd: "queue/join",
     getLongAdvice() {
       const params = {
         patient_id: this.patient_id,
-        schedule_date:this.new_date,
+        schedule_date:this.$route.query.date,
 
       }
       getLongAdviceTwo(params).then(rs => {
     },
     getScheduleDetail: function() {
       this.loading = true
-      // var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+      var dateStr = parseTime(this.date, '{y}-{m}-{d}')
       if(this.$route.query.showView == true){
         this.loading = false
         return
       }
-      console.log('kkkkkkk2222222222222222222',this.selected_date);
+      // console.log('kkkkkkk',dateStr);
       this.doctor_advices = []
-      getDialysisScheduleDetail(this.patient_id, this.selected_date).then(rs => {
+      getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
 
         var resp = rs.data
         if (resp.state == 1) {
       //   schedule_type: this.schedule_type_selected,
       //   schedule_date: this.selected_date,
       // })
-      console.log("index-------------",index)
-      this.new_date = (new Date(index).getTime()/1000)-28800
-      this.dialysis_date = (new Date(index).getTime()/1000)-28800
       this.selected_date = index
       this.$store.dispatch('SetSelectedDate', { selected_date: index })
       this.requestDialysisSchedules()
     },
     requestDialysisSchedules: function() {
 
-      // var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
-      console.log("热切吴2222222222",this.selected_date)
-      getDialysisSchedules(this.selected_date).then(rs => {
+      var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
+      getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
     changePatient(schedual) {
         this.patient_id = schedual.patient_id
         this.date = schedual.schedule_date
-
-        this.new_date = schedual.schedule_date
-        this.dialysis_date = ""
-        this.dialysis_date = schedual.schedule_date
-
-        console.log("到哪去啊大大阿道夫阿道夫",this.dialysis_date)
          this.getScheduleDetail();
         console.log('schedual',schedual);
         //this.getLongAdvice();
 
         var patient_id = schedual.patient_id
-        // var date = schedual.schedule_date
-        // this.$router.push({
-        //   path: '/dialysis/details',
-        //   query: {
-        //     patient_id: patient_id,
-        //     date: date,
-        //     patient_name: schedual.patient.name,
-        //     mode_id:schedual.mode_id
-        //   }
-        // })
+        var date = schedual.schedule_date
+        this.$router.push({
+          path: '/dialysis/details',
+          query: {
+            patient_id: patient_id,
+            date: date,
+            patient_name: schedual.patient.name,
+            mode_id:schedual.mode_id
+          }
+        })
     },
     handleClick(type) {
       sessionStorage.setItem('nameActive', type.name);
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.new_date,
+                date: this.$route.query.date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.new_date,
+                date: this.$route.query.date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:this.$route.query.mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date:this.new_date,
+                date: this.$route.query.date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date:this.new_date,
+                date: this.$route.query.date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:this.$route.query.mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
 
        var params = {
          patient_id:this.$route.query.patient_id,
-         record_date:this.new_date,
+         record_date:this.$route.query.date,
        }
       getInitPrintData(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

             if (item.project.length > 0) {
               item.project.map((it) => {
                 if (it.type == 2) {
-                  if (it.project.cost_classify == 3) {
+                  //103属于韶关宜柏的检验项目类型
+                  if (it.project.cost_classify == 3 || it.project.cost_classify == 103) {
                     projectPrint.push(it);
                     total += it.project.price * parseInt(it.count);
                   }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

     <!-- <div class="backColor"></div> -->
     <div class="mainCenter" v-loading="loading">
       <div class="centerLeft">
-        <div v-if="prescriptions[0].id >0 && (org_id == 10278 || org_id == 10138 || org_id == 0) ">
-        <el-button style="width: 100px" size="small" @click="callElePre(1)" type="primary">处方预核验</el-button>
-        <el-button style="width: 100px"  size="small" @click="callElePre(2)" type="primary">处方签名</el-button>
-        <el-button style="width: 100px"  size="small" @click="callElePre(3)" type="primary">处方上传</el-button>
-        <el-button style="width: 100px"  size="small" @click="callElePre(4)" type="primary">处方撤销</el-button>
-        <el-button style="width: 100px"  size="small" @click="callElePre(5)" type="primary">处方信息查询</el-button>
-        <el-button style="width: 100px"  size="small" @click="callElePre(6)" type="primary">处方审核结果查询</el-button>
-          <el-button style="width: 100px"  size="small" @click="callElePre(7)" type="primary">处方取药结果查询</el-button>
-          <el-button style="width: 100px"  size="small" @click="callElePre(8)" type="primary">药品在售查询</el-button>
+        <div v-if="prescriptions[0].id >0 && (org_id == 10454) ">
+          <el-button style="width: 100px" size="small" @click="callElePre(1)" type="primary">处方预核验</el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(2)" type="primary">处方签名</el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(3)" type="primary">处方上传</el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(4)" type="primary">处方撤销</el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(5)" type="primary">处方信息查询</el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(6)" type="primary">处方审核结果查询
+          </el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(7)" type="primary">处方取药结果查询
+          </el-button>
+          <el-button style="width: 100px" size="small" @click="callElePre(8)" type="primary">药品在售查询</el-button>
 
 
         </div>
                     <el-table-column label="规格" width="60" v-if="org_id != 10206">
                       <template slot-scope="scope">
                         <span
-                          v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+                          v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>{{
+                          scope.row.min_number
+                        }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
                       </template>
                     </el-table-column>
 
                        </span>
                        <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> -->
                         <span
-                          v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count/scope.row.min_number >0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
+                          v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count/scope.row.min_number >0">{{
+                            Math.floor(scope.row.sum_count / scope.row.min_number)
+                          }}{{ scope.row.max_unit }}</span>
                         <span
-                          v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count%scope.row.min_number >0">{{ Math.floor(scope.row.sum_count % scope.row.min_number) }}{{ scope.row.min_unit }}</span>
+                          v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count%scope.row.min_number >0">{{
+                            Math.floor(scope.row.sum_count % scope.row.min_number)
+                          }}{{ scope.row.min_unit }}</span>
                         <span
-                          v-if="scope.row.sum_count >0 && scope.row.max_unit == scope.row.min_unit">{{ scope.row.sum_count }}{{ scope.row.max_unit }}</span>
+                          v-if="scope.row.sum_count >0 && scope.row.max_unit == scope.row.min_unit">{{
+                            scope.row.sum_count
+                          }}{{ scope.row.max_unit }}</span>
                       </template>
                     </el-table-column>
 
                         </span>
                         <span v-else> {{ scope.row.total }}</span> -->
                         <span
-                          v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{ scope.row.good_info.sum_count }}</span>
+                          v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{
+                            scope.row.good_info.sum_count
+                          }}</span>
                         <!--                                            //针对坐标系统的库存数据-->
                         <span v-if="org_id == 10206 && scope.row.type == 3">{{ scope.row.zuobiao_stock_num }}</span>
 
         var hours = nowDate.getHours()
         var min = nowDate.getMinutes()
 
-        var preTime = ""
+        var preTime = ''
         var nowTime =
           nowYear +
           '-' +
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
-        if(nowTime.split(" ")[0] != this.record_date){
-          if(this.org_id == 10206  || this.org_id == 0) {
-            preTime = this.record_date+ ' '  + (hours < 10 ? '0' + hours : hours) +
+        if (nowTime.split(' ')[0] != this.record_date) {
+          if (this.org_id == 10206 || this.org_id == 0) {
+            preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
               ':' + (min < 10 ? '0' + min : min)
-          }else {
+          } else {
             preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
               ':' + (min < 10 ? '0' + min : min)
           }
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
         ':' + (min < 10 ? '0' + min : min)
-      var preTime  = ""
-      console.log(nowTime.split(" ")[0] )
+      var preTime = ''
+      console.log(nowTime.split(' ')[0])
       console.log(this.record_date)
 
-      if(nowTime.split(" ")[0] != this.record_date){
-          preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
-            ':' + (min < 10 ? '0' + min : min)
+      if (nowTime.split(' ')[0] != this.record_date) {
+        preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+          ':' + (min < 10 ? '0' + min : min)
       } else {
         preTime = nowTime
       }
 
-
-
-
       for (let i = 0; i < this.prescriptions.length; i++) {
         this.prescriptions[i].name = '处方' + (i + 1)
         this.prescriptions[i]['pre_time'] = preTime
         (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
         ':' + (min < 10 ? '0' + min : min)
 
-
-      var preTime  = ""
-      console.log(nowTime.split(" ")[0] )
+      var preTime = ''
+      console.log(nowTime.split(' ')[0])
       console.log(this.record_date)
 
-      if(nowTime.split(" ")[0] != this.record_date){
+      if (nowTime.split(' ')[0] != this.record_date) {
 
-            preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
-              ':' + (min < 10 ? '0' + min : min)
+        preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+          ':' + (min < 10 ? '0' + min : min)
 
       } else {
         preTime = nowTime
       }
 
-
-
       let obj = {
         id: 0,
         name: newTabName,
       //     }
       // }
 
-      if(row.is_user!=1 &&  this.org_id != 10206){
-        console.log("row.sum_count",row)
+      if (row.is_user != 1 && this.org_id != 10206) {
+        console.log('row.sum_count', row)
         if (row.sum_count <= 0) {
-        if (selection) {
-          selection.forEach(row => {
-            if(row.is_project!=1){
-              if ( row.sum_count <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
+          if (selection) {
+            selection.forEach(row => {
+              if (row.is_project != 1) {
+                if (row.sum_count <= 0) {
+                  this.$refs.multipleTable.toggleRowSelection(row)
+                }
               }
-            }
 
-          })
-        } else {
-          this.$refs.multipleTable.clearSelection()
-        }
-        if (row.is_project == 0 || row.is_project == 2){
-          this.$message.error(row.drug_name + '库存不足')
-          return
+            })
+          } else {
+            this.$refs.multipleTable.clearSelection()
+          }
+          if (row.is_project == 0 || row.is_project == 2) {
+            this.$message.error(row.drug_name + '库存不足')
+            return
+          }
         }
-       }
       }
 
-
-
-      if(this.org_id == 10206){
+      if (this.org_id == 10206) {
         if (row.zuobiao_stock_num <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (that.curPrescriptions.advices.length > 0) {
                 index = that.curPrescriptions.advices.length
               }
-              let maxIndexAdvice =null
+              let maxIndexAdvice = null
               if (that.curPrescriptions.advices.length > 0) {
                 for (let i = 0; i < that.curPrescriptions.advices.length; i++) {
                   // 获取当前对象
             }
 
             let tempMaxIndexAdvice = {
-              groupno:0
+              groupno: 0
             }
-            let maxIndexAdvice =null
+            let maxIndexAdvice = null
             if (this.curPrescriptions.advices.length > 0) {
               for (let i = 0; i < this.curPrescriptions.advices.length; i++) {
                 // 获取当前对象
 
       // }
 
-      if (row.stock_count <= 0 &&  this.org_id != 10206 && this.org_id != 0) {
-         if (row.type == 3) {
-           if (selection) {
-             selection.forEach(row => {
-               if (row.stock_count <= 0) {
-                 this.$refs.tables.toggleRowSelection(row)
-               }
-             })
-           } else {
-             this.$refs.tables.clearSelection()
-           }
-           this.$message.error(row.project_name + '库存不足')
-           return
-       }
+      if (row.stock_count <= 0 && this.org_id != 10206 && this.org_id != 0) {
+        if (row.type == 3) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.stock_count <= 0) {
+                this.$refs.tables.toggleRowSelection(row)
+              }
+            })
+          } else {
+            this.$refs.tables.clearSelection()
+          }
+          this.$message.error(row.project_name + '库存不足')
+          return
+        }
       }
 
-      if ( this.org_id == 10206 && row.zuobiao_stock_num <= 0) {
+      if (this.org_id == 10206 && row.zuobiao_stock_num <= 0) {
         if (row.type == 3) {
           if (selection) {
             selection.forEach(row => {
     },
     clearSelection() {
       this.$refs.tabProjectTeam.clearSelection()
-    },callElePre(type){
-      switch (type){
+    }, callElePre(type) {
+      switch (type) {
         case 1:
-          var  that = this
+          var that = this
           let params = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG001', {
             params: params
 
           break
         case 2:
-          var  that = this
+          var that = this
           let params2 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG002', {
             params: params2
             })
           break
         case 3:
-          var  that = this
+          var that = this
           let params3 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG003', {
             params: params3
             })
           break
         case 4:
-          var  that = this
+          var that = this
           let params4 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG004', {
             params: params4
             })
           break
         case 5:
-          var  that = this
+          var that = this
           let params5 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG005', {
             params: params5
             })
           break
         case 6:
-          var  that = this
+          var that = this
           let params6 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG006', {
             params: params6
             })
           break
         case 7:
-          var  that = this
+          var that = this
           let params7 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG007', {
             params: params7
             })
           break
         case 8:
-          var  that = this
+          var that = this
           let params8 = {
-            'admin_user_id':3626,
+            'admin_user_id': 3626,
             'patient_id': this.patientInfo.id,
             'his_patient_id': this.hisPatientInfo.id,
-            'record_time':this.record_date
+            'record_time': this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG008', {
             params: params8