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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -78,30 +78,33 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537 ||  this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537 ||  this.$store.getters.xt_user.org.id == 10635">
 
         <el-checkbox-group v-model="form.pay_wayss">
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
-      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.cash_pay" ></el-input>
       </el-form-item>
 
-      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
+      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.ali_pay" ></el-input>
       </el-form-item>
       <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
+      <el-form-item label="储值卡说明：" v-if="this.$store.getters.xt_user.org.id == 0 || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
+        <el-input class="number_style" v-model="form.card_desc" ></el-input>
+      </el-form-item>
+      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
       </el-form-item>
 
@@ -218,6 +221,7 @@
           wechat_pay:"",
           ali_pay:"",
           jifen_pay:"",
+          card_desc:"",
         },
         payWays: [
           {value: "1", label: '现金'},
@@ -227,6 +231,8 @@
           {value: "7", label: '积分'},
           {value: "4", label: '医保卡'},
           {value: "8", label: '其他'},
+          {value: "9", label: '储值卡'},
+
         ],
         total:"",
 

src/xt_pages/outpatientTool/components/settle.vue

@@ -214,6 +214,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column align="center" prop="cash_pay" 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>
+            <el-button size="small" @click="change(scope.row.id,scope.row.card_desc,'card_desc')">修改</el-button>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="item_name" label="其他说明">
 <!--          <template slot-scope="scope">{{scope.row.oth_desc}}</template>-->
           <template slot-scope="scope" style="width: 100px">
@@ -378,6 +385,14 @@
 <!--        </template>-->
       </el-table-column>
 
+
+      <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>-->
+        <!--        </template>-->
+      </el-table-column>
+
       <el-table-column align="center" prop="item_name" label="其他说明">
                   <template slot-scope="scope">{{scope.row.oth_desc}}</template>
 <!--        <template slot-scope="scope" style="width: 100px">-->