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

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -165,6 +165,7 @@
           :disabled="!is_has_exce"
           @click="execAdvice"
           :loading="deleLoading"
+
         >执行医嘱
         </el-button>
         <el-button v-else disabled round @click="execAdvice" :loading="deleLoading">执行医嘱</el-button>
@@ -208,7 +209,6 @@
       <!-- 医嘱列表 -->
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
-      <!-- :span-method="objectSpanMethod" -->
       <el-table
         v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -219,13 +219,14 @@
         ref="advices_list"
         @row-click="cellMouseEnter"
         :row-class-name="tableRowClassName"
-        
+        :span-method="objectSpanMethod"
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
-        @selection-change="handleSelectionChange"
         highlight-current-row
+
       >
-       <el-table-column type="selection"  width="55" ></el-table-column>
+      <!-- @selection-change="handleSelectionChange" -->
+        <!-- <el-table-column type="selection"  width="55"></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>
@@ -299,6 +300,8 @@
             <span>
               {{getXuserName(scope.row.checker)}}
             </span>
+
+
           </template>
         </el-table-column>
       </el-table>
@@ -318,9 +321,8 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection"  width="55"></el-table-column>
+        <!-- <el-table-column type="selection"  width="55"></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>
@@ -328,6 +330,13 @@
         </el-table-column>
 
 
+        <!--===================================-->
+<!--        <el-table-column prop="date" label="调试" align="center" min-width="26px">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span @click="lili(scope.$index,scope.row)">{{ scope.row.parent_id }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -614,8 +623,7 @@
     EditDoctorAdvice,
     ExecDoctorAdvice,
     getAdviceConfig,
-    GetLastOrNextDoctorAdvice,
-    GetOrderDoctorAdvice
+    GetLastOrNextDoctorAdvice
   } from '@/api/advice'
   import { getDataConfig } from '@/utils/data'
 
@@ -772,8 +780,6 @@
         drug_id: 0,
         src_type:"",
         org_id:0,
