Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/lang/zh.js

@@ -314,7 +314,7 @@ export default {
     fapiao:"电子发票列表",
 
     drugStock:"药品盘存",
-    drugChange:"药品变更",
+    drugChange:"药品销售",
     drugQuery:"药品查询",
     drugCodeQuery:"药品追溯",
     drugSourceCode:"药品追溯"

src/xt_pages/outpatientTool/components/settle.vue

@@ -214,7 +214,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="cash_pay" label="储值卡说明">
+        <el-table-column align="center" prop="card_desc" label="储值卡说明">
           <!--          <template slot-scope="scope">{{scope.row.cash_pay}}</template>-->
           <template slot-scope="scope" style="width: 100px">
             <el-input v-model="scope.row.card_desc" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
@@ -386,7 +386,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="item_name" label="其他说明">
+      <el-table-column align="center" prop="item_name" label="储值卡说明">
         <template slot-scope="scope">{{scope.row.card_desc}}</template>
         <!--        <template slot-scope="scope" style="width: 100px">-->
         <!--          <el-input v-model="scope.row.oth_desc"></el-input>-->