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

     hospitalRecord:"住院登记",
     hisTool:"HIS工具",
     hospitalCharges:'住院收费',
-
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/hospitalCharges.js

     {
       path: '/hospitalCharges/outpatientChargesManagement',
       component: () => import('@/xt_pages/hospitalStation/outpatientChargesManagement'),
-      name: 'outpatientChargesManagement',
-      meta: { title: 'outpatientChargesManagement', noCache: true }
+      name: 'hospitalChargesManagement',
+      meta: { title: 'hospitalChargesManagement', noCache: true }
     },
     // {
     //   path: '/outpatientCharges/outpatientInvoice',

src/store/modules/globalConfig.js

         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      12: {
+        id: 12,
+        name: '无抗凝剂',
+        type: 1,
+        shouji: 2,
+        weichi: 2,
+        zongliang: 2,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

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

           if (minites < 10) {
             minites = '0' + minites
           }
-          if (this.$store.getters.xt_user.org.id == 10016) {
+          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4  ) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
           } else {
             if (schedual.schedule_type == 1) {

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

              <span v-if="scope.row.monitor_anticoagulant == 7">低分子肝素钠</span>
              <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
              <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
+             <span v-if="scope.row.monitor_anticoagulant == 12">无抗凝剂</span>
              <span v-if="scope.row.monitor_anticoagulant_value!=''">（{{ scope.row.monitor_anticoagulant_value ? scope.row.monitor_anticoagulant_value : ""  }}）</span>
 
             </template>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

             <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
             <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
             <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
+            <span v-if="monitor.monitor_anticoagulant == 12">无抗凝剂</span>
             <span v-if="monitor.monitor_anticoagulant_value!=''">（{{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }}）</span>
           </td>
           <!-- <th v-if="isShow('血压监测部位')">{{getBloodPressure(monitor.blood_pressure_monitoring_site)}}</th>

src/xt_pages/hospitalStation/components/prescriptionTable.vue

   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" 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="day" width="70" label="序号">
+        <template slot-scope="scope">
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>

src/xt_pages/hospitalStation/doctorDesk.vue

                 </div>
 
                 <div class="mainCell" style="margin-bottom:10px;">
-                    <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction"
-                              @keyup.enter.native='searchAction'
+                    <el-input size="small" placeholder="请输入姓名或就诊号"
                               v-model="search_input" class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                                @click="searchAction">
             return false
           } else {
             this.patientTableData = response.data.data.list
+            this.all_data = this.patientTableData
+
             this.patientTableDataTwo = response.data.data.list
             this.cal_one = response.data.data.total_one
             this.cal_two = response.data.data.total_two
 
       searchAction() {
         if (this.search_input.length == 0) {
-          switch (this.radio) {
-            case 0:
-              this.all_data = this.all_data_two
-              break
-            case 2:
-              this.cure_data = this.cure_data_two
-              break
-            case 1:
-              this.un_cure_data = this.un_cure_data_two
-              break
-          }
+          this.patientTableData = this.all_data
         } else {
-
           switch (this.radio) {
-            case 0:
-              let arr = []
-              for (let i = 0; i < this.all_data.length; i++) {
-                if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].number.indexOf(this.search_input) != -1) {
-                  arr = arr.concat(this.all_data[i])
-                  console.log(arr)
-                }
-              }
-              this.all_data = arr
-
-              break
             case 2:
               let arr2 = []
-              for (let i = 0; i < this.cure_data.length; i++) {
-                if (this.cure_data[i].name.indexOf(this.search_input) != -1 || this.cure_data[i].number.indexOf(this.search_input) != -1) {
-                  arr2 = arr2.concat(this.cure_data[i])
+              for (let i = 0; i < this.all_data.length; i++) {
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+                  arr2 = arr2.concat(this.all_data[i])
                 }
               }
-              this.cure_data = arr2
+              this.patientTableData = arr2
 
               break
             case 1:
               let arr3 = []
-              for (let i = 0; i < this.un_cure_data.length; i++) {
-                if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
-                  arr3 = arr3.concat(this.un_cure_data[i])
+              for (let i = 0; i < this.all_data.length; i++) {
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+                  arr3 = arr3.concat(this.all_data[i])
                 }
               }
-              this.un_cure_data = arr3
+              this.patientTableData = arr3
               break
           }
         }
             return false
           } else {
             this.patientTableData = response.data.data.list
+            this.all_data = this.patientTableData
+
             this.patientTableDataTwo = response.data.data.list
             this.cal_one = response.data.data.total_one
             this.cal_two = response.data.data.total_two
             return false
           } else {
             this.patientTableData = response.data.data.list
+            this.all_data = this.patientTableData
+
             this.patientTableDataTwo = response.data.data.list
             this.cal_one = response.data.data.total_one
             this.cal_two = response.data.data.total_two
             return false
           } else {
             this.patientTableData = response.data.data.list
+            this.all_data = this.patientTableData
             this.patientTableDataTwo = response.data.data.list
             this.cal_one = response.data.data.total_one
             this.cal_two = response.data.data.total_two
             } else {
 
               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]
-                  for (let b = 0; b < prescription.advices.length; b++) {
-                    console.log(prescription.advices[b].drug.is_special_diseases)
-                    if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
-                      prescription.advices.splice(b--, 1)
-                    }
-                  }
-                  for (let b = 0; b < prescription.project.length; b++) {
-                    if (prescription.project[b].type == 2) {
-                      if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
-                        prescription.project.splice(b--, 1)
-                      }
-                    } else if (prescription.project[b].type == 3) {
-                      if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
-                        prescription.project.splice(b--, 1)
-                      }
-                    }
-                  }
-                }
+
 
                 for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                   var prescription = response.data.data.sch_prescriptions[i]
 
                     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]
