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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -83,9 +83,9 @@
           >结算单
           </el-button>
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
-          <!--&gt;退号-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"
+          >退号
+          </el-button>
 
           <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
                      size="small" @click="open(11)" type="primary"
@@ -97,10 +97,10 @@
           <!--&gt;查编码-->
           <!--</el-button>-->
 
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
-                     size="small" @click="open(13)" type="primary"
-          >查待遇
-          </el-button>
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
+                     <!--size="small" @click="open(13)" type="primary"-->
+          <!--&gt;查待遇-->
+          <!--</el-button>-->
 
 
         </div>
@@ -179,61 +179,61 @@
                 </div>
               </div>
             </el-tab-pane>
-            <!--<el-tab-pane label="月结" name="second">-->
-            <!--<div style="display:flex;height:100%;">-->
-            <!--<div class="centerLeft">-->
-            <!--<div class="tabsBox">-->
-            <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-            <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
-
-            <!--<el-tab-pane-->
-            <!--v-for="(item, index) in month_prescriptions"-->
-            <!--:key="index"-->
-            <!--:label="item.name"-->
-            <!--:name="item.name"-->
-            <!--&gt;-->
-            <!--</el-tab-pane>-->
-
-            <!--<div class="RP">-->
-            <!--Rp-->
-            <!--<el-date-picker-->
-            <!--v-model="other_start_time"-->
-            <!--prefix-icon="el-icon-date"-->
-            <!--@change="changeTime"-->
-            <!--:editable="false"-->
-            <!--style="width: 150px;"-->
-            <!--type="date"-->
-            <!--:picker-options="pickerOptions"-->
-            <!--placeholder="选择开始时间"-->
-            <!--align="right"-->
-            <!--format="yyyy-MM-dd"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--&gt;</el-date-picker>-->
-            <!--<span class>-</span>-->
-            <!--<el-date-picker-->
-            <!--v-model="other_end_time"-->
-            <!--prefix-icon="el-icon-date"-->
-            <!--@change="changeEndTime"-->
-            <!--:editable="false"-->
-            <!--style="width: 150px;"-->
-            <!--type="date"-->
-            <!--placeholder="选择结束时间"-->
-            <!--align="right"-->
-            <!--format="yyyy-MM-dd"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--&gt;</el-date-picker>-->
-            <!--</div>-->
-            <!--&lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
-            <!--</el-tabs>-->
+            <el-tab-pane label="月结" name="second">
+            <div style="display:flex;height:100%;">
+            <div class="centerLeft">
+            <div class="tabsBox">
+            <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+            <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>
+
+            <el-tab-pane
+            v-for="(item, index) in month_prescriptions"
+            :key="index"
+            :label="item.name"
+            :name="item.name"
+            >
+            </el-tab-pane>
 
+            <div class="RP">
+            Rp
+            <el-date-picker
+            v-model="other_start_time"
+            prefix-icon="el-icon-date"
+            @change="changeTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            :picker-options="pickerOptions"
+            placeholder="选择开始时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            ></el-date-picker>
+            <span class>-</span>
+            <el-date-picker
+            v-model="other_end_time"
+            prefix-icon="el-icon-date"
+            @change="changeEndTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择结束时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            ></el-date-picker>
+            </div>
+            <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
+            </el-tabs>
+
+            </div>
+            <!--<div class="costBox">-->
+            <!--<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>-->
+            <!--<span>{{ state }}</span>-->
             <!--</div>-->
-            <!--&lt;!&ndash;<div class="costBox">&ndash;&gt;-->
-            <!--&lt;!&ndash;<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</div>&ndash;&gt;-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--</el-tab-pane>-->
+            </div>
+            </div>
+            </el-tab-pane>
           </el-tabs>