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

src/api/config.js

     params: params
   })
 }
+
+export function changeAdviceConfig(params) {
+  return request({
+    url: '/api/changeadviceconfig',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/his.js

 }
 
 export function createCaseHistory(params) {
-  console.log('params', params)
   return request({
     url: '/api/doctorworkstation/casehistory/create',
     method: 'get',
   })
 }
 
-
-
 export function getMonthHisHospitalDetailInfo(params) {
   return request({
     url: '/api/monthhospitaldetail/get',
   })
 }
 
-
-
 export function getYidiClearRecord(params) {
   return request({
     url: '/api/his/getyidiclear',
   })
 }
 
-
-
-

src/xt_pages/data/basicConfig.vue

           <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方同步到透析医嘱后，同一个患者，门诊医生站开的药品类处方自动同步到透析管理临时医嘱中，同时在透析管理中，给患者开长期医嘱和临时医嘱的功能失效，医生只能在门诊医生站开处方，只有同时使用门诊管理和透析管理的机构方可开启。</p>
           <p style="margin-top:20px;">门诊处方同步到透析医嘱：
           <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
+          <p style="margin-top:20px;">门诊处方和临时医嘱同步到透析医嘱：
+          <el-switch v-model="is_open_advice_xt_his" @change="changeFuncSix"></el-switch>
           </p>
         </div>
 
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig} from '@/api/config'
 
 export default {
   name: "printTemplate",
       is_open_print:false,
       is_open_xt_his_project: false,
       is_open_is_type:false,
+      is_open_advice_xt_his:false,
     };
   },
   methods: {
               this.is_open_is_type = false
             }
 
+            if(response.data.data.is_open_advice == 1){
+              this.is_open_advice_xt_his = true
+            }else{
+              this.is_open_advice_xt_his = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
         )
       }
     },
