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

@@ -98,7 +98,7 @@
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+            <el-table-column align="center" prop="remark" width="70" label="推送频率">
                 <template slot-scope="scope">
                     <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
                     <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
@@ -108,7 +108,7 @@
             </el-table-column>
 
 
-            <el-table-column align="center" width="100" prop="name" label="操作">
+            <el-table-column align="center" width="150" prop="name" label="操作">
                 <template slot-scope="scope">
                     <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
                     <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
@@ -188,7 +188,7 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+            <el-table-column align="center" prop="remark" width="70" label="推送频率">
                 <template slot-scope="scope">
                     <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
                     <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>