-                        for (let b = 0; b < prescription.advices.length; b++) {
-                          console.log(prescription.advices[b].drug.is_special_diseases)
-                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
-                            prescription.advices.splice(b--, 1)
-                          }
-                        }
-                        for (let b = 0; b < prescription.project.length; b++) {
-                          if (prescription.project[b].type == 2) {
-                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          } else if (prescription.project[b].type == 3) {
-                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          }
-                        }
-                      }
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
                   } else {
 
                     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]
-                        for (let b = 0; b < prescription.advices.length; b++) {
-                          console.log(prescription.advices[b].drug.is_special_diseases)
-                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
-                            prescription.advices.splice(b--, 1)
-                          }
-                        }
-                        for (let b = 0; b < prescription.project.length; b++) {
-                          if (prescription.project[b].type == 2) {
-                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          } else if (prescription.project[b].type == 3) {
-                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          }
-                        }
-                      }
+
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
                 } else {
 
                   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]
-                      for (let b = 0; b < prescription.advices.length; b++) {
-                        console.log(prescription.advices[b].drug.is_special_diseases)
-                        if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
-                          prescription.advices.splice(b--, 1)
-                        }
-                      }
-                      for (let b = 0; b < prescription.project.length; b++) {
-                        if (prescription.project[b].type == 2) {
-                          if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
-                            prescription.project.splice(b--, 1)
-                          }
-                        } else if (prescription.project[b].type == 3) {
-                          if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
-                            prescription.project.splice(b--, 1)
-                          }
-                        }
-                      }
-                    }
 
                     for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                       var prescription = response.data.data.sch_prescriptions[i]
                   } else {
 
                     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]
-                        for (let b = 0; b < prescription.advices.length; b++) {
-                          console.log(prescription.advices[b].drug.is_special_diseases)
-                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
-                            prescription.advices.splice(b--, 1)
-                          }
-                        }
-                        for (let b = 0; b < prescription.project.length; b++) {
-                          if (prescription.project[b].type == 2) {
-                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          } else if (prescription.project[b].type == 3) {
-                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          }
-                        }
-                      }
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
                   } else {
 
                     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]
-                        for (let b = 0; b < prescription.advices.length; b++) {
-                          console.log(prescription.advices[b].drug.is_special_diseases)
-                          if (prescription.med_type == '14' && prescription.advices[b].drug.is_special_diseases != 1) {
-                            prescription.advices.splice(b--, 1)
-                          }
-                        }
-                        for (let b = 0; b < prescription.project.length; b++) {
-                          if (prescription.project[b].type == 2) {
-                            if (prescription.med_type == '14' && prescription.project[b].project.disease_directory != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          } else if (prescription.project[b].type == 3) {
-                            if (prescription.med_type == '14' && prescription.project[b].good_info.is_special_diseases != 1) {
-                              prescription.project.splice(b--, 1)
-                            }
-                          }
-                        }
-                      }
+
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

                     </el-radio-group>
                 </div>
                 <div class="mainCell" style="margin-bottom:10px;">
-                    <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input"
+                    <el-input size="small"  v-model.trim="search_input"
                               class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                                @click="searchAction">
         patient_id: 0,
         prescription_id: 0,
         all_table_data: [],
+        all_charge_table_data: [],
+
         hisPatientDatas: [],
         order: {},
         addtions_charge: [],
             this.patientTableData = []
             this.all_table_data = []
             this.hisPatientDatas = []
