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/nextOrLastPrescription.vue

@@ -24,7 +24,7 @@
     <div  v-for="(item,index) in allPrescription" :key="index">
       <div>{{item.title}}</div>
       <el-checkbox-group v-model="item.check_group">
-        <el-checkbox label="复选框 A" v-for="(subItem,index2) in item.prescriptions" :key="index2" :label="subItem.id">
+        <el-checkbox label="复选框 A" v-for="(subItem,index2) in item.prescriptions" :key="index2" :label="subItem.id" >
           <el-table v-if="subItem.type  == 1" :data="subItem.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
@@ -133,137 +133,9 @@
     </div>
 
 
-    <!--<el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"-->
-    <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>-->
-    <!--<el-table-column align="center" type="index" width="40" label="序号"></el-table-column>-->
-    <!--<el-table-column align="center" prop="drug_name" label="名称">-->
-    <!--<template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>-->
-    <!--</el-table-column>-->
-
-    <!--<el-table-column align="center" prop="single_dose" width="90" label="单次用量">-->
-    <!--<template slot-scope="scope">-->
-    <!--<div style="display:flex;align-items:center;">-->
-    <!--<el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>-->
-    <!--<div>{{scope.row.single_dose_unit}}</div>-->
-    <!--</div>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="delivery_way" width="100" label="用法">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-select v-model="scope.row.delivery_way" placeholder="请选择">-->
-    <!--<el-option-->
-    <!--v-for="(item,index) in drugways"-->
-    <!--:key="index"-->
-    <!--:label="item.name"-->
-    <!--:value="item.name">-->
-    <!--</el-option>-->
-    <!--</el-select>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="execution_frequency" width="100" label="频率">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-select v-model="scope.row.execution_frequency" placehold er="请选择">-->
-    <!--<el-option-->
-    <!--v-for="item,index in efs"-->
-    <!--:key="index"-->
-    <!--:label="item.name"-->
-    <!--:value="item.name">-->
-    <!--</el-option>-->
-    <!--</el-select>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-
-
-    <!--<el-table-column align="center" prop="day" width="50" label="天数">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.day" placeholder=""></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-
-    <!--<el-table-column align="center" prop="prescribing_number" width="80" label="总量">-->
-    <!--<template slot-scope="scope">-->
-    <!--<div style="display:flex;align-items:center;">-->
-    <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>-->
-    <!--<div> {{scope.row.prescribing_number_unit}}</div>-->
-    <!--</div>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="retail_price" width="60" label="单价">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="remark" width="50" label="备注">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" width="40" prop="name" label="操作">-->
-    <!--<template slot-scope="scope">-->
-    <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--</el-table>-->
-
-    <!--<el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"-->
-    <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>-->
-    <!--<el-table-column align="center" type="index" width="40" label="序号"></el-table-column>-->
-    <!--<el-table-column align="center" prop="project_name" label="名称">-->
-    <!--<template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="statistical_classification" width="100" label="组">-->
-    <!--<template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="single_dose" width="80" label="单次用量">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="delivery_way" width="80" label="用法">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.delivery_way" placeholder=""></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="execution_frequency" width="80" label="频率">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="number_days" width="50" label="天数">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.number_days" placeholder=""></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="total" width="70" label="总量">-->
-    <!--<template slot-scope="scope">-->
-    <!--<div style="display:flex;align-items:center;">-->
-    <!--<el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>-->
-    <!--<div>{{scope.row.unit}}</div>-->
-
-    <!--</div>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="name" width="50" label="单价">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" prop="name" width="50" label="备注">-->
-    <!--<template slot-scope="scope">-->
-    <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--<el-table-column align="center" width="40" prop="name" label="操作">-->
-    <!--<template slot-scope="scope">-->
-    <!--<i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>-->
-    <!--</template>-->
-    <!--</el-table-column>-->
-    <!--</el-table>-->
-
-
     <div slot="footer" class="dialog-footer">
       <el-button @click="isLastOrNextVisible = false">取 消</el-button>
-      <el-button type="primary" @click="AddNewAdvice('adForm')">保存</el-button>
+      <el-button type="primary" @click="save">保存</el-button>
     </div>
   </el-dialog>
 
@@ -318,6 +190,7 @@
                 project:[],
               },
               {
+
                 id:2,
                 type:2,
                 doctor_advice:[],
@@ -344,6 +217,13 @@
         isLastOrNextVisible: true,
 
       }
+    },methods:{
+      save(){
+        console.log(this.allPrescription)
+      }
+
+
+
     }
   }
 </script>