Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
             </el-tab-pane>
             <div class="RP">Rp</div>
-            <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs" :activeType="activeName"></prescription-table>
+            <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs" :activeType="customTabIndex"></prescription-table>
           </el-tabs>
 
         </div>
         showOne:true,
         showTwo:false,
         state1:"",
-        value:"",
+        customTabIndex:1,
         options:[],
         tabProject:[],
         strids:""
 
       },
       tabclickEvent(val){
-        console.log(val)
         for (let i= 0; i<this.prescriptions.length; i++){
           console.log(this.prescriptions[i].name)
             if(this.prescriptions[i].name == val.name){
               this.curPrescriptions = this.prescriptions[i]
+
+              //用来区分处方属于项目还是药品
+              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
+                this.customTabIndex = 1
+              }
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
+                this.customTabIndex = 2
+              }
+
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
+                this.customTabIndex = this.rightTab
+              }
+
             }
+
+
         }
       },
       setData(data){
         this.rightTab = index
 
 
+        //用来区分处方属于项目还是药品
+        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
+          this.customTabIndex = 1
+        }
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
+          this.customTabIndex = 2
+        }
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
+          // this.customTabIndex = this.rightTab
+          this.customTabIndex = index
+        }
+
+
+
+
       },
       addCharges() {
         this.$refs.additionalCharges.show()

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

 <template>
   <div class="prescriptionTable">
     <div>{{prescription.name}}</div>
-    <el-table v-if="activeType  == '1'" :data="prescription.advices" border style="width: 98%;" :row-style="{ color: '#303133' }"
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 98%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="selection" width="40"></el-table-column>
       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-if="activeType  == '2'" :data="prescription.project" border style="width: 98%;" :row-style="{ color: '#303133' }"
+    <el-table v-if="activeType  == 2" :data="prescription.project" border style="width: 98%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="selection" width="40"></el-table-column>
       <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>