+            this.all_charge_table_data = []
 
             let one_count = 0
             let two_count = 0
             this.hisPatientDatas = response.data.data.list_two
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
+            this.all_charge_table_data = response.data.data.charge_list
             this.cal_three = three_count
             this.current_index = 0
 
 
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
+            this.all_charge_table_data = response.data.data.charge_list
             this.cal_three = three_count
             this.current_index = 0
 
 
       },
       searchAction() {
+        if (this.search_input.length == 0) {
+          switch (this.radio) {
+            case 1:
+             this.patientTableData = this.all_table_data
+
+              break
+            case 2:
+
+              this.chargePatientTableData = this.all_charge_table_data
+
+              break
+          }
+
+
+        } else {
+          switch (this.radio) {
+            case 1:
+              let arr3 = []
+              for (let i = 0; i < this.all_table_data.length; i++) {
+                if (this.all_table_data[i].name.indexOf(this.search_input) != -1 || this.all_table_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+                  arr3 = arr3.concat(this.all_table_data[i])
+                }
+              }
+              this.patientTableData = arr3
+              break
+            case 2:
+              let arr2 = []
+              for (let i = 0; i < this.all_charge_table_data.length; i++) {
+                if (this.all_charge_table_data[i].name.indexOf(this.search_input) != -1 || this.all_charge_table_data[i].his_number.indexOf(this.search_input) != -1) {
+                  arr2 = arr2.concat(this.all_charge_table_data[i])
+                }
+              }
+              this.chargePatientTableData = arr2
+
+              break
+
+          }
+        }
+
+
+
 
       }, tabclickEventTwo(val) {
         for (let i = 0; i < this.month_prescriptions.length; i++) {
 
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
+            this.all_charge_table_data = response.data.data.charge_list
             this.cal_three = three_count
 
             switch (temp_id) {
 
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
+            this.all_charge_table_data = response.data.data.charge_list
             // this.cal_three = three_count;
 
             switch (temp_id) {
             this.hisPatientDatas = response.data.data.list_two
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
+            this.all_charge_table_data = response.data.data.charge_list
             this.current_index = 0
 
             switch (this.radio) {

src/xt_pages/hospitalStation/pastInquiries.vue

         })
       },
       getDiagnosis(id){
-        var name = "";
-        for(let i=0;i<this.diagnoses.length;i++){
-           if(id == this.diagnoses[i].id){
-              name = this.diagnoses[i].class_name
-           }
+        let ids = id.split(",")
+        var name = ""
+        for(let i = 0; i < ids.length; i++){
+
+          for(let b=0;b<this.diagnoses.length;b++){
+            if(parseInt(ids[i]) == this.diagnoses[b].id){
+              if(name.length == 0){
+                name = this.diagnoses[b].class_name
+              }else{
+                name = name +"," + this.diagnoses[b].class_name
+
+              }
+            }
+          }
         }
         return name
       }

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

                     <tr v-for="(it,index) in item.project" :key="index">
                         <td>{{index+1}}</td>
                         <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
-                        <td>{{it.single_dose}}</td>
+                        <td>{{it.count}}</td>
                         <td>{{getUnit(it.unit)}}</td>
                         <td>{{it.price}}</td>
                         <td></td>

src/xt_pages/qcd/workAnalysis/nurse.vue

               </template>
             </el-table-column>
 
-            <el-table-column label="开瘘" align="center">
-              <template slot-scope="scope">
-                {{scope.row.new_nuser_count?scope.row.new_nuser_count:''}}
-
-              </template>
-            </el-table-column>
-
             <el-table-column label="上机" align="center" width="300">
               <template slot-scope="scope">
                 {{scope.row.start_nuser_count?scope.row.start_nuser_count:''}}
                 <span v-if="getTotalCount(scope.row.admin_user_id)!=''">({{getTotalCount(scope.row.admin_user_id)}})</span>
               </template>
             </el-table-column>
+            
+             <el-table-column label="下机" align="center">
+              <template slot-scope="scope">
+                {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
+              </template>
+            </el-table-column>
 
+            <el-table-column label="冲管" align="center">
+              <template slot-scope="scope">
+                {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
+              </template>
+            </el-table-column>
 
             <el-table-column label="宣教/小结" align="center">
               <template slot-scope="scope">
                 start_nurse_count:total_start_nurse, -->
             <el-table-column label="合计" align="center">
               <template slot-scope="scope">
-                {{scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count + scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count +scope.row.start_nuser_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count+scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count+scope.row.start_nuser_count:''}}
+                {{scope.row.finish_nuser_count + scope.row.washpipe_nuser_count + scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count + scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count +scope.row.start_nuser_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count+scope.row.change_nuser_count+scope.row.difficult_nuser_count+scope.row.new_nuser_count+scope.row.start_nuser_count:''}}
               </template>
             </el-table-column>
           </el-table>
           {value:5, name:"疑难穿刺"},
           {value:6, name:"开瘘"},
           {value:7, name:"上机"},
+          {value:8, name:"下机"},
+          {value:9, name:"冲管"},
         ],
         crumbs: [
           { path: false, name: "质控管理" },
         GetNurseWorkloadTableData(params)
           .then(rs => {
             var resp = rs.data
-            console.log("resp232323",resp)
+            console.log("列表2323323232323233232332323223233223233223",resp)
             if (resp.state == 1) {
 
               let total_cure = 0
               let total_diffcult_nurse = 0
               let total_new_fistula_nurse = 0
               let total_start_nurse = 0
+              let total_finish_nurse = 0
+              let total_washpipe_nurse = 0
               this.loading = false
 
               for (let i = 0; i < resp.data.data.length; i++) {
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
                 total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
+                total_finish_nurse = total_finish_nurse + resp.data.data[i].finish_nuser_count
+                total_washpipe_nurse = total_washpipe_nurse + resp.data.data[i].washpipe_nuser_count
                 this.tableData.push(resp.data.data[i])
              }
               this.tableData.push( {
                 difficult_nuser_count:total_diffcult_nurse,
                 new_nuser_count:total_new_fistula_nurse,
                 start_nuser_count:total_start_nurse,
+                finish_nuser_count:total_finish_nurse,
+                washpipe_nuser_count:total_washpipe_nurse,
               })
-
+              console.log("hhhhhhh23232233223",this.tableData)
               var dialysisCount = resp.data.dialysisCount
                 console.log("dialysisCount",dialysisCount)
               for(let i=0;i<dialysisCount.length;i++){
                 }else if(this.query.statistics_type == 7){
                   this.bar.series[0].data.push(resp.data.data[i].start_nuser_count)
                   this.percent.push(resp.data.data[i].start_nurse_ratio)
+                }else if(this.query.statistics_type == 8){
+                  this.bar.series[0].data.push(resp.data.data[i].finish_nuser_count)
+                  this.percent.push(resp.data.data[i].finish_nurse_ratio)
+                }else if(this.query.statistics_type == 9){
+                  this.bar.series[0].data.push(resp.data.data[i].washpipe_nuser_count)
+                  this.percent.push(resp.data.data[i].washpipe_nurse_ratio)
                 }
               }
               this.getArrLength(this.bar.xAxis.data)

src/xt_pages/stock/detail/cancelStockDetail.vue

       @click="PrintAction"
       type="primary"
       >打印
+    </el-button>
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetail"
+      type="primary"
+      >明细导出
     </el-button>
     <el-button
       style="float: right;margin-right:10px"
       size="small"
       @click="exportList"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
     <div class="cell clearfix">
       <el-input
 
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.CancelStock.return_time | parseTime("{y}-{m}-{d}") }}
+            <span v-if="scope.row.is_total == 0">{{ scope.row.CancelStock.return_time | parseTime("{y}-{m}-{d}") }}</span> 
+            <span v-if="scope.row.is_total == 1"></span>
           </template>
         </el-table-column>
         <el-table-column label="制单人" align="center">
             {{ scope.row.count }}
           </template>
         </el-table-column>
+
+        <el-table-column label="退库价" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+
+       <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+          
+             <!-- <span v-if="scope.row.is_total == 0">{{ (scope.row.count * scope.row.price).toFixed(2) }}</span>
+            <span v-else>{{ scope.row.total }}</span> -->
+            {{scope.row.total}}
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-pagination
       selectedTableData: [],
       dealer: [],
       tableList:[],
-      goodUnit:[]
+      goodUnit:[],
+      tableDataList:[],
+      table:[],
     };
   },
   methods: {
         } else {
           this.total = response.data.data.total;
           console.log("数据源头",response.data.data.list)
+          var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.cancelStockDate.push(response.data.data.list[i]);
-            this.tableList.push(response.data.data.list[i])
+            
+            var obj = response.data.data.list[i];
+            response.data.data.list[i].total = (response.data.data.list[i].price * response.data.data.list[i].count).toFixed(2)
+            total += response.data.data.list[i].price * response.data.data.list[i].count
+            obj["is_total"] = 0;
+            this.cancelStockDate.push(obj);
+            
+          }
+          console.log("2322323323232323223322323")
+          this.tableDataList = response.data.data.list
+         
+          var listgroup = response.data.data.listgroup
+          console.log("hh2322322332",listgroup)
+
+          this.cancelStockDate.push({
+            order_number: "合计",
+            is_total: 1,
+            total: total.toFixed(2),
+            CancelStock: {
+              return_count: 0
+            }
+          });
+        for(let i=0;i<listgroup.length;i++){
+            listgroup[i].child = []
+          for(let j=0;j<response.data.data.list.length;j++){
+             if(listgroup[i].GoodInfo.id == response.data.data.list[j].GoodInfo.id){
+                 listgroup[i].child.push(response.data.data.list[j])
+             }
           }
         }
+        this.tableList = listgroup
+        console.log("退库列表",this.tableList)
+        }
       });
     },
     getXuserName(id) {
         .catch(() => {});
     },
       exportList(){
-     
+        console.log("hhhhhh",this.tableList)
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
           this.tableList[i].specification_name = this.tableList[i].GoodInfo.specification_name
           this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
-          this.tableList[i].total_price = (this.tableList[i].count * this.tableList[i].price).toFixed(2)
+          this.tableList[i].total = this.getTotalCount(this.tableList[i].child)
+          this.tableList[i].total_price = (this.tableList[i].total * this.tableList[i].price).toFixed(2)
+         
         }
