Browse Source

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

yq1 5 hours ago
parent
commit
0f5a7ae303
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/lang/zh.js
  2. 2 2
      src/xt_pages/outpatientTool/components/settle.vue

+ 1 - 1
src/lang/zh.js View File

314
     fapiao:"电子发票列表",
314
     fapiao:"电子发票列表",
315
 
315
 
316
     drugStock:"药品盘存",
316
     drugStock:"药品盘存",
317
-    drugChange:"药品变更",
317
+    drugChange:"药品销售",
318
     drugQuery:"药品查询",
318
     drugQuery:"药品查询",
319
     drugCodeQuery:"药品追溯",
319
     drugCodeQuery:"药品追溯",
320
     drugSourceCode:"药品追溯"
320
     drugSourceCode:"药品追溯"

+ 2 - 2
src/xt_pages/outpatientTool/components/settle.vue View File

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