-        hisAdviceIds:"",
-        adviceIds:"",
       }
     },
     watch: {
@@ -790,50 +796,16 @@
 
     },
     methods: {
-      handleSelectionChange(row){
-        console.log("row3233223232332322323",row)
-       if(row.length >0){
-         this.currentRow = row[0]
-       }
-       var bloodIds= []
-       var hisIds=[]
-       console.log("this.his_is_open ",this.his_is_open )
-       console.log("is_advice_open",this.is_advice_open)
-       for(let i=0;i<row.length;i++){
-        //血透
-         if(this.his_is_open  != 1 && this.is_advice_open!=1){
-            bloodIds.push(row[i].id)
-         }
-         //his
-         if(this.his_is_open == 1 && this.is_advice_open!=1){
-             hisIds.push(row[i].id)
-         }
-         
-         if(this.his_is_open == 1 && this.is_advice_open == 1){
-            if(row[i].origin == 1){
-              bloodIds.push(row[i].id)
-            }
-            if(row[i].origin == 2){
-              hisIds.push(row[i].id)
-            }
-           this.currentRow.origin = 3
-         }
-       }
-      
-       if(this.his_is_open  == 1 || this.is_advice_open == 1){
-         this.is_has_exce = true
-         this.is_has_check = true
-       }
-     
-       if(this.his_is_open!=1 && this.is_advice_open!=1){
-        
-          this.is_has_exce = true
-          this.is_has_check = true
-       }
-        console.log("bloodIds",bloodIds,"hisIds",hisIds)
-       this.adviceIds = bloodIds.join(",")
-       this.hisAdviceIds = hisIds.join(",")
-      
+      handleSelectionChange(){
+
+      },
+
+      //调试
+      lili(index,row){
+        // console.log("==index==",index)
+        // console.log("==row==",row)
+        console.log("==doctor_advices==",this.doctor_advices)
+        console.log("==this.form==",this.form)
       },
       getContent: function() {
         if (this.sch != null) {
@@ -1270,7 +1242,7 @@
         let mode = '6'
 
 
-        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin,this.hisAdviceIds,this.adviceIds).then(response => {
+        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.exceLoading = false
@@ -1282,71 +1254,46 @@
                 type: 'success',
                 duration: 2000
               })
-              
               var msg = response.data.data.msg
               if(msg == 1){
-                  let params = {
-                  patient_id: this.patientid,
-                  record_time: this.request_record_date,
-                  type: 1,
-                  advice_date:this.$route.query.date,
-                }
-                this.GetOrderDoctorAdvice(params)
-                this.execTimeDialogVisible = false
+                var exid = response.data.data.advice.id
+                  if (response.data.data.advice.parent_id > 0) {
+                    exid = response.data.data.advice.parent_id
+                  }
+
+                  this.currentRow.execution_state = 1
+                  this.currentRow.execution_staff =
+                    response.data.data.advice.execution_staff
+                  this.currentRow.execution_time =
+                    response.data.data.advice.execution_time
+                  var alen = this.doctor_advices.length
+
+                  for (var index in this.doctor_advices) {
+                    if (
+                      this.doctor_advices[index].id == exid ||
+                      this.doctor_advices[index].parent_id == exid
+                    ) {
+                      this.doctor_advices[index].execution_state = 1
+                      this.doctor_advices[index].execution_staff =
+                        response.data.data.advice.execution_staff
+                      this.doctor_advices[index].execution_time =
+                        response.data.data.advice.execution_time
+                      // this.doctor_advices[index].checker = response.data.data.advice.checker;
+                      break
+                    }
+                  }
+                  this.execTimeDialogVisible = false
+
+                  return false
               }
-            
-              // if(msg == 1){
-              //   var exid = response.data.data.advice.id
-              //     if (response.data.data.advice.parent_id > 0) {
-              //       exid = response.data.data.advice.parent_id
-              //     }
-
-              //     this.currentRow.execution_state = 1
-              //     this.currentRow.execution_staff =
-              //       response.data.data.advice.execution_staff
-              //     this.currentRow.execution_time =
-              //       response.data.data.advice.execution_time
-              //     var alen = this.doctor_advices.length
-
-              //     for (var index in this.doctor_advices) {
-              //       if (
-              //         this.doctor_advices[index].id == exid ||
-              //         this.doctor_advices[index].parent_id == exid
-              //       ) {
-              //         this.doctor_advices[index].execution_state = 1
-              //         this.doctor_advices[index].execution_staff =
-              //           response.data.data.advice.execution_staff
-              //         this.doctor_advices[index].execution_time =
-              //           response.data.data.advice.execution_time
-              //         break
-              //       }
-              //     }
-              //     this.execTimeDialogVisible = false
-
-              //     return false
-              // }
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
-               let params = {
-                patient_id: this.patientid,
-                record_time: this.request_record_date,
-                type: 1,
-                advice_date:this.$route.query.date,
-              }
-              this.GetOrderDoctorAdvice(params)
                 this.execTimeDialogVisible = false
                 return false
               }
               if(msg == 3){
                 this.$message.error("无库存,请入库")
-               let params = {
-                patient_id: this.patientid,
-                record_time: this.request_record_date,
-                type: 1,
-                advice_date:this.$route.query.date,
-              }
-              this.GetOrderDoctorAdvice(params)
                 this.execTimeDialogVisible = false
                 return false
               }
@@ -1655,7 +1602,7 @@
             this.deleLoading = true
             let mode = '7'
 
-            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin,this.hisAdviceIds,this.adviceIds).then(
+            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin).then(
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1669,37 +1616,33 @@
                     type: 'success',
                     duration: 2000
                   })
-                   let params = {
-                    patient_id: this.patientid,
-                    record_time: this.request_record_date,
-                    type: 1,
-                    advice_date:this.$route.query.date,
+
+                  var exid = response.data.data.advice.id
+                  if (response.data.data.advice.parent_id > 0) {
+                    exid = response.data.data.advice.parent_id
                   }
-                console.log("param233223223233232",params)
-                 this.GetOrderDoctorAdvice(params)
-                  // var exid = response.data.data.advice.id
-                  // if (response.data.data.advice.parent_id > 0) {
-                  //   exid = response.data.data.advice.parent_id
-                  // }
-                  // this.currentRow.check_state = 1
-                  // this.currentRow.check_time =
-                  //   response.data.data.advice.check_time
-                  // this.currentRow.checker = response.data.data.advice.checker
-                  // var alen = this.doctor_advices.length
-
-                  // for (var index in this.doctor_advices) {
-                  //   if (
-                  //     this.doctor_advices[index].id == exid ||
-                  //     this.doctor_advices[index].parent_id == exid
-                  //   ) {
-                  //     this.doctor_advices[index].check_state = 1
-                  //     this.doctor_advices[index].check_time =
-                  //       response.data.data.advice.check_time
-                  //     this.doctor_advices[index].checker =
-                  //       response.data.data.advice.checker
-                  //     // break;
-                  //   }
+                  // if (this.currentRow.parent_id > 0) {
+                  //     exid = this.currentRow.parent_id;
                   // }
+                  this.currentRow.check_state = 1
+                  this.currentRow.check_time =
+                    response.data.data.advice.check_time
+                  this.currentRow.checker = response.data.data.advice.checker
+                  var alen = this.doctor_advices.length
+
+                  for (var index in this.doctor_advices) {
+                    if (
+                      this.doctor_advices[index].id == exid ||
+                      this.doctor_advices[index].parent_id == exid
+                    ) {
+                      this.doctor_advices[index].check_state = 1
+                      this.doctor_advices[index].check_time =
+                        response.data.data.advice.check_time
+                      this.doctor_advices[index].checker =
+                        response.data.data.advice.checker
+                      // break;
+                    }
+                  }
 
                   this.deleLoading = false
                 }