+       var obj = {"index":"合计","total_price":0}
+       for(let i=0;i<this.tableList.length;i++){
+           obj.total_price +=this.tableList[i].total * this.tableList[i].price
+       }
+       obj.total_price = obj.total_price.toFixed(2)
+       console.log("obj23233",obj)
+       this.tableList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','退库价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','total','price','total_price','remark']
        
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)
           this.downloadLoading = false
         })
        },
+     exportListDetail(){
+        var obj = {index:"合计",total_price:0}
+        var total = 0
+        for(let i=0;i<this.tableDataList.length;i++){
+          this.tableDataList[i].index = i + 1
+          this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)
+          this.tableDataList[i].good_name = this.typeNameOne(this.tableDataList[i].good_id)
+          this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
+          this.tableDataList[i].time = this.getTime(this.tableDataList[i].CancelStock.return_time)
+          this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].CancelStock.creater)
+          this.tableDataList[i].out_count = this.tableDataList[i].count
+          this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+          total += this.tableDataList[i].count * this.tableDataList[i].price
+        }
+        obj.total_price = total.toFixed(2)
+        this.tableDataList.push(obj)
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','order_number', 'good_type_name', 'good_name','specification_name','time','user_name','price','out_count','total_price']
+
+       const data = this.formatJson(filterVal, this.tableDataList)
+       console.log("data",data)
+      
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+     },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },
        }
       return name
      },