-
-
     changeFuncTwo(){
-      console.log("3333333",this.is_open_monitor)
       var is_open = 0
       if(this.is_open_monitor == true){
           is_open = 1
       let params = {
          is_open:is_open,
        }
-     console.log("params",params)
       postMonitorIsOpen(params).then(response=>{
          if(response.data.state == 1){
             var config = response.data.data.config
       getMonitorConfig().then(response=>{
          if(response.data.state == 1){
            var config =  response.data.data.config
-           console.log("config",config)
            if (config.is_open == 1) {
               this.is_open_monitor = true
            }
     },
 
     changeFuncPrint(val){
-      console.log("val22222",val)
       var is_open  = 0
       if(val == true){
          is_open = 1
       getDataPrintList().then(response=>{
          if(response.data.state ==1){
            var dataPrint = response.data.data.dataPrint
-           console.log("列表数据",dataPrint)
            if(dataPrint.is_open == 1){
               this.is_open_print = true
            }
            this.$message.success("保存成功!")
         }
       })
+    },
+    changeFuncSix(){
+      var is_advice_open = 2
+      if(this.is_open_advice_xt_his == false){
+        is_advice_open = 2
+      }
+      if(this.is_open_advice_xt_his == true){
+        is_advice_open = 1
+      }
+      var params = {
+        is_advice_open:is_advice_open,
+      }
+      changeAdviceConfig(params).then(response=>{
+         if(response.data.state == 1){
+          var msg =  response.data.data.msg
+          this.$message.success("保存成功!")
+         }
+      })
     }
 
   },

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
+                          <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对者</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
                         <tr
                               getTime(advice[0].execution_time, " {h}:{i}")
                             }}</span>
                           </td>
+
+                          <td height="35px" v-if="org_id == 10223">
+                            <span
+                              v-if="
+                                setAdminUserES(advice[0], 'checker') ==
+                                  ''
+                              "
+                              >{{
+                                getAdminUser(advice[0], "checker")
+                              }}</span
+                            >
+                            <img
+                              class="es-img"
+                              :src="
+                                setAdminUserES(advice[0], 'checker')
+                              "
+                              alt=""
+                              srcset=""
+                              v-else
+                              style="height: 40px;"
+                            />
+                          </td>
                         </tr>
                         <!-- </template> -->
                       </tbody>

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

             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="血容量(L)"
+            width="140"
+            v-if="isShow('血容量')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.accumulated_blood_volume }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="heparin"
             align="center"
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('血容量')">
+            <el-form-item label="血容量(L)：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('血温监测')">
             <el-form-item label="血温监测">
               <el-input v-model="form.blood_temperature"></el-input>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
+          <th v-if="isShow('血容量')" width="92px">血容量(ml)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>
             <span v-if="monitor.monitor_anticoagulant_value!=''">（{{monitor.monitor_anticoagulant_value ? monitor.monitor_anticoagulant_value : ""  }}）</span>
           </td>
           <th v-if="isShow('累计血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
+          <th v-if="isShow('血容量')" width="92px">{{monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : ""}}</th>
           <th v-if="isShow('血温监测')" width="92px">{{monitor.blood_temperature ? monitor.blood_temperature : ""}}</th>
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
           <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
                         <td style="font-size: 16px" width="10%">执行人签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对护士</td>
                       </tr>
                       <!-- <template v-for="group in doctor_advices" > -->
 
                         <td height="32px">
                           <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         </td>
+                        <td height="32px" v-if="org_id == 10223">
+                          <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker) }}</span>
+                          <img style="height:30px" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else />
+                        </td>
                       </tr>
                       <!-- </template> -->
                     </tbody>

src/xt_pages/hospitalStation/components/deskRecord.vue

     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
-        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.name" placeholder="姓名" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="性别: " prop="name">
-        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.gender" placeholder="性别" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="年龄: " prop="name">
-        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.age" placeholder="年龄" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="证件号:" prop="name">
-        <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.id_card_no" placeholder="证件号" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="出生日期: " prop="name">
         <el-date-picker
         </el-date-picker>
       </el-form-item>
       <el-form-item label="联系电话: " prop="name">
-        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.phone" placeholder="联系电话" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保类型: " prop="name">
         <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="医保证号" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="家庭住址: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.home_address" placeholder="家庭住址" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="过敏史: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+      <el-form-item label="药物过敏史: " prop="name">
+        <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
+<!-- 
+  <el-form-item label="初始透析日期: " prop="name">
+         <el-date-picker
+          :disabled="true"
+          style="width:100%;"
+          v-model="first_dialysis_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="工作单位: " prop="name">
+         <el-input v-model="patientInfo.work_unit" placeholder="工作单位"  :disabled="true"></el-input>
+      </el-form-item>
+
+      <el-form-item label="原发病: " prop="name">
+        <el-input v-model="primary_disease" placeholder="原发病"></el-input>
+      </el-form-item>
+      
+  
+
+      <el-form-item label="确诊肾衰日期: " prop="name">
+         <el-date-picker
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          style="width:100%;"
+          v-model="confirm_failure_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+     
+
+
+      <el-form-item label="体格检查: " prop="name">
+        <el-input v-model="physical_examination" placeholder="体格检查"></el-input>
+      </el-form-item>
+
+       <el-form-item label="专科检查: " prop="name">
+        <el-input v-model="special_inspection" placeholder="专科检查"></el-input>
+      </el-form-item>
+
+      <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
+        <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
+      </el-form-item> -->
+
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
       <el-form-item label="体温:" prop="temperature">
-        <el-input v-model="case_history.temperature" placeholder=""></el-input>
+        <el-input v-model="case_history.temperature" placeholder="体温"></el-input>
         <span>℃</span>
       </el-form-item>
       <el-form-item label="脉搏: " prop="pulse">
-        <el-input v-model="case_history.pulse" placeholder=""></el-input>
+        <el-input v-model="case_history.pulse" placeholder="脉搏"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="呼吸: " prop="breathing">
-        <el-input v-model="case_history.breathing" placeholder=""></el-input>
+        <el-input v-model="case_history.breathing" placeholder="呼吸"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="血压:" prop="name">
-        <el-input v-model="case_history.sbp" placeholder=""></el-input>
+        <el-input v-model="case_history.sbp" placeholder="血压"></el-input>
         /
-        <el-input v-model="case_history.dbp" placeholder=""></el-input>
+        <el-input v-model="case_history.dbp" placeholder="血压"></el-input>
         mmHg
       </el-form-item>
     </el-form>
         diagnoses:[],
         sick:[],
         allergic_history:"",
+        primary_disease:"",
+        confirm_failure_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+        drug_allergy_history:"",
+        start_dialysis_date:"",
+        physical_examination:"",
+        special_inspection:"",
+        lab_apparatus:"",
+        first_dialysis_date:"",
         form:{
           id:0,
         },
             "diagnose":this.case_history.diagnose,
             "allergic_history":this.allergic_history,
             "id":this.form.id,
+            "primary_disease":this.primary_disease,
+            "confirm_failure_date":this.confirm_failure_date,
+            "drug_allergy_history":this.drug_allergy_history,
+            "physical_examination":this.physical_examination,
+            "special_inspection":this.special_inspection,
+            "lab_apparatus":this.lab_apparatus,
           };
           console.log("prams222",params);
           createCaseHistory(params).then(response => {
             } else {
               var caseHistory = response.data.data.caseHistory;
               console.log("caseHistory",caseHistory);
+              
+              this.primary_disease = caseHistory.primary_disease
+              this.confirm_failure_date = this.getTime(caseHistory.confirm_failure_date)
+              this.drug_allergy_history = caseHistory.drug_allergy_history
+              this.physical_examination = caseHistory.physical_examination
+              this.special_inspection = caseHistory.special_inspection
+              this.lab_apparatus = caseHistory.lab_apparatus
+
               this.$message.success("保存成功");
               this.doctor_advice = "";
               this.remark = "";
       },
     },
     created(){
+     
        this.getlist();
        this.getInitData();
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       console.log("232322323",this);
+       console.log("232322323",this.case_history);
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-
+      this.primary_disease = this.case_history.primary_disease
+      this.confirm_failure_date = this.case_history.confirm_failure_date
+      this.drug_allergy_history = this.case_history.drug_allergy_history
+      this.physical_examination = this.case_history.physical_examination
+      this.special_inspection = this.case_history.special_inspection
+      this.lab_apparatus = this.case_history.lab_apparatus
     },
     watch:{
       detalid:function(val){
           }
           this.form.id = this.case_history.id;
           this.allergic_history = this.case_history.allergic_history;
+          this.primary_disease = this.case_history.primary_disease
+          this.confirm_failure_date = this.case_history.confirm_failure_date
+          this.drug_allergy_history = this.case_history.drug_allergy_history
+          this.physical_examination = this.case_history.physical_examination
+          this.special_inspection = this.case_history.special_inspection
+          this.lab_apparatus = this.case_history.lab_apparatus
           this.watchSign++
+
         },
         deep:true
       },

