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

src/api/dialysis.js

@@ -208,6 +208,7 @@ export function postAssessmentBeforeDislysis(params) {
 }
 
 export function postTreatmentsummary(params) {
+  console.log('param223322323', params)
   return request({
     url: '/api/dialysis/treatmentsummary',
     method: 'Post',

src/api/schedule.js

@@ -237,3 +237,11 @@ export function synchroSchedule(params) {
     params: params
   })
 }
+
+export function getPatientScheduleTemplate(params) {
+  return request({
+    url: '/api/schedule/getpatientscheduletemplate',
+    method: 'get',
+    params: params
+  })
+}

src/store/modules/globalConfig.js

@@ -496,7 +496,7 @@ const global_config = {
       // 17: { id: 17, name: 'HDF前置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 18: { id: 18, name: 'HDF后置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 }
       20: {
-        id: 19,
+        id: 20,
         name: 'UF',
         dialysis_duration: 1,
         replacement_way: 1,

src/xt_pages/data/components/drugs.vue

@@ -47,7 +47,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <!--<el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>-->
         <el-button type="primary" size="small"  @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/drugTemplate.xlsx" :underline="false"
+        <el-link target="_blank" href="https://kuyi.shengws.com/drugsTemplate.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -89,16 +89,7 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.max_unit}}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="最小单位" width="60" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.min_unit}}</div>
-        </template>
-      </el-table-column> -->
+  
       <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
@@ -937,17 +928,17 @@
 
           var isHasDrugName = header.includes('*药品名称');
           console.log("isHasDrugName",isHasDrugName)
-          var isHasUnval = header.includes('*拆零');
-          console.log("isHasUnval",isHasUnval)
-          var isHasMinUnit= header.includes('*拆零单位');
-           console.log("isHasMinUnit",isHasMinUnit)
           var isHasDosage =  header.includes('*剂量')
           console.log("isHasDosage",isHasDosage)
-
           var isHasMaxUnit= header.includes('*剂量单位');
           console.log("isHasMaxUnit",isHasMaxUnit)
+            var isHasUnval = header.includes('*拆零');
+          console.log("isHasUnval",isHasUnval)
+          var isHasMinUnit= header.includes('*拆零单位');
+           console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
+        
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
@@ -956,14 +947,14 @@
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-
-          var isHasUnitMatrixing= header.includes("*单位换算");
-          console.log("isHasUnitMatrixing",isHasUnitMatrixing)
+         
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
-          var isHasLastPrice = header.includes('*进货价');
           var isHasPackingPrice= header.includes('*包装零售价');
-         console.log("isHasLastPrice",isHasLastPrice)
+          console.log("isHasLastPrice",isHasPackingPrice)
+          var isHasLastPrice = header.includes('*进货价');
+          console.log("进货价",isHasLastPrice)
+          
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
@@ -972,8 +963,9 @@
         console.log("isHasDrugDose",isHasDrugDose)
          var isDrugDoseUnit = header.includes('*默认单次用量单位');
          console.log("isDrugDoseUnit",isDrugDoseUnit)
-          if (!(isHasDrugName  && isHasUnval && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasPackingPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit && isHasDosage && isHasPackingUnit)) {
-            console.log("分区222222222222222222222222222222")
+          if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
+          isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
+           
             this.dialogVisible = true;
             return
           }
@@ -996,74 +988,49 @@
            }
 
 
-          if (results[i]['*拆零'] === undefined) {
-                obj['min_number'] = ''
-              } else {
-           if (key == '*拆零') {
-               obj['min_number'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['*拆零单位'] === undefined) {
-                obj['min_unit'] = ''
-              } else {
-           if (key == '*拆零单位') {
-               obj['min_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
-            if (results[i]['*剂量'] === undefined) {
-                obj['dosage'] = ''
+          if (results[i]['*剂量'] === undefined) {
+                obj['dose'] = ''
               } else {
             if (key == '*剂量') {
-                obj['dosage'] = results[i][key].replace(/\s/g,"")
+                obj['dose'] = results[i][key].replace(/\s/g,"")
               }
            }
 
            if (results[i]['*剂量单位'] === undefined) {
-                obj['max_unit'] = ''
+                obj['dose_unit'] = ''
               } else {
            if (key == '*剂量单位') {
-               obj['max_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-            if (results[i]['*包装单位'] === undefined) {
-                obj['packing_unit'] = ''
-              } else {
-           if (key == '*包装单位') {
-               obj['packing_unit'] = results[i][key].replace(/\s/g,"")
+               obj['dose_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
 
-          if (results[i]['默认给药途径'] === undefined) {
-                obj['delivery_way'] = ''
+  
+          if (results[i]['*拆零'] === undefined) {
+                obj['min_number'] = ''
               } else {
-           if (key == '默认给药途径') {
-               obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零') {
+               obj['min_number'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-           if (results[i]['默认执行频率'] === undefined) {
-                obj['execution_frequency'] = ''
+           if (results[i]['*拆零单位'] === undefined) {
+                obj['min_unit'] = ''
               } else {
-           if (key == '默认执行频率') {
-               obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零单位') {
+               obj['min_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-          if (results[i]['默认开药天数'] === undefined) {
-                obj['drug_day'] = ''
+
+            if (results[i]['*包装单位'] === undefined) {
+                obj['max_unit'] = ''
               } else {
-           if (key == '默认开药天数') {
-               obj['drug_day'] = results[i][key].replace(/\s/g,"")
+           if (key == '*包装单位') {
+               obj['max_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-
-
             if (results[i]['*药品类型'] === undefined) {
                 obj['drug_type'] = ''
               } else {
@@ -1099,28 +1066,6 @@
            }
 
 
-            if (results[i]['*医保等级'] === undefined) {
-                obj['medical_insurance_level'] = ''
-              } else {
-           if (key == '*医保等级') {
-               obj['medical_insurance_level'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
-
-
-            if (results[i]['*单位换算'] === undefined) {
-                obj['unit_matrixing'] = ''
-              } else {
-           if (key == '*单位换算') {
-               obj['unit_matrixing'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
-
-
           if (results[i]['*拆零零售价'] === undefined) {
                 obj['retail_price'] = ''
               } else {
@@ -1195,6 +1140,22 @@
               }
            }
 
+            if (results[i]['默认给药途径'] === undefined) {
+                obj['delivery_way'] = ''
+              } else {
+            if (key == '经销商') {
+                obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+              if (results[i]['默认执行频率'] === undefined) {
+                obj['execution_frequency'] = ''
+              } else {
+            if (key == '默认执行频率') {
+                obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
            if (results[i]['限制性用药'] === undefined) {
                 obj['lmt_used_flag'] = ''
               } else {
@@ -1415,12 +1376,14 @@
 
         }
        }
-
+       for(let i=0;i<tableData.length;i++){
+          tableData[i].dose = parseInt(tableData[i].dose)
+       }
        let params = {
           'drugs':tableData
         };
         console.log("params222222222",params)
-
+        
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

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

@@ -184,11 +184,11 @@ export default {
     show(record,date) {
       this.isVisibility = true
       this.record = record
-      console.log(111111111111111,date)
+      
       if(date){
         this.date = date
         this.record_date = uParseTime(this.date, '{y}-{m}-{d}')
-        console.log(22222222222,this.record_date)
+       
       }
       
       console.log('治疗小结', record)
@@ -320,16 +320,14 @@ export default {
       })
     },
     getPermission() {
-      request
-        .get('/api/func_per/get', {
+      request.get('/api/func_per/get', {
           params: {
             create_url: '/api/dialysis/treatmentsummary?mode=1',
             modify_url: '/api/dialysis/treatmentsummary?mode=2',
             modify_other_url: '/api/dialysis/treatmentsummary?mode=3',
             module: 9
           }
-        })
-        .then(res => {
+        }).then(res => {
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -535,6 +535,7 @@ export default {
             console.log('project_config',)
             if(project_config.is_open == 1){
               this.project = resp.data.project
+              console.log( this.project)
               let projectArr = []
               this.project.map(item => {
                 resp.data.hisAdvices.map(it => {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -286,10 +286,10 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 ">
-                             <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
-                             <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
-                          </span>
+                                          <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 ">
+                                              <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
+                                              <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
+                                            </span>
                                                 <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
                                             </template>
                                         </el-table-column>
@@ -382,9 +382,9 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
-                            {{scope.row.stock_count}}
-                        </span>
+                                                <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
+                                                    {{scope.row.stock_count}}
+                                                </span>
                                                 <span v-else> {{ scope.row.total }}</span>
                                             </template>
                                         </el-table-column>
@@ -776,7 +776,7 @@
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] = project_month_prescriptions.project[a].project
@@ -1111,13 +1111,15 @@
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['project'] = prescription.project[b].project
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      if(prescription.project[b].team_id > 0){
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
+                      }
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['good_info'] = prescription.project[b].good_info
@@ -1231,13 +1233,15 @@
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['project'] = prescription.project[b].project
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      if(prescription.project[b].team_id > 0){
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
+                      }
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['good_info'] = prescription.project[b].good_info

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -137,7 +137,7 @@
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">{{scope.row.type ==
-          2?getGroup(scope.row.statistical_classification):'耗材'}}
+          2?scope.row.statistical_classification:scope.row.statistical_classification}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -107,8 +107,11 @@
                 </div>
                 <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
                 <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-                <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
-                                   :sick="sick" :record_date="record_date"
+                <desk-prescription v-on:setData="setData"
+                                   :diagnoses="diagnoses"
+                                   :loading="isloading"
+                                   :sick="sick"
+                                   :record_date="record_date"
                                    :drugs="drugs"
                                    :allDrugs="allDrugs"
                                    :advices_template="advices_template"
@@ -747,13 +750,14 @@
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] = project_month_prescriptions.project[a].project
 
               } else if (project_month_prescriptions.project[a].type == 3) {
                 obj['statistical_classification'] = ''
+
                 obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
                 obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
                 obj['good_info'] = project_month_prescriptions.project[a].good_info
@@ -1193,7 +1197,6 @@
                     id: prescription.project[b].id,
                     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,
@@ -1208,13 +1211,18 @@
                   }
 
                   if (prescription.project[b].type == 2) {
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                    console.log("prescription.project[b].team.project_team：")
+                    console.log(prescription.project[b].team.project_team)
+                    obj['statistical_classification'] = prescription.project[b].team.project_team
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
 
                   } else if (prescription.project[b].type == 3) {
-                    obj['statistical_classification'] = ''
+                    if(prescription.project[b].team_id > 0){
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                    }
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
@@ -1328,7 +1336,6 @@
                       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,
@@ -1342,7 +1349,7 @@
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = ""
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['price'] = prescription.project[b].project.price
@@ -1587,7 +1594,6 @@
                           id: prescription.project[b].id,
                           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,
@@ -1601,13 +1607,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -1723,7 +1732,6 @@
                             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,
@@ -1737,7 +1745,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
@@ -2063,7 +2071,6 @@
                           id: prescription.project[b].id,
                           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,
@@ -2077,13 +2084,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -2190,7 +2200,6 @@
                             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,
@@ -2203,7 +2212,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] =""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
@@ -2519,7 +2528,6 @@
                         id: prescription.project[b].id,
                         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,
@@ -2533,13 +2541,16 @@
                       }
 
                       if (prescription.project[b].type == 2) {
-                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
                         obj['project'] = prescription.project[b].project
 
                       } else if (prescription.project[b].type == 3) {
-                        obj['statistical_classification'] = ''
+                        if(prescription.project[b].team_id > 0){
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                        }
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
                         obj['good_info'] = prescription.project[b].good_info
@@ -2645,7 +2656,6 @@
                           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,
@@ -2658,7 +2668,7 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = ''
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['price'] = prescription.project[b].project.price
@@ -3034,7 +3044,6 @@
                           id: prescription.project[b].id,
                           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,
@@ -3048,13 +3057,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -3167,7 +3179,6 @@
                             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,
@@ -3180,7 +3191,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
@@ -3463,7 +3474,6 @@
                           id: prescription.project[b].id,
                           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,
@@ -3477,13 +3487,16 @@
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] = prescription.project[b].project
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] = prescription.project[b].good_info
@@ -3597,7 +3610,6 @@
                             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,
@@ -3610,7 +3622,7 @@
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price

src/xt_pages/hospitalStation/template/printThree.vue

@@ -31,7 +31,7 @@
               <div style="margin-bottom: 10px;display:flex;">自费药品签名：<span class="under_line"></span></div>
               <!-- <div style="margin-bottom: 10px;display:flex;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div> -->
               <div style="margin-bottom: 10px;display:flex;">联系方式：<span class="under_line">{{item.patient.phone}}</span></div>
-              <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.pre_time) ? getTime(item.pre_time).split(' ')[0] : ''}}</span></div>
+              <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.record_date) ? getTime(item.record_date).split(' ')[0] : ''}}</span></div>
               <!-- <div>地址：{{item.patient.home_address}}</div> -->
               <!-- <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div> -->
           </div>

src/xt_pages/hospitalStation/treatTemplate/printTwo.vue

@@ -29,7 +29,7 @@
             <div style="margin-bottom: 10px;display:flex;">自费药品签名：<span class="under_line"></span></div>
             <!-- <div style="margin-bottom: 10px;display:flex;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div> -->
             <div style="margin-bottom: 10px;display:flex;">联系方式：<span class="under_line">{{item.patient.phone}}</span></div>
-            <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.pre_time) ? getTime(item.pre_time).split(' ')[0] : ''}}</span></div>
+            <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.record_date) ? getTime(item.record_date).split(' ')[0] : ''}}</span></div>
             <!-- <div>地址：{{item.patient.home_address}}</div> -->
             <!-- <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div> -->
         </div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -486,7 +486,7 @@
   import { uParseTime } from '@/utils/tools'
   import NextOrLastPrescription from './nextOrLastPrescription'
   import CallPrescription from './callPrescription'
-  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
+  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'    
 
   const moment = require('moment')
 

src/xt_pages/outpatientDoctorStation/template/printFive.vue

@@ -9,9 +9,9 @@
               <div><span style="font-size:20px;font-weight:bold;">No</span><div class="underLine" style="width:120px;"></div></div>
               <div style="display:flex;">
                   <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.record_date)?getTime(item.record_date).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.record_date)?getTime(item.record_date).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.record_date)?getTime(item.record_date).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
               </div>
           </div>
           <div class="basicCell">

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -27,14 +27,7 @@
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       v-loading="patientLoading"
                       highlight-current-row>
-                <el-table-column
-                        prop="date"
-                        label="序号"
-                        width="60"
-                        align="center"
-                        type="index"
-                >
-                </el-table-column>
+
                 <el-table-column align="center" prop="name" label="流水号">
                     <template slot-scope="scope">{{scope.row.record.trt_dcla_detl_sn}}</template>
                 </el-table-column>
@@ -102,7 +95,7 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column align="center" prop="name" label="疾病类型">
+                <el-table-column align="center" prop="name" label="疾病类型" width="100">
                     <template slot-scope="scope">
                         <el-select  filterable style="width:100%;" v-model="scope.row.record.sick_type" placeholder="请选择">
                             <el-option
@@ -121,16 +114,16 @@
                             <span @click="putOnRecord(1,scope.row)">备案</span>
                         </el-button>
 
-                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
-                            <span @click="putOnRecord(2,scope.row)">撤消</span>
-                        </el-button>
+<!--                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >-->
+<!--                            <span @click="putOnRecord(2,scope.row)">撤消</span>-->
+<!--                        </el-button>-->
                     </template>
                 </el-table-column>
             </el-table>
 
             <el-dialog title="备案" :visible.sync="dialogFormVisible">
-                <el-form :model="form" label-width="100px">
-                    <el-form-item label="险种类型" :label-width="formLabelWidth">
+                <el-form  label-width="100px">
+                    <el-form-item label="险种类型" >
                         <el-select v-model="insutype_value" placeholder="请选择" style="width: 200px;">
                             <el-option
                                     v-for="item in insutypes"
@@ -140,6 +133,48 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+
+                  <el-form-item label="医院鉴定日期" >
+                    <el-date-picker
+                        v-model="check_date"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width: 100%;"
+                        type="date"
+                        placeholder="选择开始时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd">
+                    </el-date-picker>
+
+                  </el-form-item>
+                  <el-form-item label="开始时间" >
+                    <el-date-picker
+                        v-model="start_date"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width: 100%;"
+                        type="date"
+                        placeholder="选择开始时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                  </el-form-item>
+
+                  <el-form-item label="结束时间" >
+                    <el-date-picker
+                        v-model="end_date"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width: 100%;"
+                        type="date"
+                        placeholder="选择结束时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                  </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -178,6 +213,9 @@
     data() {
       return {
         is_put_on_record:0,
+        start_date:'',
+        end_date:"",
+        check_date:"",
         datas: [
           {
             id: 0,
@@ -282,16 +320,7 @@
         this.keywords = "";
         this.getList()
       },
-      getName(value){
-        console.log(value);
-        for(let i = 0; i < this.insutype_arr.length; i++){
-          console.log(this.insutype_arr[i].value);
-          if(this.insutype_arr[i].value == value){
-            return this.insutype_arr[i].label
-          }
-        }
-        return "未知"
-      },
+
       getGdybPatientInfo(){
         let params ={
           id_card_no:this.currentObject.id_card_no,
@@ -449,10 +478,27 @@
           return
         }
 
+        if(this.start_date == '' || this.start_date  == 0){
+          this.$message.error("请选择开始时间");
+          return
+        }
+
+        if(this.end_date == '' || this.end_date  == 0){
+          this.$message.error("请选择结束时间");
+          return
+        }
+        if(this.check_date == '' || this.check_date  == 0){
+          this.$message.error("请选择鉴定时间");
+          return
+        }
+
         let params = {
           record_type: 0,
           patient_id: this.currentObject.id,
           insutype: this.insutype_value,
+          start_time: this.start_date,
+          end_time: this.end_date,
+          check_time: this.check_date,
           psn_no: this.psn_no,
           sick_id: this.currentObject.record.sick_type,
           doctor_id: this.currentObject.record.doctor_id,

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -129,84 +129,131 @@
               <div class="borderBox">
                <div v-for="(item,index) in modetype" :key="index">
                  <span v-if="item.mode_id == 'HD'">
-                    <p>HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HDF'">
-                    <p>HDF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HD+HP'">
-                    <p>HD+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HP'">
-                    <p>HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HF'">
-                    <p>HF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'SCUF'">
                     <p>SCUF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'IUF'">
-                    <p>IUF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>IUF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HFHD'">
                     <p>HFHD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HFHD+HP'">
-                    <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'PHF'">
-                    <p>PHF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>PHF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                    <span v-if="item.mode_id == 'HFR'">
-                    <p>HFR:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HFR:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HDF+HP'">
-                    <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HFHD+HP'">
-                      <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                    <span v-if="item.mode_id == '腹水回输'">
-                      <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                    <span v-if="item.mode_id == 'HD前置换'">
-                      <p>HD前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HD前置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                     <span v-if="item.mode_id == 'HD后置换'">
-                      <p>HD后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HD后置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                     <span v-if="item.mode_id == 'HDF前置换'">
-                      <p>HDF前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HDF前置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                     <span v-if="item.mode_id == 'HDF后置换'">
-                      <p>HDF后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HDF后置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                    <span v-if="item.mode_id == 'IUF+HD'">
                       <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
-                  <span v-if="item.mode_id == 'CVVHDF'">
-                      <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+
+                 <span v-if="item.mode_id == 'IU'">
+                      <p>IU:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                  <span v-if="item.mode_id == 'HD+'">
+                      <p>HD+:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == '血浆胆红素吸附+HDF'">
+                      <p>血浆胆红素吸附+HDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == '血浆胆红素吸附'">
+                      <p>血浆胆红素吸附:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'I-HDF'">
+                      <p>I-HDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'HD高通'">
+                      <p>HD高通:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'CVVH'">
+                      <p>CVVH:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'CVVHD'">
+                      <p>CVVHD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+
+                 <span v-if="item.mode_id == 'CVVHDF'">
+                      <p>CVVHDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == '未知'">
+                      <p>未知:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                </div>
               </div>
@@ -725,6 +772,11 @@ export default {
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
        console.log("本月最后一天",timeEnd)
+
+      this.startDate  = startDate
+      this.endDate = endDate
+      this.listQuery.start_time = startDate
+      this.listQuery.end_time = endDate
       //本月
       if(state == 0){
        //统计透析总量
@@ -756,6 +808,10 @@ export default {
         // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
+        this.startDate  = startDate
+        this.endDate = endDate
+        this.listQuery.start_time = startDate
+        this.listQuery.end_time = endDate
          //统计透析总量
         this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
@@ -786,6 +842,10 @@ export default {
         // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
+       this.startDate  = startDate
+       this.endDate = endDate
+       this.listQuery.start_time = startDate
+       this.listQuery.end_time = endDate
          //统计透析总量
         this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
@@ -817,6 +877,10 @@ export default {
         // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
+       this.startDate  = startDate
+       this.endDate = endDate
+       this.listQuery.start_time = startDate
+       this.listQuery.end_time = endDate
          //统计透析总量
         this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
@@ -854,9 +918,9 @@ export default {
       getDialysisModeType(startDate,endDate,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
 
-          var modetype =  response.data.data.modetype
-          console.log("modetype",modetype)
-          this.modetype = modetype
+          // var modetype =  response.data.data.modetype
+          // console.log("modetype",modetype)
+
           var total =  response.data.data.total
           console.log("total",total)
           this.total = total.count
@@ -864,6 +928,9 @@ export default {
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
           for(let i=0;i<modedate.length;i++){
+            if(modedate[i].mode_id == 0){
+              modedate[i].mode_id = "未知"
+            }
             if(modedate[i].mode_id == 1){
                modedate[i].mode_id = "HD"
             }
@@ -921,6 +988,44 @@ export default {
            if(modedate[i].mode_id == 19){
                modedate[i].mode_id = "IUF+HD"
             }
+
+            if(modedate[i].mode_id == 20){
+              modedate[i].mode_id = "IU"
+            }
+
+            if(modedate[i].mode_id == 21){
+              modedate[i].mode_id = "HD+"
+            }
+
+            if(modedate[i].mode_id == 22){
+              modedate[i].mode_id = "血浆胆红素吸附+HDF"
+            }
+
+            if(modedate[i].mode_id == 23){
+              modedate[i].mode_id = "血浆胆红素吸附"
+            }
+
+            if(modedate[i].mode_id == 24){
+              modedate[i].mode_id = "I-HDF"
+            }
+
+            if(modedate[i].mode_id == 25){
+              modedate[i].mode_id = "HD高通"
+            }
+
+            if(modedate[i].mode_id == 26){
+              modedate[i].mode_id = "CVVH"
+            }
+
+            if(modedate[i].mode_id == 27){
+              modedate[i].mode_id = "CVVHD"
+            }
+
+            if(modedate[i].mode_id == 28){
+              modedate[i].mode_id = "CVVHDF"
+            }
+            this.modetype = modedate
+
             // this.modesData.xAxis.push(modedate[i].mode_id)
             // this.modesData.series.push(((modedate[i].count/total)*100).toFixed(1))
           }

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -86,18 +86,18 @@
         ></el-table-column>
       </el-table>
 
-      <el-pagination
-        align="right"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="listQuery.page"
-        :page-sizes="[20, 40, 60, 80,100]"
-        :page-size="10"
-        background
-        style="margin-top:20px;"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
+<!--      <el-pagination-->
+<!--        align="right"-->
+<!--        @size-change="handleSizeChange"-->
+<!--        @current-change="handleCurrentChange"-->
+<!--        :current-page="listQuery.page"-->
+<!--        :page-sizes="[20, 40, 60, 80,100]"-->
+<!--        :page-size="10"-->
+<!--        background-->
+<!--        style="margin-top:20px;"-->
+<!--        layout="total, sizes, prev, pager, next, jumper"-->
+<!--        :total="total"-->
+<!--      ></el-pagination>-->
     </div>
   </div>
 </template>
@@ -296,6 +296,7 @@ export default {
       geStatistics(this.listQuery).then(response=>{
 
         if(response.data.state === 1){
+          this.tableData = []
           var statistics =  response.data.data.statistics
           var treatinfo = response.data.data.treatinfo
           this.total =  response.data.data.total
@@ -310,7 +311,7 @@ export default {
                 }
             })
          let list = Object.values(dataInfo)
-      
+
          list.map(item=>{
            for(let i=0;i<statistics.length;i++){
              if(item.date == statistics[i].date){
@@ -333,12 +334,12 @@ export default {
               dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
             }
           }
-          
+
           for (const key in dd) {
             var total = 0;
             for (const mkey in this.modeOptions) {
               if (mkey in dd[key]) {
-               
+
                 console.log(this.modeOptions[mkey].name)
                 dd[key][mkey].mode = this.modeOptions[mkey].name;
                 var number = parseInt(dd[key][mkey].number);
@@ -355,13 +356,12 @@ export default {
                 };
               }
             }
-            this.tableData = []
             this.tableData.push({ date: key, data: dd[key], total: total });
           }
         }
        })
     },
- 
+
   },
   created(){
     this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/stock/detail/print.vue

@@ -42,11 +42,9 @@
                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <!-- <span>{{item.GoodInfo.good_name}}</span> -->
                 {{item.good_name}}
               </td>
               <td style="line-height: 50px">
-                <!-- <span>{{item.GoodInfo.specification_name}}</span> -->
                 {{item.specification_name}}
               </td>
              
@@ -60,18 +58,24 @@
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
-                <!-- <span>{{item.GoodInfo.packing_unit}}</span> -->
                 {{item.packing_unit}}
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
-                <span v-if="type == 2"> {{ item.packing_price }}</span>
+                <span v-if="type == 2"> 
+                  <span v-if="org_id == 9919 || org_id == 9671">{{ item.buy_price }}</span>  
+                  <span v-else>
+                    {{ item.packing_price }} 
+                  </span>  
+                </span>
                  <span v-if="type == 4"> {{ item.price }}</span>
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2) }}</span>
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 9671">
+                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2) }}
+                  </span>
                   <span v-else>{{(item.count * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
@@ -93,7 +97,7 @@
               <td style="line-height: 50px"  width="80">
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
+                  <span v-if="org_id == 3907 || org_id == 9919 || org_id == 9671">{{getWareOutTotalOne().toFixed(2)}}</span>
                   <span v-else> {{getWareOutTotal().toFixed(2)}}</span>
                  </span> 
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
@@ -402,9 +406,10 @@
        return total
      },
      getWareOutTotalOne(){
+       console.log("数据23332323",this.stockDatas)
        var total = 0
        for(let i=0;i<this.stockDatas.length;i++){
-         total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].packing_price
+         total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].buy_price
        }
        return total
      }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -126,7 +126,8 @@
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-            {{ scope.row.price }}
+            <span v-if="scope.row.is_total == 0 && (orgId == 9919 || orgId == 9671)">{{scope.row.GoodInfo.buy_price}}</span>
+            <span v-else> {{ scope.row.price }} </span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
@@ -199,13 +200,14 @@ export default {
     }
     window.sessionStorage.removeItem('start')
     window.sessionStorage.removeItem('end')  
+    this.getGoodDetailPrintList()
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
-    this.getGoodDetailPrintList()
+    
     
   },
   data() {
@@ -366,9 +368,10 @@ export default {
             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
+           console.log("耗材出库数据323323323232232323232",this.tableDataList)
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -624,27 +627,27 @@ export default {
         }
       });
     },
-    getPrintStockGood(){
-      const params = {
-        start_time:this.start_time,
-        end_time:this.end_time,
-        type:3,
-      }
-      getPrintStockGood(params).then(response=>{
-          if(response.data.state == 1){
-            var stockTotal =  response.data.data.stockTotal
+    // getPrintStockGood(){
+    //   const params = {
+    //     start_time:this.start_time,
+    //     end_time:this.end_time,
+    //     type:3,
+    //   }
+    //   getPrintStockGood(params).then(response=>{
+    //       if(response.data.state == 1){
+    //         var stockTotal =  response.data.data.stockTotal
           
-            this.stockTotal = stockTotal
-            var list =  response.data.data.list
-            this.tableList = []
-            for(let i=0;i<list.length;i++){
-              if (list[i].query_warehouseout_info.length > 0) {
-                this.tableList.push(list[i])
-              }
-            }
-          }
-      })
-    },
+    //         this.stockTotal = stockTotal
+    //         var list =  response.data.data.list
+    //         this.tableList = []
+    //         for(let i=0;i<list.length;i++){
+    //           if (list[i].query_warehouseout_info.length > 0) {
+    //             this.tableList.push(list[i])
+    //           }
+    //         }
+    //       }
+    //   })
+    // },
      calCount(stock) {
         let total = 0
         var array = []
@@ -679,15 +682,6 @@ export default {
         }
         return Math.floor(amountPrice* 100) / 100
       },
-      getStockCount(id){
-        var count = ""
-        for(let i=0;i<this.stockTotal.length;i++){
-            if(id == this.stockTotal[i].good_id){
-              count = this.stockTotal[i].count
-            }
-        }
-        return count
-      },
       getTotal: function(price, total) {
         var m = 0, r1, r2
         var s1 = price.toString()
@@ -741,15 +735,23 @@ export default {
         this.tableOut[i].good_name = this.tableOut[i].good_name
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
-        this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+        if(this.orgId == 9919 || this.orgId == 9671){
+          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
+          this.tableOut[i].packing_price = this.tableOut[i].buy_price
+        }else{
+          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+        }
+      
         this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+
        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
-       
+       console.log("date2332323232",data)
+      
         excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -770,8 +772,15 @@ export default {
           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
+          if(this.orgId == 9919 || this.orgId == 9671){
+             this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
+             total += this.tableDataList[i].count * this.tableDataList[i].buy_price
+          }else{
+            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)
@@ -820,12 +829,24 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+        
           this.tableOut = list
           var stockTotal = response.data.data.stockTotal
+          console.log("list88888888888888888888",stockTotal)
           this.stockTotal = stockTotal
         }
       })
-     } 
+     },
+     getStockCount(id){
+     
+        var count = ""
+        for(let i=0;i<this.stockTotal.length;i++){
+            if(id == this.stockTotal[i].good_id){
+              count = this.stockTotal[i].count
+            }
+        }
+        return count
+    }, 
   }
 };
 </script>

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

@@ -153,13 +153,7 @@
           </template>
         </el-table-column>
 
-        <!-- <el-table-column label="单据类型" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.type == 1">药品出库单</span>
-            <span v-if="scope.row.type == 2">其他</span>
-          </template>
-        </el-table-column> -->
-
+       
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
            <span>{{getTime(scope.row.ctime)}}</span>
@@ -172,7 +166,8 @@
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-           {{scope.row.price}}
+           <span v-if="org_id == 9919 || org_id == 9671">{{scope.row.last_price}} </span> 
+           <span v-else>{{scope.row.price}}</span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
@@ -429,9 +424,16 @@ export default {
           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
+             if(this.org_id == 9919 || this.org_id == 9671){
+               order[i].total_price = order[i].count * order[i].last_price
+               total_price += order[i].count * order[i].last_price
+             }else{
+                order[i].total_price = order[i].count * order[i].price
+                total_price += order[i].count * order[i].price
+             }
+            
           }
+          console.log("total_price23322332232332323232",order)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -443,29 +445,50 @@ export default {
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
-        //  this.drugTypeList = response.data.data.drugTypeList
-          
+       
+          console.log("order232233232232323232332",order)
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
              let { drug_id } = item
-             if(!objInfo[drug_id]){
-               objInfo[drug_id] = {
-                 drug_id,
-                 child:[],
-                 drug_name:item.drug_name,
-                 drug_spec:item.drug_spec,
-                 min_unit:item.min_unit,
-                 count:0,
-                 price:item.price,
-                 remark:item.remark,
-                 total_price:0.0,
-                 dose:item.dose,
-                 dose_unit:item.dose_unit,
-                 min_number:item.min_number,
-                 max_unit:item.max_unit
-               }
+             if(this.org_id == 9671 || this.org_id == 9919){
+              if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.drug_name,
+                  drug_spec:item.drug_spec,
+                  min_unit:item.min_unit,
+                  count:0,
+                  price:item.last_price,
+                  remark:item.remark,
+                  total_price:0.0,
+                  dose:item.dose,
+                  dose_unit:item.dose_unit,
+                  min_number:item.min_number,
+                  max_unit:item.max_unit
+                }
+              }
+             }else{
+               if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.drug_name,
+                  drug_spec:item.drug_spec,
+                  min_unit:item.min_unit,
+                  count:0,
+                  price:item.price,
+                  remark:item.remark,
+                  total_price:0.0,
+                  dose:item.dose,
+                  dose_unit:item.dose_unit,
+                  min_number:item.min_number,
+                  max_unit:item.max_unit
+                }
+              }
              }
+            
           })
           let list = Object.values(objInfo);
           
@@ -485,10 +508,11 @@ export default {
               }
             }
           }
-          for(let i=0;i<list.length;i++){
-             list[i].total_price = list[i].count * list[i].price
-          }
-       
+
+           for(let i=0;i<list.length;i++){
+              list[i].total_price = list[i].count * list[i].price
+            }
+        
           this.tableList = list 
           var total = response.data.data.total
           this.total = total
@@ -517,6 +541,7 @@ export default {
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9671 || this.org_id == 9919 ){
+           
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
              this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
@@ -527,11 +552,9 @@ export default {
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
               this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
            }
-         
-          
         }
        console.log("列表数据333333333",this.tablePrint)
-    
+      
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
@@ -567,8 +590,15 @@ export default {
         this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
         this.tableData[i].time = this.getTime(this.tableData[i].ctime)
         this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
-        this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+        if(this.org_id == 9671 || this.org_id == 9919){
+          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
+          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+        }else{
+          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+        }
+      
+       
        }
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tableData.length;i++){
@@ -627,7 +657,30 @@ export default {
             var list = response.data.data.list
             console.log("药品出库详情",list)
             let objInfo = {}
-            list.forEach((item,index)=>{
+            if(this.org_id == 9671 || this.org_id == 9919){
+              list.forEach((item,index)=>{
+              let { drug_id } = item
+              if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.XtBaseDrug.drug_name,
+                  drug_spec:item.XtBaseDrug.drug_spec,
+                  min_unit:item.XtBaseDrug.min_unit,
+                  count:0,
+                  price:item.XtBaseDrug.last_price,
+                  remark:item.XtBaseDrug.remark,
+                  total_price:"",
+                  dose:item.XtBaseDrug.dose,
+                  dose_unit:item.XtBaseDrug.dose_unit,
+                  min_number:item.XtBaseDrug.min_number,
+                  max_unit:item.XtBaseDrug.max_unit,
+                  min_price:item.XtBaseDrug.min_price,
+                }
+              }
+            })
+            }else{
+               list.forEach((item,index)=>{
               let { drug_id } = item
               if(!objInfo[drug_id]){
                 objInfo[drug_id] = {
@@ -648,6 +701,8 @@ export default {
                 }
               }
             })
+            }
+           
             let newArr = Object.values(objInfo);
             for(let i=0;i<newArr.length;i++){
               for(let j=0;j<list.length;j++){
@@ -720,7 +775,7 @@ export default {
         return total*min_price
       },
       getCountSix(drug_id,val){
-        console.log("val233232",val)
+     
         var count = 0 
         for(let i=0;i<val.length;i++){
           count+= val[i].count

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -279,7 +279,7 @@
         return str + min_str
       },
       getCountOne(arr,max_unit,min_unit,min_number){
-        console.log("arr2332332233232",arr)
+       
         var total = 0
         var str = ""
         var min_str = ""
@@ -295,7 +295,7 @@
         for(let i=0;i<arr.length;i++){
           total+= parseInt(arr[i].total_count)
         }
-       console.log("total233223232323",total,min_number)
+     
         return total
       },
       getTotalPrice(arr,max_unit,min_number,min_price){

src/xt_pages/stock/stockPrint.vue

@@ -14,6 +14,9 @@
                     <div class="order_title_panl">
                         <span class="main_title">耗材管理查询表</span>
                     </div>
+                    <div style="text-align:left;margin-bottom:20px;font-size: 18px;margin-bottom:-30px" v-if="org_id == 3907 || org_id == 9671">
+                      <span v-if="end_time!=''">查询日期:{{start_time}} ~</span>  {{end_time}}
+                    </div>
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
                       打印时间：{{time_now}}
                     </div>

src/xt_pages/stock/stockQuery.vue

@@ -108,7 +108,7 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
@@ -116,27 +116,30 @@
           <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
          </template>
        </el-table-column>
-
-       <el-table-column label="出库数量" align="center" v-if="showTwo">
-         <template slot-scope="scope">
-          <span>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
-         </template>
-       </el-table-column>
-
-       <el-table-column label="剩余库存量" align="center" v-if="showThree">
+      
+        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919">
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
           </span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
-
+        
+    
       <el-table-column label="剩余库存量" align="center" v-if="showFour">
          <template slot-scope="scope">
           <span>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
+
+       <el-table-column label="出库数量" align="center" v-if="showTwo">
+         <template slot-scope="scope">
+          <span>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
+         </template>
+       </el-table-column>
+
+
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
               <el-button
@@ -447,9 +450,9 @@ export default {
           }
           if(this.end_time !=""){
             this.showThree = false
+            this.showOne = false
             this.showTwo = true
             console.log("hh3223322323",this.showTwo)
-            this.showOne = false
             this.showFour = true
           }
           var list = response.data.data.list

src/xt_pages/user/templateSummary.vue

@@ -331,7 +331,7 @@
                                 v-bind:r_content="form.template_plan_content">
                         </editor>
                     </keep-alive>
-                    
+
                   </el-row> -->
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
@@ -672,7 +672,7 @@
               <el-form-item>
                 <span>选择检验检查时间:</span>
                 <div>
-                
+
                  <el-form-item label="时间:">
                    <el-radio-group style="padding: 10px;"  v-model="radio" @change="changeRadio">
                       <el-radio :label="1">月份</el-radio>
@@ -966,8 +966,8 @@
       }
     },
     created() {
-     
-      console.log("this.$store.getters.xt_user.user.id",this.$store.getters.xt_user.user.id)
+
+      // console.log("this.$store.getters.xt_user.user.id",this.$store.getters.xt_user.user.id)
       this.patient_id = this.$route.params && this.$route.params.id
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
@@ -1003,7 +1003,7 @@
         })
 
       this.anticoagulantList = arrFour
-      console.log("抗凝剂量",this.anticoagulantList)
+      // console.log("抗凝剂量",this.anticoagulantList)
       var endtime= moment(new Date()).endOf('month').subtract('month', +1).endOf('month').format("YYYY-MM-DD")
       console.log("endtime",endtime)
       this.getlist()
@@ -1013,7 +1013,7 @@
     },
     methods: {
       getTime(val) {
-         console.log("val2322332322323223",val)
+         // console.log("val2322332322323223",val)
          if(val == "" || val == undefined){
           return ""
          }else {
@@ -1207,7 +1207,7 @@
               end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
             }
             if(this.quartype == 2){
-              start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+              start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")
               end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
             }
             if(this.quartype == 3){
@@ -1219,8 +1219,8 @@
               end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
             }
           }
-         
-        
+
+
           console.log("start_time",start_time)
           console.log("end_time",end_time)
           var params = {
@@ -1350,7 +1350,7 @@
         console.log("年",year)
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
         console.log("月",this.$refs)
-      
+
 
          var params = {
             title:this.form.title,
@@ -1425,7 +1425,7 @@
         })
       },
       getTemplateSummaryList(){
-        
+
           var params = {
             patient_id:this.patient_id,
             start_time:this.start_time,
@@ -1646,8 +1646,8 @@
             inspect_date:this.projectIndate,
          }
          console.log("parawm232323223",params)
-        
-       
+
+
         UpdateTemplateSummary(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list

src/xt_pages/workforce/template.vue

@@ -103,7 +103,7 @@
 
 
         <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
-        <!-- <el-button size="small" icon="el-icon-setting" type="primary" @click="setData">同步数据</el-button> -->
+        <el-button size="small" icon="el-icon-setting" type="primary" @click="setData">同步数据</el-button>
       </div>
       <!-- </el-col> -->
     </div>
@@ -117,13 +117,20 @@
                           :patients="patients"></template-table>
         </el-tab-pane>
         <el-tab-pane name="first" :disabled="template_mode.mode == 0">
-          <span slot="label"> 第一周 </span>
+          <span slot="label"> 模板一
+            <span v-if="schedule.mode ==1">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
+          </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
                           :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
 
         <el-tab-pane name="second" :disabled="template_mode.mode != 2">
-          <span slot="label"> 第二周 </span>
+          <span slot="label"> 模板二
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
+           </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="second_template"
                           :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
@@ -135,9 +142,9 @@
 
      <el-dialog title="同步排班" width="600px" :visible.sync="newVisible">
             <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
-                <el-form-item label="同步周次:">
-                   <el-radio v-model="form.firstWeek" label="1">第一周</el-radio>
-                   <el-radio v-model="form.firstWeek" label="2">第二周</el-radio>
+                <el-form-item label="同步模板:">
+                   <el-radio v-model="form.firstWeek" label="1">模板一</el-radio>
+                   <el-radio v-model="form.firstWeek" label="2">模板二</el-radio>
                 </el-form-item>
                 <el-form-item label="同步到 :">
                   <el-select v-model="form.copyWeek" placeholder="请选择" required  prop="copyWeek">
@@ -164,7 +171,7 @@
   import TemplateTable from './components/template_table'
   import { getTemplateInitData } from '@/api/schedule_template/patient'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { exportScheduleTemplate, getWeekPanels,initDate,synchroSchedule } from '@/api/schedule'
+  import { exportScheduleTemplate, getWeekPanels,initDate,synchroSchedule,getPatientScheduleTemplate } from '@/api/schedule'
   import ScheduleTemplateUploadExcel from './components/scheduleTemplateUploadExcel/index'
   import { generateLog } from '@/api/config'
 
@@ -241,16 +248,18 @@
         },
         rules: {
           copyWeek: [{ required: true, message: "请选择同步时间段", trigger: "blur" }],
-        }
+        },
+        schedule:{},
       }
     },
     created() {
+      this.getPatientScheduleTemplate()
       let year = new Date().getFullYear()
      let month = new Date().getMonth() + 1
      let date = new Date().getDate()
      this.weekNum = this.getYearWeek(year,month,date)
      this.todayDate=this.formatDate(new Date())
-     this.setDate(new Date())
+     this.setDate(new Date(new Date().setDate((new Date().getDate()-7))))
 
      for (var i = 0; i <= 9; i++) {
        this.setDate1(this.addDate(this.currentDate, 7))
@@ -259,14 +268,14 @@
      for(let i = 0; i < this.weekList.length; i++){
          if(this.weekNum + i + 1 <= 53){
              let num = this.weekNum + i 
-            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] 
              this.typeOptions.push({value:i,label:str})
             let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
             this.timeOptions.push({value:i,label:stt})
         }else{
 
             newNum++
-            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] 
             this.typeOptions.push({value:i,label:str})
             let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
             this.timeOptions.push({value:i,label:stt})
@@ -2768,6 +2777,15 @@
           }
         })
  
+      },
+      getPatientScheduleTemplate(){
+        getPatientScheduleTemplate().then(response=>{
+           if(response.data.state == 1){
+             var schedule = response.data.data.schedule 
+             console.log("schedule",schedule)
+             this.schedule = schedule
+           }
+        })
       }
     }
   }

src/xt_permission.js

@@ -26,7 +26,6 @@ router.beforeEach((to, from, next) => {
   // }
   // return
   // 线上注释
-
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)