+    getTime: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    getTotalCount(val){
+      var total = 0
+      if (val.length > 0) {
+        for(let i=0;i<val.length;i++){
+           total += val[i].count
+        }
+      }
+      return total
+    }
   }
 };
 </script>

src/xt_pages/stock/detail/stockInDetail.vue

   name: "stockInDetail",
 
   created() {
+    
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    var start_time =  window.sessionStorage.getItem('start_time')
+    var end_time =  window.sessionStorage.getItem('end_time')
+    console.log("start_time",start_time,end_time)
+    if(start_time !=null){
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('start_time')
+    window.sessionStorage.removeItem('end_time')  
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
-
-    // this.getPrintStockGood()
     this.org_id = this.$store.getters.xt_user.template_info.org_id
-    console.log("机构ID",this.org_id)
+   
     this.getGoodDetailPrintList()
   },
   data() {
       stockTotal:[],
       org_id:0,
       tableInfo:[],
+      tableDataList:[],
     };
   },
   methods: {
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }
-        
+          this.tableDataList = response.data.data.list
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
+         window.sessionStorage.removeItem('start_time')
         this.GetCancelStock();
-        // this.getPrintStockGood()
+       
       }
     },
     endTimeChange(val) {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        window.sessionStorage.removeItem('end_time')
         this.GetCancelStock();
-        // this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
       return (r1 * r2) / Math.pow(10, m);
     },
     PrintAction: function() {
+      window.sessionStorage.setItem('start_time',this.start_time)
+      window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({
         path: "/stock/print",
         query: {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
         console.log("hhhhhhhh",this.tableInfo)
-       
+        
         const data = this.formatJson(filterVal, this.tableInfo)
         console.log("data222222222",data)
+      
           excel.export_json_to_excel({
             header: tHeader,
             data,
         })
       },
       exportListDetal(){
+        console.log("l可悲2233",this.tableDataList)
         var obj = {index:"合计",total_price:0}
-        var total_price = 0
-        for(let i=0;i<this.cancelStockDate.length;i++){
-          this.cancelStockDate[i].index = i + 1
-          this.cancelStockDate[i].good_type_name = this.typeName(this.cancelStockDate[i].good_type_id)
-          this.cancelStockDate[i].good_name = this.typeNameOne(this.cancelStockDate[i].good_id)
-          this.cancelStockDate[i].specification_name = this.specificationName(this.cancelStockDate[i].good_id)
-          this.cancelStockDate[i].warehousing_time = this.getTime(this.cancelStockDate[i].Warehousing.warehousing_time)
-          this.cancelStockDate[i].user_name = this.getXuserName(this.cancelStockDate[i].Warehousing.creater)
-          this.cancelStockDate[i].total_price = (this.cancelStockDate[i].warehousing_count * this.cancelStockDate[i].price).toFixed(2)
-          total_price += this.cancelStockDate[i].warehousing_count * this.cancelStockDate[i].price
+        var total = 0
+        for(let i=0;i<this.tableDataList.length;i++){
+          this.tableDataList[i].index = i + 1
+          this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)
+          this.tableDataList[i].good_name = this.typeNameOne(this.tableDataList[i].good_id)
+          this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
+          this.tableDataList[i].time = this.getTime(this.tableDataList[i].Warehousing.warehousing_time)
+          this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].Warehousing.creater)
+          this.tableDataList[i].total_price = (this.tableDataList[i].warehousing_count * this.tableDataList[i].price).toFixed(2)
+          total += this.tableDataList[i].warehousing_count * this.tableDataList[i].price
         }
-        obj.total_price = total_price.toFixed(2)
-        this.cancelStockDate.push(obj)
+        obj.total_price = total.toFixed(2)
+        this.tableDataList.push(obj)
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
-        const filterVal = ['index','warehousing_count', 'good_type_name', 'good_name','specification_name','warehousing_time','user_name','price','warehousing_count','total_price']
-        console.log("hhhhhhhh",this.cancelStockDate)
+        const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
+        console.log("hhhhhhhh",this.tableDataList)
       
         
-        const data = this.formatJson(filterVal, this.cancelStockDate)
+        const data = this.formatJson(filterVal, this.tableDataList)
         console.log("data222222222",data)
+        return
           excel.export_json_to_excel({
             header: tHeader,
             data,

src/xt_pages/stock/detail/stockOutDetail.vue

       @click="PrintAction"
       type="primary"
       >打印
+    </el-button>
+     <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetail"
+      type="primary"
+      >明细导出
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
       size="small"
       @click="exportList"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
     <div class="cell clearfix">
       <el-input
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
-    // this.getPrintStockGood()
-    // this.getList()
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
     console.log("机构信息",org_id)
       orgId:"",
       tableData:[],
       tableOut:[],
+      tableDataList:[],
     };
   },
   methods: {
         } else {
 
           this.total = response.data.data.total;
-          console.log("详情23233323",response.data.data.list)
+         
+          var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
-
+            total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
             
           }
+          this.tableDataList = response.data.data.list
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
-            total: response.data.data.total_price,
+            total: total.toFixed(2),
             WarehouseOut: {
               warehouse_out_time: 0
             }
           this.downloadLoading = false
         })
      },