src/xt_pages/hospitalStation/doctorDesk.vue

                         :editable="false"
                         style="width: 100%;"
                         type="date"
-                        :picker-options="pickerOptions"
                         placeholder="选择开始时间"
                         align="right"
                         format="yyyy-MM-dd"
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
+            console.log("电子比你2333223232323232323232323",this.case_history)
             this.info = response.data.data.info
             this.last_info = response.data.data.last_info
             this.schedule = response.data.data.schedule
             } else {
               this.case_history.is_infect = false
             }
-
+            
+            this.case_history.primary_disease = this.case_history.primary_disease
+            this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+            this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+            this.case_history.physical_examination = this.case_history.physical_examination
+            this.case_history.special_inspection = this.case_history.special_inspection
+            this.case_history.lab_apparatus = this.case_history.lab_apparatus
+         
+          
             //处方相关
             this.prescriptionList = response.data.data.prescription
 
                   } else {
                     this.case_history.is_infect = false
                   }
+
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                
                   this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {
                   } else {
                     this.case_history.is_infect = false
                   }
+
+                   this.case_history.primary_disease = this.case_history.primary_disease
+                   this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                   this.case_history.physical_examination = this.case_history.physical_examination
+                   this.case_history.special_inspection = this.case_history.special_inspection
+                   this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {
                 } else {
                   this.case_history.is_infect = false
                 }