@@ -1793,6 +1736,29 @@
           this.nowExecTime = new Date(group_top_advice.start_time * 1000)
         }
         this.$refs.exec_time.open()
+        // if (this.currentRow == null) {
+        //   this.$message.error("请先选择要执行的医嘱！");
+        //   return false;
+        // }
+        //
+        // if (
+        //   this.currentRow.stop_state == 1 ||
+        //   this.currentRow.execution_state == 1
+        // ) {
+        //   this.$message.error("所选医嘱已停止或执行");
+        //   return false;
+        // }
+        //
+        // if (
+        //   this.currentRow.checker > 0 &&
+        //   this.currentRow.checker == this.$store.getters.xt_user.user.id
+        // ) {
+        //   this.$message.error("核对与执行不能是同一人");
+        //   return false;
+        // }
+        //
+        // this.execTimeDialogVisible = true;
+        // this.deleLoading = true;
       }
       ,
 
@@ -2043,6 +2009,8 @@
       }
       ,
       show(his_is_open,is_advice_open) {
+        console.log("his_is_open233232323232323322323",his_is_open)
+        console.log("is_advice_open233232323232323322323",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
@@ -2148,7 +2116,7 @@
         }
       },
       cellMouseEnter: function(row, column, event) {
-       
+        console.log("row323323322323233232",row)
         this.currentRow = row
         this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {
@@ -2318,11 +2286,11 @@
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
-       
         GetLastOrNextDoctorAdvice(params).then(response => {
           if (response.data.state == 1) {
 
             var doctor_advices = response.data.data.advices
+
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule
@@ -2333,40 +2301,6 @@
         })
 
       },
-      GetOrderDoctorAdvice(params){
-        GetOrderDoctorAdvice(params).then(response=>{
-           if(response.data.state == 1){
-            var doctorAdvice =  response.data.data.doctorAdvice
-            for(let i=0;i<doctorAdvice.lenght;i++){
-               doctorAdvice[i].origin = 1 
-            }
-            
-            var hisDoctorAdvice = response.data.data.hisDoctorAdvice
-            for(let i=0;i<hisDoctorAdvice.length;i++){
-               hisDoctorAdvice[i].origin = 2
-            }
-            this.doctor_advices = []
-            if(this.his_is_open!=1 && this.is_advice_open !=1){
-              
-               this.doctor_advices = doctorAdvice
-            }
-            if(this.his_is_open ==1 && this.is_advice_open!=1){
-              this.doctor_advices = hisDoctorAdvice
-            }
-
-            if(this.his_is_open == 1 &&  this.is_advice_open == 1){
-               for(let i=0;i<doctorAdvice.length;i++){
-                  this.doctor_advices.push(doctorAdvice[i])
-               }
-               for(let i=0;i<hisDoctorAdvice.length;i++){
-                 this.doctor_advices.push(hisDoctorAdvice[i])
-               }
-            }
-           
-           
-           }
-        })
-      },
       getDialysisScheduleDetail() {
         if(this.$route.query.showView && this.$route.query.showView == true){
           return
@@ -2407,8 +2341,7 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 1,
-            advice_date:this.$route.query.date,
+            type: 1
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2417,8 +2350,7 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 1,
-            advice_date:this.$route.query.date,
+            type: 1
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2434,8 +2366,7 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 2,
-            advice_date:this.$route.query.date,
+            type: 2
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2443,8 +2374,7 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 2,
-            advice_date:this.$route.query.date,
+            type: 2
           }
           this.GetLastOrNextDoctorAdvice(params)
 
@@ -2632,7 +2562,6 @@
      }
     },
     created() {
-      console.log("doctor_advices32323233323322332",this.doctor_advices)
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date
@@ -2642,6 +2571,9 @@
       this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
+
+
+      // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
     },

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -98,9 +98,12 @@
             </tr>
           </thead>
           <tbody>
-            <tr>
+            <!-- <tr>
               <td>
-                 <div class="row">
+                
+              </td>
+            </tr> -->
+                <div class="row">
                   <table class="proj_table">
                     <tbody>
                       <tr>
@@ -1724,9 +1727,6 @@
                     </tbody>
                   </table>
                 </div>
-              </td>
-            </tr>
-               
               
 
             <!-- <tr