Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -103,7 +103,7 @@
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
-                <el-table :data="drugs" border @select='selectDrugs' style="width: 100%;"
+                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;"
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
@@ -121,7 +121,7 @@
 
               </el-tab-pane>
               <el-tab-pane label="医嘱模板" name="2">
-                <el-table :data="advices_template" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                <el-table  ref="multipleTableTwo" :data="advices_template" border style="width: 100%;" :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>
@@ -421,7 +421,6 @@
           name: newTabName,
           advices: [],
           project:[],
-          projects:[]
 
         })
         this.editableTabsValue = newTabName
@@ -492,21 +491,33 @@
       },
       comfirm() {
         this.preDrugs = this.curDrugs
-
+        console.log(this.prescriptions)
         for (let i = 0; i < this.prescriptions.length; i++){
-          console.log("名称",this.prescriptions[i].name)
-          console.log("名称2",this.editableTabsValue)
           if(this.prescriptions[i].name == this.editableTabsValue){
            var temp =  this.deepClone(this.preDrugs)
             var temp2 =  this.deepClone(this.teamList)
+            console.log(this.prescriptions[i].advices)
+            console.log(this.prescriptions[i].project)
+
+            console.log(temp)
+            console.log(temp2)
+
 
-            this.prescriptions[i].advices = temp
-            this.prescriptions[i].project = temp2
+            if(temp.length > 0){
+              for (let b = 0; b < temp.length; b++){
+                this.prescriptions[i].advices.push(temp[b])
+              }
+            }
+            if(temp2.length > 0){
+              for (let b = 0; b < temp2.length; b++) {
+                this.prescriptions[i].project.concat(temp2[b])
+              }
+            }
             this.curPrescriptions = this.prescriptions[i]
+            this.$refs.multipleTable.clearSelection();
             // this.$refs.prescription_tables.setNewData(this.prescriptions[i])
           }
         }
-        console.log("222222",this.prescriptions)
       },
       selectChange(row){
         this.teamList = row

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -189,7 +189,7 @@
                 let obj = {
                   name: "处方" + index,
                   advices: prescription.advices,
-                  projects: prescription.project,
+                  project: prescription.project,
                 }
                 this.prescriptions.push(obj)
               }
@@ -197,7 +197,7 @@
               let obj = {
                 name: "处方" + 1,
                 advices: [],
-                projects: [],
+                project: [],
               }
               this.prescriptions.push(obj)
             }