+                this.case_history.primary_disease = this.case_history.primary_disease
+                this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                this.case_history.physical_examination = this.case_history.physical_examination
+                this.case_history.special_inspection = this.case_history.special_inspection
+                this.case_history.lab_apparatus = this.case_history.lab_apparatus
                 this.prescriptionList = response.data.data.prescription
 
                 if (response.data.data.prescription.length > 0) {
                   } else {
                     this.case_history.is_infect = false
                   }
-                  this.prescriptionList = response.data.data.prescription
+                   this.case_history.primary_disease = this.case_history.primary_disease
+                    this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                    this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                    this.case_history.physical_examination = this.case_history.physical_examination
+                    this.case_history.special_inspection = this.case_history.special_inspection
+                    this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                 this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {
                     for (let i = 0; i < response.data.data.prescription.length; i++) {
                     this.case_history.sick_type = ''
                   }
                   this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   if (this.case_history.is_infect == 1) {
                     this.case_history.is_infect = true
                   } else {
                     this.case_history.is_infect = false
                   }
                   this.prescriptionList = response.data.data.prescription
-
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   if (response.data.data.prescription.length > 0) {
                     for (let i = 0; i < response.data.data.prescription.length; i++) {
                       var prescription = response.data.data.prescription[i]
                     this.case_history.sick_type = ''
                   }
                   this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                  this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                  this.case_history.physical_examination = this.case_history.physical_examination
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                  this.case_history.lab_apparatus = this.case_history.lab_apparatus
                   if (this.case_history.is_infect == 1) {
                     this.case_history.is_infect = true
                   } else {
         }
       },
       handleClick() {
-        if (this.titleType == '电子处方') {
+        console.log("hhahdf adf adf ",this.titleType)
+         console.log("radio ",this.radio)
+        if (this.titleType == '电子处方' || this.titleType == "电子病历") {
           if (this.radio == 1) {
             this.un_cure_data.map(item => {
               if (item.id == this.patientid) {
             })
           }
         }
-
       },
       savePrint() {
         //处方
             }
 
             this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+            this.case_history.primary_disease = this.case_history.primary_disease
+            this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+            this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+            this.case_history.physical_examination = this.case_history.physical_examination
+            this.case_history.special_inspection = this.case_history.special_inspection
+            this.case_history.lab_apparatus = this.case_history.lab_apparatus
             if (this.case_history.is_infect == 1) {
               this.case_history.is_infect = true
             } else {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                    good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
                 }
               }
-               console.log("耗材列表2323232322332",good_info)
+               
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
-        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.name" placeholder="姓名" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="性别: " prop="name">
-        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.gender" placeholder="性别" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="年龄: " prop="name">
-        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.age" placeholder="年龄" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="证件号:" prop="name">
         <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
         </el-date-picker>
       </el-form-item>
       <el-form-item label="联系电话: " prop="name">
-        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.phone" placeholder="联系电话" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保类型: " prop="name">
         <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="医保证号" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="家庭住址: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
+        <el-input v-model="patientInfo.home_address" placeholder="家庭住址" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="过敏史: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+      <el-form-item label="药物过敏史: " prop="name">
+        <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
-<!-- 
+     
+      <!-- <el-form-item label="初始透析日期: " prop="name">
+         <el-date-picker
+          :disabled="true"
+          style="width:100%;"
+          v-model="first_dialysis_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item label="工作单位: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+         <el-input v-model="patientInfo.work_unit" placeholder="工作单位"  :disabled="true"></el-input>
       </el-form-item>
 
       <el-form-item label="原发病: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+        <el-input v-model="primary_disease" placeholder="原发病"></el-input>
       </el-form-item>
+      
+  
 
       <el-form-item label="确诊肾衰日期: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
-      </el-form-item>
-
-     <el-form-item label="药物过敏史: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
-      </el-form-item>
-
-       <el-form-item label="初始透析日期: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+         <el-date-picker
+          style="width:100%;"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          v-model="confirm_failure_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
       </el-form-item>
-
-       <el-form-item label="体格检查: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+     
+      <el-form-item label="体格检查: " prop="name">
+        <el-input v-model="physical_examination" placeholder="体格检查"></el-input>
       </el-form-item>
 
        <el-form-item label="专科检查: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+        <el-input v-model="special_inspection" placeholder="专科检查"></el-input>
       </el-form-item>
 
-        <el-form-item label="实验室及器械检查: " prop="name">
-        <el-input v-model="allergic_history" placeholder=""></el-input>
+      <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
+        <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
       </el-form-item> -->
 
     </el-form>
   import {  createCaseHistory,getInitData } from '@/api/his/his'
   import { getDataConfig } from "@/utils/data";
   import { getTemplateDetail,getMedicalTemplateList } from "@/api/project/project"
+  import { uParseTime } from '@/utils/tools'
   export default {
     props: {
       case_history: Object,
         diagnoses:[],
         sick:[],
         allergic_history:"",
+        primary_disease:"",
+        confirm_failure_date:"",
+        drug_allergy_history:"",
+        start_dialysis_date:"",
+        physical_examination:"",
+        special_inspection:"",
+        lab_apparatus:"",
+        first_dialysis_date:"",
+        work_unit:"",
         form:{
           id:0,
         },
             "diagnose":this.case_history.diagnose,
             "allergic_history":this.allergic_history,
             "id":this.form.id,
+            "primary_disease":this.primary_disease,
+            "confirm_failure_date":this.confirm_failure_date,
+            "drug_allergy_history":this.drug_allergy_history,
+            "physical_examination":this.physical_examination,
+            "special_inspection":this.special_inspection,
+            "lab_apparatus":this.lab_apparatus,
           }
-          console.log("prams222",params)
-         
+          console.log("param233322332232323",params)
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
             } else {
               var caseHistory = response.data.data.caseHistory
               console.log("caseHistory",caseHistory)
+              var historyInfo = response.data.data.historyInfo
+              console.log("historyInfo",historyInfo)
+              this.primary_disease = caseHistory.primary_disease
+              this.confirm_failure_date = this.getTime(caseHistory.confirm_failure_date)
+              this.drug_allergy_history = caseHistory.drug_allergy_history
+              this.physical_examination = caseHistory.physical_examination
+              this.special_inspection = caseHistory.special_inspection
+              this.lab_apparatus = caseHistory.lab_apparatus
+              this.form.id = historyInfo.id
+
               this.$message.success("保存成功")
               this.doctor_advice = ""
               this.remark = ""
               if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
                 console.log("templatedetail",templatedetail)
-
                 this.case_history.chief_conplaint =  templatedetail.chief_conplaint
                 this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness
                 this.case_history.past_history =  templatedetail.past_history
                 this.case_history.remark = templatedetail.remark
                 this.case_history.sick = templatedetail.sick
                 this.case_history.diagnose = templatedetail.diagnose
-
+              
               }
           })
         },
         })
 
       },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
     },
     created(){
+      
        this.getlist()
        this.getInitData()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       this.allergic_history = this.case_history.allergic_history
+      
+   
+      
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-
+      
+      this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
+      
+      this.primary_disease = this.case_history.primary_disease
+      this.confirm_failure_date = this.case_history.confirm_failure_date
+      this.drug_allergy_history = this.case_history.drug_allergy_history
+      this.physical_examination = this.case_history.physical_examination
+      this.special_inspection = this.case_history.special_inspection
+      this.lab_apparatus = this.case_history.lab_apparatus
     },
     watch:{
       detalid:function(val){
         this.getTemplateDetail(val)
+
       },
       'patientInfo.gender':{
         handler(newName, oldName){
-          console.log('newName',newName)
           if(newName == 1){
             this.patientInfo.gender = '男'
           }else if(newName == 2){
       },
       case_history:{
         handler(val){
-          console.log("南京人明",this.case_history)
+          
           this.allergic_history = this.case_history.allergic_history
           if(this.case_history.breathing == 0){
             this.case_history.breathing = ""
             this.case_history.diagnose = ""
           }
           this.form.id = this.case_history.id
-
+          
+          this.primary_disease = this.case_history.primary_disease
+          this.confirm_failure_date = this.case_history.confirm_failure_date
+          this.drug_allergy_history = this.case_history.drug_allergy_history
+          this.physical_examination = this.case_history.physical_examination
+          this.special_inspection = this.case_history.special_inspection
+          this.lab_apparatus = this.case_history.lab_apparatus
           this.watchSign++
         },
         deep:true

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             :editable="false"
             style="width: 100%;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择开始时间"
             align="right"
             format="yyyy-MM-dd"
 
       }
       this.isloading = true
+      console.log("param32323232323323223233232332",params)
       getPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
           this.patientInfo = response.data.data.xt_info
           this.hisPatientInfo = response.data.data.his_info
           this.case_history = response.data.data.case_history
+        
           this.info = response.data.data.info
           this.last_info = response.data.data.last_info
           this.schedule = response.data.data.schedule
             this.case_history.is_infect = false
           }
 
+           this.case_history.allergic_history = this.case_history.allergic_history
+           this.case_history.primary_disease = this.case_history.primary_disease
+           this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+           this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+           this.case_history.physical_examination = this.case_history.physical_examination
+           this.case_history.special_inspection = this.case_history.special_inspection
+           this.case_history.lab_apparatus = this.case_history.lab_apparatus
+
           //处方相关
           this.prescriptionList = response.data.data.prescription
 
 
     choosePatient(val) {
       if (this.titleType == '电子病历') {
-        if (this.$refs.child.watchSign > 2) {
+        if (this.$refs.child!=undefined && this.$refs.child.watchSign > 2) {
           this.$confirm('是否保存当前病例', '保存', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
                 '-' +
                 (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
                 ':' + (min < 10 ? '0' + min : min)
+          
             getPatientInfo(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                
+                if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+               
+               
+                
+               
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
                 this.schedule = response.data.data.schedule
                 } else {
                   this.case_history.is_infect = false
                 }
+
+
                 this.prescriptionList = response.data.data.prescription
 
                 if (response.data.data.prescription.length > 0) {
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+
+             
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
                 } else {
                   this.case_history.is_infect = false
                 }
+
+               if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.prescriptionList = response.data.data.prescription
 
                 if (response.data.data.prescription.length > 0) {
               this.patientInfo = response.data.data.xt_info
               this.hisPatientInfo = response.data.data.his_info
               this.case_history = response.data.data.case_history
+             
               this.info = response.data.data.info
               this.last_info = response.data.data.last_info
 
               } else {
                 this.case_history.is_infect = false
               }
+
+                    
+             if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+              }
+                
+            
+               this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }
+
+
               this.prescriptionList = response.data.data.prescription
 
               if (response.data.data.prescription.length > 0) {
           this.$refs.child.watchSign = 0
         }
       } else {
-
+       
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                console.log("999923923323232",this.case_history)
+               
+               if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.doctors = response.data.data.doctors
                 this.department = response.data.data.department
                 this.schedule = response.data.data.schedule
                   }
                 }
 
-                this.case_history = response.data.data.case_history
+              
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                
+                this.case_history.primary_disease = this.case_history.primary_disease
+                this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                this.case_history.physical_examination = this.case_history.physical_examination
+                this.case_history.special_inspection = this.case_history.special_inspection
+                this.case_history.lab_apparatus = this.case_history.lab_apparatus
+
                 var month_prescriptions = response.data.data.month_prescriptions
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
                   }
                 }
 
-                this.case_history = response.data.data.case_history
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
 
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+                
+                if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
                 this.schedule = response.data.data.schedule
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
+
+                if(this.case_history.primary_disease == ""){
+                   this.case_history.primary_disease = ""
+                }else{
+                  this.case_history.primary_disease = this.case_history.primary_disease
+                }
+                
+                if(this.case_history.confirm_failure_date <=0){
+                  this.case_history.confirm_failure_date = ""
+                }else{
+                  this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+                }
+
+                if(this.case_history.drug_allergy_history ==""){
+                   this.case_history.drug_allergy_history = ""
+                }else{
+                   this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+                }
+                 
+                if(this.case_history.physical_examination ==""){
+                  this.case_history.physical_examination = ""
+                }else{
+                 this.case_history.physical_examination = this.case_history.physical_examination
+                }
+                if(this.case_history.special_inspection == ""){
+                  this.case_history.special_inspection = ""
+                }else{
+                  this.case_history.special_inspection = this.case_history.special_inspection
+                }
+                 
+                if(this.case_history.lab_apparatus == ""){
+                  this.case_history.lab_apparatus = ""
+                }else{
+                 this.case_history.lab_apparatus = this.case_history.lab_apparatus
+                }
+
                 this.info = response.data.data.info
                 this.last_info = response.data.data.last_info
                 this.schedule = response.data.data.schedule
       }
     },
     handleClick() {
-      if (this.titleType == '电子处方') {
+      if (this.titleType == '电子处方' || this.titleType == '电子病历') {
         if (this.radio == 1) {
           this.un_cure_data.map(item => {
-            console.log('~~~~~~~~')
             if (item.id == this.patientid) {
               console.log('~~~~~~~~22222222')
 
           this.patientInfo = response.data.data.xt_info
           this.hisPatientInfo = response.data.data.his_info
           this.case_history = response.data.data.case_history
+
+            if(this.case_history.primary_disease == ""){
+                this.case_history.primary_disease = ""
+            }else{
+              this.case_history.primary_disease = this.case_history.primary_disease
+            }
+            
+            if(this.case_history.confirm_failure_date <=0){
+              this.case_history.confirm_failure_date = ""
+            }else{
+              this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
+            }
+
+            if(this.case_history.drug_allergy_history ==""){
+                this.case_history.drug_allergy_history = ""
+            }else{
+                this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
+            }
+              
+            if(this.case_history.physical_examination ==""){
+              this.case_history.physical_examination = ""
+            }else{
+              this.case_history.physical_examination = this.case_history.physical_examination
+            }
+            if(this.case_history.special_inspection == ""){
+              this.case_history.special_inspection = ""
+            }else{
+              this.case_history.special_inspection = this.case_history.special_inspection
+            }
+              
+            if(this.case_history.lab_apparatus == ""){
+              this.case_history.lab_apparatus = ""
+            }else{
+              this.case_history.lab_apparatus = this.case_history.lab_apparatus
+            }
+
           this.info = response.data.data.info
           this.last_info = response.data.data.last_info
           this.schedule = response.data.data.schedule

src/xt_pages/outpatientTool/components/drugDetail.vue

            
             <el-table-column align="center" prop="total" label="操作">
                 <template slot-scope="scope">
-                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id)">使用明细</div>
+                  <div style="color: #589ff8" @click="jump(scope.row.child,scope.row.min_number,scope.row.drug_id,scope.row.max_unit,scope.row.min_unit)">使用明细</div>
                 </template>
             </el-table-column>
 
             </el-table-column>
             <el-table-column align="center" prop="name" label="数量">
                 <template slot-scope="scope">
-                    {{scope.row.prescribing_number/min_number}}
+                  <span v-if="scope.row.prescribing_number_unit == max_unit">{{scope.row.prescribing_number/min_number}}</span>   
+                  <span v-if="scope.row.prescribing_number_unit == min_unit && max_unit!=min_unit">{{scope.row.prescribing_number}}</span>   
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="单位">
        min_number:0,
        drug_type:"",
        drug_id:0,
+       max_unit:"",
+       min_unit:"",
       }
     },
     methods:{
         }
         return max_str + min_str
        },
-       jump(val,min_number,drug_id){
+       jump(val,min_number,drug_id,max_unit,min_unit){
+         console.log("max_unit23232233",max_unit)
+         console.log("min_unit23232233",min_unit)
          this.dialogVisible = true
          this.tableList= val
          this.min_number = min_number
+         this.max_unit = max_unit
+         this.min_unit = min_unit
          this.drug_id = drug_id
        },
        getPatientName(id){

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
               <td style="line-height:18px;" width="100">规格<br>型号</td>
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
-            
+              <td style="line-height:18px;" width="80">经销商</td>
               <td style="line-height:18px;" width="80">进货价</td>
               <td style="line-height:18px;" width="80">入库<br>数量</td>
               <td style="line-height:18px;" width="80">单位</td>
                  <span v-if="item.drug_id != 0">{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
+              <td style="line-height: 18px">{{ getDeatl(item.dealer) }}</td>
               <td style="line-height:18px">
                   {{item.price}}
               </td>
             </tr>
             <tr>
               <td>合计</td>
-              <td colspan="12" style="text-align:right;">{{getAllPrince(it.id).toFixed(2)}}</td>
+              <td colspan="7" style="text-align:center"></td>
+              <td style="text-align:center">{{getAllPrince(it.id).toFixed(2)}}</td>
+              <td colspan="6" style="text-align:center"></td>
             </tr>
             </tbody>
           </table>
             return false;
             } else {
              this.manufacturer = response.data.data.manufacturer;
+             this.dealer = response.data.data.dealer
               this.getList()
             }
         });
           }
         }
         return count
+      },
+       getDeatl(id){
+       
+        var dealer_name = ""
+        for(let i=0;i<this.dealer.length;i++){
+          if(id == this.dealer[i].id){
+            dealer_name = this.dealer[i].dealer_name
+          }
+        }
+        return dealer_name
       }
     },
     created() {

src/xt_pages/stock/stockInOrderDetailPrint.vue

                                     <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
                                     <td style="line-height:18px;" width="80">规格<br>型号</td>
                                     <td style="line-height:18px;" width="80">生产<br>厂商</td>
+                                    <td style="line-height:18px;" width="80">经销商</td>
                                     <td style="line-height:18px;" width="80">单位</td>
                                     <td style="line-height:18px;" width="80">进货价</td>
                                     <td style="line-height:18px;" width="80">入库<br>数量</td> 
                                     <td style="line-height:18px;">{{ item.license_number }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
+                                    <td style="line-height:18px;">{{ getDeatl(item.dealer) }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
                                     <td style="line-height:18px;">{{item.price}}</td>
                                     <td style="line-height:18px;">{{item.warehousing_count}}</td> 
                                 </tr>
                                 <tr>
                                   <td>合计</td>
-                                  <td colspan="12" style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
+                                  <td colspan="7" style="text-align:center;"></td>
+                                  <td style="text-align:right;">{{getAllPice(it.id).toFixed(2)}}</td>
+                                  <td colspan="6" style="text-align:center"></td>
                                </tr>
                             </tbody>
                         </table>
                   if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
                      this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
                   }
+                
                } 
             }
              console.log("商品信息",this.goodInfo)
      getManufacturer(id){
          let name = ""
          for(let i=0;i<this.goodInfo.length;i++){
-             if(id == this.goodInfo[i].id){
-                name  =this.goodInfo[i].manufacturer_name
-             }
+            if(id == this.goodInfo[i].id){
+              name  =this.goodInfo[i].manufacturer_name
+            }
          }
          return name
       },
           }
         }
         return total_price
+      },
+      getDeatl(id){
+        console.log("23323233223",id)
+        var dealer_name = ""
+        for(let i=0;i<this.dealer.length;i++){
+          if(id == this.dealer[i].id){
+            dealer_name = this.dealer[i].dealer_name
+          }
+        }
+        return dealer_name
       }
     },
     created(){

src/xt_pages/stock/stockQuery.vue

               getCancelCount(scope.row.id)
               }}
            </span>
-           <span v-if="org_id != 9675 || org_id != 3907 || org_id != 9583">
+           <span v-if="org_id != 9675 && org_id != 3907 && org_id != 9583">
                {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
            </span>
          </template>