+     exportListDetail(){
+
+        var obj = {index:"合计",total_price:0}
+        var total = 0
+        for(let i=0;i<this.tableDataList.length;i++){
+          this.tableDataList[i].index = i + 1
+          this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)
+          this.tableDataList[i].good_name = this.typeNameOne(this.tableDataList[i].good_id)
+          this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
+          this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
+          this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
+          this.tableDataList[i].out_count = this.tableDataList[i].count
+          this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+          total += this.tableDataList[i].count * this.tableDataList[i].price
+        }
+        obj.total_price = total.toFixed(2)
+        this.tableDataList.push(obj)
+       import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','time','user_name','price','out_count','total_price']
+
+       const data = this.formatJson(filterVal, this.tableDataList)
+       console.log("data",data)
+      
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+     },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

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

       type="primary"
       >打印
     </el-button>
-    <!-- <el-button
+    <el-button
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListOne"
       type="primary"
       >明细导出
-    </el-button> -->
+    </el-button>
     <el-button
       style="float: right;margin-right:10px"
       size="small"
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</span>
+            <span>{{scope.row.specification_name}}</span>
           </template>
         </el-table-column>
 
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            {{scope.row.count * scope.row.price}}
+            {{scope.row.total_price}}
           </template>
         </el-table-column>
       </el-table>
       selectedTableData: [],
       dealer: [],
       tableData:[],
-      tableList:[]
+      tableList:[],
+      tableDataList:[],
     };
   },
   methods: {
       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
            var order =  response.data.data.order
-          //  console.log("退库详细222222222222222222",order)
+           var list = response.data.data.orderPrint
+           console.log("lsit232332",list)
+           for(let i=0;i<list.length;i++){
+             list[i].child = []
+            for(let j=0;j<order.length;j++){
+               if(list[i].drug_id == order[j].drug_id){
+                  list[i].child.push(order[j])
+               }
+            }
+           }
+           this.tableDataList = list
+           console.log("hh2323223",this.tableDataList)
+           var total_price = 0
+          for(let i=0;i<order.length;i++){
+             order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
+             order[i].is_total = 0
+             order[i].total_price = order[i].count * order[i].price
+             total_price += order[i].count * order[i].price
+          }
+           order.push({
+            order_number: "合计",
+            is_total: 1,
+            specification_name:"",
+            ctime:"",
+            total_price:total_price.toFixed(2),
+          });
            this.tableData = order
            this.tableList = order
            var total = response.data.data.total
       }
     },
     exportList(){
-       for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1
-          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
+       for(let i=0;i<this.tableDataList.length;i++){
+          if(this.tableDataList[i].drug_type == 1){
+            this.tableDataList[i].drug_type == "西药"
+          }
+          if(this.tableDataList[i].drug_type == 2){
+            this.tableDataList[i].drug_type == "草药"
+          }
+         if(this.tableDataList[i].drug_type == 3){
+            this.tableDataList[i].drug_type == "成药"
+          }
+          this.tableDataList[i].index = i+1
+          this.tableDataList[i].unit = this.tableDataList[i].dose + this.tableDataList[i].dose_unit + "*"+this.tableDataList[i].min_number + this.tableDataList[i].min_unit+"/"+this.tableDataList[i].max_unit
+          this.tableDataList[i].user_name = this.getAdminUser(this.tableDataList[i].creater)
+          this.tableDataList[i].total_count  = this.getTotalCount(this.tableDataList[i].child)
+          this.tableDataList[i].total_price = this.tableDataList[i].total_count * this.tableDataList[i].price
+          this.tableDataList[i].ctime = this.getTime(this.tableDataList[i].ctime)
         }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','remark']
-       
-       const data = this.formatJson(filterVal, this.tableList)
-       console.log("data",data)
-       
-       excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '药品退库明细'
+        const tHeader = ['序号','单据编号', '药品名称', '规格型号','单据类型','操作时间','制单人','数量','退库价','总价']
+        const filterVal = ['index','order_number','drug_name', 'unit', 'drug_type','ctime','user_name','total_count','price','total_price']
+        
+        const data = this.formatJson(filterVal, this.tableDataList)
+        console.log("data",data)
+        console.log("表格玩2323",this.tableDataList)
+        
+        excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '药品退库明细'
+          })
+            this.downloadLoading = false
          })
-          this.downloadLoading = false
-        })
        },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
           this.downloadLoading = false
         })
      },
-
+    getTotalCount(val){
+      var total = 0
+      if(val.length > 0){
+         for(let i=0;i<val.length;i++){
+           total +=val[i].count
+         }
+      }
+      return total
+    }
   }
 };
 </script>

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

         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
            <!-- {{scope.row.drug_spec}} -->
-           {{scope.row.dose}}{{scope.row.dose_unit}} * {{scope.row.min_number}}{{scope.row.min_unit}} / {{scope.row.max_unit}}
+           {{scope.row.specification_name}}
+           <!-- {{scope.row.dose}}{{scope.row.dose_unit}} * {{scope.row.min_number}}{{scope.row.min_unit}} / {{scope.row.max_unit}} -->
           </template>
         </el-table-column>
 
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
           console.log("drug3434444",drugInOrder)
