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,8 +29,7 @@
           </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" 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">
             搜索

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -276,7 +276,7 @@
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
-                total:prescription.project[b].count.toString(),
+                total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 medical_code:prescription.project[b].project.medical_code,
@@ -288,6 +288,7 @@
               advices: tempAdvice,
               project: tempProject,
               addition:tempAddition,
+              type:prescription.type,
               order_status:0,
             }
             prescriptions.push(obj)