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

@@ -29,7 +29,6 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <!--<el-input size="small" v-model="key" class="filter-item"/>-->
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
@@ -80,17 +79,18 @@
           </el-button>
 
 
-          <!--<el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"-->
-                     <!--@click="open(4)"-->
-                     <!--type="primary">收费-->
-          <!--</el-button>-->
+          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
+                     @click="open(4)"
+                     type="primary">收费
+          </el-button>
 
           <el-button size="small" @click="open(5)" type="primary"
                      v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
           </el-button>
-          <el-button size="small" @click="open(5)" type="primary"
-                    >退费
-          </el-button>
+
+          <!--<el-button size="small" @click="open(5)" type="primary"-->
+                    <!--&gt;退费-->
+          <!--</el-button>-->
 
 
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->
@@ -1584,7 +1584,7 @@
           this.loadingtwo = true
           if (this.$store.getters.xt_user.org_id == 9919) {
             var that = this
-            axios.get('http://127.0.0.1:9532/api/upload/get', {
+            axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form
             })
               .then(function(response) {