+          var total_price = 0
+          for(let i=0;i<drugInOrder.length;i++){
+             drugInOrder[i].specification_name  = drugInOrder[i].dose + drugInOrder[i].dose_unit + "*" + drugInOrder[i].min_number +  drugInOrder[i].min_unit + "/" + drugInOrder[i].max_unit
+             drugInOrder[i].is_total = 0
+             total_price += drugInOrder[i].warehousing_count * drugInOrder[i].price
+          }
+           drugInOrder.push({
+            warehousing_order: "合计",
+            is_total: 1,
+            specification_name:"",
+            ctime:"",
+            total_price:total_price.toFixed(2),
+          });
+          console.log("hh23232323323223232332",drugInOrder)
           this.cancelStockDate = drugInOrder
            let objInfo = {}
           drugInOrder.forEach((item,index)=>{
             list[i].total_price = list[i].warehousing_count * list[i].price  
           }
           console.log("list666666666",list)
+         
           this.tableList = list
           var total = response.data.data.total
           this.total = total

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

         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
            <!-- {{scope.row.drug_spec}} -->
-           {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+           {{scope.row.specification_name}}
           </template>
         </el-table-column>
 
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            {{scope.row.price * scope.row.count}}
+            <!-- {{scope.row.price * scope.row.count}} -->
+            {{scope.row.total_price}}
           </template>
         </el-table-column>
       </el-table>
         if(response.data.state == 1){
           var order = response.data.data.order
           console.log("出库数据",order)
+          var total_price = 0
+          for(let i=0;i<order.length;i++){
+             order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
+             order[i].is_total = 0
+             order[i].total_price = order[i].count * order[i].price
+             total_price += order[i].count * order[i].price
+          }
+           order.push({
+            warehouse_out_order_number: "合计",
+            is_total: 1,
+            specification_name:"",
+            ctime:"",
+            total_price:total_price.toFixed(2),
+          });
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{

src/xt_pages/stock/drugs/drugStockOutOrder.vue

               total += this.drugFlowList[i].count
           }
         }
-        all_price = total * min_price
+        all_price = total * price
         console.log("total",total,min_price)
         return  all_price
       },

src/xt_pages/stock/drugs/inventory.vue

             </el-table-column>
             <el-table-column prop="name" label="盘点数量" align="center">
                 <template slot-scope="scope">
-                  {{scope.row.count}}
+                  {{scope.row.count}}{{scope.row.warehousing_unit}}<span v-if="scope.row.min_count>0">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="盘点人" align="center">
                 </el-form-item>
 
                 <div style="width:100%;display:flex;">
-                    <el-form-item prop="dose" label="盘点数量" >
+                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
                       <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="dose_unit" class="noMargin">
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位">
+                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
                       <el-option
                         v-for="(item,index) in getDataConfig('hemodialysis','units')"
                         :key="index"
                         :value="item.name">
                       </el-option>
                     </el-select>
-                    </el-form-item>
-                    <el-form-item prop="min_count" class="noMargin">
-                     <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="min_unit" class="noMargin">
-                     <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位">
+                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
+                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
                       <el-option
                         v-for="(item,index) in getDataConfig('hemodialysis','units')"
                         :key="index"
                       </el-option>
                     </el-select>
                     </el-form-item>
+                      
                 </div>
 
                 <el-form-item label="库存">
                 </el-table-column>
                 <el-table-column prop="name"  label="盘点数量" width="100" align="center">
                      <template slot-scope="scope">
-                       {{scope.row.count}}
+                       {{scope.row.count}}{{scope.row.warehousing_unit}}{{scope.row.min_count}}{{scope.row.min_unit}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="原进货价" width="100" align="center">
                       </el-option>
                   </el-select>
                 </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
-                </el-form-item> -->
-               <el-form-item prop="warehousing_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+              
+                <el-form-item label="进货价">
+                    <el-input v-model="form.last_price" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
+                </el-form-item>
+
+                <div style="width:100%;display:flex;">
+                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
+                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
+                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
                       <el-option
                         v-for="(item,index) in getDataConfig('hemodialysis','units')"
                         :key="index"
                         :value="item.name">
                       </el-option>
                     </el-select>
-                </el-form-item>
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item>
+                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
+                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
+                 </el-form-item>
+                </div>
                 <el-form-item label="库存">
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="单位">
                     <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
                 </el-form-item> -->
-                <el-form-item prop="warehousing_unit" label="单位">
+                <!-- <el-form-item prop="warehousing_unit" label="单位">
                     <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
                       <el-option
                         v-for="(item,index) in getDataConfig('hemodialysis','units')"
                         :value="item.name">
                       </el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="进货价">
                     <el-input v-model="form.last_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
                     <el-input v-model="form.retail_price" :disabled="true"></el-input>
                 </el-form-item>
-                <el-form-item label="盘点数量">
+                <!-- <el-form-item label="盘点数量">
                     <el-input v-model="form.count"></el-input>
-                </el-form-item>
+                </el-form-item> -->
+              
+                <div style="width:100%;display:flex;">
+                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
+                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
+                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
+                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
+                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
+                 </el-form-item>
+                </div>
                 <el-form-item label="库存">
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 this.form.expiry_date = val.expiry_date
                 this.form.product_date =val.product_date
                 this.form.drug_origin_place = val.drug_origin_place
+                this.form.min_unit = val.min_unit
              }
            })
         },
             return str + min_str
         },
         addInventory(){
+          console.log("this.for",this.form.batch_number,this.form.warehousing_order)
+          if(this.form.drug_name == ""){
+            this.$message.error("请输入药品名称")
+            return
+          }
+          if(this.form.batch_number == undefined){
+            this.$message.error("请选择批次")
+            return
+          }
+          if(this.form.count == ""){
+            this.$message.error("请输入盘点数量")
+            return
+          }
           var obj = {
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
             warehousing_unit:this.form.warehousing_unit,
             count:this.form.count,
+            min_count:this.form.min_count,
+            min_unit:this.form.min_unit,
             retail_price:this.form.retail_price.toString(),
             manufacturer:this.form.manufacturer,
             drug_origin_place:this.form.drug_origin_place,
             product_date:this.form.product_date,
             warehouse_info_id:this.form.warehouse_info_id,
          } 
+         console.log("表格9999999",this.tableData)
          this.tableData.push(obj) 
          this.form.drug_name = ""  
          this.form.warehousing_unit = ""
            this.form.dealer = val.dealer
            this.form.manufacturer = val.manufacturer
            this.form.remark = val.remark
-           this.form.warehousing_unit = val.max_unit  
+           this.form.warehousing_unit = val.warehousing_unit  
            this.form.total = val.total
            this.form.batch_number = val.batch_number
            this.form.last_price = val.last_price
            this.form.expiry_date = val.expiry_date
            this.form.product_date =val.product_date  
            this.form.count = val.count
+           this.form.min_count = val.min_count
+           this.form.min_unit = val.min_unit
            this.index = index
            this.editdialogVisible = true
         },
                this.tableData[i].expiry_date = this.form.expiry_date
                this.tableData[i].product_date = this.form.product_date
                this.tableData[i].count =this.form.count
