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

src/xt_pages/Dialysisanalysis/summary/index.vue

@@ -40,64 +40,9 @@
           color: '#606266'
         }"
                 style="width: 100%;">
-                <el-table-column type="index" label="序号" align="center" width="60">
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="姓名"
-                >
-                  <template slot-scope="scope">
-                    {{ scope.row.name }}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="月"
-                >
-                  <template slot-scope="scope">
-                    {{start_month.split("-")[1]}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="IPTH"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.ipth}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="血红蛋白"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.xhdb}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="血钾"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.xuejia}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="白蛋白"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.bdb}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="血磷"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.xuelin}}
-                  </template>
-                </el-table-column>
+                  <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop?column.prop:''" :label="column.label?column.label:''">
+                  </el-table-column>
+
               </el-table>
             </div>
           </div>
@@ -119,7 +64,10 @@ export default {
         BreadCrumb,
     },
     data() {
+
         return {
+          tableData: [], // 数据源
+          columns: [], // 表头
           start_month:new Date(new Date().getFullYear(), new Date().getMonth()).toLocaleDateString('en-CA'),
           start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
           end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
@@ -201,6 +149,24 @@ export default {
         GetFiveInstatistisc(params).then(response => {
           if (response.data.state == 1) {
             this.patientTableData  =  response.data.data.list
+
+            this.columns = Object.keys(response.data.data.list[0]).map(key => ({
+              prop: key,
+              label: key // 可以自定义表头名称
+            }));
+            // this.tableData = response.data.data.list
+
+
+            this.tableData = response.data.data.list.map(row => {
+              let newRow = {};
+              for (let key in row) {
+                newRow[key] = row[key] === 0 ? '' : row[key];
+              }
+              return newRow;
+            });
+
+            // 将 JSON 数据设置为表格数据
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -219,6 +185,21 @@ export default {
     },created() {
       this.getData()
 
+  },computed: {
+    processedTableData() {
+      // 处理数据，将值为0的情况设为空字符串
+      return this.tableData.map(row => {
+        let newRow = {};
+        for (let key in row) {
+          if (row[key] === 0) {
+            newRow[key] = '';
+          } else {
+            newRow[key] = row[key];
+          }
+        }
+        return newRow;
+      });
+    }
   }
 }
 </script>

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

@@ -5304,7 +5304,7 @@ mu
       'dialysisPrescription.prescription_water':function(){
         if(this.$store.getters.xt_user.template_info.org_id==10598){
            
-          if(this.dialysisPrescription.mode_id == 3){
+          if(this.dialysisPrescription.mode_id == 2 || this.dialysisPrescription.mode_id == 3){
              this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){

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

@@ -961,9 +961,7 @@
             align="center"
             label="Kt/V"
             width="140"
-            v-if="
-              isShow('KT/V') &&
-              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598 || org_id ==10517)
+            v-if="isShow('KT/V')
             "
           >
             <template slot-scope="scope">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -47,7 +47,7 @@
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
         
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">Kt/V</th>
+          <th v-if="isShow('KT/V')" width="92px">Kt/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -102,7 +102,7 @@
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598 || org_id ==10517)">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V')">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
           </td>

src/xt_pages/dialysis/details/index.vue

@@ -536,6 +536,11 @@
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析时长:
+                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分 </span></span>
+                  </div>
+                </div>
               </div>
             </div>
 

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -181,7 +181,7 @@
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
 <!--      <el-button @click="init">调试</el-button>-->
-    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button type="primary" :disabled="isdisable" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 </template>
@@ -201,6 +201,7 @@
       return {
         tmp_pay: "",
         isshow: false,
+        isdisable:false,
         id: 0,
         decimal: 0,//当前押金余额
         record_date: '',
@@ -394,6 +395,7 @@
 
         },
         hide: function() {
+          this.isdisable = false
           this.form = Object.assign({}, this.resetForm);
           this.loadingtwo = false;
           this.visibility = false
@@ -411,6 +413,7 @@
           }
           this.$refs['formValue'].validate((valid) => {
             if (valid) {
+              this.isdisable = true
               let value = {};
               value = this.getValue();
               this.$emit('confirm', value);

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -378,6 +378,7 @@
                   </div>
 
                 </div>
+                
                 <div class="printCell" style="display:flex;">
                   <span style="display: block;width: 45%;">
                     床号：{{ main_collection.number.number }}
@@ -639,6 +640,11 @@
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析时长:
+                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分</span></span>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -1990,9 +1996,11 @@ export default {
               //   }
               //   tempAddition.push(obj)
               // }
+              console.log("test2")
+
 
               var preTime = nowTime
-              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 && this.$store.getters.xt_user.org.id != 0) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
@@ -2016,9 +2024,27 @@ export default {
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
+
               } else {
+                console.log("test")
                 if (prescription.pre_time == 0) {
-                  preTime = nowTime
+                  console.log("++=========")
+                  console.log(nowTime.split(" ")[0])
+                  console.log(this.record_date)
+                  console.log("++=========")
+
+                  if(nowTime.split(" ")[0] != this.record_date){
+                    // preTime = this.record_date
+                    if(this.schedule.schedule_type == 1){
+                      preTime = this.record_date + ' ' + '7:00'
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = this.record_date + ' ' + '11:00'
+
+                    }else{
+                      preTime = this.record_date + ' ' + '17:00'
+                    }
+
+                  }
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
@@ -2039,8 +2065,9 @@ export default {
               }
               this.prescriptions.push(obj)
             }
-          } else {
 
+          } else {
+            console.log("----======0000000")
             if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
               for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                 var prescription = response.data.data.sch_prescriptions[i]
@@ -2183,6 +2210,20 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
                 }
+                console.log("++=========")
+                console.log(nowTime.split(" ")[0])
+                console.log(this.record_date)
+                console.log("++=========")
+                if(nowTime.split(" ")[0] != this.record_date){
+                  if(this.schedule.schedule_type == 1){
+                    preTime = this.record_date + ' ' + '7:00'
+                  }else if(this.schedule.schedule_type == 2){
+                    preTime = this.record_date + ' ' + '11:00'
+
+                  }else{
+                    preTime = this.record_date + ' ' + '17:00'
+                  }
+                }
 
                 let index = i + 1
                 let obj = {
@@ -2217,6 +2258,25 @@ export default {
               }
 
             } else {
+              console.log("----======1111111")
+              console.log(nowTime.split(" ")[0])
+              console.log(this.record_date)
+
+              if(nowTime.split(" ")[0] != this.record_date){
+                // preTime = this.record_date
+                if(this.schedule.schedule_type == 1){
+                  preTime = this.record_date + ' ' + '7:00'
+                }else if(this.schedule.schedule_type == 2){
+                  preTime = this.record_date + ' ' + '11:00'
+
+                }else{
+                  preTime = this.record_date + ' ' + '17:00'
+                }
+
+              }else{
+
+                preTime = nowTime
+              }
               let obj = {
                 id: 0,
                 name: '处方' + 1,
@@ -2224,7 +2284,7 @@ export default {
                 project: [],
                 addition: [],
                 order_status: 0,
-                pre_time: nowTime,
+                pre_time: preTime,
                 med_type: '',
                 is_medicine_status: false
               }
@@ -2523,7 +2583,17 @@ export default {
                       }
                     } else {
                       if (prescription.pre_time == 0) {
-                        preTime = nowTime
+                        if(nowTime.split(" ")[0] != this.record_date){
+                          if(this.schedule.schedule_type == 1){
+                            preTime = this.record_date + ' ' + '7:00'
+                          }else if(this.schedule.schedule_type == 2){
+                            preTime = this.record_date + ' ' + '11:00'
+
+                          }else{
+                            preTime = this.record_date + ' ' + '17:00'
+                          }
+                        }
+                        // preTime = nowTime
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -2692,6 +2762,16 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -2724,6 +2804,18 @@ export default {
                     }
 
                   } else {
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+                      preTime = nowTime
+                    }
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -2731,7 +2823,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }
@@ -3091,7 +3183,17 @@ export default {
                     var preTime = ''
 
                     if (prescription.pre_time == 0) {
-                      preTime = nowTime
+                      // preTime = nowTime
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
                     } else {
                       preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
@@ -3232,6 +3334,16 @@ export default {
                       }
 
                       var preTime = nowTime
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -3262,6 +3374,19 @@ export default {
                     }
 
                   } else {
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+
+                      preTime = nowTime
+                    }
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -3269,7 +3394,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }
@@ -3614,7 +3739,17 @@ export default {
                   var preTime = ''
 
                   if (prescription.pre_time == 0) {
-                    preTime = nowTime
+                    // preTime = nowTime
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }
                   } else {
                     preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                   }
@@ -3754,6 +3889,16 @@ export default {
                     }
 
                     var preTime = nowTime
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }
 
                     let index = i + 1
                     let obj = {
@@ -3785,6 +3930,19 @@ export default {
                   }
 
                 } else {
+                  if(nowTime.split(" ")[0] != this.record_date){
+                    if(this.schedule.schedule_type == 1){
+                      preTime = this.record_date + ' ' + '7:00'
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = this.record_date + ' ' + '11:00'
+
+                    }else{
+                      preTime = this.record_date + ' ' + '17:00'
+                    }
+                  }else{
+
+                    preTime = nowTime
+                  }
                   let obj = {
                     id: 0,
                     name: '处方' + 1,
@@ -3792,7 +3950,7 @@ export default {
                     project: [],
                     addition: [],
                     order_status: 0,
-                    pre_time: nowTime,
+                    pre_time: preTime,
                     med_type: ''
 
                   }
@@ -4250,8 +4408,19 @@ export default {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
                     } else {
+                      console.log("0---00000000000")
                       if (prescription.pre_time == 0) {
-                        preTime = nowTime
+                        // preTime = nowTime
+                        if(nowTime.split(" ")[0] != this.record_date){
+                          if(this.schedule.schedule_type == 1){
+                            preTime = this.record_date + ' ' + '7:00'
+                          }else if(this.schedule.schedule_type == 2){
+                            preTime = this.record_date + ' ' + '11:00'
+
+                          }else{
+                            preTime = this.record_date + ' ' + '17:00'
+                          }
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -4416,6 +4585,16 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -4453,6 +4632,21 @@ export default {
                     }
 
                   } else {
+
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+                      preTime = nowTime
+                    }
+
+
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -4460,7 +4654,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }
@@ -4472,122 +4666,6 @@ export default {
 
                     this.prescriptions.push(obj)
 
-                    // if(response.data.data.count <= 1 ){
-                    //   if(response.data.data.last_prescriptions.length == 0){
-                    //     let obj = {
-                    //       id: 0,
-                    //       name: '处方' + 1,
-                    //       advices: [],
-                    //       project: [],
-                    //       addition: [],
-                    //       order_status: 0,
-                    //       pre_time: nowTime,
-                    //
-                    //     };
-                    //     this.prescriptions.push(obj)
-                    //
-                    //
-                    //   }
-                    //   else {
-                    //     for (let i = 0; i < response.data.data.last_prescriptions.length; i++) {
-                    //       var prescription = response.data.data.last_prescriptions[i];
-                    //       let tempAdvice = [];
-                    //       let tempProject = [];
-                    //       let tempAddition = [];
-                    //
-                    //       //药品
-                    //       for (let b = 0; b < prescription.advices.length; b++) {
-                    //         let obj = {
-                    //           advice_id:0,
-                    //           drug_name: prescription.advices[b].advice_name,
-                    //           single_dose: prescription.advices[b].single_dose,
-                    //           delivery_way: prescription.advices[b].delivery_way,
-                    //           execution_frequency: prescription.advices[b].execution_frequency,
-                    //           retail_price: prescription.advices[b].price.toString(),
-                    //           remark: prescription.advices[b].remark,
-                    //           day: prescription.advices[b].day,
-                    //           prescribing_number: prescription.advices[b].prescribing_number.toString(),
-                    //           single_dose_unit: prescription.advices[b].single_dose_unit,
-                    //           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                    //           medical_insurance_number: prescription.advices[b].med_list_codg,
-                    //           id: prescription.advices[b].drug_id,
-                    //           drug:prescription.advices[b].drug
-                    //
-                    //         };
-                    //         tempAdvice.push(obj)
-                    //       }
-                    //
-                    //       //项目
-                    //       for (let b = 0; b < prescription.project.length; b++) {
-                    //         let obj = {
-                    //           id:0,
-                    //           project_id: prescription.project[b].project_id,
-                    //           project_name: prescription.project[b].project.project_name,
-                    //           statistical_classification: prescription.project[b].project.statistical_classification,
-                    //           single_dose: prescription.project[b].single_dose,
-                    //           delivery_way: prescription.project[b].delivery_way,
-                    //           execution_frequency: prescription.project[b].execution_frequency,
-                    //           number_days: prescription.project[b].day,
-                    //           total: prescription.project[b].count.toString(),
-                    //           price: prescription.project[b].price,
-                    //           remark: prescription.project[b].remark,
-                    //           medical_code: prescription.project[b].project.medical_code,
-                    //           unit: prescription.project[b].project.unit,
-                    //           type: prescription.project[b].type
-                    //         };
-                    //
-                    //         if (prescription.project[b].type == 2) {
-                    //           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-                    //           obj['medical_code'] = prescription.project[b].project.medical_code
-                    //           obj['project_name'] = prescription.project[b].project.project_name
-                    //
-                    //         } else if (prescription.project[b].type == 3) {
-                    //           obj['statistical_classification'] = ""
-                    //           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-                    //           obj['project_name'] = prescription.project[b].good_info.good_name
-                    //         }
-                    //         tempProject.push(obj)
-                    //       }
-                    //
-                    //       //附加收费
-                    //       for (let b = 0; b < prescription.addition.length; b++) {
-                    //         let obj = {
-                    //           item_name: prescription.addition[b].item_name,
-                    //           price: prescription.addition[b].price,
-                    //           count: prescription.addition[b].count,
-                    //           item_id: prescription.addition[b].item_id,
-                    //         };
-                    //         tempAddition.push(obj)
-                    //       }
-                    //
-                    //       var preTime = nowTime
-                    //
-                    //       let index = i + 1;
-                    //       let obj = {
-                    //         id: 0,
-                    //         name: '处方' + index,
-                    //         advices: tempAdvice,
-                    //         project: tempProject,
-                    //         addition: tempAddition,
-                    //         order_status: 1,
-                    //         pre_time: preTime
-                    //       };
-                    //       this.prescriptions.push(obj)
-                    //     }
-                    //   }
-                    // }else{
-                    //   let obj = {
-                    //     id: 0,
-                    //     name: '处方' + 1,
-                    //     advices: [],
-                    //     project: [],
-                    //     addition: [],
-                    //     order_status: 0,
-                    //     pre_time: nowTime,
-                    //
-                    //   };
-                    //   this.prescriptions.push(obj)
-                    // }
                   }
                 }
                 console.log("jin5")
@@ -4935,6 +5013,16 @@ export default {
                     } else {
                       if (prescription.pre_time == 0) {
                         preTime = nowTime
+                        if(nowTime.split(" ")[0] != this.record_date){
+                          if(this.schedule.schedule_type == 1){
+                            preTime = this.record_date + ' ' + '7:00'
+                          }else if(this.schedule.schedule_type == 2){
+                            preTime = this.record_date + ' ' + '11:00'
+
+                          }else{
+                            preTime = this.record_date + ' ' + '17:00'
+                          }
+                        }
 
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -5101,6 +5189,16 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -5138,6 +5236,21 @@ export default {
                     }
 
                   } else {
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+
+                      preTime = nowTime
+                    }
+
+
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -5145,7 +5258,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }

src/xt_pages/role/admin.vue

@@ -240,6 +240,8 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toZiDuanJiaoBen">字段脚本</el-button> -->
+
+
      </div>
 
 

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -207,12 +207,12 @@
                     @click="handleBatch(scope.row)"
                     >批次
                     </el-button>
-                    <!-- <el-button
+                    <el-button
                       size="small"
                       type="primary"
                       @click="handleCheckBatch(scope.row)"
                       >自查
-                    </el-button> -->
+                    </el-button>
                 </template>
 
                  

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -456,7 +456,7 @@
 
            
           </el-table-column>
-          <!-- <el-table-column label="自查自检" align="center">
+          <el-table-column label="自查自检" align="center">
             <template slot-scope="scope">
               <span style="color: #589ff8" @click="getDrugPatientName(scope.row)"
                 >自查</span
@@ -464,7 +464,7 @@
             </template>
 
            
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
       </div>
     </div>

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -74,7 +74,7 @@
 
             <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
             <template slot-scope="scope">
-                <el-input style="width:100px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
+                <el-input style="width:100px" v-model="scope.row.last_stock_max_number" @input="getSupplyCount(scope.row.warehousing_count,scope.row.max_unit,scope.row.last_stock_max_number,scope.row.max_unit,scope.row.last_stock_min_number,scope.row.min_unit,scope.row.XtBaseDrug.min_number,scope.row.XtBaseDrug.max_unit,scope.row.XtBaseDrug.min_unit)"></el-input>{{scope.row.max_unit}}
                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:100px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
                 </template> 
             </el-table-column>
@@ -193,6 +193,31 @@ export default {
         }
     },
     methods:{
+        getSupplyCount(warehousing_count,max_unit,last_stock_max_number,max_unit_one,last_stock_min_number,min_unit_one,base_min_number,base_max_unit,base_min_unit){
+          
+          var total_one  = 0
+          var total_two =0
+
+          if(max_unit == base_max_unit && base_max_unit!=base_min_unit){
+             total_one = warehousing_count *base_min_number
+          }
+
+          if(max_unit == base_min_unit && base_max_unit!=base_min_unit){
+            total_one = warehousing_count 
+          }
+          if(max_unit == base_min_unit && base_max_unit==base_min_unit){
+            total_one = warehousing_count 
+          }
+
+          total_two = last_stock_max_number * base_min_number + last_stock_min_number 
+         
+          console.log("total_one",total_one)
+          console.log("total_two",total_two)
+          if(total_two > total_one){
+            this.$message.error("盘点后数量大于该批次入库数量!")
+          }
+          
+        },   
         changeNumber(val){
           this.form.warehouse_info_id = val
           this.getDrugWarehouseInfoTotal(val)
@@ -830,7 +855,8 @@ export default {
             this.tableData = list
         }
       }) 
-    }
+    },
+    
     },
     created(){
       this.unitList =  this.getDataConfig('hemodialysis','units')

src/xt_pages/stock/newInventory.vue

@@ -71,7 +71,7 @@
 
              <el-table-column prop="name" label="盘点后数量" width="120"  align="center">
                 <template slot-scope="scope">
-                  <el-input style="width:80px" v-model="scope.row.last_stock_count"></el-input>
+                  <el-input style="width:80px" v-model="scope.row.last_stock_count"  @input="getSupplyCount(scope.row.warehousing_count,scope.row.last_stock_count)"></el-input>
                  </template> 
               </el-table-column>
 
@@ -469,6 +469,14 @@ export default {
        }  
      })    
     },
+    getSupplyCount(val1,val2){
+      // console.log("val2",val2)
+      // console.log("val1",val1)
+      if(val2 >val1){
+        console.log("JINLAAAA")
+         this.$message.error("盘点后数量大于该批次入库数量!")
+      }
+    }
     
    },