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

src/xt_pages/data/components/consumables.vue

           {{ scope.row.packing_price }}
         </template>
       </el-table-column>
-       <el-table-column label="社保目录编码" width="110" align="center">
+       <el-table-column label="国家医保编码" width="110" align="center">
         <template slot-scope="scope">
           {{ scope.row.social_security_directory_code }}
         </template>

src/xt_pages/data/components/drugs.vue

           </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>
           <div>{{scope.row.retail_price}}</div>
         </template>
       </el-table-column>
-       <el-table-column prop="date" label="医保编码" width="100" align="center">
+       <el-table-column prop="date" label="国家医保编码" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.medical_insurance_number}}</div>
         </template>
                  this.formValue.drug_classify = ""
               }
 
-              
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 
            console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
-        
+
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-         
+
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
           var isHasPackingPrice= header.includes('*包装零售价');
           console.log("isHasLastPrice",isHasPackingPrice)
           var isHasLastPrice = header.includes('*进货价');
           console.log("进货价",isHasLastPrice)
-          
+
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
          console.log("isDrugDoseUnit",isDrugDoseUnit)
           if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
           isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
-           
+
             this.dialogVisible = true;
             return
           }
            }
 
 
-  
+
           if (results[i]['*拆零'] === undefined) {
                 obj['min_number'] = ''
               } else {
           'drugs':tableData
         };
         console.log("params222222222",params)
-        
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

src/xt_pages/data/components/project.vue

                     {{getExecutiveSection(scope.row.executive_section)}}
                 </template>
             </el-table-column>
-            <el-table-column label="医保编码" width="140" align="center">
+            <el-table-column label="国家医保编码" width="140" align="center">
                 <template  slot-scope="scope">
                    {{scope.row.medical_code}}
                 </template>

src/xt_pages/hospitalStation/template/printOne.vue

           </div>
           <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
-              <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+              <p>日期：{{getTime(item.pre_time)?getTime(item.pre_time):""}}</p>
           </div>
           <div class="actionBar">
                  <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
         return project_name
      },
 
-     getDiagnosis(id){
-        var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
-          }
-        }
-        return name
-     }
+     getDiagnosis(id) {
+       let arr = id.split(',')
+       var name = ''
+       for (let i = 0; i < this.diagnoses.length; i++) {
+         if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+           name += this.diagnoses[i].class_name + ' '
+         }
+       }
+       return name
+     },
 
    },
    created(){

src/xt_pages/hospitalStation/template/printTwo.vue

             <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
             <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
             <div>地址：{{patient.home_address}}</div>
-            <div style="display:flex;width:50%;">临床诊断：{{patient.diagnose}}</div>
+            <div style="display:flex;width:50%;">临床诊断：22222{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
         </div>
         <div class="prescriptionBox">
             <div class="Rp">Rp:</div>
     },
     data(){
       return {
+        diagnoses:[],
         doctorList:[],
         advicePrint:{},
         patient:{},
       }
     },
    methods:{
+     getInitData(){
+       getInitData().then(response=>{
+         if(response.data.state == 1){
+           this.department = response.data.data.department
+           this.diagnoses = response.data.data.diagnose
+           console.log("争端",this.diagnoses)
+         }
+       })
+     },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''
                this.doctorList = doctor
              }
          })
+     },   getDiagnosis(id) {
+       let arr = id.split(',')
+       var name = ''
+       for (let i = 0; i < this.diagnoses.length; i++) {
+         if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+           name += this.diagnoses[i].class_name + ' '
+         }
+       }
+       return name
      },
-
       getDoctor(id){
         var name = ""
         for(let i=0;i<this.doctorList.length;i++){
           }
        })
      },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
 
-          }
-       })
-     },
      getDepart(id){
          var name = ""
        for(let i=0;i<this.department.length;i++){

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

         })
       },
       getDiagnosis(id) {
+        let arr = id.split(',')
         var name = ''
         for (let i = 0; i < this.diagnoses.length; i++) {
-          if (id == this.diagnoses[i].id) {
-            name = this.diagnoses[i].class_name
+          if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+            name += this.diagnoses[i].class_name + ' '
           }
         }
         return name