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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -197,10 +197,14 @@
                         <el-table ref="multipleTableTwo" :height="multipleTableHeight != '' ? multipleTableHeight : '200'" :data="advices_template" border
                                   :row-style="{ color: '#303133' }"
                                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                                  highlight-current-row>
+                                  highlight-current-row
+                                  @select='selectTemplate'
+                                  @select-all="changeTemplateData"
+
+                        >
                           <el-table-column type="selection" width="40" align="center"></el-table-column>
                           <el-table-column prop="name" label="名称">
-                            <template slot-scope="scope">{{}}</template>
+                            <template slot-scope="scope">{{scope.row.name}}</template>
                           </el-table-column>
                           <!--<el-table-column label="规格" width="60">-->
                             <!--<template slot-scope="scope">33</template>-->
@@ -392,10 +396,18 @@
         diagnoses: [],
         diagnose:'',
         curTotal: 0,
-        prescription_id: 0
+        prescription_id: 0,
+        tempDrugs:[]
+
       }
     },
     methods: {
+      selectTemplate(selection, row){
+        this.tempDrugs = selection
+
+      },changeTemplateData(selection){
+        this.tempDrugs = selection
+      },
       stockInCount: function(row) {
         let total = 0;
         if(row.stock_in != null) {
@@ -1042,7 +1054,9 @@
           this.$message.error('该处方已经结算或者退费，无法继续添加药品或者项目')
           this.teamList = []
           this.curDrugs = []
+          this.tempDrugs = []
           this.$refs.tables.clearSelection()
+          this.$refs.multipleTableTwo.clearSelection()
           this.$refs.multipleTable.clearSelection()
           return
         }
@@ -1051,13 +1065,17 @@
           this.$message.error('改处方是药品，无法添加项目')
           this.teamList = []
           this.$refs.tables.clearSelection()
+
           return
         }
 
         if (this.curStatus == 2 && this.rightTab == 1) {
           this.$message.error('改处方是项目，无法添加药品')
           this.curDrugs = []
+          this.tempDrugs = []
           this.$refs.multipleTable.clearSelection()
+          this.$refs.multipleTableTwo.clearSelection()
+
           return
         }
 
@@ -1066,7 +1084,6 @@
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
               this.$message.error('改处方存在相同的项目，无法添加相同的项目')
               return
-
             }
           }
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -54,8 +54,8 @@
               <el-button size="small" ref="button_six"   @click="open(6)">治疗单</el-button>
               <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
             </el-popover>
-            <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
-            <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button>
+            <!--<el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>-->
+            <!--<el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button>-->
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>