+               this.tableData[i].min_unit = this.form.min_unit
+               this.tableData[i].min_count = this.form.min_count
              }
             if(this.index == i){
                this.tableData[i].drug_id = this.form.drug_id
                this.tableData[i].expiry_date = this.form.expiry_date
                this.tableData[i].product_date = this.form.product_date
                this.tableData[i].count =this.form.count
+               this.tableData[i].min_unit = this.form.min_unit
+               this.tableData[i].min_count = this.form.min_count
              }
           }   
           this.editdialogVisible = false
               this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
               this.tableData[i].last_price = this.tableData[i].last_price.toString()
               this.tableData[i].count = parseInt(this.tableData[i].count)
+              this.tableData[i].min_count = parseInt(this.tableData[i].min_count)
               if(this.tableData[i].expiry_date == undefined){
                 this.tableData[i].expiry_date  = 0
               }else{
             this.form.stock_max_number = detail.stock_max_number
             this.form.stock_min_number = detail.stock_min_number
             this.form.warehouse_info_id = detail.warehouse_info_id
+            this.form.min_unit = detail.min_unit
+            this.form.min_count = detail.min_count
             this.modifydialogVisible = true
          }
        })
           warehousing_unit:this.form.warehousing_unit,
           last_price:this.form.last_price,
           retail_price:this.form.retail_price,
-          count:this.form.count,
+          count:parseInt(this.form.count),
           total:this.form.total,
           drug_origin_place:this.form.drug_origin_place,
           batch_number:this.form.batch_number,
           stock_max_number:this.form.stock_max_number,
           stock_min_number:this.form.stock_min_number,
           warehouse_info_id:this.form.warehouse_info_id,
+          min_count:parseInt(this.form.min_count),
+          min_unit:this.form.min_unit,
        }
        console.log("params2222",params)
       

src/xt_pages/stock/drugs/inventoryDetails.vue

                 <el-button size="small" type="primary">导出</el-button>
             </div> -->
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column prop="date" label="药品名称" width="100" align="center">
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
+            <el-table-column prop="date" label="药品名称" width="200" align="center">
                <template slot-scope="scope">
                  {{scope.row.drug_name}}
                </template>
             </el-table-column>
             <el-table-column prop="name" label="实盘点" width="100"  align="center">
                <template slot-scope="scope">
-                  {{scope.row.count}}
+                  {{scope.row.count}}{{scope.row.warehousing_unit}} <span v-if="scope.row.min_count">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
                 </template> 
             </el-table-column>
-            <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
+            <!-- <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
                <template slot-scope="scope">
                
                 </template>  
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="name" label="生产日期" width="100"  align="center">
                 <template slot-scope="scope">
                   {{getTime(scope.row.product_date)}}

src/xt_pages/stock/stockQuery.vue

         }
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
-          //  var count = response.data.data.count
-          //  console.log("入库统计",count)
-          //  this.countList = count
+         
            var outlist = response.data.data.outList
            console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
            console.log("autoCount",autoCount)
            this.autoCountList = autoCount
-          //  var totalCount = response.data.data.totalCount
-          //  console.log("totalcount",totalCount)
-          //  this.cancelCountList = totalCount
+           var totalCount = response.data.data.totalCount
+           console.log("totalcount",totalCount)
+           this.cancelCountList = totalCount
          }
       })
     },

src/xt_pages/workforce/remind_print_setting.vue

                 </div> 
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
-                <div v-if="org_id == 10188">体重增加:{{main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight}}</div>
+                <div v-if="org_id == 10188">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
                 <div>用法:静脉注射</div> 
                 <div>打印时间:{{currentDate}}</div>
               </div>